git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@7 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.0 (2008-12-02)
+  # version 1.0 (2009-03-02)
   ############################################################################
 -->
 <project name="w2l" default="help" basedir=".">
@@ -34,9 +34,9 @@
 
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
-    <property name="basename" value="writer2latex09"/>
+    <property name="basename" value="writer2latex10"/>
-    <property name="distrofile" value="${basename}4.zip" />
+    <property name="distrofile" value="${basename}beta.zip" />
-    <property name="sourcedistrofile" value="${basename}4source.zip" />
+    <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />
     <property name="classes" location="target/classes"/>
@@ -212,9 +212,9 @@
         </zip>		
 		
         <!-- Pack the source distribution -->
-        <zip destfile="${target.lib}/${sourcedistrofile}">
+        <!--<zip destfile="${target.lib}/${sourcedistrofile}">
             <zipfileset dir="." includes="source/**/*,build.xml" prefix="${basename}" /> 
-        </zip>
+        </zip>-->
 			 
     </target>
 

source/distro/changelog.txt

@@ -2,6 +2,13 @@ Changelog for Writer2LaTeX version 0.5 -> 1.0
 
 ---------- version 1.0 beta ----------
 
+[w2l] Added support for bitmap graphics with backend=dvips
+
+[all] No longer create source distribution (SourceForge provides tarballs generated
+  directly from SVN)
+
+[all] Added german description to filters
+
 [w2l] Bugfix: Fixed crash for tables with fewer columns than rows
 
 ---------- version 0.9.4 -----------

source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-10-07)
+ *  Version 1.0 (2009-03-02)
  *
  */
  
@@ -93,15 +93,16 @@ public class GraphicConverterImpl2 implements GraphicConverter {
         // We don't support cropping and resizing
         if (bCrop || bResize) { return false; }
 
-        // We currently only support conversion of svm into pdf
+        // We currently support conversion of bitmaps and svm into pdf and eps
         // Trying wmf causes an IllegalArgumentException "URL seems to be an unsupported one"
         // Seems to be an OOo bug; workaround: Use temporary files..??
-        boolean bSupportsSource = MIMETypes.SVM.equals(sSourceMime);
+        boolean bSupportsSource = MIMETypes.SVM.equals(sSourceMime) ||
-           /*MIMETypes.PNG.equals(sSourceMime) || MIMETypes.JPEG.equals(sSourceMime) ||
+           MIMETypes.PNG.equals(sSourceMime) || MIMETypes.JPEG.equals(sSourceMime) ||
            MIMETypes.GIF.equals(sSourceMime) || MIMETypes.TIFF.equals(sSourceMime) ||
-           MIMETypes.BMP.equals(sSourceMime) || MIMETypes.WMF.equals(sSourceMime) ||
+           MIMETypes.BMP.equals(sSourceMime);
-           MIMETypes.SVM.equals(sSourceMime);*/
+           //  || MIMETypes.WMF.equals(sSourceMime)
-        return bSupportsSource && MIMETypes.PDF.equals(sTargetMime);
+        boolean bSupportsTarget = MIMETypes.PDF.equals(sTargetMime) || MIMETypes.EPS.equals(sTargetMime);
+        return bSupportsSource && bSupportsTarget;
     }
 	
     public byte[] convert(byte[] source, String sSourceMime, String sTargetMime) {

source/java/writer2latex/latex/ConverterPalette.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-17) 
+ *  Version 1.0 (2009-03-02) 
  *
  */
 
