diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java index a4e8e10..ace5f19 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java @@ -50,15 +50,15 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XStringSubstitution; +import w2phtml.api.ComplexOption; +import w2phtml.api.Config; +import w2phtml.api.ConverterFactory; +import w2phtml.util.Misc; + import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter; import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter; -import writer2latex.api.ComplexOption; -import writer2latex.api.Config; -import writer2latex.api.ConverterFactory; -import writer2latex.util.Misc; - import org.openoffice.da.comp.w2lcommon.helper.DialogAccess; import org.openoffice.da.comp.w2lcommon.helper.FilePicker; import org.openoffice.da.comp.w2lcommon.helper.StyleNameProvider; diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java index 06839ed..4c0579b 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java @@ -31,10 +31,12 @@ import com.sun.star.lang.XTypeProvider; import com.sun.star.uno.Type; import com.sun.star.uno.XComponentContext; import com.sun.star.xml.sax.XDocumentHandler; + +import w2phtml.util.SimpleDOMBuilder; + import com.sun.star.xml.XExportFilter; import org.openoffice.da.comp.w2lcommon.helper.MessageBox; -import writer2latex.util.SimpleDOMBuilder; import java.io.IOException; diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java index fc0ece9..6856387 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.java @@ -42,11 +42,12 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XStringSubstitution; +import w2phtml.api.Converter; + import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter; import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter; import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; -import writer2latex.api.Converter; /** This class parses the FilterData property passed to the filter and diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl.java index a02be2e..b851bf0 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl.java @@ -27,7 +27,7 @@ package org.openoffice.da.comp.w2lcommon.filter; import com.sun.star.uno.XComponentContext; -import writer2latex.api.GraphicConverter; +import w2phtml.api.GraphicConverter; public class GraphicConverterImpl implements GraphicConverter { diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java index a81fee8..5d5d889 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java @@ -36,14 +36,12 @@ import com.sun.star.graphic.XGraphicProvider; //import com.sun.star.io.XOutputStream; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.uno.XComponentContext; + +import w2phtml.api.GraphicConverter; +import w2phtml.api.MIMETypes; + import com.sun.star.uno.UnoRuntime; -//import java.io.InputStream; -//import java.io.OutputStream; - -import writer2latex.api.GraphicConverter; -import writer2latex.api.MIMETypes; - /** A GraphicConverter implementation which uses the GraphicProvider service * to convert the graphic. This service does only support simple format * conversion using the "internal" graphics filters in Draw. Advanced features diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java index 7de85e4..25abced 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java @@ -44,12 +44,12 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XRefreshable; +import w2phtml.api.GraphicConverter; +import w2phtml.api.MIMETypes; + import com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter; import com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter; -import writer2latex.api.GraphicConverter; -import writer2latex.api.MIMETypes; - /** A GraphicConverter implementation which uses a hidden Draw document to * store the graphic, providing more control over the image than the * simple GraphicProvider implementation. diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java index deb90c1..b0f166e 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOConverter.java @@ -32,12 +32,6 @@ import java.util.Iterator; import org.w3c.dom.Document; -import writer2latex.api.Converter; -import writer2latex.api.ConverterFactory; -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.util.Misc; - import com.sun.star.beans.PropertyValue; import com.sun.star.io.XInputStream; import com.sun.star.io.XOutputStream; @@ -49,6 +43,12 @@ import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; +import w2phtml.api.Converter; +import w2phtml.api.ConverterFactory; +import w2phtml.api.ConverterResult; +import w2phtml.api.OutputFile; +import w2phtml.util.Misc; + /** This class provides conversion using UNO: * Graphics conversion is done using appropriate UNO services. * Files are written to an URL using UCB. diff --git a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java index 71c26ae..85338e5 100644 --- a/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java +++ b/src/main/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.util.regex.Pattern; import org.openoffice.da.comp.w2lcommon.helper.MessageBox; -import writer2latex.util.Misc; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertyAccess; @@ -46,11 +45,13 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XModifiable; +import w2phtml.util.Misc; + /** This class converts an open office document to another format */ public class UNOPublisher { - public enum TargetFormat { xhtml, xhtml11, xhtml_mathml, html5, epub, epub3, latex }; + public enum TargetFormat { xhtml, xhtml11, xhtml_mathml, html5, epub, epub3 }; private String sAppName; @@ -256,8 +257,7 @@ public class UNOPublisher { private boolean updateMediaProperties(TargetFormat format) { prepareMediaProperties(format); - String sDialogName = xModel.getURL().endsWith(".odt") || xModel.getURL().endsWith(".fodt") ? //$NON-NLS-1$ //$NON-NLS-2$ - getDialogName(format) : getDialogNameCalc(format); + String sDialogName = getDialogName(format); if (sDialogName!=null) { try { // Display options dialog @@ -295,7 +295,6 @@ public class UNOPublisher { case html5: return ".html"; //$NON-NLS-1$ case epub: return ".epub"; //$NON-NLS-1$ case epub3: return ".epub"; //$NON-NLS-1$ - case latex: return ".tex"; //$NON-NLS-1$ default: return ""; //$NON-NLS-1$ } } @@ -308,24 +307,10 @@ public class UNOPublisher { case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogMath"; //$NON-NLS-1$ case epub: return "org.openoffice.da.comp.writer2xhtml.EpubOptionsDialog"; //$NON-NLS-1$ case epub3: return "org.openoffice.da.comp.writer2xhtml.Epub3OptionsDialog"; //$NON-NLS-1$ - case latex: return "org.openoffice.da.comp.writer2latex.LaTeXOptionsDialog"; //$NON-NLS-1$ default: return null; } } - private static String getDialogNameCalc(TargetFormat format) { - switch (format) { - case xhtml: - case xhtml11: - case xhtml_mathml: - case html5: return "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialogCalc"; //$NON-NLS-1$ - case epub: - case epub3: - case latex: - default: return null; - } - } - private static String getFilterName(TargetFormat format) { switch (format) { case xhtml: return "org.openoffice.da.writer2xhtml"; //$NON-NLS-1$ @@ -334,7 +319,6 @@ public class UNOPublisher { case html5: return "org.openoffice.da.writer2xhtml5"; //$NON-NLS-1$ case epub: return "org.openoffice.da.writer2xhtml.epub"; //$NON-NLS-1$ case epub3: return "org.openoffice.da.writer2xhtml.epub3"; //$NON-NLS-1$ - case latex: return "org.openoffice.da.writer2latex"; //$NON-NLS-1$ default: return ""; //$NON-NLS-1$ } } diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchConverter.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchConverter.java index 93ee1d4..98d719e 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchConverter.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchConverter.java @@ -53,13 +53,10 @@ import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; -//import writer2latex.api.BatchConverter; -//import writer2latex.api.BatchHandler; -//import writer2latex.api.Converter; -import writer2latex.api.ConverterFactory; -import writer2latex.api.IndexPageEntry; -import writer2latex.api.MIMETypes; -import writer2latex.api.OutputFile; +import w2phtml.api.ConverterFactory; +import w2phtml.api.IndexPageEntry; +import w2phtml.api.MIMETypes; +import w2phtml.api.OutputFile; // Import interfaces as defined in uno idl import org.openoffice.da.writer2xhtml.XBatchConverter; @@ -84,7 +81,7 @@ public class BatchConverter implements private XComponentContext xComponentContext = null; private XSimpleFileAccess2 sfa2 = null; - private writer2latex.api.BatchConverter batchConverter = null; + private w2phtml.api.BatchConverter batchConverter = null; private XBatchHandler handler; diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchHandlerAdapter.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchHandlerAdapter.java index 7d35973..b95f7ec 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchHandlerAdapter.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/BatchHandlerAdapter.java @@ -25,9 +25,10 @@ package org.openoffice.da.comp.writer2xhtml; -import writer2latex.api.BatchHandler; import org.openoffice.da.writer2xhtml.XBatchHandler; +import w2phtml.api.BatchHandler; + /** The uno interface provides an XBatchHandler implementation, the java * interface requires a BatchHandler implementation. This simple class * implements the latter using an instance of the former. diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index 98f72da..f6201c0 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java @@ -31,8 +31,6 @@ import java.util.Map; import org.openoffice.da.comp.w2lcommon.filter.ConfigurationDialogBase; import org.openoffice.da.comp.w2lcommon.helper.DialogAccess; -import writer2latex.api.Converter; -import writer2latex.api.ConverterFactory; import com.sun.star.container.NoSuchElementException; import com.sun.star.lang.XServiceInfo; @@ -40,6 +38,9 @@ import com.sun.star.ucb.CommandAbortedException; import com.sun.star.uno.Exception; import com.sun.star.uno.XComponentContext; +import w2phtml.api.Converter; +import w2phtml.api.ConverterFactory; + public class ConfigurationDialog extends ConfigurationDialogBase implements XServiceInfo { private String sResourceDirName; diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java index a672101..a53f9dc 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java @@ -36,9 +36,6 @@ import java.util.regex.Pattern; import org.openoffice.da.comp.w2lcommon.helper.DialogBase; import org.openoffice.da.comp.w2lcommon.helper.SimpleDialog; -import writer2latex.util.CSVList; -import writer2latex.util.Misc; - import com.sun.star.awt.XDialog; import com.sun.star.beans.IllegalTypeException; import com.sun.star.beans.NotRemoveableException; @@ -61,6 +58,9 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.DateTime; +import w2phtml.util.CSVList; +import w2phtml.util.Misc; + // TODO: Create the UNO helper class DocumentPropertiesAccess /** This class provides a UNO component which implements a custom metadata editor UI for the EPUB export diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlUNOPublisher.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlUNOPublisher.java index 67fcf70..8165009 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlUNOPublisher.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlUNOPublisher.java @@ -35,14 +35,14 @@ import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; import org.openoffice.da.comp.w2lcommon.helper.StreamGobbler; import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper; -import writer2latex.util.Misc; - import com.sun.star.beans.XPropertySet; import com.sun.star.frame.XFrame; import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; +import w2phtml.util.Misc; + public class XhtmlUNOPublisher extends UNOPublisher { public XhtmlUNOPublisher(XComponentContext xContext, XFrame xFrame, String sAppName) { diff --git a/src/main/java/properties/Property.java b/src/main/java/properties/Property.java deleted file mode 100644 index c88bdbf..0000000 --- a/src/main/java/properties/Property.java +++ /dev/null @@ -1,5 +0,0 @@ -package properties; - -public interface Property { - -} diff --git a/src/main/java/writer2latex/Application.java b/src/main/java/w2phtml/Application.java similarity index 97% rename from src/main/java/writer2latex/Application.java rename to src/main/java/w2phtml/Application.java index acd19e7..c267444 100644 --- a/src/main/java/writer2latex/Application.java +++ b/src/main/java/w2phtml/Application.java @@ -23,7 +23,7 @@ * */ -package writer2latex; +package w2phtml; import java.io.ByteArrayInputStream; import java.io.File; @@ -37,14 +37,12 @@ import java.util.Hashtable; import java.util.Set; import java.util.Vector; -import writer2latex.api.BatchConverter; -import writer2latex.api.Converter; -import writer2latex.api.ConverterFactory; -import writer2latex.api.ConverterResult; -import writer2latex.api.MIMETypes; -//import writer2latex.api.OutputFile; - -import writer2latex.util.Misc; +import w2phtml.api.BatchConverter; +import w2phtml.api.Converter; +import w2phtml.api.ConverterFactory; +import w2phtml.api.ConverterResult; +import w2phtml.api.MIMETypes; +import w2phtml.util.Misc; /** *

Command line utility to convert an OpenOffice.org Writer XML file into XHTML/LaTeX/BibTeX

@@ -320,7 +318,7 @@ public final class Application { */ private static void showUsage(String msg) { System.out.println(); - System.out.println("This is Writer2LaTeX, Version " + ConverterFactory.getVersion() + System.out.println("This is w2phtml, Version " + ConverterFactory.getVersion() + " (" + ConverterFactory.getDate() + ")"); System.out.println(); if (msg != null) System.out.println(msg); diff --git a/src/main/java/writer2latex/BatchHandlerImpl.java b/src/main/java/w2phtml/BatchHandlerImpl.java similarity index 97% rename from src/main/java/writer2latex/BatchHandlerImpl.java rename to src/main/java/w2phtml/BatchHandlerImpl.java index 4910f9d..46cca3c 100644 --- a/src/main/java/writer2latex/BatchHandlerImpl.java +++ b/src/main/java/w2phtml/BatchHandlerImpl.java @@ -23,13 +23,13 @@ * */ -package writer2latex; +package w2phtml; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import writer2latex.api.BatchHandler; +import w2phtml.api.BatchHandler; /** This class implements a BatchHandler for command line usage */ diff --git a/src/main/java/writer2latex/api/BatchConverter.java b/src/main/java/w2phtml/api/BatchConverter.java similarity index 99% rename from src/main/java/writer2latex/api/BatchConverter.java rename to src/main/java/w2phtml/api/BatchConverter.java index 85411f1..78b4a8d 100644 --- a/src/main/java/writer2latex/api/BatchConverter.java +++ b/src/main/java/w2phtml/api/BatchConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.io.File; import java.io.InputStream; diff --git a/src/main/java/writer2latex/api/BatchHandler.java b/src/main/java/w2phtml/api/BatchHandler.java similarity index 98% rename from src/main/java/writer2latex/api/BatchHandler.java rename to src/main/java/w2phtml/api/BatchHandler.java index 0f6b90a..6ace11f 100644 --- a/src/main/java/writer2latex/api/BatchHandler.java +++ b/src/main/java/w2phtml/api/BatchHandler.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /** This is a call back interface to handle user interaction during a * batch conversion with a {@link BatchConverter} diff --git a/src/main/java/writer2latex/api/ComplexOption.java b/src/main/java/w2phtml/api/ComplexOption.java similarity index 99% rename from src/main/java/writer2latex/api/ComplexOption.java rename to src/main/java/w2phtml/api/ComplexOption.java index 0dcbbac..f0d3769 100644 --- a/src/main/java/writer2latex/api/ComplexOption.java +++ b/src/main/java/w2phtml/api/ComplexOption.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/writer2latex/api/Config.java b/src/main/java/w2phtml/api/Config.java similarity index 99% rename from src/main/java/writer2latex/api/Config.java rename to src/main/java/w2phtml/api/Config.java index efa64a8..13cd10e 100644 --- a/src/main/java/writer2latex/api/Config.java +++ b/src/main/java/w2phtml/api/Config.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.io.File; import java.io.InputStream; diff --git a/src/main/java/writer2latex/api/ContentEntry.java b/src/main/java/w2phtml/api/ContentEntry.java similarity index 98% rename from src/main/java/writer2latex/api/ContentEntry.java rename to src/main/java/w2phtml/api/ContentEntry.java index 213000a..d0a087e 100644 --- a/src/main/java/writer2latex/api/ContentEntry.java +++ b/src/main/java/w2phtml/api/ContentEntry.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /** This interface represents a content entry, that is a named reference * to a position within the output document. diff --git a/src/main/java/writer2latex/api/Converter.java b/src/main/java/w2phtml/api/Converter.java similarity index 99% rename from src/main/java/writer2latex/api/Converter.java rename to src/main/java/w2phtml/api/Converter.java index c93e12b..40cb9e3 100644 --- a/src/main/java/writer2latex/api/Converter.java +++ b/src/main/java/w2phtml/api/Converter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/writer2latex/api/ConverterFactory.java b/src/main/java/w2phtml/api/ConverterFactory.java similarity index 82% rename from src/main/java/writer2latex/api/ConverterFactory.java rename to src/main/java/w2phtml/api/ConverterFactory.java index 13a4c2b..32778c8 100644 --- a/src/main/java/writer2latex/api/ConverterFactory.java +++ b/src/main/java/w2phtml/api/ConverterFactory.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /** This is a factory class which provides static methods to create converters * for documents in OpenDocument (or OpenOffice.org 1.x) format into a specific MIME type @@ -70,33 +70,26 @@ public class ConverterFactory { */ public static Converter createConverter(String sMIME) { Object converter = null; - /*if (MIMETypes.LATEX.equals(sMIME)) { - converter = createInstance("writer2latex.latex.ConverterPalette"); - } - else if (MIMETypes.BIBTEX.equals(sMIME)) { - converter = createInstance("writer2latex.bibtex.Converter"); - } - else*/ if (MIMETypes.XHTML.equals(sMIME)) { - converter = createInstance("writer2latex.xhtml.Xhtml10Converter"); + converter = createInstance("w2phtml.xhtml.Xhtml10Converter"); } else if (MIMETypes.XHTML11.equals(sMIME)) { - converter = createInstance("writer2latex.xhtml.Xhtml11Converter"); + converter = createInstance("w2phtml.xhtml.Xhtml11Converter"); } else if (MIMETypes.XHTML_MATHML.equals(sMIME)) { - converter = createInstance("writer2latex.xhtml.XhtmlMathMLConverter"); + converter = createInstance("w2phtml.xhtml.XhtmlMathMLConverter"); } else if (MIMETypes.HTML5.equals(sMIME)) { - converter = createInstance("writer2latex.xhtml.Html5Converter"); + converter = createInstance("w2phtml.xhtml.Html5Converter"); } else if (MIMETypes.EPUB3.equals(sMIME)) { - converter = createInstance("writer2latex.epub.EPUB3Converter"); + converter = createInstance("w2phtml.epub.EPUB3Converter"); } else if (MIMETypes.EPUB.equals(sMIME)) { - converter = createInstance("writer2latex.epub.EPUBConverter"); + converter = createInstance("w2phtml.epub.EPUBConverter"); } else if (MIMETypes.RDF.equals(sMIME)) { - converter = createInstance("writer2latex.rdf.RDFConverter"); + converter = createInstance("w2phtml.rdf.RDFConverter"); } return converter instanceof Converter ? (Converter) converter : null; } @@ -113,7 +106,7 @@ public class ConverterFactory { public static BatchConverter createBatchConverter(String sMIME) { Object converter = null; if (MIMETypes.XHTML.equals(sMIME)) { - converter = createInstance("writer2latex.xhtml.BatchConverterImpl"); + converter = createInstance("w2phtml.xhtml.BatchConverterImpl"); } return converter instanceof BatchConverter ? (BatchConverter) converter : null; } @@ -123,7 +116,7 @@ public class ConverterFactory { * @return the converter */ public static StarMathConverter createStarMathConverter() { - Object converter = createInstance("writer2latex.latex.StarMathConverter"); + Object converter = createInstance("w2phtml.latex.StarMathConverter"); return converter instanceof StarMathConverter ? (StarMathConverter) converter : null; } diff --git a/src/main/java/writer2latex/api/ConverterResult.java b/src/main/java/w2phtml/api/ConverterResult.java similarity index 99% rename from src/main/java/writer2latex/api/ConverterResult.java rename to src/main/java/w2phtml/api/ConverterResult.java index 77d9531..0307d77 100644 --- a/src/main/java/writer2latex/api/ConverterResult.java +++ b/src/main/java/w2phtml/api/ConverterResult.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.io.File; import java.io.IOException; diff --git a/src/main/java/writer2latex/api/GraphicConverter.java b/src/main/java/w2phtml/api/GraphicConverter.java similarity index 98% rename from src/main/java/writer2latex/api/GraphicConverter.java rename to src/main/java/w2phtml/api/GraphicConverter.java index 0646641..8ce6146 100644 --- a/src/main/java/writer2latex/api/GraphicConverter.java +++ b/src/main/java/w2phtml/api/GraphicConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /** A simple interface for a graphic converter which converts between various * graphics formats diff --git a/src/main/java/writer2latex/api/IndexPageEntry.java b/src/main/java/w2phtml/api/IndexPageEntry.java similarity index 99% rename from src/main/java/writer2latex/api/IndexPageEntry.java rename to src/main/java/w2phtml/api/IndexPageEntry.java index 2175dae..0c938c2 100644 --- a/src/main/java/writer2latex/api/IndexPageEntry.java +++ b/src/main/java/w2phtml/api/IndexPageEntry.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /** This class represents a single entry on an index page created by a batch converter */ diff --git a/src/main/java/writer2latex/api/MIMETypes.java b/src/main/java/w2phtml/api/MIMETypes.java similarity index 98% rename from src/main/java/writer2latex/api/MIMETypes.java rename to src/main/java/w2phtml/api/MIMETypes.java index 307b5ce..9f7c649 100644 --- a/src/main/java/writer2latex/api/MIMETypes.java +++ b/src/main/java/w2phtml/api/MIMETypes.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; /* Some helpers to handle the MIME types used by OOo and Writer2LaTeX */ diff --git a/src/main/java/writer2latex/api/MetaData.java b/src/main/java/w2phtml/api/MetaData.java similarity index 98% rename from src/main/java/writer2latex/api/MetaData.java rename to src/main/java/w2phtml/api/MetaData.java index 6c6265a..a191d37 100644 --- a/src/main/java/writer2latex/api/MetaData.java +++ b/src/main/java/w2phtml/api/MetaData.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.util.Map; diff --git a/src/main/java/writer2latex/api/OutputFile.java b/src/main/java/w2phtml/api/OutputFile.java similarity index 98% rename from src/main/java/writer2latex/api/OutputFile.java rename to src/main/java/w2phtml/api/OutputFile.java index 55b638a..4f25b85 100644 --- a/src/main/java/writer2latex/api/OutputFile.java +++ b/src/main/java/w2phtml/api/OutputFile.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; import java.io.OutputStream; import java.io.IOException; diff --git a/src/main/java/writer2latex/api/Package.html b/src/main/java/w2phtml/api/Package.html similarity index 100% rename from src/main/java/writer2latex/api/Package.html rename to src/main/java/w2phtml/api/Package.html diff --git a/src/main/java/writer2latex/api/StarMathConverter.java b/src/main/java/w2phtml/api/StarMathConverter.java similarity index 98% rename from src/main/java/writer2latex/api/StarMathConverter.java rename to src/main/java/w2phtml/api/StarMathConverter.java index f8d6f72..c3a6dee 100644 --- a/src/main/java/writer2latex/api/StarMathConverter.java +++ b/src/main/java/w2phtml/api/StarMathConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.api; +package w2phtml.api; //import java.io.InputStream; //import java.io.IOException; diff --git a/src/main/java/writer2latex/base/BasicConverter.java b/src/main/java/w2phtml/base/BasicConverter.java similarity index 93% rename from src/main/java/writer2latex/base/BasicConverter.java rename to src/main/java/w2phtml/base/BasicConverter.java index 46aff54..3c018fb 100644 --- a/src/main/java/writer2latex/base/BasicConverter.java +++ b/src/main/java/w2phtml/base/BasicConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.io.File; import java.io.FileInputStream; @@ -32,16 +32,17 @@ import java.io.InputStream; import java.io.IOException; import org.w3c.dom.Element; -import writer2latex.api.GraphicConverter; -import writer2latex.api.Converter; -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.office.EmbeddedObject; -import writer2latex.office.MetaData; -import writer2latex.office.OfficeDocument; -import writer2latex.office.OfficeReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; + +import w2phtml.api.Converter; +import w2phtml.api.ConverterResult; +import w2phtml.api.GraphicConverter; +import w2phtml.api.OutputFile; +import w2phtml.office.EmbeddedObject; +import w2phtml.office.MetaData; +import w2phtml.office.OfficeDocument; +import w2phtml.office.OfficeReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; /**

Abstract base implementation of writer2latex.api.Converter

*/ diff --git a/src/main/java/writer2latex/base/BatchConverterBase.java b/src/main/java/w2phtml/base/BatchConverterBase.java similarity index 95% rename from src/main/java/writer2latex/base/BatchConverterBase.java rename to src/main/java/w2phtml/base/BatchConverterBase.java index 4512e3f..c283dcd 100644 --- a/src/main/java/writer2latex/base/BatchConverterBase.java +++ b/src/main/java/w2phtml/base/BatchConverterBase.java @@ -23,21 +23,20 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.io.File; import java.io.FileOutputStream; import java.io.FileNotFoundException; import java.io.IOException; -import writer2latex.api.BatchConverter; -import writer2latex.api.BatchHandler; -import writer2latex.api.Converter; -import writer2latex.api.ConverterResult; -import writer2latex.api.IndexPageEntry; -import writer2latex.api.OutputFile; - -import writer2latex.util.Misc; +import w2phtml.api.BatchConverter; +import w2phtml.api.BatchHandler; +import w2phtml.api.Converter; +import w2phtml.api.ConverterResult; +import w2phtml.api.IndexPageEntry; +import w2phtml.api.OutputFile; +import w2phtml.util.Misc; /** * Abstract base implementation of writer2latex.api.BatchConverter. diff --git a/src/main/java/writer2latex/base/BibliographyGenerator.java b/src/main/java/w2phtml/base/BibliographyGenerator.java similarity index 98% rename from src/main/java/writer2latex/base/BibliographyGenerator.java rename to src/main/java/w2phtml/base/BibliographyGenerator.java index 085e67a..e692c53 100644 --- a/src/main/java/writer2latex/base/BibliographyGenerator.java +++ b/src/main/java/w2phtml/base/BibliographyGenerator.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.util.ArrayList; import java.util.Collection; @@ -38,10 +38,10 @@ import java.util.Set; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.util.StringComparator; +import w2phtml.office.OfficeReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.util.StringComparator; /** This class is used to generate bibliographic references and a bibliography. * Bibliographies are generated from a list of items (text:bibliograpy-mark), a global configuration diff --git a/src/main/java/writer2latex/base/BinaryGraphicsDocument.java b/src/main/java/w2phtml/base/BinaryGraphicsDocument.java similarity index 98% rename from src/main/java/writer2latex/base/BinaryGraphicsDocument.java rename to src/main/java/w2phtml/base/BinaryGraphicsDocument.java index c9e2454..2e79c33 100644 --- a/src/main/java/writer2latex/base/BinaryGraphicsDocument.java +++ b/src/main/java/w2phtml/base/BinaryGraphicsDocument.java @@ -23,12 +23,13 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.io.OutputStream; -import java.io.IOException; -import writer2latex.api.OutputFile; +import w2phtml.api.OutputFile; + +import java.io.IOException; /** This class is used to represent a binary graphics document to be included in the converter result. diff --git a/src/main/java/writer2latex/base/BooleanOption.java b/src/main/java/w2phtml/base/BooleanOption.java similarity index 97% rename from src/main/java/writer2latex/base/BooleanOption.java rename to src/main/java/w2phtml/base/BooleanOption.java index c850f1e..dccbc52 100644 --- a/src/main/java/writer2latex/base/BooleanOption.java +++ b/src/main/java/w2phtml/base/BooleanOption.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; // A BooleanOption interprets the values as booleans public class BooleanOption extends Option { diff --git a/src/main/java/writer2latex/base/ConfigBase.java b/src/main/java/w2phtml/base/ConfigBase.java similarity index 97% rename from src/main/java/writer2latex/base/ConfigBase.java rename to src/main/java/w2phtml/base/ConfigBase.java index 48a11f5..6e5ce81 100644 --- a/src/main/java/writer2latex/base/ConfigBase.java +++ b/src/main/java/w2phtml/base/ConfigBase.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; /** Base implementation of writer2latex.api.Config */ @@ -43,12 +43,13 @@ import javax.xml.parsers.ParserConfigurationException; import org.w3c.dom.Document; import org.w3c.dom.Node; + +import w2phtml.api.ComplexOption; + import org.w3c.dom.Element; import org.w3c.dom.DOMImplementation; -import writer2latex.api.ComplexOption; - -public abstract class ConfigBase implements writer2latex.api.Config { +public abstract class ConfigBase implements w2phtml.api.Config { protected abstract int getOptionCount(); protected abstract String getDefaultConfigPath(); diff --git a/src/main/java/writer2latex/base/ContentEntryImpl.java b/src/main/java/w2phtml/base/ContentEntryImpl.java similarity index 93% rename from src/main/java/writer2latex/base/ContentEntryImpl.java rename to src/main/java/w2phtml/base/ContentEntryImpl.java index e47bd34..54b5861 100644 --- a/src/main/java/writer2latex/base/ContentEntryImpl.java +++ b/src/main/java/w2phtml/base/ContentEntryImpl.java @@ -23,10 +23,10 @@ * */ -package writer2latex.base; +package w2phtml.base; -import writer2latex.api.ContentEntry; -import writer2latex.api.OutputFile; +import w2phtml.api.ContentEntry; +import w2phtml.api.OutputFile; public class ContentEntryImpl implements ContentEntry { private String sTitle; diff --git a/src/main/java/writer2latex/base/ConverterResultImpl.java b/src/main/java/w2phtml/base/ConverterResultImpl.java similarity index 97% rename from src/main/java/writer2latex/base/ConverterResultImpl.java rename to src/main/java/w2phtml/base/ConverterResultImpl.java index d490b45..8b35b0d 100644 --- a/src/main/java/writer2latex/base/ConverterResultImpl.java +++ b/src/main/java/w2phtml/base/ConverterResultImpl.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.io.File; import java.io.FileOutputStream; @@ -31,12 +31,13 @@ import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.Vector; -import java.util.Iterator; -import writer2latex.api.ConverterResult; -import writer2latex.api.MetaData; -import writer2latex.api.OutputFile; -import writer2latex.api.ContentEntry; +import w2phtml.api.ContentEntry; +import w2phtml.api.ConverterResult; +import w2phtml.api.MetaData; +import w2phtml.api.OutputFile; + +import java.util.Iterator; /** ConverterResultImpl is a straightforward implementation of ConverterResult */ diff --git a/src/main/java/writer2latex/base/DOMDocument.java b/src/main/java/w2phtml/base/DOMDocument.java similarity index 99% rename from src/main/java/writer2latex/base/DOMDocument.java rename to src/main/java/w2phtml/base/DOMDocument.java index f0c6271..a12eccc 100644 --- a/src/main/java/writer2latex/base/DOMDocument.java +++ b/src/main/java/w2phtml/base/DOMDocument.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.io.InputStream; import java.io.IOException; @@ -42,7 +42,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; //import org.xml.sax.SAXParseException; -import writer2latex.api.OutputFile; +import w2phtml.api.OutputFile; /** * This class represents XML-based documents. It is loosely based on a class from the former xmerge project diff --git a/src/main/java/writer2latex/base/ImageConverter.java b/src/main/java/w2phtml/base/ImageConverter.java similarity index 97% rename from src/main/java/writer2latex/base/ImageConverter.java rename to src/main/java/w2phtml/base/ImageConverter.java index 7b023af..011f07b 100644 --- a/src/main/java/writer2latex/base/ImageConverter.java +++ b/src/main/java/w2phtml/base/ImageConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -39,14 +39,14 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import writer2latex.api.GraphicConverter; -import writer2latex.office.EmbeddedBinaryObject; -import writer2latex.office.EmbeddedObject; -import writer2latex.office.MIMETypes; -import writer2latex.office.OfficeReader; -import writer2latex.office.SVMReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; +import w2phtml.api.GraphicConverter; +import w2phtml.office.EmbeddedBinaryObject; +import w2phtml.office.EmbeddedObject; +import w2phtml.office.MIMETypes; +import w2phtml.office.OfficeReader; +import w2phtml.office.SVMReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; /** This class extracts and converts images from an office document. * The images are returned as BinaryGraphicsDocument. diff --git a/src/main/java/writer2latex/base/IntegerOption.java b/src/main/java/w2phtml/base/IntegerOption.java similarity index 97% rename from src/main/java/writer2latex/base/IntegerOption.java rename to src/main/java/w2phtml/base/IntegerOption.java index a2ca8bc..9426e3f 100644 --- a/src/main/java/writer2latex/base/IntegerOption.java +++ b/src/main/java/w2phtml/base/IntegerOption.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; // An IntegerOption must always be subclassed (must override setString) diff --git a/src/main/java/writer2latex/base/Option.java b/src/main/java/w2phtml/base/Option.java similarity index 97% rename from src/main/java/writer2latex/base/Option.java rename to src/main/java/w2phtml/base/Option.java index c60d208..366826a 100644 --- a/src/main/java/writer2latex/base/Option.java +++ b/src/main/java/w2phtml/base/Option.java @@ -23,7 +23,7 @@ * */ -package writer2latex.base; +package w2phtml.base; // The mother of all options; reads and writes string values public class Option { diff --git a/src/main/java/writer2latex/base/Package.html b/src/main/java/w2phtml/base/Package.html similarity index 100% rename from src/main/java/writer2latex/base/Package.html rename to src/main/java/w2phtml/base/Package.html diff --git a/src/main/java/writer2latex/epub/ContainerWriter.java b/src/main/java/w2phtml/epub/ContainerWriter.java similarity index 97% rename from src/main/java/writer2latex/epub/ContainerWriter.java rename to src/main/java/w2phtml/epub/ContainerWriter.java index 875d21a..59421fc 100644 --- a/src/main/java/writer2latex/epub/ContainerWriter.java +++ b/src/main/java/w2phtml/epub/ContainerWriter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -34,7 +34,7 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import writer2latex.base.DOMDocument; +import w2phtml.base.DOMDocument; /** This class creates the required META-INF/container.xml file for an EPUB package * (see http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm). diff --git a/src/main/java/writer2latex/epub/EPUB3Converter.java b/src/main/java/w2phtml/epub/EPUB3Converter.java similarity index 93% rename from src/main/java/writer2latex/epub/EPUB3Converter.java rename to src/main/java/w2phtml/epub/EPUB3Converter.java index 8a761a0..eb8336c 100644 --- a/src/main/java/writer2latex/epub/EPUB3Converter.java +++ b/src/main/java/w2phtml/epub/EPUB3Converter.java @@ -23,14 +23,14 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import java.io.IOException; import java.io.InputStream; -import writer2latex.api.ConverterResult; -import writer2latex.base.ConverterResultImpl; -import writer2latex.xhtml.Html5Converter; +import w2phtml.api.ConverterResult; +import w2phtml.base.ConverterResultImpl; +import w2phtml.xhtml.Html5Converter; /** This class converts an OpenDocument file to an EPUB 3 document. diff --git a/src/main/java/writer2latex/epub/EPUBConverter.java b/src/main/java/w2phtml/epub/EPUBConverter.java similarity index 93% rename from src/main/java/writer2latex/epub/EPUBConverter.java rename to src/main/java/w2phtml/epub/EPUBConverter.java index 456e5ab..1652ef4 100644 --- a/src/main/java/writer2latex/epub/EPUBConverter.java +++ b/src/main/java/w2phtml/epub/EPUBConverter.java @@ -23,14 +23,14 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import java.io.IOException; import java.io.InputStream; -import writer2latex.api.ConverterResult; -import writer2latex.base.ConverterResultImpl; -import writer2latex.xhtml.Xhtml11Converter; +import w2phtml.api.ConverterResult; +import w2phtml.base.ConverterResultImpl; +import w2phtml.xhtml.Xhtml11Converter; /** This class converts an OpenDocument file to an EPUB document. diff --git a/src/main/java/writer2latex/epub/EPUBWriter.java b/src/main/java/w2phtml/epub/EPUBWriter.java similarity index 96% rename from src/main/java/writer2latex/epub/EPUBWriter.java rename to src/main/java/w2phtml/epub/EPUBWriter.java index 1202be9..f7052a5 100644 --- a/src/main/java/writer2latex/epub/EPUBWriter.java +++ b/src/main/java/w2phtml/epub/EPUBWriter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,10 +32,10 @@ import java.util.Iterator; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.util.Misc; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.api.ConverterResult; +import w2phtml.api.OutputFile; +import w2phtml.util.Misc; +import w2phtml.xhtml.XhtmlConfig; /** This class repackages an XHTML document into EPUB format. * Some filenames are hard wired in this implementation: The main directory is OEBPS and diff --git a/src/main/java/writer2latex/epub/NCXWriter.java b/src/main/java/w2phtml/epub/NCXWriter.java similarity index 97% rename from src/main/java/writer2latex/epub/NCXWriter.java rename to src/main/java/w2phtml/epub/NCXWriter.java index 22b0101..6f3e0c6 100644 --- a/src/main/java/writer2latex/epub/NCXWriter.java +++ b/src/main/java/w2phtml/epub/NCXWriter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import java.util.Iterator; @@ -36,10 +36,10 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import writer2latex.api.ContentEntry; -import writer2latex.api.ConverterResult; -import writer2latex.base.DOMDocument; -import writer2latex.util.Misc; +import w2phtml.api.ContentEntry; +import w2phtml.api.ConverterResult; +import w2phtml.base.DOMDocument; +import w2phtml.util.Misc; /** This class creates the required NXC file for an EPUB document * (see http://www.idpf.org/2007/opf/OPF_2.0_final_spec.html#Section2.4). diff --git a/src/main/java/writer2latex/epub/NavigationWriter.java b/src/main/java/w2phtml/epub/NavigationWriter.java similarity index 96% rename from src/main/java/writer2latex/epub/NavigationWriter.java rename to src/main/java/w2phtml/epub/NavigationWriter.java index 212a4e5..a2c7153 100644 --- a/src/main/java/writer2latex/epub/NavigationWriter.java +++ b/src/main/java/w2phtml/epub/NavigationWriter.java @@ -22,7 +22,7 @@ * version 1.6 (2015-04-21) * */ -package writer2latex.epub; +package w2phtml.epub; import java.util.Iterator; @@ -35,10 +35,10 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import writer2latex.api.ContentEntry; -import writer2latex.api.ConverterResult; -import writer2latex.base.DOMDocument; -import writer2latex.util.Misc; +import w2phtml.api.ContentEntry; +import w2phtml.api.ConverterResult; +import w2phtml.base.DOMDocument; +import w2phtml.util.Misc; /** This class writes the EPUB Navigation Document as defined in EPUB 3 */ diff --git a/src/main/java/writer2latex/epub/OPFWriter.java b/src/main/java/w2phtml/epub/OPFWriter.java similarity index 98% rename from src/main/java/writer2latex/epub/OPFWriter.java rename to src/main/java/w2phtml/epub/OPFWriter.java index f3e6dbe..66f5043 100644 --- a/src/main/java/writer2latex/epub/OPFWriter.java +++ b/src/main/java/w2phtml/epub/OPFWriter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.epub; +package w2phtml.epub; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -44,12 +44,12 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import writer2latex.api.ContentEntry; -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.base.DOMDocument; -import writer2latex.util.Misc; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.api.ContentEntry; +import w2phtml.api.ConverterResult; +import w2phtml.api.OutputFile; +import w2phtml.base.DOMDocument; +import w2phtml.util.Misc; +import w2phtml.xhtml.XhtmlConfig; /** This class writes an OPF-file for an EPUB document (see http://www.idpf.org/2007/opf/OPF_2.0_final_spec.html). */ diff --git a/src/main/java/writer2latex/epub/Package.html b/src/main/java/w2phtml/epub/Package.html similarity index 100% rename from src/main/java/writer2latex/epub/Package.html rename to src/main/java/w2phtml/epub/Package.html diff --git a/src/main/java/writer2latex/office/BibMark.java b/src/main/java/w2phtml/office/BibMark.java similarity index 99% rename from src/main/java/writer2latex/office/BibMark.java rename to src/main/java/w2phtml/office/BibMark.java index 677223f..7ad46d7 100644 --- a/src/main/java/writer2latex/office/BibMark.java +++ b/src/main/java/w2phtml/office/BibMark.java @@ -23,13 +23,14 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.util.HashMap; import java.util.Map; import org.w3c.dom.Node; -import writer2latex.util.Misc; + +import w2phtml.util.Misc; /** This class represents a single bibliography-mark in an ODF document */ diff --git a/src/main/java/writer2latex/office/CellView.java b/src/main/java/w2phtml/office/CellView.java similarity index 97% rename from src/main/java/writer2latex/office/CellView.java rename to src/main/java/w2phtml/office/CellView.java index bf2cfa9..efe2987 100644 --- a/src/main/java/writer2latex/office/CellView.java +++ b/src/main/java/w2phtml/office/CellView.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Element; diff --git a/src/main/java/writer2latex/office/ControlReader.java b/src/main/java/w2phtml/office/ControlReader.java similarity index 98% rename from src/main/java/writer2latex/office/ControlReader.java rename to src/main/java/w2phtml/office/ControlReader.java index bca8944..a4e675e 100644 --- a/src/main/java/writer2latex/office/ControlReader.java +++ b/src/main/java/w2phtml/office/ControlReader.java @@ -23,13 +23,14 @@ * */ -package writer2latex.office; +package w2phtml.office; //import java.util.Hashtable; import java.util.Vector; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.util.Misc; + +import w2phtml.util.Misc; /**

This class reads a form control in an OOo document (a form:control * node). A control always has an owner form. diff --git a/src/main/java/writer2latex/office/EmbeddedBinaryObject.java b/src/main/java/w2phtml/office/EmbeddedBinaryObject.java similarity index 96% rename from src/main/java/writer2latex/office/EmbeddedBinaryObject.java rename to src/main/java/w2phtml/office/EmbeddedBinaryObject.java index 7d2c279..7652f12 100644 --- a/src/main/java/writer2latex/office/EmbeddedBinaryObject.java +++ b/src/main/java/w2phtml/office/EmbeddedBinaryObject.java @@ -23,9 +23,9 @@ * */ -package writer2latex.office; +package w2phtml.office; -import writer2latex.util.SimpleZipReader; +import w2phtml.util.SimpleZipReader; /** * This class represents an embedded object with a binary representation in an ODF package document diff --git a/src/main/java/writer2latex/office/EmbeddedObject.java b/src/main/java/w2phtml/office/EmbeddedObject.java similarity index 98% rename from src/main/java/writer2latex/office/EmbeddedObject.java rename to src/main/java/w2phtml/office/EmbeddedObject.java index c1fa240..aa987e8 100644 --- a/src/main/java/writer2latex/office/EmbeddedObject.java +++ b/src/main/java/w2phtml/office/EmbeddedObject.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; /** This class represents and embedded object within an ODF package document */ diff --git a/src/main/java/writer2latex/office/EmbeddedXMLObject.java b/src/main/java/w2phtml/office/EmbeddedXMLObject.java similarity index 98% rename from src/main/java/writer2latex/office/EmbeddedXMLObject.java rename to src/main/java/w2phtml/office/EmbeddedXMLObject.java index 15d246b..3ebec32 100644 --- a/src/main/java/writer2latex/office/EmbeddedXMLObject.java +++ b/src/main/java/w2phtml/office/EmbeddedXMLObject.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.io.IOException; @@ -31,7 +31,7 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; -import writer2latex.util.SimpleZipReader; +import w2phtml.util.SimpleZipReader; /** This class represents those embedded objects in an ODF document that have an XML representation: * Formulas, charts, spreadsheets, text, drawings and presentations. diff --git a/src/main/java/writer2latex/office/FontDeclaration.java b/src/main/java/w2phtml/office/FontDeclaration.java similarity index 98% rename from src/main/java/writer2latex/office/FontDeclaration.java rename to src/main/java/w2phtml/office/FontDeclaration.java index 059e74c..250719a 100644 --- a/src/main/java/writer2latex/office/FontDeclaration.java +++ b/src/main/java/w2phtml/office/FontDeclaration.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; diff --git a/src/main/java/writer2latex/office/FormReader.java b/src/main/java/w2phtml/office/FormReader.java similarity index 97% rename from src/main/java/writer2latex/office/FormReader.java rename to src/main/java/w2phtml/office/FormReader.java index 6f7b6cd..2266c4c 100644 --- a/src/main/java/writer2latex/office/FormReader.java +++ b/src/main/java/w2phtml/office/FormReader.java @@ -22,13 +22,13 @@ // Version 1.0 (2008-11-22) -package writer2latex.office; +package w2phtml.office; //import java.util.Hashtable; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /**

This class reads a form in an OOo document (a form:form node)

* Note: Subforms, properties and events are ignored. diff --git a/src/main/java/writer2latex/office/FormsReader.java b/src/main/java/w2phtml/office/FormsReader.java similarity index 99% rename from src/main/java/writer2latex/office/FormsReader.java rename to src/main/java/w2phtml/office/FormsReader.java index e5bd384..8f16909 100644 --- a/src/main/java/writer2latex/office/FormsReader.java +++ b/src/main/java/w2phtml/office/FormsReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.util.Hashtable; import java.util.Iterator; diff --git a/src/main/java/writer2latex/office/IndexMark.java b/src/main/java/w2phtml/office/IndexMark.java similarity index 98% rename from src/main/java/writer2latex/office/IndexMark.java rename to src/main/java/w2phtml/office/IndexMark.java index 0769447..f2af1e8 100644 --- a/src/main/java/writer2latex/office/IndexMark.java +++ b/src/main/java/w2phtml/office/IndexMark.java @@ -23,11 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; -import writer2latex.util.*; +import w2phtml.util.*; /** *

This class contains static methods to read an index-mark.

diff --git a/src/main/java/writer2latex/office/ListCounter.java b/src/main/java/w2phtml/office/ListCounter.java similarity index 98% rename from src/main/java/writer2latex/office/ListCounter.java rename to src/main/java/w2phtml/office/ListCounter.java index 88a24ec..44609a7 100644 --- a/src/main/java/writer2latex/office/ListCounter.java +++ b/src/main/java/w2phtml/office/ListCounter.java @@ -23,9 +23,9 @@ * */ -package writer2latex.office; +package w2phtml.office; -import writer2latex.util.*; +import w2phtml.util.*; /** *

This class produces labels for OOo lists/outlines (for xhtml diff --git a/src/main/java/writer2latex/office/ListStyle.java b/src/main/java/w2phtml/office/ListStyle.java similarity index 98% rename from src/main/java/writer2latex/office/ListStyle.java rename to src/main/java/w2phtml/office/ListStyle.java index ffa5c54..1b152e7 100644 --- a/src/main/java/writer2latex/office/ListStyle.java +++ b/src/main/java/w2phtml/office/ListStyle.java @@ -23,11 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /**

Class representing a list style (including outline numbering) in OOo Writer

*/ diff --git a/src/main/java/writer2latex/office/LoftReader.java b/src/main/java/w2phtml/office/LoftReader.java similarity index 98% rename from src/main/java/writer2latex/office/LoftReader.java rename to src/main/java/w2phtml/office/LoftReader.java index 0664b43..1ede038 100644 --- a/src/main/java/writer2latex/office/LoftReader.java +++ b/src/main/java/w2phtml/office/LoftReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; //import java.util.Hashtable; //import java.util.Set; @@ -31,7 +31,7 @@ package writer2latex.office; import org.w3c.dom.Element; //import org.w3c.dom.Node; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /** *

The class reads a text:illustration-index or diff --git a/src/main/java/writer2latex/office/MIMETypes.java b/src/main/java/w2phtml/office/MIMETypes.java similarity index 98% rename from src/main/java/writer2latex/office/MIMETypes.java rename to src/main/java/w2phtml/office/MIMETypes.java index 26c8ebb..d75d42b 100644 --- a/src/main/java/writer2latex/office/MIMETypes.java +++ b/src/main/java/w2phtml/office/MIMETypes.java @@ -23,12 +23,12 @@ * */ -package writer2latex.office; +package w2phtml.office; /* Some helpers to handle the MIME types used by OOo */ -public final class MIMETypes extends writer2latex.api.MIMETypes { +public final class MIMETypes extends w2phtml.api.MIMETypes { // OOo MIME types, taken from // http://framework.openoffice.org/documentation/mimetypes/mimetypes.html public static final String WRITER="application/vnd.sun.xml.writer"; diff --git a/src/main/java/writer2latex/office/MasterPage.java b/src/main/java/w2phtml/office/MasterPage.java similarity index 97% rename from src/main/java/writer2latex/office/MasterPage.java rename to src/main/java/w2phtml/office/MasterPage.java index 6d98986..c5b9ecc 100644 --- a/src/main/java/writer2latex/office/MasterPage.java +++ b/src/main/java/w2phtml/office/MasterPage.java @@ -23,12 +23,12 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; import pro.litvinovg.xml.Debug; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /**

Class representing a master page in OOo Writer

*/ public class MasterPage extends OfficeStyle { diff --git a/src/main/java/writer2latex/office/MetaData.java b/src/main/java/w2phtml/office/MetaData.java similarity index 97% rename from src/main/java/writer2latex/office/MetaData.java rename to src/main/java/w2phtml/office/MetaData.java index 178890f..ed5792b 100644 --- a/src/main/java/writer2latex/office/MetaData.java +++ b/src/main/java/w2phtml/office/MetaData.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.util.HashMap; import java.util.Map; @@ -32,14 +32,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import writer2latex.util.*; -//import writer2latex.office.*; +import w2phtml.util.*; /** *

This class represents the metadata of an OOo Writer document.

*/ -public class MetaData implements writer2latex.api.MetaData { +public class MetaData implements w2phtml.api.MetaData { // Dublin Core private String sTitle = ""; private String sCreator = ""; diff --git a/src/main/java/writer2latex/office/OfficeDocument.java b/src/main/java/w2phtml/office/OfficeDocument.java similarity index 98% rename from src/main/java/writer2latex/office/OfficeDocument.java rename to src/main/java/w2phtml/office/OfficeDocument.java index d0459ad..dda3730 100644 --- a/src/main/java/writer2latex/office/OfficeDocument.java +++ b/src/main/java/w2phtml/office/OfficeDocument.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.io.BufferedInputStream; import java.io.InputStream; @@ -41,8 +41,8 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import writer2latex.util.SimpleXMLParser; -import writer2latex.util.SimpleZipReader; +import w2phtml.util.SimpleXMLParser; +import w2phtml.util.SimpleZipReader; /** * This class implements reading of ODF files from various sources diff --git a/src/main/java/writer2latex/office/OfficeReader.java b/src/main/java/w2phtml/office/OfficeReader.java similarity index 99% rename from src/main/java/writer2latex/office/OfficeReader.java rename to src/main/java/w2phtml/office/OfficeReader.java index e8eca2c..59d0433 100644 --- a/src/main/java/writer2latex/office/OfficeReader.java +++ b/src/main/java/w2phtml/office/OfficeReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.util.ArrayList; import java.util.Enumeration; @@ -37,9 +37,10 @@ import java.util.Set; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.Document; -import writer2latex.util.Misc; +import w2phtml.util.Misc; + +import org.w3c.dom.Document; /**

This class reads and collects global information about an OOo document. * This includes styles, forms, information about indexes and references etc. diff --git a/src/main/java/writer2latex/office/OfficeStyle.java b/src/main/java/w2phtml/office/OfficeStyle.java similarity index 97% rename from src/main/java/writer2latex/office/OfficeStyle.java rename to src/main/java/w2phtml/office/OfficeStyle.java index c059c11..df61bde 100644 --- a/src/main/java/writer2latex/office/OfficeStyle.java +++ b/src/main/java/w2phtml/office/OfficeStyle.java @@ -23,10 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; -import writer2latex.util.Misc; + +import w2phtml.util.Misc; /**

Abstract class representing a style in OOo

*/ public abstract class OfficeStyle implements Cloneable { diff --git a/src/main/java/writer2latex/office/OfficeStyleFamily.java b/src/main/java/w2phtml/office/OfficeStyleFamily.java similarity index 98% rename from src/main/java/writer2latex/office/OfficeStyleFamily.java rename to src/main/java/w2phtml/office/OfficeStyleFamily.java index 18b132d..4eedde7 100644 --- a/src/main/java/writer2latex/office/OfficeStyleFamily.java +++ b/src/main/java/w2phtml/office/OfficeStyleFamily.java @@ -23,12 +23,14 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; + +import w2phtml.util.Misc; + import java.util.Hashtable; import java.util.Enumeration; -import writer2latex.util.Misc; /** Container class representing a style family in OOo */ public class OfficeStyleFamily { diff --git a/src/main/java/writer2latex/office/Package.html b/src/main/java/w2phtml/office/Package.html similarity index 100% rename from src/main/java/writer2latex/office/Package.html rename to src/main/java/w2phtml/office/Package.html diff --git a/src/main/java/writer2latex/office/PageLayout.java b/src/main/java/w2phtml/office/PageLayout.java similarity index 98% rename from src/main/java/writer2latex/office/PageLayout.java rename to src/main/java/w2phtml/office/PageLayout.java index 398e5a0..0bd2c69 100644 --- a/src/main/java/writer2latex/office/PageLayout.java +++ b/src/main/java/w2phtml/office/PageLayout.java @@ -23,10 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; -import writer2latex.util.Misc; + +import w2phtml.util.Misc; /**

Class representing a page master in OOo Writer. This is represented * like other styles + a separate style for header and footer

diff --git a/src/main/java/writer2latex/office/PropertySet.java b/src/main/java/w2phtml/office/PropertySet.java similarity index 99% rename from src/main/java/writer2latex/office/PropertySet.java rename to src/main/java/w2phtml/office/PropertySet.java index 8ebebc6..4db5ae4 100644 --- a/src/main/java/writer2latex/office/PropertySet.java +++ b/src/main/java/w2phtml/office/PropertySet.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; import org.w3c.dom.Element; diff --git a/src/main/java/writer2latex/office/SVMReader.java b/src/main/java/w2phtml/office/SVMReader.java similarity index 99% rename from src/main/java/writer2latex/office/SVMReader.java rename to src/main/java/w2phtml/office/SVMReader.java index 219e3b8..e3264e0 100644 --- a/src/main/java/writer2latex/office/SVMReader.java +++ b/src/main/java/w2phtml/office/SVMReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; /** This class contains a static method to extract EPS data from an SVM file */ public final class SVMReader { diff --git a/src/main/java/writer2latex/office/StyleWithProperties.java b/src/main/java/w2phtml/office/StyleWithProperties.java similarity index 98% rename from src/main/java/writer2latex/office/StyleWithProperties.java rename to src/main/java/w2phtml/office/StyleWithProperties.java index e9c2b1a..4035567 100644 --- a/src/main/java/writer2latex/office/StyleWithProperties.java +++ b/src/main/java/w2phtml/office/StyleWithProperties.java @@ -22,16 +22,14 @@ * Version 1.0 (2008-11-22) */ -package writer2latex.office; +package w2phtml.office; //import org.w3c.dom.Element; import org.w3c.dom.Node; import pro.litvinovg.xml.Debug; -import writer2latex.util.Calc; -//import org.w3c.dom.NamedNodeMap; -//import java.util.Hashtable; -import writer2latex.util.Misc; +import w2phtml.util.Calc; +import w2phtml.util.Misc; /**

Class representing a style in OOo which contains a style:properties * element

diff --git a/src/main/java/writer2latex/office/TableLine.java b/src/main/java/w2phtml/office/TableLine.java similarity index 97% rename from src/main/java/writer2latex/office/TableLine.java rename to src/main/java/w2phtml/office/TableLine.java index dc8bee1..e08273f 100644 --- a/src/main/java/writer2latex/office/TableLine.java +++ b/src/main/java/w2phtml/office/TableLine.java @@ -23,10 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Node; -import writer2latex.util.Misc; + +import w2phtml.util.Misc; /** *

This class represents the properties of a row or column in a table

diff --git a/src/main/java/writer2latex/office/TableRange.java b/src/main/java/w2phtml/office/TableRange.java similarity index 99% rename from src/main/java/writer2latex/office/TableRange.java rename to src/main/java/w2phtml/office/TableRange.java index ebde01d..00bc15d 100644 --- a/src/main/java/writer2latex/office/TableRange.java +++ b/src/main/java/w2phtml/office/TableRange.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; /** * This class represent a table range within a table. A table range is defined diff --git a/src/main/java/writer2latex/office/TableRangeParser.java b/src/main/java/w2phtml/office/TableRangeParser.java similarity index 97% rename from src/main/java/writer2latex/office/TableRangeParser.java rename to src/main/java/w2phtml/office/TableRangeParser.java index cadacfb..2c5d8ca 100644 --- a/src/main/java/writer2latex/office/TableRangeParser.java +++ b/src/main/java/w2phtml/office/TableRangeParser.java @@ -23,10 +23,10 @@ * */ -package writer2latex.office; +package w2phtml.office; -import writer2latex.util.Misc; -import writer2latex.util.SimpleInputBuffer; +import w2phtml.util.Misc; +import w2phtml.util.SimpleInputBuffer; /** * This class parses a space separated list of table ranges. A table range is of the form diff --git a/src/main/java/writer2latex/office/TableReader.java b/src/main/java/w2phtml/office/TableReader.java similarity index 99% rename from src/main/java/writer2latex/office/TableReader.java rename to src/main/java/w2phtml/office/TableReader.java index 510b0fe..383b7f0 100644 --- a/src/main/java/writer2latex/office/TableReader.java +++ b/src/main/java/w2phtml/office/TableReader.java @@ -22,7 +22,7 @@ * along with Writer2LaTeX. If not, see . */ -package writer2latex.office; +package w2phtml.office; import java.util.LinkedList; import java.util.Vector; @@ -31,8 +31,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import writer2latex.util.Calc; -import writer2latex.util.Misc; +import w2phtml.util.Calc; +import w2phtml.util.Misc; /** *

This class reads a table from a table:table or table:sub-table element diff --git a/src/main/java/writer2latex/office/TableView.java b/src/main/java/w2phtml/office/TableView.java similarity index 99% rename from src/main/java/writer2latex/office/TableView.java rename to src/main/java/w2phtml/office/TableView.java index 140949f..313571d 100644 --- a/src/main/java/writer2latex/office/TableView.java +++ b/src/main/java/w2phtml/office/TableView.java @@ -23,11 +23,11 @@ * */ -package writer2latex.office; +package w2phtml.office; import org.w3c.dom.Element; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /** * This class represents a view of a TableRange. A view provides diff --git a/src/main/java/writer2latex/office/TocReader.java b/src/main/java/w2phtml/office/TocReader.java similarity index 99% rename from src/main/java/writer2latex/office/TocReader.java rename to src/main/java/w2phtml/office/TocReader.java index 912f0ba..b21da44 100644 --- a/src/main/java/writer2latex/office/TocReader.java +++ b/src/main/java/w2phtml/office/TocReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; import java.util.Hashtable; import java.util.Set; @@ -31,7 +31,7 @@ import java.util.Set; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.util.Misc; +import w2phtml.util.Misc; /** *

The class reads a text:table-of-content element.

diff --git a/src/main/java/writer2latex/office/XMLString.java b/src/main/java/w2phtml/office/XMLString.java similarity index 99% rename from src/main/java/writer2latex/office/XMLString.java rename to src/main/java/w2phtml/office/XMLString.java index 9bb156b..6c9a456 100644 --- a/src/main/java/writer2latex/office/XMLString.java +++ b/src/main/java/w2phtml/office/XMLString.java @@ -23,7 +23,7 @@ * */ -package writer2latex.office; +package w2phtml.office; /* XML strings (tags and attributes) in the OOo XML namespaces * typosafe but not typesafe :-) diff --git a/src/main/java/writer2latex/rdf/ContainerWriter.java b/src/main/java/w2phtml/rdf/ContainerWriter.java similarity index 96% rename from src/main/java/writer2latex/rdf/ContainerWriter.java rename to src/main/java/w2phtml/rdf/ContainerWriter.java index 0784541..b453253 100644 --- a/src/main/java/writer2latex/rdf/ContainerWriter.java +++ b/src/main/java/w2phtml/rdf/ContainerWriter.java @@ -1,4 +1,4 @@ -package writer2latex.rdf; +package w2phtml.rdf; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -9,7 +9,7 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import writer2latex.base.DOMDocument; +import w2phtml.base.DOMDocument; /** This class creates the required META-INF/container.xml file for an EPUB package * (see http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm). diff --git a/src/main/java/writer2latex/rdf/DocumentPart.java b/src/main/java/w2phtml/rdf/DocumentPart.java similarity index 98% rename from src/main/java/writer2latex/rdf/DocumentPart.java rename to src/main/java/w2phtml/rdf/DocumentPart.java index 2b62594..6890a6d 100644 --- a/src/main/java/writer2latex/rdf/DocumentPart.java +++ b/src/main/java/w2phtml/rdf/DocumentPart.java @@ -1,4 +1,4 @@ -package writer2latex.rdf; +package w2phtml.rdf; import java.io.StringWriter; import java.util.HashMap; @@ -20,7 +20,7 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSSerializer; -import writer2latex.xhtml.XhtmlDocument; +import w2phtml.xhtml.XhtmlDocument; public class DocumentPart { diff --git a/src/main/java/writer2latex/rdf/DocumentStructure.java b/src/main/java/w2phtml/rdf/DocumentStructure.java similarity index 99% rename from src/main/java/writer2latex/rdf/DocumentStructure.java rename to src/main/java/w2phtml/rdf/DocumentStructure.java index fd9c658..8484855 100644 --- a/src/main/java/writer2latex/rdf/DocumentStructure.java +++ b/src/main/java/w2phtml/rdf/DocumentStructure.java @@ -1,4 +1,4 @@ -package writer2latex.rdf; +package w2phtml.rdf; import java.io.File; import java.io.FileWriter; @@ -14,7 +14,7 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; import org.apache.jena.vocabulary.*; -import writer2latex.xhtml.XhtmlDocument; +import w2phtml.xhtml.XhtmlDocument; import org.apache.jena.rdf.model.Property; diff --git a/src/main/java/writer2latex/rdf/Metadata.java b/src/main/java/w2phtml/rdf/Metadata.java similarity index 99% rename from src/main/java/writer2latex/rdf/Metadata.java rename to src/main/java/w2phtml/rdf/Metadata.java index 80c0792..20a6d3d 100644 --- a/src/main/java/writer2latex/rdf/Metadata.java +++ b/src/main/java/w2phtml/rdf/Metadata.java @@ -1,4 +1,4 @@ -package writer2latex.rdf; +package w2phtml.rdf; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/writer2latex/rdf/RDFConverter.java b/src/main/java/w2phtml/rdf/RDFConverter.java similarity index 90% rename from src/main/java/writer2latex/rdf/RDFConverter.java rename to src/main/java/w2phtml/rdf/RDFConverter.java index 49b68a7..e991ccc 100644 --- a/src/main/java/writer2latex/rdf/RDFConverter.java +++ b/src/main/java/w2phtml/rdf/RDFConverter.java @@ -1,4 +1,4 @@ -package writer2latex.rdf; +package w2phtml.rdf; import java.io.IOException; import java.io.InputStream; @@ -33,11 +33,11 @@ import org.w3c.dom.ls.LSSerializer; import com.sun.org.apache.xml.internal.utils.NameSpace; import pro.litvinovg.xml.Debug; -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.base.ConverterResultImpl; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlDocument; +import w2phtml.api.ConverterResult; +import w2phtml.api.OutputFile; +import w2phtml.base.ConverterResultImpl; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlDocument; public final class RDFConverter extends Converter { diff --git a/src/main/java/writer2latex/rdf/RDFDocumentResult.java b/src/main/java/w2phtml/rdf/RDFDocumentResult.java similarity index 83% rename from src/main/java/writer2latex/rdf/RDFDocumentResult.java rename to src/main/java/w2phtml/rdf/RDFDocumentResult.java index cb80ad6..a16b8d8 100644 --- a/src/main/java/writer2latex/rdf/RDFDocumentResult.java +++ b/src/main/java/w2phtml/rdf/RDFDocumentResult.java @@ -1,15 +1,14 @@ -package writer2latex.rdf; +package w2phtml.rdf; import java.io.IOException; import java.io.OutputStream; import java.util.Vector; - -import writer2latex.api.ConverterResult; -import writer2latex.api.OutputFile; -import writer2latex.util.Misc; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlDocument; +import w2phtml.api.ConverterResult; +import w2phtml.api.OutputFile; +import w2phtml.util.Misc; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlDocument; public class RDFDocumentResult implements OutputFile { diff --git a/src/main/java/writer2latex/util/CSVList.java b/src/main/java/w2phtml/util/CSVList.java similarity index 98% rename from src/main/java/writer2latex/util/CSVList.java rename to src/main/java/w2phtml/util/CSVList.java index cf85186..5c7f0c7 100644 --- a/src/main/java/writer2latex/util/CSVList.java +++ b/src/main/java/w2phtml/util/CSVList.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; // Create a list of values separated by commas or another seperation character public class CSVList{ diff --git a/src/main/java/writer2latex/util/Calc.java b/src/main/java/w2phtml/util/Calc.java similarity index 99% rename from src/main/java/writer2latex/util/Calc.java rename to src/main/java/w2phtml/util/Calc.java index ffa3c24..3c1834a 100644 --- a/src/main/java/writer2latex/util/Calc.java +++ b/src/main/java/w2phtml/util/Calc.java @@ -22,7 +22,7 @@ * Version 1.6 (2015-02-19) * */ -package writer2latex.util; +package w2phtml.util; /** A collection of static methods used to perform calculations on strings representing floating point numbers * with units or percentages. In the JavaDoc, a length refers to a string like e.g. "21.7cm" and percent refers diff --git a/src/main/java/writer2latex/util/ExportNameCollection.java b/src/main/java/w2phtml/util/ExportNameCollection.java similarity index 99% rename from src/main/java/writer2latex/util/ExportNameCollection.java rename to src/main/java/w2phtml/util/ExportNameCollection.java index a7fb20f..b335216 100644 --- a/src/main/java/writer2latex/util/ExportNameCollection.java +++ b/src/main/java/w2phtml/util/ExportNameCollection.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; import java.util.Enumeration; import java.util.Hashtable; diff --git a/src/main/java/writer2latex/util/Misc.java b/src/main/java/w2phtml/util/Misc.java similarity index 99% rename from src/main/java/writer2latex/util/Misc.java rename to src/main/java/w2phtml/util/Misc.java index 6e1755c..d8720a3 100644 --- a/src/main/java/writer2latex/util/Misc.java +++ b/src/main/java/w2phtml/util/Misc.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/main/java/writer2latex/util/Package.html b/src/main/java/w2phtml/util/Package.html similarity index 100% rename from src/main/java/writer2latex/util/Package.html rename to src/main/java/w2phtml/util/Package.html diff --git a/src/main/java/writer2latex/util/SimpleDOMBuilder.java b/src/main/java/w2phtml/util/SimpleDOMBuilder.java similarity index 99% rename from src/main/java/writer2latex/util/SimpleDOMBuilder.java rename to src/main/java/w2phtml/util/SimpleDOMBuilder.java index 399ad4d..3698516 100644 --- a/src/main/java/writer2latex/util/SimpleDOMBuilder.java +++ b/src/main/java/w2phtml/util/SimpleDOMBuilder.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/java/writer2latex/util/SimpleInputBuffer.java b/src/main/java/w2phtml/util/SimpleInputBuffer.java similarity index 99% rename from src/main/java/writer2latex/util/SimpleInputBuffer.java rename to src/main/java/w2phtml/util/SimpleInputBuffer.java index 747a8ab..581a145 100644 --- a/src/main/java/writer2latex/util/SimpleInputBuffer.java +++ b/src/main/java/w2phtml/util/SimpleInputBuffer.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; /** This class provides a simple string input buffer; it can be used as the * basis of a tokenizer. diff --git a/src/main/java/writer2latex/util/SimpleXMLParser.java b/src/main/java/w2phtml/util/SimpleXMLParser.java similarity index 99% rename from src/main/java/writer2latex/util/SimpleXMLParser.java rename to src/main/java/w2phtml/util/SimpleXMLParser.java index a2cce0d..36f94de 100644 --- a/src/main/java/writer2latex/util/SimpleXMLParser.java +++ b/src/main/java/w2phtml/util/SimpleXMLParser.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/writer2latex/util/SimpleZipReader.java b/src/main/java/w2phtml/util/SimpleZipReader.java similarity index 98% rename from src/main/java/writer2latex/util/SimpleZipReader.java rename to src/main/java/w2phtml/util/SimpleZipReader.java index dbf8645..28613d5 100644 --- a/src/main/java/writer2latex/util/SimpleZipReader.java +++ b/src/main/java/w2phtml/util/SimpleZipReader.java @@ -23,7 +23,7 @@ * */ -package writer2latex.util; +package w2phtml.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/writer2latex/util/StringComparator.java b/src/main/java/w2phtml/util/StringComparator.java similarity index 98% rename from src/main/java/writer2latex/util/StringComparator.java rename to src/main/java/w2phtml/util/StringComparator.java index 012e425..a42dae7 100644 --- a/src/main/java/writer2latex/util/StringComparator.java +++ b/src/main/java/w2phtml/util/StringComparator.java @@ -22,7 +22,7 @@ * Version 1.6 (2015-05-19) * */ -package writer2latex.util; +package w2phtml.util; import java.text.Collator; import java.util.Comparator; diff --git a/src/main/java/writer2latex/xhtml/BatchConverter.java b/src/main/java/w2phtml/xhtml/BatchConverter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/BatchConverter.java rename to src/main/java/w2phtml/xhtml/BatchConverter.java index 3089801..1cd0616 100644 --- a/src/main/java/writer2latex/xhtml/BatchConverter.java +++ b/src/main/java/w2phtml/xhtml/BatchConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.io.File; import java.io.FileInputStream; @@ -33,10 +33,10 @@ import java.util.Locale; import java.text.Collator; import org.w3c.dom.Element; -import writer2latex.api.IndexPageEntry; -import writer2latex.api.OutputFile; -import writer2latex.base.BatchConverterBase; -import writer2latex.xhtml.l10n.L10n; +import w2phtml.api.IndexPageEntry; +import w2phtml.api.OutputFile; +import w2phtml.base.BatchConverterBase; +import w2phtml.xhtml.l10n.L10n; /** * Implementation of writer2latex.api.BatchConverter for @@ -64,7 +64,7 @@ public class BatchConverter extends BatchConverterBase { // Implementation of the remaining (xhtml specific) parts of the interface - public writer2latex.api.Config getConfig() { + public w2phtml.api.Config getConfig() { return config; } diff --git a/src/main/java/writer2latex/xhtml/Converter.java b/src/main/java/w2phtml/xhtml/Converter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/Converter.java rename to src/main/java/w2phtml/xhtml/Converter.java index aeb016e..00d6b84 100644 --- a/src/main/java/writer2latex/xhtml/Converter.java +++ b/src/main/java/w2phtml/xhtml/Converter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.io.File; import java.io.FileInputStream; @@ -44,26 +44,26 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.Text; -import writer2latex.api.Config; -import writer2latex.api.ContentEntry; -import writer2latex.api.ConverterFactory; -import writer2latex.api.OutputFile; -import writer2latex.base.ContentEntryImpl; -import writer2latex.base.BasicConverter; -import writer2latex.office.MIMETypes; -import writer2latex.office.OfficeReader; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.ExportNameCollection; -import writer2latex.util.Misc; -import writer2latex.xhtml.content.DrawParser; -import writer2latex.xhtml.content.ListParser; -import writer2latex.xhtml.content.MathParser; -import writer2latex.xhtml.content.PageContainer; -import writer2latex.xhtml.content.TableParser; -import writer2latex.xhtml.content.TextParser; -import writer2latex.xhtml.l10n.L10n; -import writer2latex.xhtml.style.Styles; +import w2phtml.api.Config; +import w2phtml.api.ContentEntry; +import w2phtml.api.ConverterFactory; +import w2phtml.api.OutputFile; +import w2phtml.base.BasicConverter; +import w2phtml.base.ContentEntryImpl; +import w2phtml.office.MIMETypes; +import w2phtml.office.OfficeReader; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.ExportNameCollection; +import w2phtml.util.Misc; +import w2phtml.xhtml.content.DrawParser; +import w2phtml.xhtml.content.ListParser; +import w2phtml.xhtml.content.MathParser; +import w2phtml.xhtml.content.PageContainer; +import w2phtml.xhtml.content.TableParser; +import w2phtml.xhtml.content.TextParser; +import w2phtml.xhtml.l10n.L10n; +import w2phtml.xhtml.style.Styles; /** *

This class converts an OpenDocument file to an XHTML(+MathML) or EPUB document.

diff --git a/src/main/java/writer2latex/xhtml/CssDocument.java b/src/main/java/w2phtml/xhtml/CssDocument.java similarity index 97% rename from src/main/java/writer2latex/xhtml/CssDocument.java rename to src/main/java/w2phtml/xhtml/CssDocument.java index 90bc3dd..6a63fce 100644 --- a/src/main/java/writer2latex/xhtml/CssDocument.java +++ b/src/main/java/w2phtml/xhtml/CssDocument.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.io.BufferedReader; import java.io.IOException; @@ -32,7 +32,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import writer2latex.api.OutputFile; +import w2phtml.api.OutputFile; /** * An implementation of OutputFile for CSS documents. diff --git a/src/main/java/writer2latex/xhtml/Html5Converter.java b/src/main/java/w2phtml/xhtml/Html5Converter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/Html5Converter.java rename to src/main/java/w2phtml/xhtml/Html5Converter.java index bc06613..b7507bc 100644 --- a/src/main/java/writer2latex/xhtml/Html5Converter.java +++ b/src/main/java/w2phtml/xhtml/Html5Converter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; public class Html5Converter extends Converter { diff --git a/src/main/java/writer2latex/xhtml/LinkDescriptor.java b/src/main/java/w2phtml/xhtml/LinkDescriptor.java similarity index 97% rename from src/main/java/writer2latex/xhtml/LinkDescriptor.java rename to src/main/java/w2phtml/xhtml/LinkDescriptor.java index 634e3e4..42c6156 100644 --- a/src/main/java/writer2latex/xhtml/LinkDescriptor.java +++ b/src/main/java/w2phtml/xhtml/LinkDescriptor.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import org.w3c.dom.Element; diff --git a/src/main/java/writer2latex/xhtml/NewFile.xml b/src/main/java/w2phtml/xhtml/NewFile.xml similarity index 100% rename from src/main/java/writer2latex/xhtml/NewFile.xml rename to src/main/java/w2phtml/xhtml/NewFile.xml diff --git a/src/main/java/writer2latex/xhtml/ODFPageSplitter.java b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java similarity index 99% rename from src/main/java/writer2latex/xhtml/ODFPageSplitter.java rename to src/main/java/w2phtml/xhtml/ODFPageSplitter.java index 249805a..22b9d7f 100644 --- a/src/main/java/writer2latex/xhtml/ODFPageSplitter.java +++ b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java @@ -1,4 +1,6 @@ -package writer2latex.xhtml; +package w2phtml.xhtml; + +import static w2phtml.office.XMLString.*; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -6,10 +8,9 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import pro.litvinovg.xml.Debug; -import writer2latex.office.OfficeReader; -import writer2latex.office.StyleWithProperties; -import static writer2latex.office.XMLString.*; -import writer2latex.util.Misc; +import w2phtml.office.OfficeReader; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.Misc; public class ODFPageSplitter { static Node truncatedListItemNodeContent = null; diff --git a/src/main/java/writer2latex/xhtml/Parser.java b/src/main/java/w2phtml/xhtml/Parser.java similarity index 82% rename from src/main/java/writer2latex/xhtml/Parser.java rename to src/main/java/w2phtml/xhtml/Parser.java index dd60138..4bd2035 100644 --- a/src/main/java/writer2latex/xhtml/Parser.java +++ b/src/main/java/w2phtml/xhtml/Parser.java @@ -23,28 +23,28 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import org.w3c.dom.Element; -import writer2latex.office.OfficeReader; -import writer2latex.xhtml.content.DrawParser; -import writer2latex.xhtml.content.ListParser; -import writer2latex.xhtml.content.MathParser; -import writer2latex.xhtml.content.TableParser; -import writer2latex.xhtml.content.TextParser; -import writer2latex.xhtml.style.CellStyleParser; -import writer2latex.xhtml.style.FrameStyleParser; -import writer2latex.xhtml.style.HeadingStyleParser; -import writer2latex.xhtml.style.ListStyleParser; -import writer2latex.xhtml.style.PageStyleParser; -import writer2latex.xhtml.style.ParStyleParser; -import writer2latex.xhtml.style.PresentationStyleParser; -import writer2latex.xhtml.style.RowStyleParser; -import writer2latex.xhtml.style.SectionStyleParser; -import writer2latex.xhtml.style.Styles; -import writer2latex.xhtml.style.TableStyleParser; -import writer2latex.xhtml.style.TextStyleParser; +import w2phtml.office.OfficeReader; +import w2phtml.xhtml.content.DrawParser; +import w2phtml.xhtml.content.ListParser; +import w2phtml.xhtml.content.MathParser; +import w2phtml.xhtml.content.TableParser; +import w2phtml.xhtml.content.TextParser; +import w2phtml.xhtml.style.CellStyleParser; +import w2phtml.xhtml.style.FrameStyleParser; +import w2phtml.xhtml.style.HeadingStyleParser; +import w2phtml.xhtml.style.ListStyleParser; +import w2phtml.xhtml.style.PageStyleParser; +import w2phtml.xhtml.style.ParStyleParser; +import w2phtml.xhtml.style.PresentationStyleParser; +import w2phtml.xhtml.style.RowStyleParser; +import w2phtml.xhtml.style.SectionStyleParser; +import w2phtml.xhtml.style.Styles; +import w2phtml.xhtml.style.TableStyleParser; +import w2phtml.xhtml.style.TextStyleParser; /** A ConverterHelper is responsible for conversion of some specific content into XHTML. */ diff --git a/src/main/java/writer2latex/xhtml/ResourceDocument.java b/src/main/java/w2phtml/xhtml/ResourceDocument.java similarity index 95% rename from src/main/java/writer2latex/xhtml/ResourceDocument.java rename to src/main/java/w2phtml/xhtml/ResourceDocument.java index 482f851..9f0af04 100644 --- a/src/main/java/writer2latex/xhtml/ResourceDocument.java +++ b/src/main/java/w2phtml/xhtml/ResourceDocument.java @@ -23,14 +23,14 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import writer2latex.api.OutputFile; -import writer2latex.util.Misc; +import w2phtml.api.OutputFile; +import w2phtml.util.Misc; /** An implementation of OutputFile for resource documents. * (A resource document is an arbitrary binary file to include in the converter result) diff --git a/src/main/java/writer2latex/xhtml/StyleInfo.java b/src/main/java/w2phtml/xhtml/StyleInfo.java similarity index 95% rename from src/main/java/writer2latex/xhtml/StyleInfo.java rename to src/main/java/w2phtml/xhtml/StyleInfo.java index 5a97343..735a19c 100644 --- a/src/main/java/writer2latex/xhtml/StyleInfo.java +++ b/src/main/java/w2phtml/xhtml/StyleInfo.java @@ -23,11 +23,11 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.util.HashSet; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.xhtml.style.properties.Properties; public class StyleInfo { public String sTagName = null; diff --git a/src/main/java/writer2latex/xhtml/Xhtml10Converter.java b/src/main/java/w2phtml/xhtml/Xhtml10Converter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/Xhtml10Converter.java rename to src/main/java/w2phtml/xhtml/Xhtml10Converter.java index 1e7bcfc..df65d61 100644 --- a/src/main/java/writer2latex/xhtml/Xhtml10Converter.java +++ b/src/main/java/w2phtml/xhtml/Xhtml10Converter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; public class Xhtml10Converter extends Converter { diff --git a/src/main/java/writer2latex/xhtml/Xhtml11Converter.java b/src/main/java/w2phtml/xhtml/Xhtml11Converter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/Xhtml11Converter.java rename to src/main/java/w2phtml/xhtml/Xhtml11Converter.java index 989f415..1284673 100644 --- a/src/main/java/writer2latex/xhtml/Xhtml11Converter.java +++ b/src/main/java/w2phtml/xhtml/Xhtml11Converter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; public class Xhtml11Converter extends Converter { diff --git a/src/main/java/writer2latex/xhtml/XhtmlConfig.java b/src/main/java/w2phtml/xhtml/XhtmlConfig.java similarity index 98% rename from src/main/java/writer2latex/xhtml/XhtmlConfig.java rename to src/main/java/w2phtml/xhtml/XhtmlConfig.java index 0fc7cc4..f0968dd 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlConfig.java +++ b/src/main/java/w2phtml/xhtml/XhtmlConfig.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.util.HashMap; import java.util.Iterator; @@ -32,13 +32,13 @@ import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Element; -import writer2latex.api.ComplexOption; -import writer2latex.base.BooleanOption; -import writer2latex.base.IntegerOption; -import writer2latex.base.Option; -import writer2latex.util.Misc; +import w2phtml.api.ComplexOption; +import w2phtml.base.BooleanOption; +import w2phtml.base.IntegerOption; +import w2phtml.base.Option; +import w2phtml.util.Misc; -public class XhtmlConfig extends writer2latex.base.ConfigBase { +public class XhtmlConfig extends w2phtml.base.ConfigBase { // Implement configuration methods protected int getOptionCount() { return 65; } protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; } diff --git a/src/main/java/writer2latex/xhtml/XhtmlDocument.java b/src/main/java/w2phtml/xhtml/XhtmlDocument.java similarity index 99% rename from src/main/java/writer2latex/xhtml/XhtmlDocument.java rename to src/main/java/w2phtml/xhtml/XhtmlDocument.java index e8b3482..8e27a9d 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlDocument.java +++ b/src/main/java/w2phtml/xhtml/XhtmlDocument.java @@ -26,9 +26,13 @@ //TODO: Add named entities outside ISO-latin 1 //TODO: When polyglot markup uses either a textarea or pre element, the text within the element does not begin with a newline. -package writer2latex.xhtml; +package w2phtml.xhtml; import org.w3c.dom.NodeList; + +import w2phtml.base.DOMDocument; +import w2phtml.office.XMLString; + import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; @@ -39,9 +43,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; -import writer2latex.base.DOMDocument; -import writer2latex.office.XMLString; - import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; diff --git a/src/main/java/writer2latex/xhtml/XhtmlFormatOption.java b/src/main/java/w2phtml/xhtml/XhtmlFormatOption.java similarity index 95% rename from src/main/java/writer2latex/xhtml/XhtmlFormatOption.java rename to src/main/java/w2phtml/xhtml/XhtmlFormatOption.java index 4955c8c..eab98a9 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlFormatOption.java +++ b/src/main/java/w2phtml/xhtml/XhtmlFormatOption.java @@ -23,9 +23,9 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; -import writer2latex.base.IntegerOption; +import w2phtml.base.IntegerOption; class XhtmlFormatOption extends IntegerOption { public XhtmlFormatOption(String sName, String sDefaultValue) { diff --git a/src/main/java/writer2latex/xhtml/XhtmlMathMLConverter.java b/src/main/java/w2phtml/xhtml/XhtmlMathMLConverter.java similarity index 97% rename from src/main/java/writer2latex/xhtml/XhtmlMathMLConverter.java rename to src/main/java/w2phtml/xhtml/XhtmlMathMLConverter.java index 0fca3ad..7db9c27 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlMathMLConverter.java +++ b/src/main/java/w2phtml/xhtml/XhtmlMathMLConverter.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; public class XhtmlMathMLConverter extends Converter { diff --git a/src/main/java/writer2latex/xhtml/XhtmlStyleMap.java b/src/main/java/w2phtml/xhtml/XhtmlStyleMap.java similarity index 98% rename from src/main/java/writer2latex/xhtml/XhtmlStyleMap.java rename to src/main/java/w2phtml/xhtml/XhtmlStyleMap.java index 0bc80a0..d298a3d 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlStyleMap.java +++ b/src/main/java/w2phtml/xhtml/XhtmlStyleMap.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml; +package w2phtml.xhtml; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/writer2latex/xhtml/XhtmlStyleMapItem.java b/src/main/java/w2phtml/xhtml/XhtmlStyleMapItem.java similarity index 98% rename from src/main/java/writer2latex/xhtml/XhtmlStyleMapItem.java rename to src/main/java/w2phtml/xhtml/XhtmlStyleMapItem.java index 4671a4c..0b39468 100644 --- a/src/main/java/writer2latex/xhtml/XhtmlStyleMapItem.java +++ b/src/main/java/w2phtml/xhtml/XhtmlStyleMapItem.java @@ -22,7 +22,7 @@ * Version 1.6 (2014-10-24) * */ -package writer2latex.xhtml; +package w2phtml.xhtml; /** This is a simple struct to hold data about a single style map */ diff --git a/src/main/java/writer2latex/xhtml/content/AlphabeticalIndexParser.java b/src/main/java/w2phtml/xhtml/content/AlphabeticalIndexParser.java similarity index 94% rename from src/main/java/writer2latex/xhtml/content/AlphabeticalIndexParser.java rename to src/main/java/w2phtml/xhtml/content/AlphabeticalIndexParser.java index 9c28ab3..cd9de42 100644 --- a/src/main/java/writer2latex/xhtml/content/AlphabeticalIndexParser.java +++ b/src/main/java/w2phtml/xhtml/content/AlphabeticalIndexParser.java @@ -22,7 +22,7 @@ * Version 1.6 (2015-06-19) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.ArrayList; import java.util.Collections; @@ -30,13 +30,14 @@ import java.util.Comparator; import java.util.List; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.IndexMark; -import writer2latex.office.OfficeReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.util.StringComparator; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; + +import w2phtml.office.IndexMark; +import w2phtml.office.OfficeReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.util.StringComparator; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; // Helper class (a struct) to contain information about an alphabetical index entry. final class AlphabeticalEntry { diff --git a/src/main/java/writer2latex/xhtml/content/BibliographyParser.java b/src/main/java/w2phtml/xhtml/content/BibliographyParser.java similarity index 89% rename from src/main/java/writer2latex/xhtml/content/BibliographyParser.java rename to src/main/java/w2phtml/xhtml/content/BibliographyParser.java index eacaff2..92f23cf 100644 --- a/src/main/java/writer2latex/xhtml/content/BibliographyParser.java +++ b/src/main/java/w2phtml/xhtml/content/BibliographyParser.java @@ -22,16 +22,16 @@ * Version 1.6 (2015-06-16) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; /** This class handles the export of the bibliography. Most of the work is delegated to the * {@link XhtmlBibliographyGenerator} diff --git a/src/main/java/writer2latex/xhtml/content/DrawParser.java b/src/main/java/w2phtml/xhtml/content/DrawParser.java similarity index 98% rename from src/main/java/writer2latex/xhtml/content/DrawParser.java rename to src/main/java/w2phtml/xhtml/content/DrawParser.java index 632f14b..6b62cea 100644 --- a/src/main/java/writer2latex/xhtml/content/DrawParser.java +++ b/src/main/java/w2phtml/xhtml/content/DrawParser.java @@ -37,7 +37,7 @@ * export notes (part of draw-page) * export list-style-image for image bullets! */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.HashMap; import java.util.Iterator; @@ -50,35 +50,32 @@ import javax.xml.bind.DatatypeConverter; import org.xml.sax.SAXException; +import w2phtml.base.BinaryGraphicsDocument; +import w2phtml.office.ControlReader; +import w2phtml.office.EmbeddedObject; +import w2phtml.office.EmbeddedXMLObject; +import w2phtml.office.FormReader; +import w2phtml.office.MIMETypes; +import w2phtml.office.OfficeReader; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.util.Calc; +import w2phtml.util.Misc; +import w2phtml.util.SimpleXMLParser; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlDocument; +import w2phtml.xhtml.style.properties.Properties; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import writer2latex.util.Calc; -import writer2latex.util.Misc; -import writer2latex.util.CSVList; -import writer2latex.util.SimpleXMLParser; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlDocument; -import writer2latex.xhtml.style.properties.Properties; -import writer2latex.base.BinaryGraphicsDocument; -import writer2latex.office.EmbeddedObject; -import writer2latex.office.EmbeddedXMLObject; -import writer2latex.office.XMLString; -import writer2latex.office.MIMETypes; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.FormReader; -import writer2latex.office.ControlReader; -//import writer2latex.office.MasterPage; -//import writer2latex.office.PageLayout; -import writer2latex.office.OfficeReader; -//import writer2latex.xhtml.XhtmlStyleMap; - public class DrawParser extends Parser { /** Identifies objects that should be displayed inline. diff --git a/src/main/java/writer2latex/xhtml/content/EndnoteParser.java b/src/main/java/w2phtml/xhtml/content/EndnoteParser.java similarity index 91% rename from src/main/java/writer2latex/xhtml/content/EndnoteParser.java rename to src/main/java/w2phtml/xhtml/content/EndnoteParser.java index 081b91b..3dc377a 100644 --- a/src/main/java/writer2latex/xhtml/content/EndnoteParser.java +++ b/src/main/java/w2phtml/xhtml/content/EndnoteParser.java @@ -22,14 +22,14 @@ * Version 1.6 (2015-06-12) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; class EndnoteParser extends NoteParser { diff --git a/src/main/java/writer2latex/xhtml/content/FootnoteParser.java b/src/main/java/w2phtml/xhtml/content/FootnoteParser.java similarity index 90% rename from src/main/java/writer2latex/xhtml/content/FootnoteParser.java rename to src/main/java/w2phtml/xhtml/content/FootnoteParser.java index 4891e28..03905ba 100644 --- a/src/main/java/writer2latex/xhtml/content/FootnoteParser.java +++ b/src/main/java/w2phtml/xhtml/content/FootnoteParser.java @@ -22,17 +22,17 @@ * Version 1.6 (2015-06-14) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.office.PropertySet; -import writer2latex.office.XMLString; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.office.PropertySet; +import w2phtml.office.XMLString; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; class FootnoteParser extends NoteParser { diff --git a/src/main/java/writer2latex/xhtml/content/IndexParser.java b/src/main/java/w2phtml/xhtml/content/IndexParser.java similarity index 93% rename from src/main/java/writer2latex/xhtml/content/IndexParser.java rename to src/main/java/w2phtml/xhtml/content/IndexParser.java index 35c04c4..6b7177f 100644 --- a/src/main/java/writer2latex/xhtml/content/IndexParser.java +++ b/src/main/java/w2phtml/xhtml/content/IndexParser.java @@ -23,18 +23,18 @@ * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; /** This is a base class for conversion of indexes (table of contents, bibliography, alphabetical index, * list of tables, list of figures) diff --git a/src/main/java/writer2latex/xhtml/content/LOFParser.java b/src/main/java/w2phtml/xhtml/content/LOFParser.java similarity index 86% rename from src/main/java/writer2latex/xhtml/content/LOFParser.java rename to src/main/java/w2phtml/xhtml/content/LOFParser.java index 27642b9..56eb698 100644 --- a/src/main/java/writer2latex/xhtml/content/LOFParser.java +++ b/src/main/java/w2phtml/xhtml/content/LOFParser.java @@ -22,14 +22,14 @@ * Version 1.6 (2015-06-10) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.XhtmlConfig; public class LOFParser extends Parser { diff --git a/src/main/java/writer2latex/xhtml/content/LOTParser.java b/src/main/java/w2phtml/xhtml/content/LOTParser.java similarity index 86% rename from src/main/java/writer2latex/xhtml/content/LOTParser.java rename to src/main/java/w2phtml/xhtml/content/LOTParser.java index ae3bbcf..3cfed84 100644 --- a/src/main/java/writer2latex/xhtml/content/LOTParser.java +++ b/src/main/java/w2phtml/xhtml/content/LOTParser.java @@ -22,14 +22,14 @@ * Version 1.6 (2015-06-10) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.XhtmlConfig; public class LOTParser extends Parser { diff --git a/src/main/java/writer2latex/xhtml/content/ListParser.java b/src/main/java/w2phtml/xhtml/content/ListParser.java similarity index 93% rename from src/main/java/writer2latex/xhtml/content/ListParser.java rename to src/main/java/w2phtml/xhtml/content/ListParser.java index 7859907..5d8e0b7 100644 --- a/src/main/java/writer2latex/xhtml/content/ListParser.java +++ b/src/main/java/w2phtml/xhtml/content/ListParser.java @@ -1,16 +1,16 @@ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; -import static writer2latex.office.XMLString.TEXT_CONTINUE_NUMBERING; -import static writer2latex.office.XMLString.TEXT_H; -import static writer2latex.office.XMLString.TEXT_LIST; -import static writer2latex.office.XMLString.TEXT_LIST_HEADER; -import static writer2latex.office.XMLString.TEXT_LIST_ITEM; -import static writer2latex.office.XMLString.TEXT_ORDERED_LIST; -import static writer2latex.office.XMLString.TEXT_P; -import static writer2latex.office.XMLString.TEXT_RESTART_NUMBERING; -import static writer2latex.office.XMLString.TEXT_START_VALUE; -import static writer2latex.office.XMLString.TEXT_STYLE_NAME; -import static writer2latex.office.XMLString.TEXT_UNORDERED_LIST; +import static w2phtml.office.XMLString.TEXT_CONTINUE_NUMBERING; +import static w2phtml.office.XMLString.TEXT_H; +import static w2phtml.office.XMLString.TEXT_LIST; +import static w2phtml.office.XMLString.TEXT_LIST_HEADER; +import static w2phtml.office.XMLString.TEXT_LIST_ITEM; +import static w2phtml.office.XMLString.TEXT_ORDERED_LIST; +import static w2phtml.office.XMLString.TEXT_P; +import static w2phtml.office.XMLString.TEXT_RESTART_NUMBERING; +import static w2phtml.office.XMLString.TEXT_START_VALUE; +import static w2phtml.office.XMLString.TEXT_STYLE_NAME; +import static w2phtml.office.XMLString.TEXT_UNORDERED_LIST; import java.util.Hashtable; @@ -18,14 +18,14 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import writer2latex.office.ListCounter; -import writer2latex.office.ListStyle; -import writer2latex.office.OfficeReader; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.ListCounter; +import w2phtml.office.ListStyle; +import w2phtml.office.OfficeReader; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; public class ListParser extends Parser { diff --git a/src/main/java/writer2latex/xhtml/content/MathParser.java b/src/main/java/w2phtml/xhtml/content/MathParser.java similarity index 97% rename from src/main/java/writer2latex/xhtml/content/MathParser.java rename to src/main/java/w2phtml/xhtml/content/MathParser.java index e1a644b..b1946b9 100644 --- a/src/main/java/writer2latex/xhtml/content/MathParser.java +++ b/src/main/java/w2phtml/xhtml/content/MathParser.java @@ -23,22 +23,22 @@ * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Node; import org.w3c.dom.NodeList; + +import w2phtml.base.BinaryGraphicsDocument; +import w2phtml.office.*; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlDocument; + import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import writer2latex.office.*; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlDocument; -import writer2latex.base.BinaryGraphicsDocument; -//import writer2latex.latex.StarMathConverter; - /** This class converts formulas: Either as MathML, as an image or as plain text (StarMath or LaTeX format) */ public class MathParser extends Parser { diff --git a/src/main/java/writer2latex/xhtml/content/NoteParser.java b/src/main/java/w2phtml/xhtml/content/NoteParser.java similarity index 95% rename from src/main/java/writer2latex/xhtml/content/NoteParser.java rename to src/main/java/w2phtml/xhtml/content/NoteParser.java index e567c0e..e5dccb2 100644 --- a/src/main/java/writer2latex/xhtml/content/NoteParser.java +++ b/src/main/java/w2phtml/xhtml/content/NoteParser.java @@ -22,7 +22,7 @@ * Version 1.6 (2015-06-14) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.ArrayList; import java.util.HashMap; @@ -33,14 +33,14 @@ import java.util.Map.Entry; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.OfficeReader; -import writer2latex.office.PropertySet; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; +import w2phtml.office.OfficeReader; +import w2phtml.office.PropertySet; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; /** This is a base class handles the conversion of footnotes and endnotes */ diff --git a/src/main/java/writer2latex/xhtml/content/PageContainer.java b/src/main/java/w2phtml/xhtml/content/PageContainer.java similarity index 95% rename from src/main/java/writer2latex/xhtml/content/PageContainer.java rename to src/main/java/w2phtml/xhtml/content/PageContainer.java index 33c8ffe..413c096 100644 --- a/src/main/java/writer2latex/xhtml/content/PageContainer.java +++ b/src/main/java/w2phtml/xhtml/content/PageContainer.java @@ -1,4 +1,4 @@ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/writer2latex/xhtml/content/Separator.java b/src/main/java/w2phtml/xhtml/content/Separator.java similarity index 98% rename from src/main/java/writer2latex/xhtml/content/Separator.java rename to src/main/java/w2phtml/xhtml/content/Separator.java index 13de852..1406b49 100644 --- a/src/main/java/writer2latex/xhtml/content/Separator.java +++ b/src/main/java/w2phtml/xhtml/content/Separator.java @@ -1,4 +1,6 @@ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; + +import static w2phtml.util.Misc.*; import java.util.Iterator; import java.util.LinkedList; @@ -9,11 +11,9 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import pro.litvinovg.xml.Debug; -import writer2latex.office.XMLString; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; - -import static writer2latex.util.Misc.*; +import w2phtml.office.XMLString; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; //LinkedList stringList = new LinkedList(); public class Separator { diff --git a/src/main/java/writer2latex/xhtml/content/TOCParser.java b/src/main/java/w2phtml/xhtml/content/TOCParser.java similarity index 97% rename from src/main/java/writer2latex/xhtml/content/TOCParser.java rename to src/main/java/w2phtml/xhtml/content/TOCParser.java index 78de2a8..aa51c6e 100644 --- a/src/main/java/writer2latex/xhtml/content/TOCParser.java +++ b/src/main/java/w2phtml/xhtml/content/TOCParser.java @@ -22,22 +22,22 @@ * Version 1.6 (2015-07-23) * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.ArrayList; import java.util.List; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.IndexMark; -import writer2latex.office.ListCounter; -import writer2latex.office.OfficeReader; -import writer2latex.office.TocReader; -import writer2latex.office.XMLString; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.l10n.L10n; +import w2phtml.office.IndexMark; +import w2phtml.office.ListCounter; +import w2phtml.office.OfficeReader; +import w2phtml.office.TocReader; +import w2phtml.office.XMLString; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.l10n.L10n; //Helper class (a struct) to contain information about a toc entry (ie. a heading, other paragraph or toc-mark) final class TocEntry { diff --git a/src/main/java/writer2latex/xhtml/content/TableParser.java b/src/main/java/w2phtml/xhtml/content/TableParser.java similarity index 97% rename from src/main/java/writer2latex/xhtml/content/TableParser.java rename to src/main/java/w2phtml/xhtml/content/TableParser.java index 881f880..8926aa0 100644 --- a/src/main/java/writer2latex/xhtml/content/TableParser.java +++ b/src/main/java/w2phtml/xhtml/content/TableParser.java @@ -23,29 +23,29 @@ * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import java.util.Vector; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.Element; -import writer2latex.util.Calc; -import writer2latex.util.Misc; -import writer2latex.util.SimpleInputBuffer; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlDocument; -import writer2latex.office.XMLString; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.OfficeReader; -//import writer2latex.office.TableLine; -import writer2latex.office.TableRange; -import writer2latex.office.TableReader; -import writer2latex.office.TableView; +import w2phtml.office.OfficeReader; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.TableRange; +import w2phtml.office.TableReader; +import w2phtml.office.TableView; +import w2phtml.office.XMLString; +import w2phtml.util.Calc; +import w2phtml.util.Misc; +import w2phtml.util.SimpleInputBuffer; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlDocument; + +import org.w3c.dom.Element; public class TableParser extends Parser { diff --git a/src/main/java/writer2latex/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java similarity index 98% rename from src/main/java/writer2latex/xhtml/content/TextParser.java rename to src/main/java/w2phtml/xhtml/content/TextParser.java index 92d1665..462927d 100644 --- a/src/main/java/writer2latex/xhtml/content/TextParser.java +++ b/src/main/java/w2phtml/xhtml/content/TextParser.java @@ -23,7 +23,9 @@ * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; + +import static w2phtml.office.XMLString.*; import java.util.Hashtable; import java.util.Stack; @@ -32,27 +34,25 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import pro.litvinovg.xml.Debug; +import w2phtml.office.FontDeclaration; +import w2phtml.office.ListCounter; +import w2phtml.office.ListStyle; +import w2phtml.office.MasterPage; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyle; +import w2phtml.office.PageLayout; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.Misc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.ODFPageSplitter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.XhtmlStyleMapItem; import org.w3c.dom.Element; -import writer2latex.util.Misc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.ODFPageSplitter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.XhtmlStyleMapItem; -import writer2latex.office.FontDeclaration; -import writer2latex.office.MasterPage; -import writer2latex.office.OfficeStyle; -import writer2latex.office.PageLayout; -import writer2latex.office.ListCounter; -import writer2latex.office.ListStyle; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.OfficeReader; -import static writer2latex.office.XMLString.*; - /** This class handles text content */ diff --git a/src/main/java/writer2latex/xhtml/content/XhtmlBibliographyGenerator.java b/src/main/java/w2phtml/xhtml/content/XhtmlBibliographyGenerator.java similarity index 93% rename from src/main/java/writer2latex/xhtml/content/XhtmlBibliographyGenerator.java rename to src/main/java/w2phtml/xhtml/content/XhtmlBibliographyGenerator.java index 2a91cd9..db15db4 100644 --- a/src/main/java/writer2latex/xhtml/content/XhtmlBibliographyGenerator.java +++ b/src/main/java/w2phtml/xhtml/content/XhtmlBibliographyGenerator.java @@ -23,13 +23,13 @@ * */ -package writer2latex.xhtml.content; +package w2phtml.xhtml.content; import org.w3c.dom.Element; -import writer2latex.base.BibliographyGenerator; -import writer2latex.office.OfficeReader; -import writer2latex.xhtml.Converter; +import w2phtml.base.BibliographyGenerator; +import w2phtml.office.OfficeReader; +import w2phtml.xhtml.Converter; class XhtmlBibliographyGenerator extends BibliographyGenerator { diff --git a/src/main/java/writer2latex/xhtml/l10n/L10n.java b/src/main/java/w2phtml/xhtml/l10n/L10n.java similarity index 93% rename from src/main/java/writer2latex/xhtml/l10n/L10n.java rename to src/main/java/w2phtml/xhtml/l10n/L10n.java index 7d8bd04..b0e6ea9 100644 --- a/src/main/java/writer2latex/xhtml/l10n/L10n.java +++ b/src/main/java/w2phtml/xhtml/l10n/L10n.java @@ -23,7 +23,7 @@ * */ -package writer2latex.xhtml.l10n; +package w2phtml.xhtml.l10n; import java.util.Locale; import java.util.ResourceBundle; @@ -46,7 +46,7 @@ public class L10n { public final static int DIRECTORY = 8; public final static int DOCUMENT = 9; - private ResourceBundle resourceBundle = ResourceBundle.getBundle("writer2latex.xhtml.l10n.XhtmlStrings",Locale.getDefault()); + private ResourceBundle resourceBundle = ResourceBundle.getBundle("w2phtml.xhtml.l10n.XhtmlStrings",Locale.getDefault()); private Locale locale = null; public void setLocale(String sLanguage, String sCountry) { @@ -62,7 +62,7 @@ public class L10n { locale = Locale.getDefault(); } - resourceBundle = ResourceBundle.getBundle("writer2latex.xhtml.l10n.XhtmlStrings",locale); + resourceBundle = ResourceBundle.getBundle("w2phtml.xhtml.l10n.XhtmlStrings",locale); } public Locale getLocale() { diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_ca.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_ca.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_ca.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_ca.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_cs.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_cs.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_cs.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_cs.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_da.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_da.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_da.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_da.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_de.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_de.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_de.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_de.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_en.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_en.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_en.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_en.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_es.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_es.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_es.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_es.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fa.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fa.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fa.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fa.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fi.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fi.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fi.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fi.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fr.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fr.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_fr.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_fr.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_hr.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_hr.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_hr.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_hr.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_it.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_it.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_it.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_it.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_nl.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_nl.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_nl.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_nl.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_nn.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_nn.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_nn.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_nn.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_pl.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_pl.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_pl.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_pl.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_pt_BR.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_pt_BR.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_pt_BR.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_pt_BR.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_ru.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_ru.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_ru.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_ru.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_tr.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_tr.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_tr.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_tr.properties diff --git a/src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_uk.properties b/src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_uk.properties similarity index 100% rename from src/main/java/writer2latex/xhtml/l10n/XhtmlStrings_uk.properties rename to src/main/java/w2phtml/xhtml/l10n/XhtmlStrings_uk.properties diff --git a/src/main/java/writer2latex/xhtml/style/CellStyleParser.java b/src/main/java/w2phtml/xhtml/style/CellStyleParser.java similarity index 90% rename from src/main/java/writer2latex/xhtml/style/CellStyleParser.java rename to src/main/java/w2phtml/xhtml/style/CellStyleParser.java index 4aff16e..3b4e48f 100644 --- a/src/main/java/writer2latex/xhtml/style/CellStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/CellStyleParser.java @@ -23,17 +23,17 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument cell styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java b/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java similarity index 96% rename from src/main/java/writer2latex/xhtml/style/FrameStyleParser.java rename to src/main/java/w2phtml/xhtml/style/FrameStyleParser.java index 1480ef1..9651217 100644 --- a/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/FrameStyleParser.java @@ -23,21 +23,20 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.util.Calc; -//import writer2latex.util.Misc; -import writer2latex.util.SimpleInputBuffer; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.util.Calc; +import w2phtml.util.SimpleInputBuffer; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument graphic (frame) styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java b/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java similarity index 94% rename from src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java rename to src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java index 1ccdbcf..0d1769e 100644 --- a/src/main/java/writer2latex/xhtml/style/HeadingStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/HeadingStyleParser.java @@ -22,22 +22,22 @@ * Version 1.6 (2015-06-10) * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMapItem; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMapItem; +import w2phtml.xhtml.style.properties.Properties; public class HeadingStyleParser extends StyleParser { diff --git a/src/main/java/writer2latex/xhtml/style/ListStyleParser.java b/src/main/java/w2phtml/xhtml/style/ListStyleParser.java similarity index 94% rename from src/main/java/writer2latex/xhtml/style/ListStyleParser.java rename to src/main/java/w2phtml/xhtml/style/ListStyleParser.java index 65bf7e5..f35ae9f 100644 --- a/src/main/java/writer2latex/xhtml/style/ListStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/ListStyleParser.java @@ -23,23 +23,23 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; //import java.util.Hashtable; -import writer2latex.office.ListStyle; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyle; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMapItem; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.ListStyle; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyle; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMapItem; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument list styles to diff --git a/src/main/java/writer2latex/xhtml/style/PageStyleParser.java b/src/main/java/w2phtml/xhtml/style/PageStyleParser.java similarity index 95% rename from src/main/java/writer2latex/xhtml/style/PageStyleParser.java rename to src/main/java/w2phtml/xhtml/style/PageStyleParser.java index 0f9ee25..207df57 100644 --- a/src/main/java/writer2latex/xhtml/style/PageStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/PageStyleParser.java @@ -23,22 +23,22 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; -import writer2latex.office.MasterPage; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.PageLayout; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.util.Calc; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.MasterPage; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.PageLayout; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.util.Calc; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument page styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/ParStyleParser.java b/src/main/java/w2phtml/xhtml/style/ParStyleParser.java similarity index 94% rename from src/main/java/writer2latex/xhtml/style/ParStyleParser.java rename to src/main/java/w2phtml/xhtml/style/ParStyleParser.java index 96e6b39..30ef544 100644 --- a/src/main/java/writer2latex/xhtml/style/ParStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/ParStyleParser.java @@ -23,16 +23,16 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.style.properties.Properties; /* TODO: drop caps (contained in a child of the style:properties element) diff --git a/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java b/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java similarity index 92% rename from src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java rename to src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java index c84704d..b7164c7 100644 --- a/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/PresentationStyleParser.java @@ -23,22 +23,21 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; import java.util.Hashtable; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -//import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.util.ExportNameCollection; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.CSVList; +import w2phtml.util.ExportNameCollection; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument presentation styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/RowStyleParser.java b/src/main/java/w2phtml/xhtml/style/RowStyleParser.java similarity index 86% rename from src/main/java/writer2latex/xhtml/style/RowStyleParser.java rename to src/main/java/w2phtml/xhtml/style/RowStyleParser.java index 96a92e1..ec92a26 100644 --- a/src/main/java/writer2latex/xhtml/style/RowStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/RowStyleParser.java @@ -23,17 +23,16 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -//import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument row styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/SectionStyleParser.java b/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java similarity index 87% rename from src/main/java/writer2latex/xhtml/style/SectionStyleParser.java rename to src/main/java/w2phtml/xhtml/style/SectionStyleParser.java index 5338706..f89d8c1 100644 --- a/src/main/java/writer2latex/xhtml/style/SectionStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/SectionStyleParser.java @@ -23,17 +23,16 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -//import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument section styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/StyleParser.java b/src/main/java/w2phtml/xhtml/style/StyleParser.java similarity index 90% rename from src/main/java/writer2latex/xhtml/style/StyleParser.java rename to src/main/java/w2phtml/xhtml/style/StyleParser.java index 0fa5fde..f0a1942 100644 --- a/src/main/java/writer2latex/xhtml/style/StyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/StyleParser.java @@ -23,19 +23,19 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.Calc; -import writer2latex.util.ExportNameCollection; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.Calc; +import w2phtml.util.ExportNameCollection; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; /** *

This is an abstract base class to convert an OpenDocument style family to diff --git a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java similarity index 94% rename from src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java rename to src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java index 024a442..8bd1096 100644 --- a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java +++ b/src/main/java/w2phtml/xhtml/style/StyleWithPropertiesParser.java @@ -23,19 +23,18 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; //import java.util.Hashtable; -//import writer2latex.latex.util.Info; -import writer2latex.office.OfficeReader; -import writer2latex.office.StyleWithProperties; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMapItem; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.StyleWithProperties; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMapItem; +import w2phtml.xhtml.style.properties.Properties; /** *

This is an abstract class to convert an OpenDocument style family diff --git a/src/main/java/writer2latex/xhtml/style/Styles.java b/src/main/java/w2phtml/xhtml/style/Styles.java similarity index 96% rename from src/main/java/writer2latex/xhtml/style/Styles.java rename to src/main/java/w2phtml/xhtml/style/Styles.java index c0e4ab0..a4a34aa 100644 --- a/src/main/java/writer2latex/xhtml/style/Styles.java +++ b/src/main/java/w2phtml/xhtml/style/Styles.java @@ -24,19 +24,19 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import writer2latex.office.*; -import writer2latex.util.*; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.Parser; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.*; +import w2phtml.util.*; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.Parser; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.style.properties.Properties; /** This class converts OpenDocument styles to CSS2 styles. * Note that some elements in OpenDocument has attributes that also maps to CSS2 properties. diff --git a/src/main/java/writer2latex/xhtml/style/TableStyleParser.java b/src/main/java/w2phtml/xhtml/style/TableStyleParser.java similarity index 91% rename from src/main/java/writer2latex/xhtml/style/TableStyleParser.java rename to src/main/java/w2phtml/xhtml/style/TableStyleParser.java index 088649a..91f3e0d 100644 --- a/src/main/java/writer2latex/xhtml/style/TableStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/TableStyleParser.java @@ -23,17 +23,17 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMap; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMap; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument table styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/TextStyleParser.java b/src/main/java/w2phtml/xhtml/style/TextStyleParser.java similarity index 97% rename from src/main/java/writer2latex/xhtml/style/TextStyleParser.java rename to src/main/java/w2phtml/xhtml/style/TextStyleParser.java index 399a30e..16e32a2 100644 --- a/src/main/java/writer2latex/xhtml/style/TextStyleParser.java +++ b/src/main/java/w2phtml/xhtml/style/TextStyleParser.java @@ -23,24 +23,24 @@ * */ -package writer2latex.xhtml.style; +package w2phtml.xhtml.style; import java.util.Enumeration; import java.util.Hashtable; -import writer2latex.office.FontDeclaration; -import writer2latex.office.OfficeReader; -import writer2latex.office.OfficeStyleFamily; -import writer2latex.office.StyleWithProperties; -import writer2latex.office.XMLString; -import writer2latex.util.CSVList; -import writer2latex.util.Calc; -import writer2latex.util.ExportNameCollection; -import writer2latex.xhtml.Converter; -import writer2latex.xhtml.StyleInfo; -import writer2latex.xhtml.XhtmlConfig; -import writer2latex.xhtml.XhtmlStyleMapItem; -import writer2latex.xhtml.style.properties.Properties; +import w2phtml.office.FontDeclaration; +import w2phtml.office.OfficeReader; +import w2phtml.office.OfficeStyleFamily; +import w2phtml.office.StyleWithProperties; +import w2phtml.office.XMLString; +import w2phtml.util.CSVList; +import w2phtml.util.Calc; +import w2phtml.util.ExportNameCollection; +import w2phtml.xhtml.Converter; +import w2phtml.xhtml.StyleInfo; +import w2phtml.xhtml.XhtmlConfig; +import w2phtml.xhtml.XhtmlStyleMapItem; +import w2phtml.xhtml.style.properties.Properties; /** * This class converts OpenDocument text styles to CSS2 styles. diff --git a/src/main/java/writer2latex/xhtml/style/properties/Properties.java b/src/main/java/w2phtml/xhtml/style/properties/Properties.java similarity index 96% rename from src/main/java/writer2latex/xhtml/style/properties/Properties.java rename to src/main/java/w2phtml/xhtml/style/properties/Properties.java index 404922d..af0bc02 100644 --- a/src/main/java/writer2latex/xhtml/style/properties/Properties.java +++ b/src/main/java/w2phtml/xhtml/style/properties/Properties.java @@ -1,4 +1,4 @@ -package writer2latex.xhtml.style.properties; +package w2phtml.xhtml.style.properties; import java.util.HashMap; import java.util.Map;