litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Some minor bugfixing, refactoring and rearrangement

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@165 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2014-08-27 07:25:22 +00:00
parent 8a6e654344
commit 6249ef406e
31 changed files with 146 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.2 -> 1.4
---------- version 1.3.2 alpha ----------
[all] Refactored and rearranged some code; in particular the last remaining bits of the old xmerge framework has been removed
[all] Optimized reading of package format: The settings.xml files are not parsed and the unused parts of the ZIP file are disposed
---------- version 1.3.1 alpha ----------

10
source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.4 (2012-03-22)
* Version 1.4 (2014-08-27)
*
*/
@ -240,15 +240,15 @@ XTypeProvider {
// Get base name from the URL provided by OOo
String sName= getFileName(sURL);
// Adapter for output stream (Main output file)
XOutputStreamToOutputStreamAdapter newxos =new XOutputStreamToOutputStreamAdapter(exportStream);
// Create converter
Converter converter = ConverterFactory.createConverter(sdMime);
if (converter==null) {
throw new com.sun.star.uno.RuntimeException("Failed to create converter to "+sdMime);
}
// Adapter for output stream (Main output file)
XOutputStreamToOutputStreamAdapter newxos =new XOutputStreamToOutputStreamAdapter(exportStream);
// Apply the FilterData to the converter
if (filterData!=null) {
FilterDataParser fdp = new FilterDataParser(xComponentContext);

1
source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java
View file

@ -30,7 +30,6 @@ import java.util.Map;
import org.openoffice.da.comp.w2lcommon.filter.ConfigurationDialogBase;
import org.openoffice.da.comp.w2lcommon.helper.DialogAccess;
import org.openoffice.da.comp.w2lcommon.helper.FilePicker;
import com.sun.star.container.NoSuchElementException;
import com.sun.star.lang.XServiceInfo;

9
source/java/writer2latex/xmerge/BinaryGraphicsDocument.java → source/java/writer2latex/base/BinaryGraphicsDocument.java
View file

@ -16,21 +16,22 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.4 (2012-04-01)
* Version 1.4 (2014-08-25)
*
*/
package writer2latex.xmerge;
package writer2latex.base;
import java.io.OutputStream;
import java.io.InputStream;
//import java.io.ByteArrayOutputStream;
import java.io.IOException;
import writer2latex.api.OutputFile;
import writer2latex.util.Misc;
@ -43,7 +44,7 @@ import writer2latex.util.Misc;
* <p><code>GraphicsDocument</code> is used to create new graphics documents.</p>
*
*/
public class BinaryGraphicsDocument implements Document {
public class BinaryGraphicsDocument implements OutputFile {
//private final static int BUFFERSIZE = 1024;

16
source/java/writer2latex/base/ConfigBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.4 (2012-03-19)
* Version 1.4 (2014-08-26)
*
*/
@ -40,13 +40,14 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Element;
import org.w3c.dom.DOMImplementation;
import writer2latex.api.ComplexOption;
import writer2latex.xmerge.DOMDocument;
public abstract class ConfigBase implements writer2latex.api.Config {
@ -127,7 +128,7 @@ public abstract class ConfigBase implements writer2latex.api.Config {
if (elm.getTagName().equals("option")) {
String sName = elm.getAttribute("name");
String sValue = elm.getAttribute("value");
if (sName!="") { setOption(sName,sValue); }
if (sName.length()>0) { setOption(sName,sValue); }
}
else {
readInner(elm);
@ -154,9 +155,10 @@ public abstract class ConfigBase implements writer2latex.api.Config {
DocumentBuilder builder = builderFactory.newDocumentBuilder();
DOMImplementation domImpl = builder.getDOMImplementation();
dom = domImpl.createDocument("","config",null);
}
catch (Throwable t) {
t.printStackTrace();
} catch (ParserConfigurationException e) {
// This will not happen
e.printStackTrace();
return;
}
Element rootElement = dom.getDocumentElement();

11
source/java/writer2latex/base/ConverterBase.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-13)
* Version 1.4 (2014-08-27)
*
*/
@ -38,7 +38,6 @@ import writer2latex.api.Converter;
import writer2latex.api.ConverterResult;
import writer2latex.api.OutputFile;
import writer2latex.office.EmbeddedObject;
import writer2latex.office.ImageLoader;
import writer2latex.office.MetaData;
import writer2latex.office.OfficeDocument;
import writer2latex.office.OfficeReader;
@ -58,7 +57,7 @@ public abstract class ConverterBase implements Converter {
protected OfficeDocument odDoc;
protected OfficeReader ofr;
protected MetaData metaData;
protected ImageLoader imageLoader;
protected ImageConverter imageConverter;
// The output file(s)
protected String sTargetFileName;
@ -114,8 +113,8 @@ public abstract class ConverterBase implements Converter {
private ConverterResult convert(String sTargetFileName) throws IOException {
ofr = new OfficeReader(odDoc,false);
metaData = new MetaData(odDoc);
imageLoader = new ImageLoader(odDoc,true);
imageLoader.setGraphicConverter(graphicConverter);
imageConverter = new ImageConverter(odDoc,true);
imageConverter.setGraphicConverter(graphicConverter);
// Prepare output
this.sTargetFileName = sTargetFileName;
@ -136,7 +135,7 @@ public abstract class ConverterBase implements Converter {
public MetaData getMetaData() { return metaData; }
public ImageLoader getImageLoader() { return imageLoader; }
public ImageConverter getImageCv() { return imageConverter; }
public void addDocument(OutputFile doc) { converterResult.addDocument(doc); }

40
source/java/writer2latex/xmerge/DOMDocument.java → source/java/writer2latex/base/DOMDocument.java
View file

@ -1,15 +1,6 @@
/************************************************************************
*
* The Contents of this file are made available subject to the terms of
*
* - GNU Lesser General Public License Version 2.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
* DOMDocument.java
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -25,21 +16,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-26)
*
* Contributor(s): _______________________________________
*
*
************************************************************************/
// This version is adapted for writer2latex
// Version 1.4 (2012-03-19)
*/
package writer2latex.xmerge;
package writer2latex.base;
import java.io.InputStream;
import java.io.IOException;
@ -58,12 +43,13 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
//import org.xml.sax.SAXParseException;
import writer2latex.api.OutputFile;
/**
* An implementation of <code>Document</code> for
* StarOffice documents.
* This class represents XML-based documents. It is loosely based on a class from the former xmerge project
* from OOo.
*/
public class DOMDocument
implements writer2latex.xmerge.Document {
public class DOMDocument implements OutputFile {
/** Factory for <code>DocumentBuilder</code> objects. */
private static DocumentBuilderFactory factory =
@ -352,9 +338,9 @@ public class DOMDocument
doc = builder.newDocument();
} catch (ParserConfigurationException ex) {
// This will not happen
System.err.println("Error:"+ ex);
throw new IOException(ex);
}
Element root = (Element) doc.createElement(rootName);

13
source/java/writer2latex/office/ImageLoader.java → source/java/writer2latex/base/ImageConverter.java
View file

@ -24,7 +24,7 @@
*
*/
package writer2latex.office;
package writer2latex.base;
import java.text.DecimalFormat;
import java.text.NumberFormat;
@ -34,15 +34,20 @@ 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.OfficeDocument;
import writer2latex.office.SVMReader;
import writer2latex.office.XMLString;
import writer2latex.util.Base64;
import writer2latex.util.Misc;
import writer2latex.xmerge.BinaryGraphicsDocument;
/**
* <p>This class extracts images from an OOo file.
* The images are returned as BinaryGraphicsDocument.</p>
*/
public final class ImageLoader {
public final class ImageConverter {
// The Office document to load images from
private OfficeDocument oooDoc;
@ -62,7 +67,7 @@ public final class ImageLoader {
private String sDefaultVectorFormat = null;
private HashSet<String> acceptedFormats = new HashSet<String>();
public ImageLoader(OfficeDocument oooDoc, boolean bExtractEPS) {
public ImageConverter(OfficeDocument oooDoc, boolean bExtractEPS) {
this.oooDoc = oooDoc;
this.bExtractEPS = bExtractEPS;
this.formatter = new DecimalFormat("000");

24
source/java/writer2latex/bibtex/BibTeXDocument.java
View file

@ -16,27 +16,25 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2010 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2010-03-28)
* Version 1.4 (2014-08-26)
*
*/
package writer2latex.bibtex;
import writer2latex.xmerge.Document;
import java.util.Hashtable;
import java.util.Enumeration;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import writer2latex.api.ConverterFactory;
import writer2latex.api.MIMETypes;
import writer2latex.api.OutputFile;
import writer2latex.latex.LaTeXConfig;
import writer2latex.latex.i18n.ClassicI18n;
import writer2latex.latex.i18n.I18n;
@ -48,7 +46,7 @@ import writer2latex.office.BibMark;
* <p>Class representing a BibTeX document.</p>
*
*/
public class BibTeXDocument implements Document {
public class BibTeXDocument implements OutputFile {
private static final String FILE_EXTENSION = ".bib";
private String sName;
@ -73,19 +71,6 @@ public class BibTeXDocument implements Document {
i18n = new ClassicI18n(new LaTeXConfig());
}
/**
* <p>This method is supposed to read <code>byte</code> data from the InputStream.
* Currently it does nothing, since we don't need it.</p>
*
* @param is InputStream containing a BibTeX data file.
*
* @throws IOException In case of any I/O errors.
*/
public void read(InputStream is) throws IOException {
// Do nothing.
}
/**
* <p>Returns the <code>Document</code> name with no file extension.</p>
*
@ -247,4 +232,3 @@ public class BibTeXDocument implements Document {
}
}

6
source/java/writer2latex/epub/ContainerWriter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2001-2012 by Henrik Just
* Copyright: 2001-2014 by Henrik Just
*
* All Rights Reserved.
*
* version 1.4 (2012-03-19)
* version 1.4 (2014-08-26)
*
*/
@ -35,7 +35,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
import writer2latex.xmerge.DOMDocument;
import writer2latex.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).

8
source/java/writer2latex/epub/EPUBWriter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2001-2011 by Henrik Just
* Copyright: 2001-2014 by Henrik Just
*
* All Rights Reserved.
*
* version 1.2 (2011-03-04)
* version 1.4 (2014-08-27)
*
*/
@ -49,12 +49,12 @@ public class EPUBWriter implements OutputFile {
private ConverterResult xhtmlResult;
private String sFileName;
private XhtmlConfig config;
//private XhtmlConfig config;
public EPUBWriter(ConverterResult xhtmlResult, String sFileName, XhtmlConfig config) {
this.xhtmlResult = xhtmlResult;
this.sFileName = Misc.removeExtension(sFileName);
this.config = config;
//this.config = config;
}
public String getFileName() {

6
source/java/writer2latex/epub/NCXWriter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2001-2012 by Henrik Just
* Copyright: 2001-2014 by Henrik Just
*
* All Rights Reserved.
*
* version 1.4 (2012-03-19)
* version 1.4 (2014-08-26)
*
*/
@ -39,8 +39,8 @@ import org.w3c.dom.Element;
import writer2latex.api.ContentEntry;
import writer2latex.api.ConverterResult;
import writer2latex.base.DOMDocument;
import writer2latex.util.Misc;
import writer2latex.xmerge.DOMDocument;
/** 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).

6
source/java/writer2latex/epub/OPFWriter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2001-2012 by Henrik Just
* Copyright: 2001-2014 by Henrik Just
*
* All Rights Reserved.
*
* version 1.4 (2012-03-19)
* version 1.4 (2014-08-26)
*
*/
@ -43,8 +43,8 @@ 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.xmerge.DOMDocument;
/** This class writes an OPF-file for an EPUB document (see http://www.idpf.org/2007/opf/OPF_2.0_final_spec.html).
*/

14
source/java/writer2latex/latex/ConverterPalette.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-10)
* Version 1.4 (2014-08-27)
*
*/
@ -125,19 +125,19 @@ public final class ConverterPalette extends ConverterBase {
public void convertInner() throws IOException {
sTargetFileName = Misc.trimDocumentName(sTargetFileName,".tex");
String sSafeTargetFileName = new ExportNameCollection(true).getExportName(sTargetFileName);
imageLoader.setBaseFileName(sSafeTargetFileName+"-img");
imageConverter.setBaseFileName(sSafeTargetFileName+"-img");
if (config.saveImagesInSubdir()) {
imageLoader.setUseSubdir(sSafeTargetFileName+"-img");
imageConverter.setUseSubdir(sSafeTargetFileName+"-img");
}
// Set graphics formats depending on backend
if (config.getBackend()==LaTeXConfig.PDFTEX || config.getBackend()==LaTeXConfig.XETEX) {
imageLoader.setDefaultFormat(MIMETypes.PNG);
imageLoader.setDefaultVectorFormat(MIMETypes.PDF);
imageLoader.addAcceptedFormat(MIMETypes.JPEG);
imageConverter.setDefaultFormat(MIMETypes.PNG);
imageConverter.setDefaultVectorFormat(MIMETypes.PDF);
imageConverter.addAcceptedFormat(MIMETypes.JPEG);
}
else if (config.getBackend()==LaTeXConfig.DVIPS) {
imageLoader.setDefaultFormat(MIMETypes.EPS);
imageConverter.setDefaultFormat(MIMETypes.EPS);
}
// Other values: keep original format

6
source/java/writer2latex/latex/DrawConverter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-25)
* Version 1.4 (2014-08-26)
*
*/
@ -32,6 +32,7 @@ import java.util.Stack;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import writer2latex.base.BinaryGraphicsDocument;
import writer2latex.latex.util.BeforeAfter;
import writer2latex.latex.util.Context;
import writer2latex.office.EmbeddedObject;
@ -41,7 +42,6 @@ import writer2latex.office.OfficeReader;
import writer2latex.office.XMLString;
import writer2latex.util.CSVList;
import writer2latex.util.Misc;
import writer2latex.xmerge.BinaryGraphicsDocument;
/**
* <p>This class handles draw elements.</p>
@ -312,7 +312,7 @@ public class DrawConverter extends ConverterHelper {
(config.getBackend()==LaTeXConfig.DVIPS && MIMETypes.EPS_EXT.equals(sExt)));
}
else { // embedded or base64 encoded image
BinaryGraphicsDocument bgd = palette.getImageLoader().getImage(node);
BinaryGraphicsDocument bgd = palette.getImageCv().getImage(node);
if (bgd!=null) {
palette.addDocument(bgd);
sFileName = bgd.getFileName();

23
source/java/writer2latex/latex/LaTeXDocument.java
View file

@ -16,21 +16,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2010 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2010-03-28)
* Version 1.4 (2014-08-27)
*
*/
package writer2latex.latex;
import writer2latex.api.MIMETypes;
import writer2latex.xmerge.Document;
import writer2latex.api.OutputFile;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@ -38,7 +36,7 @@ import java.io.OutputStreamWriter;
* <p>Class representing a LaTeX document.</p>
*
*/
public class LaTeXDocument implements Document {
public class LaTeXDocument implements OutputFile {
private static final String FILE_EXTENSION = ".tex";
private String sName;
@ -68,19 +66,6 @@ public class LaTeXDocument implements Document {
contents = new LaTeXDocumentPortion(true);
}
/**
* <p>This method is supposed to read <code>byte</code> data from the InputStream.
* Currently it does nothing, since we don't need it.</p>
*
* @param is InputStream containing a LaTeX data file.
*
* @throws IOException In case of any I/O errors.
*/
public void read(InputStream is) throws IOException {
// Do nothing.
}
/**
* <p>Returns the <code>Document</code> name with no file extension.</p>
*

2
source/java/writer2latex/latex/MathConverter.java
View file

@ -146,7 +146,7 @@ public final class MathConverter extends ConverterHelper {
/** Try to convert a draw:frame or draw:g element as an (inline) TexMaths or OOoLaTeX equation
*
* @param the element containing the equation (draw:frame or draw:g)
* @param node the element containing the equation (draw:frame or draw:g)
* @param ldp the LaTeXDocumentPortion to contain the converted equation
*
* @return true if this elements happen to be a TexMaths equation, otherwise false

4
source/java/writer2latex/office/EmbeddedBinaryObject.java
View file

@ -40,8 +40,8 @@ public class EmbeddedBinaryObject extends EmbeddedObject {
* Package private constructor for use when reading an object from a
* package ODF file
*
* @param name The name of the object.
* @param type The MIME-type of the object.
* @param sName The name of the object.
* @param sType The MIME-type of the object.
* @param source A <code>SimpleZipReader</code> containing the object
*/
protected EmbeddedBinaryObject(String sName, String sType, SimpleZipReader source) {

6
source/java/writer2latex/office/EmbeddedObject.java
View file

@ -37,9 +37,9 @@ public abstract class EmbeddedObject {
* @param sName The name of the object.
* @param sType The MIME-type of the object.
*/
protected EmbeddedObject(String name, String type) {
sName = name;
sType = type;
protected EmbeddedObject(String sName, String sType) {
this.sName = sName;
this.sType = sType;
}
/** Get the name of the embedded object represented by this instance.

4
source/java/writer2latex/office/OfficeReader.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-20)
* Version 1.4 (2014-08-27)
*
*/
@ -272,7 +272,7 @@ public class OfficeReader {
if (next.getNextSibling()!=null) { return next.getNextSibling(); }
// Then move to parent, if this is the text:p node, we are done
next = next.getParentNode();
if (next.getNodeType()==Node.ELEMENT_NODE &&
if (next!=null && next.getNodeType()==Node.ELEMENT_NODE &&
next.getNodeName().equals(XMLString.TEXT_P)) {
return null;
}

6
source/java/writer2latex/office/PropertySet.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2007 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 0.5 (2007-03-17)
* Version 1.4 (2014-08-27)
*
*/
@ -62,9 +62,9 @@ public class PropertySet {
public String getName() { return sName; }
public void loadFromDOM(Node node) {
sName = node.getNodeName();
// read the attributes of the node, if any
if (node!=null) {
sName = node.getNodeName();
NamedNodeMap attrNodes = node.getAttributes();
if (attrNodes!=null) {
int nLen = attrNodes.getLength();

8
source/java/writer2latex/office/TocReader.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2008 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.0 (2008-11-22)
* Version 1.4 (2014-08-27)
*
*/
@ -40,7 +40,7 @@ import writer2latex.util.Misc;
public class TocReader {
Element tocSource = null;
Element indexBody = null;
//Element indexBody = null;
String sName=null; // (section) name for this toc
String sStyleName=null; // section style name
@ -181,7 +181,7 @@ public class TocReader {
/** <p>Return the generated content of this toc, if available</p>
* @return the <code>text:index-body</code> element
*/
public Element getIndexBody() { return indexBody; }
/* public Element getIndexBody() { return indexBody; } */
}

7
source/java/writer2latex/util/Misc.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2012-02-26)
* Version 1.4 (2014-08-27)
*
*/
@ -63,9 +63,8 @@ public class Misc{
// Truncate a date+time to the date only
public static final String dateOnly(String sDate) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
Date date = null;
try {
date = sdf.parse(sDate);
sdf.parse(sDate);
} catch (ParseException e) {
// If the date cannot be parsed according to the given pattern, return the original string
return sDate;

2
source/java/writer2latex/util/SimpleZipReader.java
View file

@ -67,7 +67,7 @@ public class SimpleZipReader {
* You can only get an entry once: The <code>SimpleZipReader</code> removes the entry from the
* collection when this method is called (memory optimization).
*
* @param name the name (path) of the ZIP entry
* @param sName the name (path) of the ZIP entry
*
* @return a byte array with the contents of the entry, or null if the entry does not exist
*/

18
source/java/writer2latex/xhtml/Converter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-13)
* Version 1.4 (2014-08-26)
*
*/
@ -248,22 +248,22 @@ public class Converter extends ConverterBase {
l10n = new L10n();
if (isOPS()) {
imageLoader.setBaseFileName("image");
imageLoader.setUseSubdir("images");
imageConverter.setBaseFileName("image");
imageConverter.setUseSubdir("images");
}
else {
imageLoader.setBaseFileName(sTargetFileName+"-img");
imageConverter.setBaseFileName(sTargetFileName+"-img");
if (config.saveImagesInSubdir()) {
imageLoader.setUseSubdir(sTargetFileName+"-img");
imageConverter.setUseSubdir(sTargetFileName+"-img");
}
}
imageLoader.setDefaultFormat(MIMETypes.PNG);
imageLoader.addAcceptedFormat(MIMETypes.JPEG);
imageLoader.addAcceptedFormat(MIMETypes.GIF);
imageConverter.setDefaultFormat(MIMETypes.PNG);
imageConverter.addAcceptedFormat(MIMETypes.JPEG);
imageConverter.addAcceptedFormat(MIMETypes.GIF);
if (nType==XhtmlDocument.HTML5 && config.useSVG()) { // HTML supports (inline) SVG as well
imageLoader.setDefaultVectorFormat(MIMETypes.SVG);
imageConverter.setDefaultVectorFormat(MIMETypes.SVG);
}
styleCv = new StyleConverter(ofr,config,this,nType);

6
source/java/writer2latex/xhtml/DrawConverter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-20)
* Version 1.4 (2014-08-26)
*
*/
@ -59,7 +59,7 @@ import org.w3c.dom.Element;
import writer2latex.util.Misc;
import writer2latex.util.CSVList;
import writer2latex.util.SimpleXMLParser;
import writer2latex.xmerge.BinaryGraphicsDocument;
import writer2latex.base.BinaryGraphicsDocument;
import writer2latex.office.EmbeddedObject;
import writer2latex.office.EmbeddedXMLObject;
import writer2latex.office.XMLString;
@ -480,7 +480,7 @@ public class DrawConverter extends ConverterHelper {
}
}
else { // embedded or base64 encoded image
bgd = converter.getImageLoader().getImage(onode);
bgd = converter.getImageCv().getImage(onode);
if (bgd!=null) {
sFileName = bgd.getFileName();
// If this is the cover image, add it to the converter result

6
source/java/writer2latex/xhtml/MathConverter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-20)
* Version 1.4 (2014-08-26)
*
*/
@ -33,7 +33,7 @@ import org.w3c.dom.NamedNodeMap;
import writer2latex.office.*;
import writer2latex.util.Misc;
import writer2latex.xmerge.BinaryGraphicsDocument;
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)
@ -151,7 +151,7 @@ public class MathConverter extends ConverterHelper {
// Get the image from the ImageLoader
String sHref = Misc.getAttribute(onode,XMLString.XLINK_HREF);
if (sHref==null || sHref.length()==0 || ofr.isInPackage(sHref)) {
BinaryGraphicsDocument bgd = converter.getImageLoader().getImage(image);
BinaryGraphicsDocument bgd = converter.getImageCv().getImage(image);
if (bgd!=null) {
String sMIME = bgd.getDocumentMIMEType();
if (MIMETypes.PNG.equals(sMIME) || MIMETypes.JPEG.equals(sMIME) || MIMETypes.GIF.equals(sMIME)) {

28
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-13)
* Version 1.4 (2014-08-27)
*
*/
@ -966,15 +966,15 @@ public class TextConverter extends ConverterHelper {
ListCounter counter = getListCounter(ofr.getListStyle(styleName));
// Restart numbering, if required
if (counter!=null) {
boolean bContinueNumbering = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_CONTINUE_NUMBERING));
if (!bContinueNumbering && counter!=null) {
counter.restart(nLevel);
}
if (config.listFormatting()==XhtmlConfig.CSS1_HACK && counter.getValue(nLevel)>0) {
hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));
}
//if (counter!=null) {
boolean bContinueNumbering = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_CONTINUE_NUMBERING));
if (!bContinueNumbering && counter!=null) {
counter.restart(nLevel);
}
if (config.listFormatting()==XhtmlConfig.CSS1_HACK && counter.getValue(nLevel)>0) {
hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));
}
//}
if (onode.hasChildNodes()) {
NodeList nList = onode.getChildNodes();
@ -1001,7 +1001,9 @@ public class TextConverter extends ConverterHelper {
}
else {
// add an li element
sCurrentListLabel = counter.step(nLevel).getLabel();
//if (counter!=null) {
sCurrentListLabel = counter.step(nLevel).getLabel();
//}
currentListStyle = ofr.getListStyle(styleName);
nCurrentListLevel = nLevel;
Element item = converter.createElement("li");
@ -1016,9 +1018,9 @@ public class TextConverter extends ConverterHelper {
XMLString.TEXT_START_VALUE),1);
if (bRestart) {
item.setAttribute("value",Integer.toString(nStartValue));
if (counter!=null) {
sCurrentListLabel = counter.restart(nLevel,nStartValue).getLabel();
}
//if (counter!=null) {
sCurrentListLabel = counter.restart(nLevel,nStartValue).getLabel();
//}
}
}
traverseListItem(child,nLevel,styleName,item);

41
source/java/writer2latex/xhtml/XhtmlDocument.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.4 (2014-08-13)
* Version 1.4 (2014-08-26)
*
*/
@ -32,20 +32,17 @@ package writer2latex.xhtml;
import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
//import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.DOMImplementation;
//import org.xml.sax.SAXException;
//import org.xml.sax.SAXParseException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
//import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.ParserConfigurationException;
import writer2latex.api.MIMETypes;
import writer2latex.base.DOMDocument;
import writer2latex.office.XMLString;
import writer2latex.xmerge.DOMDocument;
import java.io.InputStream;
import java.io.OutputStream;
@ -262,15 +259,13 @@ public class XhtmlDocument extends DOMDocument {
/**
* Constructor. This constructor also creates the DOM (minimal: root, head,
* title and body node only) - unlike the constructors in
* writer2latex.xmerge.DOMDocument.
* @param name <code>Document</code> name.
* title and body node only)
* @param name name of this document
* @param nType the type of document
*/
public XhtmlDocument(String name, int nType) {
super(name,sExtension[nType]);
this.nType = nType;
// create DOM
Document contentDOM = null;
@ -281,21 +276,21 @@ public class XhtmlDocument extends DOMDocument {
String[] sDocType = getDoctypeStrings();
DocumentType doctype = domImpl.createDocumentType("html", sDocType[0], sDocType[1]);
contentDOM = domImpl.createDocument("http://www.w3.org/1999/xhtml","html",doctype);
contentDOM.getDocumentElement().setAttribute("xmlns","http://www.w3.org/1999/xhtml");
// add head, title and body
headNode = contentDOM.createElement("head");
titleNode = contentDOM.createElement("title");
bodyNode = contentDOM.createElement("body");
contentDOM.getDocumentElement().appendChild(headNode);
headNode.appendChild(titleNode);
contentDOM.getDocumentElement().appendChild(bodyNode);
contentNode = bodyNode;
setContentDOM(contentDOM);
}
catch (Throwable t) {
t.printStackTrace();
catch (ParserConfigurationException e) {
// The newDocumentBuilder() method may in theory throw this, but this will not happen
e.printStackTrace();
}
contentDOM.getDocumentElement().setAttribute("xmlns","http://www.w3.org/1999/xhtml");
// add head, title and body
headNode = contentDOM.createElement("head");
titleNode = contentDOM.createElement("title");
bodyNode = contentDOM.createElement("body");
contentDOM.getDocumentElement().appendChild(headNode);
headNode.appendChild(titleNode);
contentDOM.getDocumentElement().appendChild(bodyNode);
contentNode = bodyNode;
setContentDOM(contentDOM);
}
@Override public String getMIMEType() {

86
source/java/writer2latex/xmerge/Document.java
View file

@ -1,86 +0,0 @@
/************************************************************************
*
* The Contents of this file are made available subject to the terms of
*
* - GNU Lesser General Public License Version 2.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
* This version is adapted for Writer2LaTeX
* version 1.0 (2008-11-22)
*
************************************************************************/
package writer2latex.xmerge;
//import java.io.OutputStream;
import java.io.InputStream;
import java.io.IOException;
import writer2latex.api.OutputFile;
/**
* <p>A <code>Document</code> represents any <code>Document</code>
* to be converted and the resulting <code>Document</code> from any
* conversion.</p>
*
*
* @author Herbie Ong
*/
public interface Document extends OutputFile {
/**
* <p>Reads the content from the <code>InputStream</code> into
* the <code>Document</code>.</p>
*
* <p>This method may not be thread-safe.
* Implementations may or may not synchronize this
* method. User code (i.e. caller) must make sure that
* calls to this method are thread-safe.</p>
*
* @param is <code>InputStream</code> to read in the
* <code>Document</code> content.
*
* @throws IOException If any I/O error occurs.
*/
public void read(InputStream is) throws IOException;
/**
* Returns the <code>Document</code> name with no file extension.
*
* @return The <code>Document</code> name with no file extension.
*/
public String getName();
}

15
source/java/writer2latex/xmerge/Package.html
View file

@ -1,15 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>The package writer2latex.xmerge</title>
</head>
<body>
<p>Classes originating from OOo's xmerge.</p>
<p>Previously, Writer2LaTeX was based on xmerge, but this is not the case
anymore. The classes in this packages are reminiscent of that.</p>
<p>This package is supposed to go away in a future version and be replaced by
something else (probably ODFDOM)</p>
</body>
</html>