Renamings

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;

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;
 

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

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 {
 

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

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.

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.

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$
+    	String sDialogName = getDialogName(format);
-    			getDialogName(format) : getDialogNameCalc(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,20 +307,6 @@ 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;
     	}
     }
@@ -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$
     	}
     }

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 w2phtml.api.ConverterFactory;
-//import writer2latex.api.BatchHandler;
+import w2phtml.api.IndexPageEntry;
-//import writer2latex.api.Converter;
+import w2phtml.api.MIMETypes;
-import writer2latex.api.ConverterFactory;
+import w2phtml.api.OutputFile;
-import writer2latex.api.IndexPageEntry;
-import writer2latex.api.MIMETypes;
-import writer2latex.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;
     

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.

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;
 

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

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) {

src/main/java/properties/Property.java

@@ -1,5 +0,0 @@
-package properties;
-
-public interface Property {
-
-}

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 w2phtml.api.BatchConverter;
-import writer2latex.api.Converter;
+import w2phtml.api.Converter;
-import writer2latex.api.ConverterFactory;
+import w2phtml.api.ConverterFactory;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.api.MIMETypes;
+import w2phtml.api.MIMETypes;
-//import writer2latex.api.OutputFile;
+import w2phtml.util.Misc;
-
-import writer2latex.util.Misc;
 
 /**
  * <p>Command line utility to convert an OpenOffice.org Writer XML file into XHTML/LaTeX/BibTeX</p>
@@ -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);

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 <code>BatchHandler</code> for command line usage
  */

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;

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}

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;

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;

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.

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;

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;
     }
 	

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;

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 

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 
  */

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
  */

src/main/java/w2phtml/api/MetaData.java

@@ -23,7 +23,7 @@
  *
  */
 
-package writer2latex.api;
+package w2phtml.api;
 
 import java.util.Map;
 

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;

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;

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 w2phtml.api.Converter;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.api.OutputFile;
+import w2phtml.api.GraphicConverter;
-import writer2latex.office.EmbeddedObject;
+import w2phtml.api.OutputFile;
-import writer2latex.office.MetaData;
+import w2phtml.office.EmbeddedObject;
-import writer2latex.office.OfficeDocument;
+import w2phtml.office.MetaData;
-import writer2latex.office.OfficeReader;
+import w2phtml.office.OfficeDocument;
-import writer2latex.office.XMLString;
+import w2phtml.office.OfficeReader;
-import writer2latex.util.Misc;
+import w2phtml.office.XMLString;
+import w2phtml.util.Misc;
 
 /**<p>Abstract base implementation of <code>writer2latex.api.Converter</code></p>
  */

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 w2phtml.api.BatchConverter;
-import writer2latex.api.BatchHandler;
+import w2phtml.api.BatchHandler;
-import writer2latex.api.Converter;
+import w2phtml.api.Converter;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.api.IndexPageEntry;
+import w2phtml.api.IndexPageEntry;
-import writer2latex.api.OutputFile;
+import w2phtml.api.OutputFile;
-
+import w2phtml.util.Misc;
-import writer2latex.util.Misc;
 
 /**
  * Abstract base implementation of <code>writer2latex.api.BatchConverter</code>.

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 w2phtml.office.OfficeReader;
-import writer2latex.office.XMLString;
+import w2phtml.office.XMLString;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
-import writer2latex.util.StringComparator;
+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

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.

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 {

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 w2phtml.api.Config {
-
-public abstract class ConfigBase implements writer2latex.api.Config {
 	
     protected abstract int getOptionCount();
     protected abstract String getDefaultConfigPath();

src/main/java/w2phtml/base/ContentEntryImpl.java

@@ -23,10 +23,10 @@
  *
  */ 
 
-package writer2latex.base;
+package w2phtml.base;
 