@@ -266,7 +266,7 @@ public final class ConverterPalette extends ConverterBase {
         if (!config.noPreamble()) {
             // Create document class declaration
 	        result.append("% This file was converted to LaTeX by Writer2LaTeX ver. "+ConverterFactory.getVersion()).nl()
-                  .append("% see http://www.hj-gym.dk/~hj/writer2latex for more info").nl();
+                  .append("% see http://writer2latex.sourceforge.net for more info").nl();
             result.append("\\documentclass");
             if (!globalOptions.isEmpty()) {
                 result.append("[").append(globalOptions.toString()).append("]");

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-16)
+ *  Version 1.0 (2009-03-02)
  *
  */
 
@@ -460,7 +460,7 @@ public class Converter extends ConverterBase {
              "This file was converted to xhtml by "
              + (ofr.isText() ? "Writer" : (ofr.isSpreadsheet() ? "Calc" : "Impress"))
              + "2xhtml ver. " + ConverterFactory.getVersion() +
-             ". See http://www.hj-gym.dk/~hj/writer2latex for more info."),
+             ". See http://writer2latex.sourceforge.net for more info."),
              rootElement.getFirstChild());
 		
         // Apply page formatting (using first master page)

source/oxt/writer2latex/desc_de.txt

@@ -0,0 +1 @@
+Writer2Latex bietet Writer Exportfilter für LaTeX und BibTeX

source/oxt/writer2latex/description.xml

@@ -5,7 +5,7 @@
 
   <identifier value="org.openoffice.da.writer2latex.oxt"/>
 
-  <version value="0.9.4" />
+  <version value="1.0" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
@@ -14,6 +14,7 @@
   <display-name>
     <name lang="da">Writer2LaTeX eksportfiltre</name>
     <name lang="en">Writer2LaTeX export filters</name>
+    <name lang="de">Writer2Latex Exportfilter</name>
     <name lang="de">Filtres d'exportation Writer2LaTeX</name>
     <name lang="ru">Фильтры экспорта Writer2LaTeX</name>
     <name lang="uk">Фільтри експорту Writer2LaTeX</name>
@@ -22,6 +23,7 @@
   <extension-description>
     <src xlink:href="description/desc_da.txt" lang="da" />
     <src xlink:href="description/desc_en.txt" lang="en" />
+    <src xlink:href="description/desc_de.txt" lang="de" />
     <src xlink:href="description/desc_fr.txt" lang="fr" />
     <src xlink:href="description/desc_ru.txt" lang="ru" />
     <src xlink:href="description/desc_uk.txt" lang="uk" />

source/oxt/writer2xhtml/desc_de.txt

@@ -0,0 +1 @@
+Writer2Latex bietet Witer und Calc  Exportfilter für XHTML und XHTML+MathML

source/oxt/writer2xhtml/description.xml

@@ -4,7 +4,7 @@
 			 
   <identifier value="org.openoffice.da.writer2xhtml.oxt" />
   
-  <version value="0.9.4" />
+  <version value="1.0" />
   
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
@@ -13,6 +13,7 @@
   <display-name>
     <name lang="da">Writer2xhtml eksportfiltre</name>
     <name lang="en">Writer2xhtml export filters</name>
+    <name lang="de">Writer2xhtml Exportfilter</name>
     <name lang="fr">Filtres d'exportation Writer2xhtml</name>
     <name lang="ru">Фильтры экспорта Writer2xhtml</name>
     <name lang="uk">Фільтри експорту Writer2xhtml</name>
@@ -21,6 +22,7 @@
   <extension-description>
     <src xlink:href="description/desc_da.txt" lang="da" />
     <src xlink:href="description/desc_en.txt" lang="en" />
+    <src xlink:href="description/desc_de.txt" lang="de" />
     <src xlink:href="description/desc_fr.txt" lang="fr" />
     <src xlink:href="description/desc_ru.txt" lang="ru" />
     <src xlink:href="description/desc_uk.txt" lang="uk" />

source/oxt/xhtml-config-sample/description.xml

@@ -2,5 +2,5 @@
 <description xmlns="http://openoffice.org/extensions/description/2006"
              xmlns:d="http://openoffice.org/extensions/description/2006">
   <identifier value="org.openoffice.da.writer2latex.xhtml-config-sample.oxt" />
-  <version value="0.9.4" />
+  <version value="1.0" />
 </description>