diff --git a/build.xml b/build.xml index c529196..9262896 100644 --- a/build.xml +++ b/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) ############################################################################ --> @@ -34,9 +34,9 @@ - - - + + + @@ -212,9 +212,9 @@ - + diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 25b4bcf..949a7dd 100644 --- a/source/distro/changelog.txt +++ b/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 ----------- diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 2efa35c..85d655f 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java index 4f22413..eb6c3a8 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java +++ b/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); - /*MIMETypes.PNG.equals(sSourceMime) || MIMETypes.JPEG.equals(sSourceMime) || + boolean bSupportsSource = MIMETypes.SVM.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.SVM.equals(sSourceMime);*/ - return bSupportsSource && MIMETypes.PDF.equals(sTargetMime); + MIMETypes.BMP.equals(sSourceMime); + // || MIMETypes.WMF.equals(sSourceMime) + boolean bSupportsTarget = MIMETypes.PDF.equals(sTargetMime) || MIMETypes.EPS.equals(sTargetMime); + return bSupportsSource && bSupportsTarget; } public byte[] convert(byte[] source, String sSourceMime, String sTargetMime) { diff --git a/source/java/writer2latex/latex/ConverterPalette.java b/source/java/writer2latex/latex/ConverterPalette.java index 82896fa..8522f9f 100644 --- a/source/java/writer2latex/latex/ConverterPalette.java +++ b/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("]"); diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index 9bcc643..cbacd5e 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/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) diff --git a/source/oxt/writer2latex/desc_de.txt b/source/oxt/writer2latex/desc_de.txt new file mode 100644 index 0000000..0befd56 --- /dev/null +++ b/source/oxt/writer2latex/desc_de.txt @@ -0,0 +1 @@ +Writer2Latex bietet Writer Exportfilter für LaTeX und BibTeX diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index a27ccad..3997015 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,7 +5,7 @@ - + @@ -14,6 +14,7 @@ Writer2LaTeX eksportfiltre Writer2LaTeX export filters + Writer2Latex Exportfilter Filtres d'exportation Writer2LaTeX Фильтры экспорта Writer2LaTeX Фільтри експорту Writer2LaTeX @@ -22,6 +23,7 @@ + diff --git a/source/oxt/writer2xhtml/desc_de.txt b/source/oxt/writer2xhtml/desc_de.txt new file mode 100644 index 0000000..f84f40d --- /dev/null +++ b/source/oxt/writer2xhtml/desc_de.txt @@ -0,0 +1 @@ +Writer2Latex bietet Witer und Calc Exportfilter für XHTML und XHTML+MathML diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index 470181b..61916f0 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -4,7 +4,7 @@ - + @@ -13,6 +13,7 @@ Writer2xhtml eksportfiltre Writer2xhtml export filters + Writer2xhtml Exportfilter Filtres d'exportation Writer2xhtml Фильтры экспорта Writer2xhtml Фільтри експорту Writer2xhtml @@ -21,6 +22,7 @@ + diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml index bf56138..b45afb0 100644 --- a/source/oxt/xhtml-config-sample/description.xml +++ b/source/oxt/xhtml-config-sample/description.xml @@ -2,5 +2,5 @@ - +