-import writer2latex.api.ContentEntry;
+import w2phtml.api.ContentEntry;
-import writer2latex.api.OutputFile;
+import w2phtml.api.OutputFile;
 
 public class ContentEntryImpl implements ContentEntry {
 	private String sTitle;

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 w2phtml.api.ContentEntry;
-import writer2latex.api.MetaData;
+import w2phtml.api.ConverterResult;
-import writer2latex.api.OutputFile;
+import w2phtml.api.MetaData;
-import writer2latex.api.ContentEntry;
+import w2phtml.api.OutputFile;
+
+import java.util.Iterator;
 
 /** <code>ConverterResultImpl</code> is a straightforward implementation of <code>ConverterResult</code>
  */

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

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 w2phtml.api.GraphicConverter;
-import writer2latex.office.EmbeddedBinaryObject;
+import w2phtml.office.EmbeddedBinaryObject;
-import writer2latex.office.EmbeddedObject;
+import w2phtml.office.EmbeddedObject;
-import writer2latex.office.MIMETypes;
+import w2phtml.office.MIMETypes;
-import writer2latex.office.OfficeReader;
+import w2phtml.office.OfficeReader;
-import writer2latex.office.SVMReader;
+import w2phtml.office.SVMReader;
-import writer2latex.office.XMLString;
+import w2phtml.office.XMLString;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
 
 /** This class extracts and converts images from an office document.
  *  The images are returned as <code>BinaryGraphicsDocument</code>.

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)

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 {

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).

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 w2phtml.api.ConverterResult;
-import writer2latex.base.ConverterResultImpl;
+import w2phtml.base.ConverterResultImpl;
-import writer2latex.xhtml.Html5Converter;
+import w2phtml.xhtml.Html5Converter;
 
 
 /** This class converts an OpenDocument file to an EPUB 3 document.

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 w2phtml.api.ConverterResult;
-import writer2latex.base.ConverterResultImpl;
+import w2phtml.base.ConverterResultImpl;
-import writer2latex.xhtml.Xhtml11Converter;
+import w2phtml.xhtml.Xhtml11Converter;
 
 
 /** This class converts an OpenDocument file to an EPUB document.

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 w2phtml.api.ConverterResult;
-import writer2latex.api.OutputFile;
+import w2phtml.api.OutputFile;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
-import writer2latex.xhtml.XhtmlConfig;
+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

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 w2phtml.api.ContentEntry;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.base.DOMDocument;
+import w2phtml.base.DOMDocument;
-import writer2latex.util.Misc;
+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).

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 w2phtml.api.ContentEntry;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.base.DOMDocument;
+import w2phtml.base.DOMDocument;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
 
 /** This class writes the EPUB Navigation Document as defined in EPUB 3
  */

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 w2phtml.api.ContentEntry;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.ConverterResult;
-import writer2latex.api.OutputFile;
+import w2phtml.api.OutputFile;
-import writer2latex.base.DOMDocument;
+import w2phtml.base.DOMDocument;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
-import writer2latex.xhtml.XhtmlConfig;
+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).
  */

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
  */

src/main/java/w2phtml/office/CellView.java

@@ -23,7 +23,7 @@
  *
  */
 
-package writer2latex.office;
+package w2phtml.office;
 
 import org.w3c.dom.Element;
 

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;
 
 /** <p> This class reads a form control in an OOo document (a form:control
   * node). A control always has an owner form.

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

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
  */

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.              

src/main/java/w2phtml/office/FontDeclaration.java

@@ -23,7 +23,7 @@
  *
  */
 
-package writer2latex.office;
+package w2phtml.office;
 
 import org.w3c.dom.Node;
 

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;
 
 /** <p> This class reads a form in an OOo document (a form:form node)</p>
   * Note: Subforms, properties and events are ignored.

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;

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.*;
 
 /**
  *  <p>This class contains static methods to read an index-mark.</p>

src/main/java/w2phtml/office/ListCounter.java

@@ -23,9 +23,9 @@
  *
  */
 
