diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index f2f8f07..7d0c762 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -1,7 +1,7 @@ -Writer2LaTeX version 1.1.3 (development release) +Writer2LaTeX version 1.1.4 (development release) ================================================ -This is the distribution of Writer2LaTeX version 1.1.3 +This is the distribution of Writer2LaTeX version 1.1.4 Latest version can be found at the web site http://writer2latex.sourceforge.net diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index c7c71b4..c6ebc01 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,5 +1,11 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 +---------- version 1.1.4 ---------- + +[w2x] Added help content for custom format + +[all] Bugfix: Heading styles are now recognized correctly again in old file format (sxw) + ---------- version 1.1.3 ---------- [w2x] The standard configuration cleanxhtml.xml now maps footnote and endnote references to diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index edf5a4d..0dac2eb 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index d2bf79e..8f62aaa 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-17) + * Version 1.2 (2010-05-27) * */ @@ -32,8 +32,8 @@ package writer2latex.api; public class ConverterFactory { // Version information - private static final String VERSION = "1.1.3"; - private static final String DATE = "2010-05-17"; + private static final String VERSION = "1.1.4"; + private static final String DATE = "2010-05-27"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/office/OfficeReader.java b/source/java/writer2latex/office/OfficeReader.java index ce2ea78..b6aafd0 100644 --- a/source/java/writer2latex/office/OfficeReader.java +++ b/source/java/writer2latex/office/OfficeReader.java @@ -1022,7 +1022,13 @@ public class OfficeReader { //collectMasterPage(getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME))); } else if (sName.equals(XMLString.TEXT_H)) { - int nLevel = Misc.getPosInteger(node.getAttribute(XMLString.TEXT_OUTLINE_LEVEL),1); + int nLevel; + if (node.hasAttribute(XMLString.TEXT_OUTLINE_LEVEL)) { + nLevel = Misc.getPosInteger(node.getAttribute(XMLString.TEXT_OUTLINE_LEVEL),1); + } + else { + nLevel = Misc.getPosInteger(node.getAttribute(XMLString.TEXT_LEVEL),1); + } StyleWithProperties style = getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME)); //collectMasterPage(style); if (1<=nLevel && nLevel<=10 && heading[nLevel]==null) { diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 4f1f065..5085a30 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl index a8a7242..3da0287 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl @@ -4,7 +4,7 @@ - + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl index 829ec58..074a89c 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,18 +20,18 @@ - - - + + + - + - - + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/General.xdl b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl index d00afe5..2f37c97 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/General.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl @@ -2,10 +2,10 @@ - - + + - + @@ -15,14 +15,14 @@ - + - - - + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl index 59a7e40..5b4cace 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Styles1.xdl @@ -4,7 +4,7 @@ - + @@ -15,24 +15,24 @@ - + - + - + - + - + - + - - + + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Styles2.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Styles2.xdl index 11451e4..38ae39d 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Styles2.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Styles2.xdl @@ -4,7 +4,7 @@ - + @@ -16,15 +16,15 @@ - + - + - + - + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Stylesheets.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Stylesheets.xdl index 7afb996..720187b 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Stylesheets.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Stylesheets.xdl @@ -4,17 +4,17 @@ - + - + - + - - + + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl index 34eebb7..b56027e 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl @@ -2,33 +2,33 @@ - + - - + + - + - + - + - + diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index 588d0db..09ac59b 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/help/en/help.tree b/source/oxt/writer2xhtml/help/en/help.tree index 1987750..51ec2bd 100644 --- a/source/oxt/writer2xhtml/help/en/help.tree +++ b/source/oxt/writer2xhtml/help/en/help.tree @@ -4,5 +4,15 @@ XHTML and EPUB Export (Writer) XHTML Export (Calc) + + Introduction + General + Template + Style sheets + Master styles + Other styles + Formatting + Content + 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 new file mode 100644 index 0000000..f647dc1 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp @@ -0,0 +1,40 @@ + + + + + Content + org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp + + + + Content + + +
+ Choose Tools - Options - Writer2xhtml - Content +
+ + Formulas + + + Include as + Select how to export formulas if you are not using XHTML+MathML. + + + Image with StarMath code: Export formulas as images + with the original StarMath formula in the alt attribute. + + + Image with LaTeX code: Export formulas as images + with LaTeX code in the alt attribute. + + + StarMath code: Export the original StarMath code directly + in the text. + + + LaTeX code: Export LaTeX code directly in the text. + + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Formatting.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Formatting.xhp new file mode 100644 index 0000000..92db46d --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Formatting.xhp @@ -0,0 +1,85 @@ + + + + + Formatting + org.openoffice.da.writer2xhtml.oxt/Configuration/Formatting.xhp + + + + Formatting + Use this page to define how much formatting to export. + +
+ Choose Tools - Options - Writer2xhtml - Formatting +
+ + + Formatting + This is used to specify how much text formatting + (character, paragraph and list formatting) to export. + + + Convert all: Convert all supported formatting to CSS + + + Ignore styles: Convert hard formatting but not formatting + by styles. Use this value if you use a custom style sheet, but still want to be able to add some hard formatting + (eg. a centered paragraph, some bold text etc.). + + + Ignore hard formatting: Convert formatting by styles, but + no hard formatting (except as given by + attribute style + mappings). + Use this if the document is well structured using styles, so that any hard formatting should be considered + an error. + + + Ignore all: Convert no formatting at all. Use this value + if you use a custom stylesheet and the document is well structured using styles, so that any hard formatting should + be considered an error. + + + + + Frame formatting + This is used for the same purpose, but affects frame formatting only. + + + Convert section formatting + Check this if you want to export section formatting (background, margins). + + + Convert table formatting + Check this if you want to export table formatting. + + + Ignore table dimensions + Check this if you do not want table dimensions (table width, column width and + row height) to be exported, but want to leave the layout of the tables to the browser. + + + List formatting + Choose how to export list formatting. + + + Use CSS1: List formatting is exported using CSS1. + This only provides basic support for list labels, and currently the browsers default indentations are used. + + + Use CSS1 and non-standard lists: This value is used to fix a + problem with continued lists. If you select this value, Writer2xhtml will export a list that continues on level 2 or below + like + <ol><ol><li>...</li></ol></ol> + This is not valid in XHTML, but works in browsers. + Also two deprecated attributes are used to continue numbering. + + + Use hard labels: If select this value, list labels are + exported as part of the text. This adds full support for list labels (e.g. labels of the form 1.2.3). Unlike the other + values indentations of the list are exported as well. + + + + \ 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 new file mode 100644 index 0000000..d6eddd8 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp @@ -0,0 +1,57 @@ + + + + + Content + org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp + + + + General + Use this page to define general technical aspects of the generated + XHTML documents. + +
+ Choose Tools - Options - Writer2xhtml - General +
+ + + Do not include DOCTYPE + Check this if you do not want to not include the !DOCTYPE declaration in + the converted document. + 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. + + + Numeric character entities + Select how to export numeric character entities. You can use either + hexadecimal or decimal numbers. This is not relevant if you use UTF-8 or UTF-16. + + + Use named character entities + Check this to use named character entities as defined by (X)HTML. + If you export to XHTML+MathML, also named MathML entities will be used. + + + Include detailed language information + Check this to include all language information in the XHTML document. + Otherwise only the default language will be exported. + + + Use "pretty printing" + Check this to use “pretty print” + (using indentations and line breaks) in the XHTML output. + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Introduction.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Introduction.xhp new file mode 100644 index 0000000..9470e14 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Introduction.xhp @@ -0,0 +1,25 @@ + + + + + Custom style + org.openoffice.da.writer2xhtml.oxt/Configuration/Introduction.xhp + + + + Custom style + Define a custom style for the XHTML export + +
+ Choose Tools - Options - Writer2xhtml +
+ + + Writer2xhtml comes with a number of predefined styles. + A style defines technical aspects of the generated XHTML styles, in particular the export of formatting. + Advanced users can define their own custom style. You can for example use the custom style to create XHTML documents that + takes advantage of your own CSS style sheet. + This requires some knowledge of XHTML and CSS. + To use the custom style, choose Custom in the export dialog. + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp new file mode 100644 index 0000000..d7b5af8 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp @@ -0,0 +1,70 @@ + + + + + Content + org.openoffice.da.writer2xhtml.oxt/Configuration/Masterstyles.xhp + + + + Master styles + Use this page to define how to export style information. + +
+ Choose Tools - Options - Writer2xhtml - Master styles +
+ + Style mappings + For each %PRODUCTNAME Writer style you can define a corresponding XHTML element + and CSS style. + + + Style family + Select the %PRODUCTNAME Writer style family. Note that headings and other + paragraphs are handled separately. + + + Style name + Select a style name from the list + + + New... + Click to add a new style name to the list. Type a name or select a style name + from the list. + + + Delete... + Click this to delete the current style name from the list. + + + XHTML element + Enter the name of an XHTML element or select one from the list. + + + CSS class + Enter the name of a CSS class. If you leave this field empty, the + class attribute will not be set. + + + Block XHTML element + This is only valid for paragraphs and headings. + For paragraphs this element is used as a container for a sequence of paragraphs + with the same paragraph style. As an example: For the paragraph style Quotations you can set the XHTML element to + p and the block XHTML element to blockquote. This will convert a sequence of paragraphs with the + Quotations style to a block quote. You can leave the field empty if you do not need it. + For headings the block XHTML element is used for the entire heading, whereas the + XHTML element is used for the text content (without the label). + + + Block CSS class + Enter the name of a CSS class for the block element. If you leave the field empty, the + class attribute will not be set. + + + Load default mappings... + Writer2xhtml comes with a set of default style mappings corresponding to + some of the predefined styles in %PRODUCTNAME Writer. Click this button to add these mappings to the current set. You will get + a warning if this will overwrite one or more existing mappings. + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Otherstyles.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Otherstyles.xhp new file mode 100644 index 0000000..a530fbb --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Otherstyles.xhp @@ -0,0 +1,53 @@ + + + + + Other styles + org.openoffice.da.writer2xhtml.oxt/Configuration/Otherstyles.xhp + + + + Other styles + Use this page to define various style related features of the export. + This supplements the settings on the page + Master styles. + +
+ Choose Tools - Options - Writer2xhtml - Other styles +
+ + Style mappings for hard formatting + In general using real styles is preferred. These setting allows you to define + styles for a selection of hard text formatting attributes. + To apply these settings: Go to the page + Formatting and set Formatting to either Ignore hard formatting or + Ignore all. Otherwise the rules you define here are ignored. + + + Formatting attribute + Select a formatting attribute. + + + Apply custom style + Check this if you want to apply a custom style for this attribute. + + + XHTML element + Enter the name of an XHTML element or select one from the list. + + + CSS class + Enter the name of a CSS class to apply to the element. If you leave this field + empty, the class attribute will not be set. + + Other styles + + + CSS class for tabulator stop + Normally tabulator stops are exported as spaces. If you enter the name of + a CSS class here, the space will be contained in a span element with your style in the class attribute. + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Stylesheets.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Stylesheets.xhp new file mode 100644 index 0000000..5b4280b --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Stylesheets.xhp @@ -0,0 +1,41 @@ + + + + + Content + org.openoffice.da.writer2xhtml.oxt/Configuration/Stylesheets.xhp + + + + Stylesheets + Use this page to provide your own style sheets for the exported documents. + +
+ Choose Tools - Options - Writer2xhtml - Style sheets +
+ + Custom style sheets + The custom style sheet can either be an embedded style sheet for the EPUB + export or a linked style sheet for the XHTML export. + + + Insert link to custom style sheet (XHTML export) + Check this to link to your own, external CSS style sheet. + For more advanced solutions (eg. different style sheets for screen viewing and printing) you can use an + XHTML template. + + + URL + Enter the URL for the style sheet. + + + Include custom style sheet (EPUB export) + Check this to include a custom style sheet in the EPUB document. + + + Load... + Click to load the style sheet from a file. + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Template.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Template.xhp new file mode 100644 index 0000000..571250f --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Template.xhp @@ -0,0 +1,88 @@ + + + + + Content + org.openoffice.da.writer2xhtml.oxt/Configuration/Template.xhp + + + + Template + Use this page to define an XHTML template to use as a basis for the + generated XHTML documents. + +
+ Choose Tools - Options - Writer2xhtml - Template +
+ + + Use custom XHTML template + Check this if you want to define an XHTML template. Otherwise a default + template will be used. + A template should be an ordinary XHTML file (do not include a DOCTYPE declaration) + with some special elements: + + + A div-element with the id content is used to + fill the text content. + If no such element exists, the body element is used. If there is no body element + in the template, the root element is used. + + + div-elements with the id header or + footer (optional) will be filled with a simple navigation panel using a first/previous/next/last scheme + (for spreadsheet documents, sheet names are used for navigation). + + + A div-element with the id panel (optional) + will be filled with a simple navigation panel using a table of contens-like scheme. + + + You can change the names of the id attributes at the bottom of this page. + A simple template including a header might look like this: + +<html>
+  <head>
+    <title/>
+  </head>
+  <body>
+    <div id='header' />
+    <div id='content' />
+  </body>
+</html> + + As the template does not include footer and panel nodes, these elements will not be included. + + The absolute mininal template is this: + +<div/> + + The div-element will be used as the content container. + The generated document will not be a complete XHTML document (no html, head and + body nodes). It will however still be a well-formed XML file that can be handled with standard tools. + The use case for this is that you can produce XHTML fragments suitable for inclusion in e.g. a CMS. + Make sure to check the option Do not include DOCTYPE in this case! + + + Load... + Click this to load a template from a file. This will overwrite the current contents + of the template. + + + Content id + Enter the id to use for the content node. + + + Panel id + Enter the id to use for the panel node. + + + Header id + Enter the id to use for the header node. + + + Footer id + Enter the id to use for the footer node. + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp index 0e19db5..6d377f6 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp @@ -44,8 +44,8 @@ Custom is a user defined format. You can define your own style by providing a CSS style sheet and a mapping from Writer styles to your CSS styles. - To configure the custom format, choose Tools - Options - Writer2xhtml. - + To configure the custom format, choose Tools - Options - Writer2xhtml.
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp index 640626d..b16ef3f 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp @@ -24,8 +24,8 @@ Custom is a user defined format. - To configure the custom format, choose Tools - Options - Writer2xhtml. - + To configure the custom format, choose Tools - Options - Writer2xhtml. diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index 4d8a39c..c5d003e 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml index 6cf129c..7954bac 100644 --- a/source/oxt/xhtml-config-sample/description.xml +++ b/source/oxt/xhtml-config-sample/description.xml @@ -2,5 +2,5 @@ - + diff --git a/source/readme-source.txt b/source/readme-source.txt index 581d83d..ff080ae 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -1,4 +1,4 @@ -Writer2LaTeX source version 1.1.3 +Writer2LaTeX source version 1.1.4 ================================= Writer2LaTeX is (c) 2002-2010 by Henrik Just.