diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index ad09807..b0f45cd 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,9 +1,18 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 -TODO2: Tilføj ?-knap til xhtml export dialoger +TODO: Problem med genkendelse af display formler i w2l?? ---------- version 1.1.3 ---------- +[w2x] New option "use_hard_list_numbering". If this option is set to true (default is false), list labels are exported as + part of the text rather than by style. This allows for full support of list numbering. + +[w2x] Now includes a space after the list label if the list style defines that the label is followed by a tab or a space + +[w2l] Now recognize the "numbered formula" AutoText provided with OOo as a display equation + +[w2l] Bugfix: Display equations in flat XML are now recognized correctly + [w2x] Bugfix: Now adds XML prolog for XHTML 1.1 documents [w2x] XHTML templates without and/or are now allowed. If no content element is found, the diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index b762c89..d54fcb1 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index a8bed12..26f00ea 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-04-09) +* Version 1.2 (2010-05-04) * */ @@ -364,6 +364,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer checkBoxFromConfig(dlg, "IgnoreTableDimensions", "ignore_table_dimensions"); checkBoxFromConfig(dlg, "UseListHack", "use_list_hack"); + checkBoxFromConfig(dlg, "UseHardListNumbering", "use_hard_list_numbering"); //TODO: These have been postponed //checkBoxFromConfig(dlg, "ConvertToPx", "convert_to_px"); //checkBoxFromConfig(dlg, "SeparateStylesheet", "separate_stylesheet"); @@ -378,6 +379,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer checkBoxToConfig(dlg, "IgnoreTableDimensions", "ignore_table_dimensions"); checkBoxToConfig(dlg, "UseListHack", "use_list_hack"); + checkBoxToConfig(dlg, "UseHardListNumbering", "use_hard_list_numbering"); //TODO: These have been postponed //checkBoxToConfig(dlg, "ConvertToPx", "convert_to_px"); //checkBoxToConfig(dlg, "SeparateStylesheet", "separate_stylesheet"); diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 7a62c4c..f60dad8 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-04-23) + * Version 1.2 (2010-05-04) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.1.3"; - private static final String DATE = "2010-04-23"; + private static final String DATE = "2010-05-04"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/latex/MathmlConverter.java b/source/java/writer2latex/latex/MathmlConverter.java index d8ab27d..123d599 100644 --- a/source/java/writer2latex/latex/MathmlConverter.java +++ b/source/java/writer2latex/latex/MathmlConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-19) + * Version 1.2 (2010-04-29) * */ @@ -36,6 +36,7 @@ import org.w3c.dom.NodeList; //import writer2latex.latex.i18n.I18n; import writer2latex.office.MIMETypes; import writer2latex.office.OfficeReader; +import writer2latex.office.TableReader; import writer2latex.office.XMLString; import writer2latex.util.Misc; import writer2latex.xmerge.EmbeddedObject; @@ -108,42 +109,77 @@ public final class MathmlConverter extends ConverterHelper { // Data for display equations private Element theEquation = null; private Element theSequence = null; + + /** Try to convert a table as a display equation: + * A 1 row by 2 columns table in which each cell contains exactly one paragraph, + * the left cell contains exactly one formula and the right cell contains exactly + * one sequence number is treated as a (numbered) display equation. + * This happens to coincide with the AutoText provided with OOo Writer :-) + * @param table the table reader + * @param ldp the LaTeXDocumentPortion to contain the converted equation + * @return true if the conversion was successful, false if the table + * did not represent a display equation + */ + public boolean handleDisplayEquation(TableReader table, LaTeXDocumentPortion ldp) { + if (table.getRowCount()==1 && table.getColCount()==2 && + OfficeReader.isSingleParagraph(table.getCell(0, 0)) && OfficeReader.isSingleParagraph(table.getCell(0, 1)) ) { + // Table of the desired form + theEquation = null; + theSequence = null; + if (parseDisplayEquation(Misc.getFirstChildElement(table.getCell(0, 0))) && theEquation!=null && theSequence==null) { + // Found equation in first cell + Element myEquation = theEquation; + theEquation = null; + theSequence = null; + if (parseDisplayEquation(Misc.getFirstChildElement(table.getCell(0, 1))) && theEquation==null && theSequence!=null) { + // Found sequence in second cell + handleDisplayEquation(myEquation, theSequence, ldp); + return true; + } + } + } + return false; + } /**Try to convert a paragraph as a display equation: * A paragraph which contains exactly one formula + at most one sequence * number is treated as a display equation. Other content must be brackets - * or whitespace (possible with formatting). + * or whitespace (possibly with formatting). * @param node the paragraph * @param ldp the LaTeXDocumentPortion to contain the converted equation - * @return true if the conversion was succesful, false if the paragraph + * @return true if the conversion was successful, false if the paragraph * did not contain a display equation */ public boolean handleDisplayEquation(Element node, LaTeXDocumentPortion ldp) { theEquation = null; theSequence = null; if (parseDisplayEquation(node) && theEquation!=null) { - if (theSequence!=null) { - // Numbered equation - ldp.append("\\begin{equation}"); - palette.getFieldCv().handleSequenceLabel(theSequence,ldp); - ldp.nl() - .append(convert(null,theEquation)).nl() - .append("\\end{equation}").nl(); - if (bAddParAfterDisplay) { ldp.nl(); } - } - else { - // Unnumbered equation - ldp.append("\\begin{equation*}").nl() - .append(convert(null,theEquation)).nl() - .append("\\end{equation*}").nl(); - if (bAddParAfterDisplay) { ldp.nl(); } - } - return true; + handleDisplayEquation(theEquation, theSequence, ldp); + return true; } else { return false; } } + + private void handleDisplayEquation(Element equation, Element sequence, LaTeXDocumentPortion ldp) { + if (sequence!=null) { + // Numbered equation + ldp.append("\\begin{equation}"); + palette.getFieldCv().handleSequenceLabel(sequence,ldp); + ldp.nl() + .append(convert(null,equation)).nl() + .append("\\end{equation}").nl(); + if (bAddParAfterDisplay) { ldp.nl(); } + } + else { + // Unnumbered equation + ldp.append("\\begin{equation*}").nl() + .append(convert(null,equation)).nl() + .append("\\end{equation*}").nl(); + if (bAddParAfterDisplay) { ldp.nl(); } + } + } private boolean parseDisplayEquation(Node node) { Node child = node.getFirstChild(); @@ -210,7 +246,7 @@ public final class MathmlConverter extends ConverterHelper { if (Misc.isElement(node,XMLString.DRAW_FRAME)) { node=Misc.getFirstChildElement(node); } - + String sHref = Misc.getAttribute(node,XMLString.XLINK_HREF); if (sHref!=null) { // Embedded object in package or linked object @@ -243,6 +279,7 @@ public final class MathmlConverter extends ConverterHelper { if (formula==null) { formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); } + return formula; } return null; } diff --git a/source/java/writer2latex/latex/TableConverter.java b/source/java/writer2latex/latex/TableConverter.java index da0b186..c431220 100644 --- a/source/java/writer2latex/latex/TableConverter.java +++ b/source/java/writer2latex/latex/TableConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-08-23) + * Version 1.2 (2010-04-29) * */ @@ -165,6 +165,8 @@ public class TableConverter extends ConverterHelper { // Read the table table = ofr.getTableReader(node); + + if (palette.getMathmlCv().handleDisplayEquation(table,ldp)) { return; } // Get formatter and update flags according to formatter formatter = new TableFormatter(ofr,config,palette,table,!oc.isInMulticols(),oc.isInTable()); diff --git a/source/java/writer2latex/office/ListCounter.java b/source/java/writer2latex/office/ListCounter.java index b18d46b..be4b06d 100644 --- a/source/java/writer2latex/office/ListCounter.java +++ b/source/java/writer2latex/office/ListCounter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-12-15) + * Version 1.2 (2010-05-04) * */ @@ -99,20 +99,30 @@ public class ListCounter { } public String getLabel() { - if (sNumFormat[nLevel]==null) return ""; - int nLevels = Misc.getPosInteger(style.getLevelProperty(nLevel, - XMLString.TEXT_DISPLAY_LEVELS),1); - String sPrefix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_PREFIX); - String sSuffix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_SUFFIX); - String sLabel=""; - if (sPrefix!=null) { sLabel+=sPrefix; } - for (int j=nLevel-nLevels+1; j1) { + props.addValue("margin-left", "2em"); + } + else { + props.addValue("margin-left","0"); + } + + // Also reset the padding (some browsers use a non-zero default value) + props.addValue("padding-left", "0"); } + // We don't want floats to pass a list to the left (Mozilla and IE both //handles this terribly!) props.addValue("clear:left"); } + + private void cssListParMargins(ListStyle style, int nLevel, CSVList props){ + // Instead margin is applied to the paragraphs in the list, more precisely the list style defines a + // left margin and a text indent to *replace* the values from the paragraph style + String sMarginLeft = style.getLevelStyleProperty(nLevel, XMLString.FO_MARGIN_LEFT); + if (sMarginLeft!=null) { + props.addValue("margin-left", sMarginLeft); + } + else { + props.addValue("margin-left", "0"); + } + String sTextIndent = style.getLevelStyleProperty(nLevel, XMLString.FO_TEXT_INDENT); + if (sTextIndent!=null) { + props.addValue("text-indent", sTextIndent); + } + else { + props.addValue("text-indent", "0"); + } + } diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java index a9129e0..2815141 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-03-29) + * Version 1.2 (2010-05-04) * */ @@ -91,6 +91,8 @@ public class TextConverter extends ConverterHelper { private ListCounter outlineNumbering; private Hashtable listCounters = new Hashtable(); private String sCurrentListLabel = null; + private ListStyle currentListStyle = null; + private int nCurrentListLevel = 0; // Mode used to handle floats (depends on source doc type and config) private int nFloatMode; @@ -555,20 +557,8 @@ public class TextConverter extends ConverterHelper { ListCounter counter = getListCounter(listStyle); if (bRestart) { counter.restart(nListLevel,nStartValue); } String sLabel = counter.step(nListLevel).getLabel(); - if (!bUnNumbered && sLabel.length()>0) { - Element span = converter.createElement("span"); - StyleInfo info = new StyleInfo(); - info.sClass = "SectionNumber"; - if (listStyle!=null) { - String sTextStyleName = listStyle.getLevelProperty( - nListLevel,XMLString.TEXT_STYLE_NAME); - getTextSc().applyStyle(sTextStyleName, info); - } - getTextSc().applyStyle(info, span); - heading.appendChild(span); - span.appendChild( converter.createTextNode(sLabel) ); - } - + insertListLabel(listStyle,nListLevel,"SectionNumber",sLabel,heading); + // Add to toc if (!bInToc) { String sTarget = "toc"+(++nTocIndex); @@ -634,16 +624,20 @@ public class TextConverter extends ConverterHelper { entry.nFileIndex = converter.getOutFileIndex(); tocEntries.add(entry); } - sCurrentListLabel = null; if (!bIsEmpty) { par = createTextBackground(par, sStyleName); + if (config.useHardListNumbering()) { + insertListLabel(currentListStyle, nCurrentListLevel, "ItemNumber", sCurrentListLabel, par); + } + sCurrentListLabel = null; traverseInlineText(onode,par); } else { // An empty paragraph (this includes paragraphs that only contains // whitespace) is ignored by the browser, hence we add   par.appendChild( converter.createTextNode("\u00A0") ); + sCurrentListLabel = null; } } @@ -684,6 +678,22 @@ public class TextConverter extends ConverterHelper { return new ListCounter(); } } + + // Helper: Insert a list label formatted with a list style + private void insertListLabel(ListStyle style, int nLevel, String sDefaultStyle, String sLabel, Element hnode) { + if (sLabel!=null && sLabel.length()>0) { + Element span = converter.createElement("span"); + StyleInfo info = new StyleInfo(); + info.sClass = sDefaultStyle; + if (style!=null) { + String sTextStyleName = style.getLevelProperty(nLevel,XMLString.TEXT_STYLE_NAME); + getTextSc().applyStyle(sTextStyleName, info); + } + getTextSc().applyStyle(info, span); + hnode.appendChild(span); + span.appendChild( converter.createTextNode(sLabel) ); + } + } // Helper: Check if a list contains any items private boolean hasItems(Node onode) { @@ -765,7 +775,7 @@ public class TextConverter extends ConverterHelper { if (!bContinueNumbering && counter!=null) { counter.restart(nLevel); } - if (config.xhtmlUseListHack() && counter.getValue(nLevel)>0) { + if (config.xhtmlUseListHack() && !config.useHardListNumbering() && counter.getValue(nLevel)>0) { hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1)); } } @@ -796,12 +806,14 @@ public class TextConverter extends ConverterHelper { else { // add an li element sCurrentListLabel = counter.step(nLevel).getLabel(); + currentListStyle = ofr.getListStyle(styleName); + nCurrentListLevel = nLevel; Element item = converter.createElement("li"); StyleInfo info = new StyleInfo(); getPresentationSc().applyOutlineStyle(nLevel,info); applyStyle(info,item); hnode.appendChild(item); - if (config.xhtmlUseListHack()) { + if (config.xhtmlUseListHack() && !config.useHardListNumbering()) { boolean bRestart = "true".equals(Misc.getAttribute(child, XMLString.TEXT_RESTART_NUMBERING)); int nStartValue = Misc.getPosInteger(Misc.getAttribute(child, @@ -893,7 +905,7 @@ public class TextConverter extends ConverterHelper { // A fake list is a list which is converted into a sequence of numbered // paragraphs rather than into a list. - // Currently this is done for list which only containsheadings + // Currently this is done for list which only contains headings // Helper: Check to see, if this list contains only headings // (If so, we will ignore the list and apply the numbering to the headings) diff --git a/source/java/writer2latex/xhtml/XhtmlConfig.java b/source/java/writer2latex/xhtml/XhtmlConfig.java index 12ff410..498d7f0 100644 --- a/source/java/writer2latex/xhtml/XhtmlConfig.java +++ b/source/java/writer2latex/xhtml/XhtmlConfig.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-04-09) + * Version 1.2 (2010-05-04) * */ @@ -41,7 +41,7 @@ import writer2latex.util.Misc; public class XhtmlConfig extends writer2latex.base.ConfigBase { // Implement configuration methods - protected int getOptionCount() { return 42; } + protected int getOptionCount() { return 43; } protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; } // Override setOption: To be backwards compatible, we must accept options @@ -93,21 +93,22 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { private static final int FLOAT_OBJECTS = 24; private static final int TABSTOP_STYLE = 25; private static final int USE_LIST_HACK = 26; - private static final int FORMULAS = 27; - private static final int SPLIT_LEVEL = 28; - private static final int REPEAT_LEVELS = 29; - private static final int CALC_SPLIT = 30; - private static final int DISPLAY_HIDDEN_SHEETS = 31; - private static final int DISPLAY_HIDDEN_ROWS_COLS = 32; - private static final int DISPLAY_FILTERED_ROWS_COLS = 33; - private static final int APPLY_PRINT_RANGES = 34; - private static final int USE_TITLE_AS_HEADING = 35; - private static final int USE_SHEET_NAMES_AS_HEADINGS = 36; - private static final int XSLT_PATH = 37; - private static final int SAVE_IMAGES_IN_SUBDIR = 38; - private static final int UPLINK = 39; - private static final int DIRECTORY_ICON = 40; - private static final int DOCUMENT_ICON = 41; + private static final int USE_HARD_LIST_NUMBERING = 27; + private static final int FORMULAS = 28; + private static final int SPLIT_LEVEL = 29; + private static final int REPEAT_LEVELS = 30; + private static final int CALC_SPLIT = 31; + private static final int DISPLAY_HIDDEN_SHEETS = 32; + private static final int DISPLAY_HIDDEN_ROWS_COLS = 33; + private static final int DISPLAY_FILTERED_ROWS_COLS = 34; + private static final int APPLY_PRINT_RANGES = 35; + private static final int USE_TITLE_AS_HEADING = 36; + private static final int USE_SHEET_NAMES_AS_HEADINGS = 37; + private static final int XSLT_PATH = 38; + private static final int SAVE_IMAGES_IN_SUBDIR = 39; + private static final int UPLINK = 40; + private static final int DIRECTORY_ICON = 41; + private static final int DOCUMENT_ICON = 42; protected ComplexOption xpar = addComplexOption("paragraph-map"); protected ComplexOption xtext = addComplexOption("text-map"); @@ -145,6 +146,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { options[FLOAT_OBJECTS] = new BooleanOption("float_objects","true"); options[TABSTOP_STYLE] = new Option("tabstop_style",""); options[USE_LIST_HACK] = new BooleanOption("use_list_hack","false"); + options[USE_HARD_LIST_NUMBERING] = new BooleanOption("use_hard_list_numbering","false"); options[FORMULAS] = new IntegerOption("formulas","starmath") { public void setString(String sValue) { super.setString(sValue); @@ -268,6 +270,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { public boolean xhtmlFloatObjects() { return ((BooleanOption) options[FLOAT_OBJECTS]).getValue(); } public String getXhtmlTabstopStyle() { return options[TABSTOP_STYLE].getString(); } public boolean xhtmlUseListHack() { return ((BooleanOption) options[USE_LIST_HACK]).getValue(); } + public boolean useHardListNumbering() { return ((BooleanOption) options[USE_HARD_LIST_NUMBERING]).getValue(); } public int formulas() { return ((IntegerOption) options[FORMULAS]).getValue(); } public int getXhtmlSplitLevel() { return ((IntegerOption) options[SPLIT_LEVEL]).getValue(); } public int getXhtmlRepeatLevels() { return ((IntegerOption) options[REPEAT_LEVELS]).getValue(); } diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl index cf6015a..d28f09a 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl @@ -24,7 +24,8 @@ - - + + + \ No newline at end of file