A few fixes before the release of 1.4 beta

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@180 f0f2a975-2e09-46c8-9428-3b39399b9f3c

build.xml

@@ -2,7 +2,7 @@
   ############################################################################
   # This is the Ant build file for writer2latex
   # Original: Sep 2004 (mgn)
-  # version 1.4 (2014-08-25)
+  # version 1.4 (2014-10-01)
   ############################################################################
 -->
 <project name="w2l" default="help" basedir=".">
@@ -10,6 +10,8 @@
     <!-- set this property to the location of your SO/OOo installation -->
 	<property name="OFFICE_CLASSES" location="/usr/share/java" />
 	<property name="URE_CLASSES" location="/usr/share/java" />
+    <!-- set this property to the location of the java 6 bootstrap classes (rt.jar) -->
+	<property name="JAVA6_RT_JAR" location="/home/hj/jre6/lib/rt.jar" />
 
     <description>writer2latex - build file</description>
 
@@ -34,8 +36,8 @@
 
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
-    <property name="basename" value="writer2latex13"/>
+    <property name="basename" value="writer2latex14"/>
-    <property name="distrofile" value="${basename}2alpha.zip" />
+    <property name="distrofile" value="${basename}beta.zip" />
     <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />
@@ -70,6 +72,9 @@
                destdir="${classes}"
                encoding="us-ascii"
         	   source="1.6"
+        	   target="1.6"
+        	   bootclasspath="${JAVA6_RT_JAR}"
+        	   includeantruntime="false"
                debug="on">
             <classpath refid="main.class.path"/>
         </javac>

source/distro/History.txt

@@ -1,9 +1,32 @@
 Version history for Writer2LaTeX
 ================================
 
+Version 1.4 beta (October 2014)
+  - All:
+       - Optimized memory usage
+       - Images that are used more than once in the document are now only exported once
+       - Now requires Java 6
+  - LaTeX:
+       - New option display_hidden_text to toggle the export of hidden text in the document
+       - Merge spans with identical formatting
+       - Support for TexMaths equations
+       - The package ooomath.sty is no longer required by standard configurations
+       - StarMath bugfixes
+  - XHTML:
+       - Support for (polyglot) HTML5, replacing the target format XHTML+MathML+XSLT
+       - New option use_mathjax to load the MathJax library if the target format is XHTML+MathML or HTML5
+       - Support for TexMaths equations (only if use_mathjax=true)
+       - Vector graphics is now converted to SVG if target format is HTML5
+       - New option embed_svg to embed SVG directly in HTML if target format is HTML5
+       - Support for HTML5 elements in templates
+       - Merge span elements with identical attributes
+       - New option table_size replacing the option ignore_table_dimensions
+       - Support display equations
+       
 Version 1.2.1 (September 2014)
   - All:
        - Updated to work with LO 4.x
+       
 Version 1.2 beta (March 2012)
   - Filters:
        - Added user interface to edit custom configuration
@@ -36,7 +59,8 @@ Version 1.2 beta (March 2012)
        - New method in the converter API to access the metadata of the converted document
        - The converter API now provides pointers to headings and other important places in the converted document
        - The converter API now provides better identification of files that are part of the main document flow
-       - New attributes Resouces, ResourceURL in filter API    
+       - New attributes Resources, ResourceURL in filter API
+           
 Version 1.0 (September 2009)
   -Filters:
       - Changed to oxt format and separated into Writer2LaTeX and Writer2xhtml extensions

source/distro/Readme.txt

@@ -11,8 +11,8 @@ in the user guide, which is included in the
 directory doc.
   
 Bugs and feature requests should be reported to
-  henrikjust (at) openoffice.org
+  writer2latex (at) gmail.com
   
 
-September 2014
+October 2014
 Henrik Just

source/distro/changelog.txt

@@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.2 -> 1.4
 
 ---------- version 1.4 beta ----------
 
+[all] Build file is now set up to cross compile for java 6
+
 [w2x] If the export dialogs are loaded with a setting for scaling or column_scaling of 1% or less, the value
   is reset to 100%. This is a workaround for an obscure bug in the extension manager, which in some cases sets
   the value to 1% if the export is used right after installation.

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-26)
+ *  Version 1.4 (2014-09-30)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.4";
-    private static final String DATE = "2014-09-26";
+    private static final String DATE = "2014-09-30";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>
@@ -59,8 +59,6 @@ public class ConverterFactory {
      *    (see http://www.w3.org/TR/xhtml-media-types/), but it is used internally
      *    by Writer2xhtml to distinguish from XHTML+MathML</li>
      *    <li><code>application/xhtml+xml</code> for XHTML+MathML</li>
-     *    <li><code>application/xml</code> for XHTML+MathML using stylesheets from w3c's
-     *        math working group</li>
      *    <li><code>text/html5</code> for HTML5 documents
      *    Note that this is <em>not</em> the recommended media type for HTML5
      *    (see http://wiki.whatwg.org/), but it is used internally

source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp

@@ -179,7 +179,7 @@
 
     	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:OptionsSaveImagesInSubdir" id="bm_options_saveimagesinsubdir"/>
 		<paragraph role="heading" level="3" xml-lang="en-US">Save images in subdirectory</paragraph>
-   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:OptionsSaveImagesInSubdir" visibility="hidden">Check this to save the documents in a separate subdirectory</ahelp></paragraph>
+   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:OptionsSaveImagesInSubdir" visibility="hidden">Check this to save the images in a separate subdirectory</ahelp></paragraph>
 		<paragraph role="paragraph" xml-lang="en-US">Writer2LaTeX normally saves images associated with the document in the same
 		directory as the LaTeX document. If the document contains a large number of images it may be more convenient to save
 		the images in a separate subdirectory. This option will create a subdirectory with the same name as the LaTeX document

source/readme-source.txt

@@ -17,7 +17,7 @@ The source of Writer2LaTeX consists of three major parts:
   This is to be found in the packages writer2latex.* and should only be used
   through the provided api writer2latex.api.*
 * A command line utility writer2latex.Application
-* A collection of components for OpenOffice.org
+* A collection of components for LibreOffice and Apache OpenOffice
   These are to be found in the packages org.openoffice.da.comp.*
   
 Currently parts of the source for Writer2LaTeX are somewhat messy and
@@ -53,7 +53,7 @@ The class writer2latex.util.Base64 is Robert Harders public domain Base64 class
 Building Writer2LaTeX
 ---------------------
 
-Writer2LaTeX uses Ant version 1.5 or later (http://ant.apache.org) to build.
+Writer2LaTeX uses Ant version 1.6 or later (http://ant.apache.org) to build.
 
 
 Some java libraries from OOo are needed to build the filter part of Writer2LaTeX,
@@ -66,7 +66,12 @@ The lines
 	<property name="OFFICE_CLASSES" location="/usr/share/java" />
 	<property name="URE_CLASSES" location="/usr/share/java" />
 should be modified to the directories where your LO/AOO installation keeps these files
-In some cases your need to install the office development kit as well
+With some LO/AOO installations, you need to install the office development kit as well
+
+The line
+	<property name="JAVA6_RT_JAR" location="/home/hj/jre6/lib/rt.jar" />
+should be modified to point to rt.jar from a java 6 runtime
+(if you want to cross compile for java 6, otherwise change the parameters to the javac task) 
 
 To build, open a command shell, navigate to the source directory and type
 
@@ -88,7 +93,7 @@ In addition to oxt, the build file supports the following targets:
     clean
 
 
-Henrik Just, September 2014
+Henrik Just, October 2014
 
 
 Thanks to Michael Niedermair for writing the original ant build file