diff --git a/build.xml b/build.xml index aac1115..098237b 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-03-14) + # version 1.2 (2010-04-17) ############################################################################ --> @@ -35,7 +35,7 @@ - + diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index 1334ac9..3677612 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -1,7 +1,7 @@ -Writer2LaTeX version 1.1.2 (development release) +Writer2LaTeX version 1.1.3 (development release) ================================================ -This is the distribution of Writer2LaTeX version 1.1.2 +This is the distribution of Writer2LaTeX version 1.1.3 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 74e29a1..ad09807 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,7 +1,20 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 +TODO2: Tilføj ?-knap til xhtml export dialoger + +---------- version 1.1.3 ---------- + +[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 + root element is used + +[w2x] Added help content for export dialogs + ---------- version 1.1.2 ---------- +[w2l] Added help content for export dialog + [all] API change: Added the method readStyleSheet to the Converter interface [w2x] The custom configuration now supports an optional xhtml template (writer2xhtml-template.xhtml) diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 67a82c3..b762c89 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 0e01ce0..7a62c4c 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-16) + * Version 1.2 (2010-04-23) * */ @@ -32,8 +32,8 @@ package writer2latex.api; public class ConverterFactory { // Version information - private static final String VERSION = "1.1.2"; - private static final String DATE = "2010-04-16"; + private static final String VERSION = "1.1.3"; + private static final String DATE = "2010-04-23"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/xhtml/BatchConverterImpl.java b/source/java/writer2latex/xhtml/BatchConverterImpl.java index a1424a9..37bb9c8 100644 --- a/source/java/writer2latex/xhtml/BatchConverterImpl.java +++ b/source/java/writer2latex/xhtml/BatchConverterImpl.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-03-15) + * Version 1.2 (2010-04-23) * */ @@ -96,20 +96,23 @@ public class BatchConverterImpl extends BatchConverterBase { org.w3c.dom.Document htmlDOM = htmlDoc.getContentDOM(); - // Declare charset (we need this for xhtml because we have no ) - Element meta = htmlDOM.createElement("meta"); - meta.setAttribute("http-equiv","Content-Type"); - meta.setAttribute("content","text/html; charset="+htmlDoc.getEncoding().toLowerCase()); - htmlDoc.getHeadNode().appendChild(meta); - - // Add link to stylesheet - if (config.xhtmlCustomStylesheet().length()>0) { - Element htmlStyle = htmlDOM.createElement("link"); - htmlStyle.setAttribute("rel","stylesheet"); - htmlStyle.setAttribute("type","text/css"); - htmlStyle.setAttribute("media","all"); - htmlStyle.setAttribute("href",config.xhtmlCustomStylesheet()); - htmlDoc.getHeadNode().appendChild(htmlStyle); + Element head = htmlDoc.getHeadNode(); + if (head!=null) { + // Declare charset (we need this for xhtml because we have no ) + Element meta = htmlDOM.createElement("meta"); + meta.setAttribute("http-equiv","Content-Type"); + meta.setAttribute("content","text/html; charset="+htmlDoc.getEncoding().toLowerCase()); + head.appendChild(meta); + + // Add link to stylesheet + if (config.xhtmlCustomStylesheet().length()>0) { + Element htmlStyle = htmlDOM.createElement("link"); + htmlStyle.setAttribute("rel","stylesheet"); + htmlStyle.setAttribute("type","text/css"); + htmlStyle.setAttribute("media","all"); + htmlStyle.setAttribute("href",config.xhtmlCustomStylesheet()); + head.appendChild(htmlStyle); + } } // Add uplink to header and footer @@ -140,7 +143,10 @@ public class BatchConverterImpl extends BatchConverterBase { } // Add title and heading - htmlDoc.getTitleNode().appendChild(htmlDOM.createTextNode(sHeading)); + Element title = htmlDoc.getTitleNode(); + if (title!=null) { + title.appendChild(htmlDOM.createTextNode(sHeading)); + } Element h1 = htmlDOM.createElement("h1"); htmlDoc.getContentNode().appendChild(h1); h1.appendChild(htmlDOM.createTextNode(sHeading)); diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index ebafb31..13fc5ec 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/source/java/writer2latex/xhtml/Converter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-04-13) + * Version 1.2 (2010-04-23) * */ @@ -259,12 +259,13 @@ public class Converter extends ConverterBase { // Export styles (temp.) for (int i=0; i<=nOutFileIndex; i++) { - Document dom = outFiles.get(i).getContentDOM(); - NodeList hlist = dom.getElementsByTagName("head"); - Node styles = styleCv.exportStyles(dom); - if (styles!=null) { - hlist.item(0).appendChild(styles); - } + Element head = outFiles.get(i).getHeadNode(); + if (head!=null) { + Node styles = styleCv.exportStyles(outFiles.get(i).getContentDOM()); + if (styles!=null) { + head.appendChild(styles); + } + } } // Create headers & footers (if nodes are available) @@ -531,66 +532,71 @@ public class Converter extends ConverterBase { } // Add title (required by xhtml) - String sTitle = metaData.getTitle(); - if (sTitle==null) { // use filename as fallback - sTitle = htmlDoc.getFileName(); - } - htmlDoc.getTitleNode().appendChild( htmlDOM.createTextNode(sTitle) ); - - // Declare charset (we need this for xhtml because we have no ) - if (nType==XhtmlDocument.XHTML10) { - Element meta = htmlDOM.createElement("meta"); - meta.setAttribute("http-equiv","Content-Type"); - meta.setAttribute("content","text/html; charset="+htmlDoc.getEncoding().toLowerCase()); - htmlDoc.getHeadNode().appendChild(meta); - } - - // Add meta data (for EPUB the meta data belongs to the .opf file) - if (!bOPS) { - // "Traditional" meta data - //createMeta("generator","Writer2LaTeX "+Misc.VERSION); - createMeta("description",metaData.getDescription()); - createMeta("keywords",metaData.getKeywords()); - - // Dublin core meta data (optional) - // Format as recommended on dublincore.org - // Declare meta data profile - if (config.xhtmlUseDublinCore()) { - htmlDoc.getHeadNode().setAttribute("profile","http://dublincore.org/documents/dcq-html/"); - // Add link to declare namespace - Element dclink = htmlDOM.createElement("link"); - dclink.setAttribute("rel","schema.DC"); - dclink.setAttribute("href","http://purl.org/dc/elements/1.1/"); - htmlDoc.getHeadNode().appendChild(dclink); - // Insert the actual meta data - createMeta("DC.title",metaData.getTitle()); - // DC.subject actually contains subject+keywords, so we merge them - String sDCSubject = ""; - if (metaData.getSubject()!=null && metaData.getSubject().length()>0) { - sDCSubject = metaData.getSubject(); - } - if (metaData.getKeywords()!=null && metaData.getKeywords().length()>0) { - if (sDCSubject.length()>0) { sDCSubject+=", "; } - sDCSubject += metaData.getKeywords(); - } - createMeta("DC.subject",sDCSubject); - createMeta("DC.description",metaData.getDescription()); - createMeta("DC.creator",metaData.getCreator()); - createMeta("DC.date",metaData.getDate()); - createMeta("DC.language",metaData.getLanguage()); + Element title = htmlDoc.getTitleNode(); + if (title!=null) { + String sTitle = metaData.getTitle(); + if (sTitle==null) { // use filename as fallback + sTitle = htmlDoc.getFileName(); } + title.appendChild( htmlDOM.createTextNode(sTitle) ); } - - // Add link to stylesheet, if producing nomral XHTML - if (!bOPS && config.xhtmlCustomStylesheet().length()>0) { - Element htmlStyle = htmlDOM.createElement("link"); - htmlStyle.setAttribute("rel","stylesheet"); - htmlStyle.setAttribute("type","text/css"); - htmlStyle.setAttribute("media","all"); - htmlStyle.setAttribute("href",config.xhtmlCustomStylesheet()); - htmlDoc.getHeadNode().appendChild(htmlStyle); - } - /* later.... + + Element head = htmlDoc.getHeadNode(); + if (head!=null) { + // Declare charset (we need this for xhtml because we have no ) + if (nType==XhtmlDocument.XHTML10) { + Element meta = htmlDOM.createElement("meta"); + meta.setAttribute("http-equiv","Content-Type"); + meta.setAttribute("content","text/html; charset="+htmlDoc.getEncoding().toLowerCase()); + head.appendChild(meta); + } + + // Add meta data (for EPUB the meta data belongs to the .opf file) + if (!bOPS) { + // "Traditional" meta data + //createMeta("generator","Writer2LaTeX "+Misc.VERSION); + createMeta(head,"description",metaData.getDescription()); + createMeta(head,"keywords",metaData.getKeywords()); + + // Dublin core meta data (optional) + // Format as recommended on dublincore.org + // Declare meta data profile + if (config.xhtmlUseDublinCore()) { + head.setAttribute("profile","http://dublincore.org/documents/dcq-html/"); + // Add link to declare namespace + Element dclink = htmlDOM.createElement("link"); + dclink.setAttribute("rel","schema.DC"); + dclink.setAttribute("href","http://purl.org/dc/elements/1.1/"); + head.appendChild(dclink); + // Insert the actual meta data + createMeta(head,"DC.title",metaData.getTitle()); + // DC.subject actually contains subject+keywords, so we merge them + String sDCSubject = ""; + if (metaData.getSubject()!=null && metaData.getSubject().length()>0) { + sDCSubject = metaData.getSubject(); + } + if (metaData.getKeywords()!=null && metaData.getKeywords().length()>0) { + if (sDCSubject.length()>0) { sDCSubject+=", "; } + sDCSubject += metaData.getKeywords(); + } + createMeta(head,"DC.subject",sDCSubject); + createMeta(head,"DC.description",metaData.getDescription()); + createMeta(head,"DC.creator",metaData.getCreator()); + createMeta(head,"DC.date",metaData.getDate()); + createMeta(head,"DC.language",metaData.getLanguage()); + } + } + + // Add link to stylesheet, if producing nomral XHTML + if (!bOPS && config.xhtmlCustomStylesheet().length()>0) { + Element htmlStyle = htmlDOM.createElement("link"); + htmlStyle.setAttribute("rel","stylesheet"); + htmlStyle.setAttribute("type","text/css"); + htmlStyle.setAttribute("media","all"); + htmlStyle.setAttribute("href",config.xhtmlCustomStylesheet()); + head.appendChild(htmlStyle); + } + /* later.... if (nSplit>0 && !config.xhtmlIgnoreStyles()) { Element htmlStyle = htmlDOM.createElement("link"); htmlStyle.setAttribute("rel","stylesheet"); @@ -599,18 +605,18 @@ public class Converter extends ConverterBase { htmlStyle.setAttribute("href",oooDoc.getName()+"-styles.css"); htmlHead.appendChild(htmlStyle); }*/ - // Note: For single output file, styles are exported to the doc at the end. + // Note: For single output file, styles are exported to the doc at the end. - // Add link to included style sheet if producing OPS content - if (bOPS && styleSheet!=null) { - Element sty = htmlDOM.createElement("link"); - sty.setAttribute("rel", "stylesheet"); - sty.setAttribute("type", "text/css"); - sty.setAttribute("media", "all"); - sty.setAttribute("href", styleSheet.getFileName()); - htmlDoc.getHeadNode().appendChild(sty); + // Add link to included style sheet if producing OPS content + if (bOPS && styleSheet!=null) { + Element sty = htmlDOM.createElement("link"); + sty.setAttribute("rel", "stylesheet"); + sty.setAttribute("type", "text/css"); + sty.setAttribute("media", "all"); + sty.setAttribute("href", styleSheet.getFileName()); + head.appendChild(sty); + } } - // Recreate nested sections, if any if (!textCv.sections.isEmpty()) { @@ -710,12 +716,12 @@ public class Converter extends ConverterBase { } - private void createMeta(String sName, String sValue) { + private void createMeta(Element head, String sName, String sValue) { if (sValue==null) { return; } Element meta = htmlDOM.createElement("meta"); meta.setAttribute("name",sName); meta.setAttribute("content",sValue); - htmlDoc.getHeadNode().appendChild(meta); + head.appendChild(meta); } diff --git a/source/java/writer2latex/xhtml/XhtmlDocument.java b/source/java/writer2latex/xhtml/XhtmlDocument.java index b07cbe3..ddc7cfa 100644 --- a/source/java/writer2latex/xhtml/XhtmlDocument.java +++ b/source/java/writer2latex/xhtml/XhtmlDocument.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-03-15) + * Version 1.2 (2010-04-23) * */ @@ -116,27 +116,7 @@ public class XhtmlDocument extends DOMDocument { public XhtmlDocument(String name, int nType) { super(name,sExtension[nType]); this.nType = nType; - // Define publicId and systemId - String sPublicId = null; - String sSystemId = null; - switch (nType) { - case XHTML10 : - sPublicId = "-//W3C//DTD XHTML 1.0 Strict//EN"; - sSystemId = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; - break; - case XHTML11 : - sPublicId = "-//W3C//DTD XHTML 1.1//EN"; - sSystemId = "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"; - break; - case XHTML_MATHML : - case XHTML_MATHML_XSL : - sPublicId = "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"; - sSystemId = "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd"; - //sSystemId = "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd"; (old version) - /* An alternative is to use XHTML + MathML + SVG: - sPublicId = "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN", - sSystemId = "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"); */ - } + // create DOM Document contentDOM = null; @@ -144,7 +124,8 @@ public class XhtmlDocument extends DOMDocument { DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = builderFactory.newDocumentBuilder(); DOMImplementation domImpl = builder.getDOMImplementation(); - DocumentType doctype = domImpl.createDocumentType("html", sPublicId, sSystemId); + String[] sDocType = getDoctypeStrings(); + DocumentType doctype = domImpl.createDocumentType("html", sDocType[0], sDocType[1]); contentDOM = domImpl.createDocument("http://www.w3.org/1999/xhtml","html",doctype); } catch (Throwable t) { @@ -216,24 +197,67 @@ public class XhtmlDocument extends DOMDocument { } public void readFromTemplate(XhtmlDocument template) { - // Remove all current child nodes - Element root = getContentDOM().getDocumentElement(); - Node child = root.getFirstChild(); - while (child!=null) { - root.removeChild(child); - child = root.getFirstChild(); - } + // create a new DOM + Document templateDOM = template.getContentDOM(); + Document newDOM = null; + try { + DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = builderFactory.newDocumentBuilder(); + DOMImplementation domImpl = builder.getDOMImplementation(); + String[] sDocType = getDoctypeStrings(); + DocumentType doctype = domImpl.createDocumentType("html", sDocType[0], sDocType[1]); + newDOM = domImpl.createDocument("http://www.w3.org/1999/xhtml", + templateDOM.getDocumentElement().getTagName(),doctype); + setContentDOM(newDOM); + + // Import attributes on root element + Element templateRoot = templateDOM.getDocumentElement(); + Element newRoot = newDOM.getDocumentElement(); + NamedNodeMap attributes = templateRoot.getAttributes(); + int nCount = attributes.getLength(); + for (int i=0; i\n"); } // Either specify doctype or xsl transformation (the user may require @@ -374,11 +398,14 @@ public class XhtmlDocument extends DOMDocument { osw.write("\n"); } else if (!bNoDoctype) { - osw.write("\n"); + DocumentType docType = getContentDOM().getDoctype(); + if (docType!=null) { + osw.write("\n"); + } } Element doc = getContentDOM().getDocumentElement(); optimize(doc,null,null); diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 3c7206b..4f1f065 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,10 +5,10 @@ - + - + diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp index 52855fa..92087f0 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp @@ -51,7 +51,7 @@ Custom is a user defined format. To configure the custom format, - select Tools - Options - Writer2LaTeX. + choose Tools - Options - Writer2LaTeX. diff --git a/source/oxt/writer2xhtml/META-INF/manifest.xml b/source/oxt/writer2xhtml/META-INF/manifest.xml index 15c6790..aedff71 100644 --- a/source/oxt/writer2xhtml/META-INF/manifest.xml +++ b/source/oxt/writer2xhtml/META-INF/manifest.xml @@ -37,4 +37,8 @@ manifest:full-path="writer2xhtml.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/> + + diff --git a/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptions.xdl index c32d2da..65da698 100644 --- a/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptions.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptions.xdl @@ -4,7 +4,7 @@ - + @@ -20,26 +20,26 @@ - + - + - - + + - - + + - - - + + + - + - + @@ -50,7 +50,7 @@ - + @@ -60,10 +60,12 @@ - + - + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptionsCalc.xdl b/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptionsCalc.xdl index 17ff8fe..841e82c 100644 --- a/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptionsCalc.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs/XhtmlOptionsCalc.xdl @@ -4,7 +4,7 @@ - + @@ -12,27 +12,28 @@ - + - + - - + + - - + + - - - - - - + + + + + + - - + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index 62ac9e9..588d0db 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 new file mode 100644 index 0000000..1987750 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/help.tree @@ -0,0 +1,8 @@ + + + + + XHTML and EPUB Export (Writer) + XHTML Export (Calc) + + 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 new file mode 100644 index 0000000..0e19db5 --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp @@ -0,0 +1,183 @@ + + + + + XHTML and EPUB Export (Writer) + org.openoffice.da.writer2xhtml.oxt/export.xhp + + + + + XHTML Export (Writer) + Exports the current document to XHTML or EPUB format. +
+ Choose File - Export - XHTML 1.0 strict
+ or File - Export - XHTML 1.1
+ or File - Export - XHTML 1.1 + MathML 2.0
+ or File - Export - XHTML 1.1 + MathML 2.0 (xsl)
+ or File - Export - EPUB +
+ + Style + + + Select the style to use for the XHTML document +
+ Use style + This option allows you to choose between various styles to apply to the + XHTML document. +
+ + +
+ Original formatting produces an XHTML document which uses + the same style as the original document. The document will look quite similar to the original when viewed + in a browser. +
+ + + Chocolate, Midnight, Modern, Oldstyle, Steely, Swiss, Traditional + and Ultramarine formats the document with one of the + 8 core styles + provided by the World Wide Web Consortium. + + + 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. + + + +
+ Expert users can extend the list with further formats using + configuration packages. See the documentation on the + web site for Writer2xhtml. +
+ + + Select a scaling to apply to all dimensions in the document +
+ Scaling + Viewing the document in a web browser may require different dimensions + (e.g. font sizes) than the original document. Using this option you can define a percentage used to scale all + dimensions, thus with the setting 140, all dimensions will be 40% larger than in the original document. Depending on the + style you have selected and on the option Use original image size, some dimensions may be unaffected by + this option. +
+ + + Select a scaling to apply to all column dimensions in the document +
+ Column scaling + This is a similar option, which only affects table columns. Thus you can further + widen or narrow the columns of the tables if you wish. +
+ + + Check this if you want to convert all units to px rather than using the original units +
+ Convert units to px (pixels) + In %PRODUCTNAME, font sizes are usually given in points and other dimensions + in e.g. cm or inches. For XHTML it is recommended to use the unit px instead, and using this option you can require that + all dimensions are converted to px. If you choose not to check this option,the original units will always be used. +
+ + + Check this to use the natural size of images rather than the size defined in the document +
+ Use original image size + Often images in a %PRODUCTNAME document are scaled up or down from their original size. + Normally the same scaling will be used in the XHTML document, but if you select this option, the original (unscaled) image + size will be used. +
+ +
+ Special content +
+ + + Check this if you want to export notes (annotations) in the document +
+ Export notes + If you select this option, notes (also known as annotations) in the + %PRODUCTNAME document are exported as comments in the XHTML document. They will not be directly visible in the browser, + only in the XHTML source. If the option is not selected, notes are completely ignored. +
+ + + Check this if you want to export all meta data (using the Dublin Core standard) +
+ Export document properties (Dublin Core Meta data) + If you select this option, the document properties (File – Properties) + are exported using + the Dublin Core standard. +
+ + AutoCorrect + + + Ignore hard line breaks + Check this if you don't want to export hard (manual) line breaks + Sometimes hard (or manual) line breaks are used in Writer to optimize + the placement of the line breaks. Since line breaking in a browser is completely different, you may want to ignore + all hard line breaks by selecting this option. + + + Ignore empty paragraphs + Check this if you don't want to export empty paragraphs + Empty paragraphs are sometimes used a simple means to create vertical + spacing in Writer. In a well-structured document, an empty paragraph is probably a mistake. Hence you can select + this option to ignore empty paragraphs in the document in the export. + + + Ignore double spaces + Check this to treat several spaces as a single space in the export + For similar reasons you can choose to ignore two or more spaces in a + row using this option. + +
+ Files +
+ + + Split document at headings + Check this to create a new document for each heading + To make a long Writer document easier to read in the browser, you can use + this option to split the document in several small files. Writer2xhtml will add a simple navigation panel that lets you + move between pages. The navigation links will be in the same language as the document (as defined + under Tools – Options – Language Settings – Languages). Note that this option has no effect for headings + inside tables. + + + Heading level + Select the heading level at which the spliting should occur + If you have chosen to split the document at headings, you can use this option + to define at which level splitting should occur. For example 2 to split the document at all headings of level 1 or 2. + + + Repeat heading levels + Select the number of heading levels to repeat at the top of new documents + To help the reader to identify the current position within the document, + you can use this option to repeat the parent headings whenever the document is split. If you for example split at + headings of level 3 and set this option to 2, the headings of level 1 and 2 will be repeated before the heading of level 3, + providing precise information as to where in the document the section belongs. + + + Check this to save images in a subdirectory relative to the exported document +
+ Save images in subdirectory + Writer2xhtml normally saves images associated with the document in the same + directory as the XHTML document. If the document contains a large number of images it may be more convenient to save the + images in a separate subdirectory. This option will create a subdirectory with the same name as the XHTML document to + store the images. +
+ + + XSLT path + Enter the path to pmathml.xsl and pmathmlcss.xsl + If you choose the export filter + XHTML 1.1 + MathML 2.0 (xsl), two XSLT style sheets provided by the World Wide Web Consortium are required. + If they are not available in the same directory as the exported document, you can give the path here. + + + \ No newline at end of file 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 new file mode 100644 index 0000000..640626d --- /dev/null +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp @@ -0,0 +1,115 @@ + + + + + XHTML Export (Calc) + org.openoffice.da.writer2xhtml.oxt/export_calc.xhp + + + + + XHTML Export (Calc) + Exports the current document to XHTML format. +
+ Choose File - Export - XHTML 1.0 strict
+ or File - Export - XHTML 1.1 +
+ + + Select the style to use for the XHTML document + + + + + + + Custom is a user defined format. + To configure the custom format, choose Tools - Options - Writer2xhtml. + + + + + + + Select a scaling to apply to all dimensions in the document + + + + Select a scaling to apply to all column dimensions in the document + + + + Check this if you want to convert all units to px rather than using the original units + + + + Check this to use the natural size of images rather than the size defined in the document + + + + + + Check this if you want to export notes (annotations) in the document + + + + Check this if you want to export all meta data (using the Dublin Core standard) + + + Sheets + + + Check this to display all sheets, even if they are hidden + Display hidden sheets + If you have chosen to hide some sheets in %PRODUCTNAME Calc, you can select this + option if you want to display them in the XHTML document anyway. + + + Check this to display all rows and columns, even if they are hidden + Display hidden rows and columns + The same applies, if you have chosen to hide some columns or rows in your + spreadsheet. + + + Check this to display all rows and columns, even if they are filtered + Display filtered rows and columns + When you export the document, some rows or columns may be invisible because + you have applied a filter in %PRODUCTNAME Calc. If you select this option, the invisible rows and columns will be exported + to XHTML anyway. + + + Check this to export the print ranges rather than the complete contents of the sheets + Apply print ranges + If you check this option, the XHTML document will display the parts of the document + which are selected for printing using print ranges in %PRODUCTNAME Calc. The display in the browser will thus be similar + to what you get when you are printing the document from %PRODUCTNAME Calc. If the option is not checked, the result will instead resemble + what you see when you edit the document in %PRODUCTNAME Calc. + + + Check this to insert the document title as a heading + Use title as heading + Use sheet names as headings + If you check this option, Calc2xhtml will insert the document title + (File – Properties – Description – Title) as heading at the top of the XHTML document. + + + Check this to insert the sheet name as a heading above each sheet + Use sheet names as headings + If you check this option, Calc2xhtml will insert the name of each sheet + as a heading above the sheet in the XHTML document. + + + + + Check this to create a separate file for each sheet + Save sheets in separate files + If you select this option, Calc2xhtml will produce a separate file for + each sheet, otherwise all sheets will be exported to the same XHTML file. In any case, a simple navigation panel showing + all sheet names will be added. + + + Check this to save images in a subdirectory relative to the exported document + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index 5740feb..4d8a39c 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -4,9 +4,9 @@ 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 8a90a62..6cf129c 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 1689325..2cd4a1d 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -1,4 +1,4 @@ -Writer2LaTeX source version 1.1.2 +Writer2LaTeX source version 1.1.3 ================================= Writer2LaTeX is (c) 2002-2010 by Henrik Just.