litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

W2X: New option separate_stylesheet

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@122 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2011-08-05 07:48:15 +00:00
parent 498aded635
commit 5dc6aed004
4 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.8 ----------
[w2x] Implemented the option separate_stylesheet to separate the style sheet from the XHTML files (has no effect on EPUB export)
[all] Added Catalan translation from Martí Ruiz-Altaba
[all] Image files are now extracted with proper file extension, even if the ODF manifest contains no media type

BIN
source/distro/doc/user-manual.odt
View file

Binary file not shown.

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2011-07-29)
* Version 1.2 (2011-08-05)
*
*/
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.1.8";
private static final String DATE = "2011-07-29";
private static final String DATE = "2011-08-05";
/** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)<br/>

33
source/java/writer2latex/xhtml/Converter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2011-07-20)
* Version 1.2 (2011-08-05)
*
*/
@ -328,7 +328,6 @@ public class Converter extends ConverterBase {
// Add included style sheet, if any - and we are creating OPS content
if (bOPS && styleSheet!=null) {
// TODO: Move to subfolder
converterResult.addDocument(styleSheet);
for (ResourceDocument doc : resources) {
converterResult.addDocument(doc);
@ -336,7 +335,7 @@ public class Converter extends ConverterBase {
}
// Export styles (XHTML)
if (!isOPS()) {
if (!isOPS() && !config.separateStylesheet()) {
for (int i=0; i<=nOutFileIndex; i++) {
Element head = outFiles.get(i).getHeadNode();
if (head!=null) {
@ -472,11 +471,18 @@ public class Converter extends ConverterBase {
}
}
// Export styles (EPUB)
if (isOPS() && config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) {
CssDocument cssDoc = new CssDocument(EPUB_STYLESHEET);
cssDoc.read(styleCv.exportStyles(false));
converterResult.addDocument(cssDoc);
// Export styles
if (config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) {
if (isOPS()) { // EPUB
CssDocument cssDoc = new CssDocument(EPUB_STYLESHEET);
cssDoc.read(styleCv.exportStyles(false));
converterResult.addDocument(cssDoc);
}
else if (config.separateStylesheet()) { // XHTML
CssDocument cssDoc = new CssDocument(sTargetFileName+"-styles.css");
cssDoc.read(styleCv.exportStyles(false));
converterResult.addDocument(cssDoc);
}
}
}
@ -697,6 +703,16 @@ public class Converter extends ConverterBase {
head.appendChild(htmlStyle);
}
// Add link to generated stylesheet if producing normal XHTML and the user wants separate css
if (!bOPS && config.separateStylesheet() && config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) {
Element htmlStyle = htmlDOM.createElement("link");
htmlStyle.setAttribute("rel","stylesheet");
htmlStyle.setAttribute("type","text/css");
htmlStyle.setAttribute("media","all");
htmlStyle.setAttribute("href",sTargetFileName+"-styles.css");
head.appendChild(htmlStyle);
}
// Add link to included style sheet if producing OPS content
if (bOPS && styleSheet!=null) {
Element sty = htmlDOM.createElement("link");
@ -716,7 +732,6 @@ public class Converter extends ConverterBase {
htmlStyle.setAttribute("href",EPUB_STYLESHEET);
head.appendChild(htmlStyle);
}
// Note: For XHTML, generated styles are exported to the doc at the end.
}