From a799097caaa1c406933f2431f3380a44a0f9e4c2 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Sun, 20 Jun 2010 09:26:32 +0000 Subject: [PATCH] A few w2x fixes git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@70 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- build.xml | 13 +- source/distro/changelog.txt | 10 + .../writer2xhtml/ConfigurationDialog.java | 16 +- .../writer2latex/api/ConverterFactory.java | 4 +- .../writer2latex/xhtml/TextConverter.java | 75 ++-- .../java/writer2latex/xhtml/XhtmlConfig.java | 37 +- .../writer2latex/xhtml/XhtmlDocument.java | 331 ++++++++++-------- .../oxt/writer2xhtml/W2XDialogs2/Content.xdl | 3 + .../oxt/writer2xhtml/W2XDialogs2/General.xdl | 6 +- .../Configuration/Content.xhp | 7 + .../Configuration/General.xhp | 11 +- 11 files changed, 309 insertions(+), 204 deletions(-) diff --git a/build.xml b/build.xml index 098237b..2571655 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.2 (2010-04-17) + # version 1.2 (2010-06-19) ############################################################################ --> @@ -35,7 +35,7 @@ - + @@ -169,7 +169,16 @@ + + + + + + + + + diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index e469416..b65c4fe 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,16 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.4 ---------- +[w2x] New option endnotes_heading: The value of this (if non-empty) is used as heading for the endnotes + +[w2x] The option add_bom now only has effect if the encoding is UTF-8 + +[w2x] Filter bugfix: Added missing classes to produce LaTeX formulas + +[w2x] Bugfix: Pretty printing no longer results in unwanted spaces in the text + +[w2x] Added support for unnumbered headings + [w2x] Added Finnish translation from Samuli Selin (merged from 1.0.2) [w2x] Added help content for custom format diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index 4915d0c..03e9b5c 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * -* Version 1.2 (2010-05-06) +* Version 1.2 (2010-06-20) * */ @@ -99,8 +99,8 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer @Override protected void setControls(DialogAccess dlg) { checkBoxFromConfig(dlg, "NoDoctype", "no_doctype"); - checkBoxFromConfig(dlg, "AddBOM", "add_bom"); listBoxFromConfig(dlg, "Encoding", "encoding", sEncodingValues, (short) 0); + checkBoxFromConfig(dlg, "AddBOM", "add_bom"); if ("true".equals(config.getOption("hexadecimal_entities"))) { dlg.setListBoxSelectedItem("HexadecimalEntities", (short) 0); @@ -109,6 +109,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer dlg.setListBoxSelectedItem("HexadecimalEntities", (short) 1); } + checkBoxFromConfig(dlg, "UseNamedEntities", "use_named_entities"); checkBoxFromConfig(dlg, "Multilingual", "multilingual"); checkBoxFromConfig(dlg, "PrettyPrint", "pretty_print"); @@ -118,8 +119,8 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer @Override protected void getControls(DialogAccess dlg) { checkBoxToConfig(dlg, "NoDoctype", "no_doctype"); - checkBoxToConfig(dlg, "AddBOM", "add_bom"); listBoxToConfig(dlg, "Encoding", "encoding", sEncodingValues); + checkBoxToConfig(dlg, "AddBOM", "add_bom"); config.setOption("hexadecimal_entities", Boolean.toString(dlg.getListBoxSelectedItem("HexadecimalEntities")==(short)0)); @@ -137,9 +138,10 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer } private void updateControls(DialogAccess dlg) { - boolean bUnicode = dlg.getListBoxSelectedItem("Encoding")<2; - dlg.setControlEnabled("HexadecimalEntitiesLabel", !bUnicode); - dlg.setControlEnabled("HexadecimalEntities", !bUnicode); + int nEncoding = dlg.getListBoxSelectedItem("Encoding"); + dlg.setControlEnabled("AddBOM", nEncoding==0); // Only for UTF-8 + dlg.setControlEnabled("HexadecimalEntitiesLabel", nEncoding>1); // Not for UNICODE + dlg.setControlEnabled("HexadecimalEntities", nEncoding>1); // Not for UNICODE } } @@ -399,10 +401,12 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer @Override protected void setControls(DialogAccess dlg) { listBoxFromConfig(dlg, "Formulas", "formulas", sFormulaValues, (short) 0); + textFieldFromConfig(dlg, "EndnotesHeading", "endnotes_heading"); } @Override protected void getControls(DialogAccess dlg) { listBoxToConfig(dlg, "Formulas", "formulas", sFormulaValues); + textFieldToConfig(dlg, "EndnotesHeading", "endnotes_heading"); } @Override protected boolean handleEvent(DialogAccess dlg, String sMethod) { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 8f62aaa..931ad59 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-05-27) + * Version 1.2 (2010-06-20) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.1.4"; - private static final String DATE = "2010-05-27"; + private static final String DATE = "2010-06-20"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java index e839132..5507b26 100644 --- a/source/java/writer2latex/xhtml/TextConverter.java +++ b/source/java/writer2latex/xhtml/TextConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-05-17) + * Version 1.2 (2010-06-20) * */ @@ -501,11 +501,11 @@ public class TextConverter extends ConverterHelper { private void handleHeading(Element onode, Node hnode, boolean bAfterSplit) { int nListLevel = getOutlineLevel((Element)onode); - boolean bUnNumbered = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_IS_LIST_HEADER)); + //boolean bUnNumbered = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_IS_LIST_HEADER)); boolean bRestart = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_RESTART_NUMBERING)); int nStartValue = Misc.getPosInteger(Misc.getAttribute(onode,XMLString.TEXT_START_VALUE),1)-1; handleHeading(onode, hnode, bAfterSplit, ofr.getOutlineStyle(), - nListLevel, bUnNumbered, bRestart, nStartValue); + nListLevel, false, bRestart, nStartValue); } /* @@ -515,11 +515,21 @@ public class TextConverter extends ConverterHelper { ListStyle listStyle, int nListLevel, boolean bUnNumbered, boolean bRestart, int nStartValue) { String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME); + if (!bUnNumbered) { + // If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered + StyleWithProperties style = ofr.getParStyle(sStyleName); + if (style!=null) { + String sListStyleName = style.getListStyleName(); + if (sListStyleName!=null && sListStyleName.length()==0) { + bUnNumbered = true; + } + } + } // Note: nListLevel may in theory be different from the outline level, // though the ui in OOo does not allow this // Numbering: It is possible to define outline numbering in CSS2 - // using counters; but this is not supported by Mozilla 1.0. + // using counters; but this is not supported in all browsers // TODO: Offer CSS2 solution as an alternative later. // Note: Conditional styles are not supported @@ -560,16 +570,19 @@ public class TextConverter extends ConverterHelper { prependAsapNode(heading); // Prepend numbering - ListCounter counter = getListCounter(listStyle); - if (bRestart) { counter.restart(nListLevel,nStartValue); } - String sLabel = counter.step(nListLevel).getLabel(); - if (config.zenHack() && nLevel==2) { - // Hack for ePub Zen Garden: Special style for the prefix at level 2 - // TODO: Replace by some proper style map construct... - insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading); - } - else { - insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading); + String sLabel=""; + if (!bUnNumbered) { + ListCounter counter = getListCounter(listStyle); + if (bRestart) { counter.restart(nListLevel,nStartValue); } + sLabel = counter.step(nListLevel).getLabel(); + if (config.zenHack() && nLevel==2) { + // Hack for ePub Zen Garden: Special style for the prefix at level 2 + // TODO: Replace by some proper style map construct... + insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading); + } + else { + insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading); + } } // Add to toc @@ -1606,19 +1619,27 @@ public class TextConverter extends ConverterHelper { public void insertEndnotes(Node hnode) { int n = endnotes.size(); - if (nSplit>0 && n>0) { hnode = converter.nextOutFile(); } - for (int i=0; i0) { + if (nSplit>0) { hnode = converter.nextOutFile(); } + String sHeading = config.getEndnotesHeading(); + if (sHeading.length()>0) { + Element heading = converter.createElement("h1"); + hnode.appendChild(heading); + heading.appendChild(converter.createTextNode(sHeading)); + } + for (int i=0; iDocument for @@ -65,15 +67,17 @@ public class XhtmlDocument extends DOMDocument { /** Constant to identify XHTML + MathML documents */ public static final int XHTML_MATHML = 2; - /** Constant to identify XHTML + MathML documents using the xsl transformations + /** Constant to identify XHTML + MathML documents using the XSL transformations * from w3c's math working group (http://www.w3.org/Math/XSL/) */ public static final int XHTML_MATHML_XSL = 3; - + + // Some static data private static final String[] sExtension = { ".html", ".xhtml", ".xhtml", ".xml" }; - private static final String[] sEmpty = { "base", "meta", "link", "hr", "br", "param", "img", "area", "input", "col" }; - + private static Set blockPrettyPrint; + private static Set conditionalBlockPrettyPrint; + private static Set emptyElements; private static String[] entities; // Not convenient to define directly due to a lot of null values // Type of document @@ -102,6 +106,139 @@ public class XhtmlDocument extends DOMDocument { private Element headerNode = null; private Element footerNode = null; + // Initialize static data + static { + // Paragraphs and headings always block pretty printing + blockPrettyPrint = new HashSet(); + blockPrettyPrint.add("p"); + blockPrettyPrint.add("h1"); + blockPrettyPrint.add("h2"); + blockPrettyPrint.add("h3"); + blockPrettyPrint.add("h4"); + blockPrettyPrint.add("h5"); + blockPrettyPrint.add("h6"); + + // List items and table cells may block pretty printing, depending on the context + conditionalBlockPrettyPrint = new HashSet(); + conditionalBlockPrettyPrint.add("li"); + conditionalBlockPrettyPrint.add("th"); + conditionalBlockPrettyPrint.add("td"); + + // These elements are empty + emptyElements = new HashSet(); + emptyElements.add("base"); + emptyElements.add("meta"); + emptyElements.add("link"); + emptyElements.add("hr"); + emptyElements.add("br"); + emptyElements.add("param"); + emptyElements.add("img"); + emptyElements.add("area"); + emptyElements.add("input"); + emptyElements.add("col"); + + // Named character entities (currently only those within the ISO latin 1 range) + entities = new String[256]; + // Latin 1 symbols + entities[160]=" "; + entities[161]="¡"; + entities[162]="¢"; + entities[163]="£"; + entities[164]="¤"; + entities[165]="¥"; + entities[166]="¦"; + entities[167]="§"; + entities[168]="¨"; + entities[169]="©"; + entities[170]="ª"; + entities[171]="«"; + entities[172]="¬"; + entities[173]="­"; + entities[174]="®"; + entities[175]="¯"; + entities[176]="°"; + entities[177]="±"; + entities[178]="²"; + entities[179]="³"; + entities[180]="´"; + entities[181]="µ"; + entities[182]="¶"; + entities[183]="·"; + entities[184]="¸"; + entities[185]="¹"; + entities[186]="º"; + entities[187]="»"; + entities[188]="¼"; + entities[189]="½"; + entities[190]="¾"; + entities[191]="¿"; + entities[215]="×"; + entities[247]="÷"; + // Latin 1 characters + entities[192]="À"; + entities[193]="Á"; + entities[194]="Â"; + entities[195]="Ã"; + entities[196]="Ä"; + entities[197]="Å"; + entities[198]="Æ"; + entities[199]="Ç"; + entities[200]="È"; + entities[201]="É"; + entities[202]="Ê"; + entities[203]="Ë"; + entities[204]="Ì"; + entities[205]="Í"; + entities[206]="Î"; + entities[207]="Ï"; + entities[208]="Ð"; + entities[209]="Ñ"; + entities[210]="Ò"; + entities[211]="Ó"; + entities[212]="Ô"; + entities[213]="Õ"; + entities[214]="Ö"; + entities[216]="Ø"; + entities[217]="Ù"; + entities[218]="Ú"; + entities[219]="Û"; + entities[220]="Ü"; + entities[221]="Ý"; + entities[222]="Þ"; + entities[223]="ß"; + entities[224]="à"; + entities[225]="á"; + entities[226]="â"; + entities[227]="ã"; + entities[228]="ä"; + entities[229]="å"; + entities[230]="æ"; + entities[231]="ç"; + entities[232]="è"; + entities[233]="é"; + entities[234]="ê"; + entities[235]="ë"; + entities[236]="ì"; + entities[237]="í"; + entities[238]="î"; + entities[239]="ï"; + entities[240]="ð"; + entities[241]="ñ"; + entities[242]="ò"; + entities[243]="ó"; + entities[244]="ô"; + entities[245]="õ"; + entities[246]="ö"; + entities[248]="ø"; + entities[249]="ù"; + entities[250]="ú"; + entities[251]="û"; + entities[252]="ü"; + entities[253]="ý"; + entities[254]="þ"; + entities[255]="ÿ"; + } + public static final String getExtension(int nType) { return sExtension[nType]; } @@ -322,7 +459,7 @@ public class XhtmlDocument extends DOMDocument { cLimit = 65535; } - bAddBOM = config.xhtmlAddBOM(); + bAddBOM = config.xhtmlAddBOM() && sEncoding.equals("UTF-8"); bNoDoctype = config.xhtmlNoDoctype(); bPrettyPrint = config.prettyPrint(); bUseNamedEntities = config.useNamedEntities(); @@ -341,6 +478,7 @@ public class XhtmlDocument extends DOMDocument { public String getFileExtension() { return super.getFileExtension(); } + // Optimize the usage of xml:dir and xml:lang attributes private void optimize(Element node, String sLang, String sDir) { if (node.hasAttribute("xml:lang")) { if (node.getAttribute("xml:lang").equals(sLang)) { @@ -378,9 +516,6 @@ public class XhtmlDocument extends DOMDocument { * @throws IOException If any I/O error occurs. */ public void write(OutputStream os) throws IOException { - // Prepare named entities - prepareEntities(); - OutputStreamWriter osw = new OutputStreamWriter(os,sEncoding); // Add a BOM if the user desires so if (bAddBOM) { osw.write("\uFEFF"); } @@ -409,16 +544,42 @@ public class XhtmlDocument extends DOMDocument { } Element doc = getContentDOM().getDocumentElement(); optimize(doc,null,null); - write(doc,0,osw); + write(doc,bPrettyPrint ? 0 : -1,osw); osw.flush(); osw.close(); } + + private static boolean blockThis(Element node) { + String sTagName = node.getTagName(); + if (blockPrettyPrint.contains(sTagName)) { + return true; + } + else if (conditionalBlockPrettyPrint.contains(sTagName)) { + // Block pretty printing if the content is anything but elements that block pretty print + Node child = node.getFirstChild(); + while (child!=null) { + if (child.getNodeType()==Node.ELEMENT_NODE && !blockPrettyPrint.contains(child.getNodeName())) { + return true; + } + child = child.getNextSibling(); + } + return false; + } + else { + // Other elements block pretty printing if they contain text nodes + Node child = node.getFirstChild(); + while (child!=null) { + if (child.getNodeType()==Node.TEXT_NODE) { + return true; + } + child = child.getNextSibling(); + } + return false; + } + } - private boolean isEmpty(String sTagName) { - for (int i=0; i=0) { writeSpaces(nLevel,osw); } osw.write("<"+node.getNodeName()); writeAttributes(node,osw); osw.write(" />"); - if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } + if (nLevel>=0) { osw.write("\n"); } } else if (node.hasChildNodes()) { - // Block pretty print from this node? - NodeList list = node.getChildNodes(); - int nLen = list.getLength(); - boolean bBlockPrettyPrint = false; - if (nLevel>=0) { - for (int i = 0; i < nLen; i++) { - bBlockPrettyPrint |= list.item(i).getNodeType()==Node.TEXT_NODE; - } - } + int nNextLevel = (nLevel<0 || blockThis((Element)node)) ? -1 : nLevel+1; // Print start tag if (nLevel>=0) { writeSpaces(nLevel,osw); } osw.write("<"+node.getNodeName()); writeAttributes(node,osw); osw.write(">"); - if (bPrettyPrint && nLevel>=0 && !bBlockPrettyPrint) { osw.write("\n"); } + if (nNextLevel>=0) { osw.write("\n"); } // Print children - for (int i = 0; i < nLen; i++) { - int nNextLevel; - if (bBlockPrettyPrint || nLevel<0) { nNextLevel=-1; } - else { nNextLevel=nLevel+1; } - write(list.item(i),nNextLevel,osw); + Node child = node.getFirstChild(); + while (child!=null) { + write(child,nNextLevel,osw); + child = child.getNextSibling(); } // Print end tag - if (nLevel>=0 && !bBlockPrettyPrint) { writeSpaces(nLevel,osw); } + if (nNextLevel>=0) { writeSpaces(nLevel,osw); } osw.write(""); - if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } + if (nLevel>=0) { osw.write("\n"); } } else { // empty element if (nLevel>=0) { writeSpaces(nLevel,osw); } @@ -473,7 +625,7 @@ public class XhtmlDocument extends DOMDocument { else { osw.write(" />"); } - if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } + if (nLevel>=0) { osw.write("\n"); } } break; case Node.TEXT_NODE: @@ -484,7 +636,7 @@ public class XhtmlDocument extends DOMDocument { osw.write(""); - if (bPrettyPrint && nLevel>=0) { osw.write("\n"); } + if (nLevel>=0) { osw.write("\n"); } } } @@ -502,9 +654,7 @@ public class XhtmlDocument extends DOMDocument { } private void writeSpaces(int nCount, OutputStreamWriter osw) throws IOException { - if (bPrettyPrint) { - for (int i=0; i + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/General.xdl b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl index 2f37c97..2778124 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/General.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl @@ -3,9 +3,8 @@ - - - + + @@ -14,6 +13,7 @@ + diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp index f647dc1..0f66a5c 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp @@ -36,5 +36,12 @@ LaTeX code: Export LaTeX code directly in the text. + + Endnotes + + + Heading + In %PRODUCTNAME Writer, endnotes cannot have a heading. If you want to add + a heading for the endnotes in the exported document, enter the desired heading here. \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp index d6eddd8..a9471d2 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp @@ -22,17 +22,18 @@ The !DOCTYPE is required for a valid XHTML document: This option should only be used if you need to process the document further. - - Add Byte Order Mark (BOM) - Check this to include a BOM (Byte Order Mark) to the XHTML document. - Most applications will not need this, but it may be required in rare cases. - Encoding Select the character encoding to use for the XHTML document. Currently supported encodings are UTF-8 (recommended), UTF-16, ISO-8859-1 and US-ASCII. Characters not supported by the encoding are exported as numeric character entities. + + Add Byte Order Mark (BOM) + Check this to include a BOM (Byte Order Mark) to the XHTML document (UTF-8 only). + Normally this is not needed if you use UTF-8 encoding, but it may be required in rare cases. + + Numeric character entities Select how to export numeric character entities. You can use either