From e0cb22dd2e9efff4ed3e1d29c4e677a6cc20a73a Mon Sep 17 00:00:00 2001 From: henrikjust Date: Mon, 15 Mar 2010 08:49:05 +0000 Subject: [PATCH] Writer2xhtml custom config ui + API changes git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@53 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 3 ++ source/java/writer2latex/api/OutputFile.java | 19 +++++++- .../writer2latex/bibtex/BibTeXDocument.java | 13 +++++- .../writer2latex/latex/ConverterPalette.java | 6 +-- .../writer2latex/latex/DrawConverter.java | 4 +- .../writer2latex/latex/LaTeXDocument.java | 21 +++++++-- .../writer2latex/latex/SectionConverter.java | 9 ++-- .../writer2latex/latex/i18n/ClassicI18n.java | 8 ++-- .../java/writer2latex/office/TableReader.java | 8 ++-- .../xhtml/BatchConverterImpl.java | 6 +-- source/java/writer2latex/xhtml/Converter.java | 6 +-- .../writer2latex/xhtml/MathConverter.java | 3 +- .../writer2latex/xhtml/XhtmlDocument.java | 24 +++++++++- .../xmerge/BinaryGraphicsDocument.java | 14 +++++- .../java/writer2latex/xmerge/DOMDocument.java | 11 ++++- .../writer2latex/xmerge/OfficeDocument.java | 12 ++++- .../writer2latex/W2LDialogs2/Characters.xdl | 2 +- source/oxt/writer2xhtml/OptionPages.xcu | 44 ++++++++++++++++++- .../W2XDialogs2/ConfigurationRoot.xdl | 2 +- .../oxt/writer2xhtml/W2XDialogs2/Content.xdl | 16 +++++++ .../writer2xhtml/W2XDialogs2/StylesPartII.xdl | 23 ++++++++++ .../oxt/writer2xhtml/W2XDialogs2/Template.xdl | 8 +++- .../oxt/writer2xhtml/W2XDialogs2/dialog.xlb | 2 + 23 files changed, 221 insertions(+), 43 deletions(-) create mode 100644 source/oxt/writer2xhtml/W2XDialogs2/Content.xdl create mode 100644 source/oxt/writer2xhtml/W2XDialogs2/StylesPartII.xdl diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index b8f024f..a3eedfb 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.2 ---------- +[all] API change: New methods getMIMEType() and getSequenceNumber() added + to the OutputFile interface + [w2x] Added user interface to edit custom configuration ---------- version 1.1.1 ---------- diff --git a/source/java/writer2latex/api/OutputFile.java b/source/java/writer2latex/api/OutputFile.java index 78c94a5..08b1cd7 100644 --- a/source/java/writer2latex/api/OutputFile.java +++ b/source/java/writer2latex/api/OutputFile.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-23) + * Version 1.2 (2010-03-15) * */ @@ -49,5 +49,20 @@ public interface OutputFile { * @return the file name of this OutputFile */ public String getFileName(); + + /** Get the MIME type of the OutputFile. + * + * @return string reprensentation of the MIME type + */ + public String getMIMEType(); + + /** Get the sequence number of this OutputFile. + * The master document has the sequence number 0. + * Other files which are part of the main document flow has a unique, positive sequence number. + * Auxiliary files like images always has the sequence number -1. + * + * @return the sequence number + */ + public int getSequenceNumber(); } diff --git a/source/java/writer2latex/bibtex/BibTeXDocument.java b/source/java/writer2latex/bibtex/BibTeXDocument.java index acb4ff0..5e9270d 100644 --- a/source/java/writer2latex/bibtex/BibTeXDocument.java +++ b/source/java/writer2latex/bibtex/BibTeXDocument.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-06-05) + * Version 1.2 (2010-03-15) * */ @@ -36,6 +36,7 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import writer2latex.api.ConverterFactory; +import writer2latex.api.MIMETypes; import writer2latex.latex.LaTeXConfig; import writer2latex.latex.i18n.ClassicI18n; import writer2latex.latex.i18n.I18n; @@ -101,6 +102,13 @@ public class BibTeXDocument implements Document { return new String(sName + FILE_EXTENSION); } + public String getMIMEType() { + return MIMETypes.BIBTEX; + } + + public int getSequenceNumber() { + return -1; + } /** *

Writes out the Document content to the specified @@ -234,5 +242,6 @@ public class BibTeXDocument implements Document { return name; } + } \ No newline at end of file diff --git a/source/java/writer2latex/latex/ConverterPalette.java b/source/java/writer2latex/latex/ConverterPalette.java index 812c9eb..2eb8921 100644 --- a/source/java/writer2latex/latex/ConverterPalette.java +++ b/source/java/writer2latex/latex/ConverterPalette.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-26) + * Version 1.2 (2010-03-15) * */ @@ -57,7 +57,7 @@ public final class ConverterPalette extends ConverterBase { // The main outfile private LaTeXDocument texDoc; - + // Various data used in conversion private Context mainContext; // main context private CSVList globalOptions; // global options @@ -174,7 +174,7 @@ public final class ConverterPalette extends ConverterBase { info = new Info(ofr,config,this); // Create master document and add this - this.texDoc = new LaTeXDocument(sTargetFileName,config.getWrapLinesAfter()); + this.texDoc = new LaTeXDocument(sTargetFileName,config.getWrapLinesAfter(),0); if (config.getBackend()!=LaTeXConfig.XETEX) { texDoc.setEncoding(ClassicI18n.writeJavaEncoding(config.getInputencoding())); } diff --git a/source/java/writer2latex/latex/DrawConverter.java b/source/java/writer2latex/latex/DrawConverter.java index d4a6799..310428d 100644 --- a/source/java/writer2latex/latex/DrawConverter.java +++ b/source/java/writer2latex/latex/DrawConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-19) + * Version 1.2 (2010-03-15) * */ @@ -490,7 +490,7 @@ public class DrawConverter extends ConverterHelper { public void flushFloatingFrames(LaTeXDocumentPortion ldp, Context oc) { // todo: fix language - LinkedList floatingFrames = floatingFramesStack.peek(); + LinkedList floatingFrames = floatingFramesStack.peek(); int n = floatingFrames.size(); if (n==0) { return; } for (int i=0; iConstructs a new LaTeX Document.

@@ -56,10 +59,12 @@ public class LaTeXDocument implements Document { * * @param sName The name of the LaTeXDocument. * @param nWrap Lines should be wrapped after this position + * @param nSequenceNumber this file has this sequence number in the result */ - public LaTeXDocument(String sName,int nWrap) { + public LaTeXDocument(String sName,int nWrap, int nSequenceNumber) { this.nWrap = nWrap; this.sName = trimDocumentName(sName); + this.nSequenceNumber = nSequenceNumber; contents = new LaTeXDocumentPortion(true); } @@ -95,7 +100,14 @@ public class LaTeXDocument implements Document { return new String(sName + FILE_EXTENSION); } - + public String getMIMEType() { + return MIMETypes.LATEX; + } + + public int getSequenceNumber() { + return nSequenceNumber; + } + /** *

Writes out the Document content to the specified * OutputStream.

@@ -148,5 +160,6 @@ public class LaTeXDocument implements Document { return name; } + } \ No newline at end of file diff --git a/source/java/writer2latex/latex/SectionConverter.java b/source/java/writer2latex/latex/SectionConverter.java index f695d9d..6c8d1f2 100644 --- a/source/java/writer2latex/latex/SectionConverter.java +++ b/source/java/writer2latex/latex/SectionConverter.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.0 (2009-02-17) + * Version 1.2 (2010-03-15) * */ @@ -45,6 +45,9 @@ public class SectionConverter extends ConverterHelper { // Filenames for external sections private ExportNameCollection fileNames = new ExportNameCollection(true); + + // Current sequence number (until this class creates further LaTeX files, the master file is the only document) + private int nSequenceNumber = 0; /**

Constructs a new SectionStyleConverter.

*/ @@ -80,7 +83,7 @@ public class SectionConverter extends ConverterHelper { LaTeXDocumentPortion sectionLdp = ldp; if (sFileName!=null) { - LaTeXDocument newDoc = new LaTeXDocument(sFileName,config.getWrapLinesAfter()); + LaTeXDocument newDoc = new LaTeXDocument(sFileName,config.getWrapLinesAfter(),++nSequenceNumber); if (config.getBackend()!=LaTeXConfig.XETEX) { newDoc.setEncoding(ClassicI18n.writeJavaEncoding(config.getInputencoding())); } diff --git a/source/java/writer2latex/latex/i18n/ClassicI18n.java b/source/java/writer2latex/latex/i18n/ClassicI18n.java index 7ddaba6..c8a8327 100644 --- a/source/java/writer2latex/latex/i18n/ClassicI18n.java +++ b/source/java/writer2latex/latex/i18n/ClassicI18n.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-03-26) + * Version 1.2 (2010-03-15) * */ @@ -286,9 +286,9 @@ public class ClassicI18n extends I18n { // Load babel with the used languages CSVList babelopt = new CSVList(","); - Iterator langiter = languages.iterator(); + Iterator langiter = languages.iterator(); while (langiter.hasNext()) { - String sLang = (String) langiter.next(); + String sLang = langiter.next(); if (!sLang.equals(sDefaultLanguage)) { if ("el".equals(sLang) && this.polytonicGreek()) { babelopt.addValue("polutonikogreek"); diff --git a/source/java/writer2latex/office/TableReader.java b/source/java/writer2latex/office/TableReader.java index 70fa6eb..04a7f0a 100644 --- a/source/java/writer2latex/office/TableReader.java +++ b/source/java/writer2latex/office/TableReader.java @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * - * Version 1.0 (2009-09-14) + * Version 1.2 (2010-03-15) * * All Rights Reserved. */ @@ -143,7 +143,7 @@ public class TableReader { // (Calc exports a lot of empty rows at columns bottom/right) int nRows = cells.size(); for (int nRow=0; nRow row = cells.get(nRow); nCols = row.size(); int nMaxCol = 0; int nMaxRow = 0; @@ -443,7 +443,7 @@ public class TableReader { public Element getCell(int nRow, int nCol) { if (nRow<0 || nRow>=cells.size()) { return null; } - LinkedList row = cells.get(nRow); + LinkedList row = cells.get(nRow); if (nCol<0 || nCol>=row.size()) { return null; } return (Element) row.get(nCol); } diff --git a/source/java/writer2latex/xhtml/BatchConverterImpl.java b/source/java/writer2latex/xhtml/BatchConverterImpl.java index 4c92b0a..be713a4 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-02) + * Version 1.2 (2010-03-15) * */ @@ -69,7 +69,7 @@ public class BatchConverterImpl extends BatchConverterBase { } public void readTemplate(InputStream is) throws IOException { - template = new XhtmlDocument("Template",XhtmlDocument.XHTML10); + template = new XhtmlDocument("Template",XhtmlDocument.XHTML10,-1); try { template.read(is); } @@ -89,7 +89,7 @@ public class BatchConverterImpl extends BatchConverterBase { public OutputFile createIndexFile(String sHeading, IndexPageEntry[] entries) { // Create the index page (with header/footer or from template) - XhtmlDocument htmlDoc = new XhtmlDocument("index",XhtmlDocument.XHTML10); + XhtmlDocument htmlDoc = new XhtmlDocument("index",XhtmlDocument.XHTML10,0); htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else { htmlDoc.createHeaderFooter(); } diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index 4a5031a..ee7cc71 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-03-02) + * Version 1.2 (2010-03-15) * */ @@ -102,7 +102,7 @@ public class Converter extends ConverterBase { // override public void readTemplate(InputStream is) throws IOException { - template = new XhtmlDocument("Template",nType); + template = new XhtmlDocument("Template",nType,-1); template.read(is); } @@ -441,7 +441,7 @@ public class Converter extends ConverterBase { // Prepare next output file public Element nextOutFile() { if (nOutFileIndex>=0) { textCv.insertFootnotes(htmlDoc.getContentNode()); } - htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType); + htmlDoc = new XhtmlDocument(getOutFileName(++nOutFileIndex,false),nType,nOutFileIndex); htmlDoc.setConfig(config); if (template!=null) { htmlDoc.readFromTemplate(template); } else if (bNeedHeaderFooter) { htmlDoc.createHeaderFooter(); } diff --git a/source/java/writer2latex/xhtml/MathConverter.java b/source/java/writer2latex/xhtml/MathConverter.java index 1f9df3f..1a9a00f 100644 --- a/source/java/writer2latex/xhtml/MathConverter.java +++ b/source/java/writer2latex/xhtml/MathConverter.java @@ -20,13 +20,12 @@ * * All Rights Reserved. * - * Version 1.2 (2010-03-04) + * Version 1.2 (2010-03-15) * */ package writer2latex.xhtml; -import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Element; diff --git a/source/java/writer2latex/xhtml/XhtmlDocument.java b/source/java/writer2latex/xhtml/XhtmlDocument.java index 804c875..5dcbc69 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-03) + * Version 1.2 (2010-03-15) * */ @@ -42,6 +42,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; //import javax.xml.parsers.ParserConfigurationException; +import writer2latex.api.MIMETypes; import writer2latex.xmerge.DOMDocument; import java.io.InputStream; @@ -77,6 +78,9 @@ public class XhtmlDocument extends DOMDocument { // Type of document private int nType; + + // Sequence number + private int nSequenceNumber; // Configuration private String sEncoding = "UTF-8"; @@ -111,10 +115,12 @@ public class XhtmlDocument extends DOMDocument { * writer2latex.xmerge.DOMDocument. * @param name Document name. * @param nType the type of document + * @param nSequenceNumber the sequence number of this file in the export */ - public XhtmlDocument(String name, int nType) { + public XhtmlDocument(String name, int nType, int nSequenceNumber) { super(name,sExtension[nType]); this.nType = nType; + this.nSequenceNumber = nSequenceNumber; // Define publicId and systemId String sPublicId = null; String sSystemId = null; @@ -161,6 +167,20 @@ public class XhtmlDocument extends DOMDocument { setContentDOM(contentDOM); } + + @Override public String getMIMEType() { + switch (nType) { + case XHTML10: return MIMETypes.XHTML; + case XHTML11: return MIMETypes.XHTML_MATHML; // TODO: Change the constant names in MIMETypes, this is a bit confusing... + case XHTML_MATHML: return MIMETypes.XHTML_MATHML; + case XHTML_MATHML_XSL: return MIMETypes.XHTML_MATHML_XSL; + } + return ""; + } + + @Override public int getSequenceNumber() { + return nSequenceNumber; + } public Element getHeadNode() { return headNode; } diff --git a/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java b/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java index c1e05a0..f4c7756 100644 --- a/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java +++ b/source/java/writer2latex/xmerge/BinaryGraphicsDocument.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-23) + * Version 1.2 (2010-03-15) * */ @@ -161,5 +161,15 @@ public class BinaryGraphicsDocument implements Document { * @return String The document's MIME type. */ public String getDocumentMIMEType(){ return sMimeType; } + + + public String getMIMEType() { + return sMimeType; + } + + + public int getSequenceNumber() { + return -1; + } } \ No newline at end of file diff --git a/source/java/writer2latex/xmerge/DOMDocument.java b/source/java/writer2latex/xmerge/DOMDocument.java index 04f2acd..060914e 100644 --- a/source/java/writer2latex/xmerge/DOMDocument.java +++ b/source/java/writer2latex/xmerge/DOMDocument.java @@ -37,7 +37,7 @@ ************************************************************************/ // This version is adapted for writer2latex -// Version 1.0 (2008-11-23) +// Version 1.2 (2010-03-15) package writer2latex.xmerge; @@ -393,6 +393,15 @@ public class DOMDocument return doc; } + // TODO: We need these because we implement OutputFile (don't do that..) + public String getMIMEType() { + return ""; + } + + public int getSequenceNumber() { + return -1; + } + } diff --git a/source/java/writer2latex/xmerge/OfficeDocument.java b/source/java/writer2latex/xmerge/OfficeDocument.java index df50dfe..09ce812 100644 --- a/source/java/writer2latex/xmerge/OfficeDocument.java +++ b/source/java/writer2latex/xmerge/OfficeDocument.java @@ -37,7 +37,7 @@ ************************************************************************/ // This version is adapted for Writer2LaTeX -// Version 1.0 (2008-11-22) +// Version 1.2 (2010-03-15) package writer2latex.xmerge; @@ -1282,5 +1282,15 @@ public class OfficeDocument manifestRoot.appendChild(docRoot); } + + // TODO: We need these because we implement OutputFile (but in fact we shouldn't) + public String getMIMEType() { + return ""; + } + + + public int getSequenceNumber() { + return -1; + } } diff --git a/source/oxt/writer2latex/W2LDialogs2/Characters.xdl b/source/oxt/writer2latex/W2LDialogs2/Characters.xdl index 65eb2c9..68d14f1 100644 --- a/source/oxt/writer2latex/W2LDialogs2/Characters.xdl +++ b/source/oxt/writer2latex/W2LDialogs2/Characters.xdl @@ -8,7 +8,7 @@ - + diff --git a/source/oxt/writer2xhtml/OptionPages.xcu b/source/oxt/writer2xhtml/OptionPages.xcu index 537308b..ad45cac 100644 --- a/source/oxt/writer2xhtml/OptionPages.xcu +++ b/source/oxt/writer2xhtml/OptionPages.xcu @@ -125,7 +125,49 @@ - + + + org.openoffice.da.writer2xhtml.configuration.styles2 + + + org.openoffice.da.writer2xhtml.configuration + + + 4 + + + Styles part II + + + %origin%/W2XDialogs2/StylesPartII.xdl + + + + + + + + + org.openoffice.da.writer2xhtml.configuration.content + + + org.openoffice.da.writer2xhtml.configuration + + + 5 + + + Content + + + %origin%/W2XDialogs2/Content.xdl + + + + + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl b/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl index ce21cc8..a77f748 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl @@ -7,7 +7,7 @@ - + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl new file mode 100644 index 0000000..11be1d6 --- /dev/null +++ b/source/oxt/writer2xhtml/W2XDialogs2/Content.xdl @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/StylesPartII.xdl b/source/oxt/writer2xhtml/W2XDialogs2/StylesPartII.xdl new file mode 100644 index 0000000..79a9865 --- /dev/null +++ b/source/oxt/writer2xhtml/W2XDialogs2/StylesPartII.xdl @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl index f3a0113..3a234eb 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl @@ -6,8 +6,12 @@ - - + + + + + + diff --git a/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb b/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb index b013697..4da7aeb 100644 --- a/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb +++ b/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb @@ -6,4 +6,6 @@ + + \ No newline at end of file