-package writer2latex.office;
+package w2phtml.office;
 
-import writer2latex.util.*;
+import w2phtml.util.*;
 
 /**
  * <p>This class produces labels for OOo lists/outlines (for xhtml

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;
 
 /** <p> Class representing a list style (including outline numbering) in OOo Writer</p>
 */

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;
 
 /**
  *  <p>The class reads a <code>text:illustration-index</code> or

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";

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;
 
 /** <p> Class representing a master page in OOo Writer </p> */
 public class MasterPage extends OfficeStyle {

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 w2phtml.util.*;
-//import writer2latex.office.*;
 
 
 /**
  *  <p>This class represents the metadata of an OOo Writer document.</p>
  */
-public class MetaData implements writer2latex.api.MetaData {
+public class MetaData implements w2phtml.api.MetaData {
     // Dublin Core
     private String sTitle = "";
     private String sCreator = "";

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 w2phtml.util.SimpleXMLParser;
-import writer2latex.util.SimpleZipReader;
+import w2phtml.util.SimpleZipReader;
 
 /**
  *  This class implements reading of ODF files from various sources

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;
 
 /** <p> This class reads and collects global information about an OOo document.
   * This includes styles, forms, information about indexes and references etc.

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;
 
 /** <p> Abstract class representing a style in OOo </p> */
 public abstract class OfficeStyle implements Cloneable {

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 {

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;
 
 /** <p> Class representing a page master in OOo Writer. This is represented
   * like other styles + a separate style for header and footer</p>

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;

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 {

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 w2phtml.util.Calc;
-//import org.w3c.dom.NamedNodeMap;
+import w2phtml.util.Misc;
-//import java.util.Hashtable;
-import writer2latex.util.Misc;
 
 /** <p> Class representing a style in OOo which contains a style:properties
   * element </p> 

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;
 
 /**
  * <p> This class represents the properties of a row or column in a table</p>

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

src/main/java/w2phtml/office/TableRangeParser.java

@@ -23,10 +23,10 @@
  *
  */
 
-package writer2latex.office;
+package w2phtml.office;
 
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
-import writer2latex.util.SimpleInputBuffer;
+import w2phtml.util.SimpleInputBuffer;
 
 /**
  * This class parses a space separated list of table ranges. A table range is of the form

src/main/java/w2phtml/office/TableReader.java

@@ -22,7 +22,7 @@
  *  along with Writer2LaTeX.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-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 w2phtml.util.Calc;
-import writer2latex.util.Misc;
+import w2phtml.util.Misc;
 
 /**
  * <p> This class reads a table from a table:table or table:sub-table element

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 <code>TableRange</code>. A view provides

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;
 
 /**
  *  <p>The class reads a <code>text:table-of-content</code> element.</p>

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 :-)

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).

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 {
 

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;
 

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;

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 w2phtml.api.ConverterResult;
-import writer2latex.api.OutputFile;
+import w2phtml.api.OutputFile;
-import writer2latex.base.ConverterResultImpl;
+import w2phtml.base.ConverterResultImpl;
-import writer2latex.xhtml.Converter;
+import w2phtml.xhtml.Converter;
-import writer2latex.xhtml.XhtmlDocument;
+import w2phtml.xhtml.XhtmlDocument;
 
 
 public final class RDFConverter extends Converter {

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 w2phtml.api.ConverterResult;
-import writer2latex.api.ConverterResult;
+import w2phtml.api.OutputFile;
-import writer2latex.api.OutputFile;
+import w2phtml.util.Misc;
-import writer2latex.util.Misc;
+import w2phtml.xhtml.XhtmlConfig;
-import writer2latex.xhtml.XhtmlConfig;
+import w2phtml.xhtml.XhtmlDocument;
-import writer2latex.xhtml.XhtmlDocument;
 
 
 public class RDFDocumentResult implements OutputFile {

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{

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

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;

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;

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;

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. 

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;

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;

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;