diff -Nru writer2latex-1.0/build.xml writer2latex-1.0.2/build.xml --- writer2latex-1.0/build.xml 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/build.xml 2010-06-03 08:50:50.000000000 +0200 @@ -2,15 +2,14 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.0 (2009-09-14) + # version 1.0.2 (2010-04-26) ############################################################################ --> - - - + + writer2latex - build file @@ -36,7 +35,7 @@ - + @@ -49,9 +48,9 @@ - - diff -Nru writer2latex-1.0/debian/changelog writer2latex-1.0.2/debian/changelog --- writer2latex-1.0/debian/changelog 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/changelog 2010-12-02 12:24:52.000000000 +0100 @@ -1,3 +1,19 @@ +writer2latex (1.0.2-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #683893). Remaining changes: + - (Build-)depend on default-jre/-jdk. + - debian/rules: Change the path of JAVA_HOME to suit with the + gcj-jdk -> default-jdk transition. + + -- Angel Abad Wed, 01 Dec 2010 22:41:23 +0100 + +writer2latex (1.0.2-1) unstable; urgency=low + + * new upstream release + * remove check_for_running_ooo as for OOo itself + + -- Rene Engelhard Mon, 22 Nov 2010 00:44:13 +0100 + writer2latex (1.0-12ubuntu1) maverick; urgency=low * Merge from debian unstable. Remaining changes: @@ -233,4 +249,3 @@ * Initial release -- Rene Engelhard Mon, 26 Nov 2007 10:06:34 +0100 - diff -Nru writer2latex-1.0/debian/control writer2latex-1.0.2/debian/control --- writer2latex-1.0/debian/control 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/control 2010-12-02 12:24:52.000000000 +0100 @@ -86,7 +86,7 @@ Package: openoffice.org-writer2latex Architecture: all -Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps, default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre +Pre-Depends: default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre Depends: openoffice.org-core (>= 1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} Enhances: openoffice.org-writer, openoffice.org-calc Conflicts: openoffice.org-core (<< 1:3.0.0~), openoffice.org-common (<< 1:3.0.1-10), ure (<< 1.5.1+OOo3.1.1-15) @@ -110,7 +110,7 @@ Package: openoffice.org-writer2xhtml Architecture: all -Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps, default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre +Pre-Depends: default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre Depends: openoffice.org-core (>= 1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} Enhances: openoffice.org-writer, openoffice.org-calc Conflicts: openoffice.org-core (<< 1:3.0.0~), openoffice.org-common (<< 1:3.0.1-10), ure (<< 1.5.1+OOo3.1.1-15) diff -Nru writer2latex-1.0/debian/openoffice.org-writer2latex.postinst writer2latex-1.0.2/debian/openoffice.org-writer2latex.postinst --- writer2latex-1.0/debian/openoffice.org-writer2latex.postinst 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2latex.postinst 2010-12-02 12:24:52.000000000 +0100 @@ -4,42 +4,11 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock" - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - flush_unopkg_cache() { /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 } remove_extension() { - check_for_running_ooo if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ @@ -52,7 +21,6 @@ } add_extension() { - check_for_running_ooo INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg add -v --shared $1 \ "-env:UserInstallation=file:///$INSTDIR" \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2latex.preinst writer2latex-1.0.2/debian/openoffice.org-writer2latex.preinst --- writer2latex-1.0/debian/openoffice.org-writer2latex.preinst 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2latex.preinst 2010-12-02 12:24:52.000000000 +0100 @@ -4,42 +4,11 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock" - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - flush_unopkg_cache() { /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 } remove_extension() { - check_for_running_ooo if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2latex.prerm writer2latex-1.0.2/debian/openoffice.org-writer2latex.prerm --- writer2latex-1.0/debian/openoffice.org-writer2latex.prerm 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2latex.prerm 2010-12-02 12:24:52.000000000 +0100 @@ -4,42 +4,11 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'` - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - flush_unopkg_cache() { /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 } remove_extension() { - check_for_running_ooo if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2latex.templates writer2latex-1.0.2/debian/openoffice.org-writer2latex.templates --- writer2latex-1.0/debian/openoffice.org-writer2latex.templates 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2latex.templates 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: shared/openofficeorg-running -Type: error -_description: OpenOffice.org running - OpenOffice.org is running right now. This can cause problems with - (de-)registration of components and extensions. - . - You should close all running instances of OpenOffice.org (including any - currently running Quickstarter) before proceeding with the package - upgrade. diff -Nru writer2latex-1.0/debian/openoffice.org-writer2latex.templates.old writer2latex-1.0.2/debian/openoffice.org-writer2latex.templates.old --- writer2latex-1.0/debian/openoffice.org-writer2latex.templates.old 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2latex.templates.old 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -Template: shared/openofficeorg-running -Type: error -_Description: OpenOffice.org running - OpenOffice.org is running right now. This can cause problems with - (de-)registration of components and extensions. - . - You should close all running instances of OpenOffice.org (including - any currently running Quickstarter) before proceeding with the package - upgrade. - diff -Nru writer2latex-1.0/debian/openoffice.org-writer2xhtml.postinst writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.postinst --- writer2latex-1.0/debian/openoffice.org-writer2xhtml.postinst 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.postinst 2010-12-02 12:24:52.000000000 +0100 @@ -4,38 +4,7 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock" - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - add_extension() { - check_for_running_ooo INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg add -v --shared $1 \ "-env:UserInstallation=file:///$INSTDIR" \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2xhtml.preinst writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.preinst --- writer2latex-1.0/debian/openoffice.org-writer2xhtml.preinst 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.preinst 2010-12-02 12:24:52.000000000 +0100 @@ -4,42 +4,11 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock" - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - flush_unopkg_cache() { /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 } remove_extension() { - check_for_running_ooo if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2xhtml.prerm writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.prerm --- writer2latex-1.0/debian/openoffice.org-writer2xhtml.prerm 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.prerm 2010-12-02 12:24:52.000000000 +0100 @@ -4,42 +4,11 @@ . /usr/share/debconf/confmodule -check_for_running_ooo() { - if [ -e /usr/lib/openoffice/program/bootstraprc ]; then - LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock" - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - echo "OpenOffice.org running!" >&2 - echo "" >&2 - echo -n "OpenOffice.org is running right now with pid " >&2 - echo -n "$PID." >&2 - echo " This can cause problems" >&2 - echo "with (de-)registration of components and extensions" >&2 - echo "Thus this package will fail to install" >&2 - echo "You should close all running instances of OpenOffice.org (including" >&2 - echo "any currently running Quickstarter) before proceeding with the package" >&2 - echo "upgrade." >&2 - exit 1 - else - db_input high shared/openofficeorg-running - db_go - # try again in case OOo got closed before hitting OK - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi - fi -} - flush_unopkg_cache() { /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 } remove_extension() { - check_for_running_ooo if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then INSTDIR=`mktemp -d` /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ diff -Nru writer2latex-1.0/debian/openoffice.org-writer2xhtml.templates writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.templates --- writer2latex-1.0/debian/openoffice.org-writer2xhtml.templates 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/openoffice.org-writer2xhtml.templates 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: shared/openofficeorg-running -Type: error -_Description: OpenOffice.org running - OpenOffice.org is running right now. This can cause problems with - (de-)registration of components and extensions. - . - You should close all running instances of OpenOffice.org (including - any currently running Quickstarter) before proceeding with the package - upgrade. - diff -Nru writer2latex-1.0/debian/rules writer2latex-1.0.2/debian/rules --- writer2latex-1.0/debian/rules 2010-12-02 12:24:52.000000000 +0100 +++ writer2latex-1.0.2/debian/rules 2010-12-02 12:24:52.000000000 +0100 @@ -36,7 +36,7 @@ build-indep: build-indep-stamp build-indep-stamp: configure-stamp - ant -DURE_HOME=/usr/lib/ure -DOFFICE_HOME=/usr/lib/openoffice/basis3.2 jar + ant -DURE_CLASSES=/usr/lib/ure/share/java -DOFFICE_CLASSES=/usr/lib/openoffice/basis3.2/program/classes jar ant javadoc ant oxt touch $@ diff -Nru writer2latex-1.0/source/distro/changelog.txt writer2latex-1.0.2/source/distro/changelog.txt --- writer2latex-1.0/source/distro/changelog.txt 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/distro/changelog.txt 2010-06-03 08:50:50.000000000 +0200 @@ -1,4 +1,19 @@ -Changelog for Writer2LaTeX version 0.5 -> 1.0 +Changelog for Writer2LaTeX version 0.5 -> 1.0.2 + +---------- version 1.0.2 final -------- + +[w2l] Bugfix: Display equations in flat XML are now again recognized correctly + +[all] Added Finnish translation from Samuli Selin + +---------- version 1.0.1 final -------- + +[w2x] Adapted to work with MathML without namespace (fix for change in OOo 3.2) + +[w2l] Adapted to work with MathML without namespace (fix for change in OOo 3.2) + +[all] OFFICE_HOME and URE_HOME in build.xml renamed to OFFICE_CLASSES and URE_CLASSES, + which should now point directly to the directory containing the jars ---------- version 1.0 final ---------- Los archivos binarios /tmp/Opr0Iue0KY/writer2latex-1.0/source/distro/doc/user-manual.odt y /tmp/TXQhC2nemI/writer2latex-1.0.2/source/distro/doc/user-manual.odt son distintos diff -Nru writer2latex-1.0/source/distro/History.txt writer2latex-1.0.2/source/distro/History.txt --- writer2latex-1.0/source/distro/History.txt 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/distro/History.txt 2010-06-03 08:50:50.000000000 +0200 @@ -1,6 +1,15 @@ Version history for Writer2LaTeX ================================ +Version 1.0.2 (May 2010) + - General: + - Added Finnish translation + - Another fix for slight change in formula representation in OOo 3.2 + +Version 1.0.1 (March 2010) + - General: + - Fix for slight change in formula representation in OOo 3.2 + Version 1.0 (September 2009) -Filters: - Changed to oxt format and separated into Writer2LaTeX and Writer2xhtml extensions diff -Nru writer2latex-1.0/source/distro/Readme.txt writer2latex-1.0.2/source/distro/Readme.txt --- writer2latex-1.0/source/distro/Readme.txt 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/distro/Readme.txt 2010-06-03 08:50:50.000000000 +0200 @@ -1,7 +1,7 @@ -Writer2LaTeX version 1.0 -======================== +Writer2LaTeX version 1.0.2 +========================== -This is the distribution of Writer2LaTeX version 1.0 +This is the distribution of Writer2LaTeX version 1.0.2 Latest version can be found at the web site http://writer2latex.sourceforge.net @@ -14,5 +14,5 @@ writer2latex (at) gmail.com -September 2009 +May 2010 Henrik Just diff -Nru writer2latex-1.0/source/java/writer2latex/api/ConverterFactory.java writer2latex-1.0.2/source/java/writer2latex/api/ConverterFactory.java --- writer2latex-1.0/source/java/writer2latex/api/ConverterFactory.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/api/ConverterFactory.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-09-21) + * Version 1.0.2 (2010-05-31) * */ @@ -32,12 +32,13 @@ public class ConverterFactory { // Version information - private static final String VERSION = "1.0"; - private static final String DATE = "2008-09-21"; + private static final String VERSION = "1.0.2"; + private static final String DATE = "2010-05-31"; /** Return version information * @return the Writer2LaTeX version in the form - * (major version).(minor version).(development version).(patch level) + * (major version).(minor version).(patch level) + * an uneven minor version indicates a development release */ public static String getVersion() { return VERSION; } diff -Nru writer2latex-1.0/source/java/writer2latex/latex/DrawConverter.java writer2latex-1.0.2/source/java/writer2latex/latex/DrawConverter.java --- writer2latex-1.0/source/java/writer2latex/latex/DrawConverter.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/latex/DrawConverter.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-05-22) + * Version 1.0.1 (2010-03-01) * */ @@ -153,7 +153,10 @@ try { Document settings = ((EmbeddedXMLObject) object).getSettingsDOM(); Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); - Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH); // Since OOo3.2 + if (formula==null) { + formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + } ldp.append(" $") .append(palette.getMathmlCv().convert(settings,formula)) .append("$"); @@ -184,7 +187,10 @@ } } else { // flat xml, object is contained in node - Element formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(node,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + } if (formula!=null) { ldp.append(" $") .append(palette.getMathmlCv().convert(null,formula)) diff -Nru writer2latex-1.0/source/java/writer2latex/latex/MathmlConverter.java writer2latex-1.0.2/source/java/writer2latex/latex/MathmlConverter.java --- writer2latex-1.0/source/java/writer2latex/latex/MathmlConverter.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/latex/MathmlConverter.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-22) + * Version 1.0.2 (2010-04-29) * */ @@ -71,9 +71,15 @@ // TODO: Use settings to determine display mode/text mode // formula must be a math:math node // First try to find a StarMath annotation - Node semantics = Misc.getChildByTagName(formula,XMLString.MATH_SEMANTICS); + Node semantics = Misc.getChildByTagName(formula,XMLString.SEMANTICS); // Since OOo 3.2 + if (semantics==null) { + semantics = Misc.getChildByTagName(formula,XMLString.MATH_SEMANTICS); + } if (semantics!=null) { - Node annotation = Misc.getChildByTagName(semantics,XMLString.MATH_ANNOTATION); + Node annotation = Misc.getChildByTagName(semantics,XMLString.ANNOTATION); // Since OOo 3.2 + if (annotation==null) { + annotation = Misc.getChildByTagName(semantics,XMLString.MATH_ANNOTATION); + } if (annotation!=null) { String sStarMath = ""; if (annotation.hasChildNodes()) { @@ -209,7 +215,11 @@ if (MIMETypes.MATH.equals(object.getType()) || MIMETypes.ODF.equals(object.getType())) { // Formula! try { Document formuladoc = ((EmbeddedXMLObject) object).getContentDOM(); - return Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(formuladoc,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(formuladoc,XMLString.MATH_MATH); + } + return formula; } catch (org.xml.sax.SAXException e) { e.printStackTrace(); @@ -222,7 +232,11 @@ } } else { // flat xml, object is contained in node - return Misc.getChildByTagName(node,XMLString.MATH_MATH); + Element formula = Misc.getChildByTagName(node,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(node,XMLString.MATH_MATH); + } + return formula; } return null; } diff -Nru writer2latex-1.0/source/java/writer2latex/office/XMLString.java writer2latex-1.0.2/source/java/writer2latex/office/XMLString.java --- writer2latex-1.0/source/java/writer2latex/office/XMLString.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/office/XMLString.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-11-10) + * Version 1.0.1 (2010-02-28) * */ @@ -443,5 +443,9 @@ public static final String MATH_MATH="math:math"; public static final String MATH_SEMANTICS="math:semantics"; public static final String MATH_ANNOTATION="math:annotation"; + // math without namespace + public static final String MATH="math"; + public static final String SEMANTICS="semantics"; + public static final String ANNOTATION="annotation"; } diff -Nru writer2latex-1.0/source/java/writer2latex/xhtml/DrawConverter.java writer2latex-1.0.2/source/java/writer2latex/xhtml/DrawConverter.java --- writer2latex-1.0/source/java/writer2latex/xhtml/DrawConverter.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/xhtml/DrawConverter.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-03-08) + * Version 1.0.1 (2010-03-01) * */ @@ -336,7 +336,10 @@ } } else { // flat xml format - Node formula = Misc.getChildByTagName(onode,XMLString.MATH_MATH); + Node formula = Misc.getChildByTagName(onode,XMLString.MATH); // Since OOo 3.2 + if (formula==null) { + formula = Misc.getChildByTagName(onode,XMLString.MATH_MATH); + } if (formula != null) { hnode.appendChild(converter.createTextNode(" ")); getMathCv().convert(formula,hnode); diff -Nru writer2latex-1.0/source/java/writer2latex/xhtml/L10n.java writer2latex-1.0.2/source/java/writer2latex/xhtml/L10n.java --- writer2latex-1.0/source/java/writer2latex/xhtml/L10n.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/xhtml/L10n.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-09-07) + * Version 1.0.2 (2010-04-26) * */ @@ -179,6 +179,20 @@ case DOCUMENT: return "Dokument"; } } + if (sLocale.startsWith("fi")) { // finnish + switch (nString) { + case UP: return "Yl\u00f6s"; + case FIRST : return "Ensimm\u00e4inen"; + case PREVIOUS : return "Edellinen"; + case NEXT : return "Seuraava"; + case LAST : return "Viimeinen"; + case CONTENTS : return "Sis\u00e4lt\u00f6"; + case INDEX : return "Indeksi"; + case HOME : return "Koti"; + case DIRECTORY: return "Hakemisto"; + case DOCUMENT: return "Dokumentti"; + } + } if (sLocale.startsWith("ru")) { // russian switch (nString) { case UP: return "\u0412\u0432\u0435\u0440\u0445"; diff -Nru writer2latex-1.0/source/java/writer2latex/xhtml/MathConverter.java writer2latex-1.0.2/source/java/writer2latex/xhtml/MathConverter.java --- writer2latex-1.0/source/java/writer2latex/xhtml/MathConverter.java 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/java/writer2latex/xhtml/MathConverter.java 2010-06-03 08:50:50.000000000 +0200 @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2009-02-19) + * Version 1.0.1 (2010-02-28) * */ @@ -51,8 +51,10 @@ } else { Document htmlDOM = hnode.getOwnerDocument(); - NodeList annotationList - = ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION); + NodeList annotationList = ((Element) onode).getElementsByTagName(XMLString.ANNOTATION); // Since OOo 3.2 + if (annotationList.getLength()==0) { + annotationList = ((Element) onode).getElementsByTagName(XMLString.MATH_ANNOTATION); + } if (annotationList.getLength()>0 && annotationList.item(0).hasChildNodes()) { // Insert the StarMath annotation as a kbd element Element kbd = htmlDOM.createElement("kbd"); @@ -74,10 +76,18 @@ public void convertNode(Node onode, Node hnode) { if (onode.getNodeType()==Node.ELEMENT_NODE) { - if (onode.getNodeName().equals(XMLString.MATH_SEMANTICS)) { + if (onode.getNodeName().equals(XMLString.SEMANTICS)) { // Since OOo 3.2 + // ignore this construction + convertNodeList(onode.getChildNodes(),hnode); + } + else if (onode.getNodeName().equals(XMLString.MATH_SEMANTICS)) { // ignore this construction convertNodeList(onode.getChildNodes(),hnode); } + else if (onode.getNodeName().equals(XMLString.ANNOTATION)) { // Since OOo 3.2 + // ignore the annotation (StarMath) completely + // (mozilla renders it for some reason) + } else if (onode.getNodeName().equals(XMLString.MATH_ANNOTATION)) { // ignore the annotation (StarMath) completely // (mozilla renders it for some reason) @@ -116,7 +126,8 @@ private String stripNamespace(String s) { int nPos = s.indexOf(':'); - return s.substring(nPos+1); + if (nPos>-1) { return s.substring(nPos+1); } + else { return s; } } // OOo exports some characters (from the OpenSymbol/StarSymbol font) diff -Nru writer2latex-1.0/source/oxt/writer2latex/desc_fi.txt writer2latex-1.0.2/source/oxt/writer2latex/desc_fi.txt --- writer2latex-1.0/source/oxt/writer2latex/desc_fi.txt 1970-01-01 01:00:00.000000000 +0100 +++ writer2latex-1.0.2/source/oxt/writer2latex/desc_fi.txt 2010-06-03 08:50:50.000000000 +0200 @@ -0,0 +1 @@ +Writer2Latex:illa on mahdollista viedä dockumentti LaTeX:iin tai BibTeX:iin \ No hay ningún carácter de nueva línea al final del archivo diff -Nru writer2latex-1.0/source/oxt/writer2latex/description.xml writer2latex-1.0.2/source/oxt/writer2latex/description.xml --- writer2latex-1.0/source/oxt/writer2latex/description.xml 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/oxt/writer2latex/description.xml 2010-06-03 08:50:50.000000000 +0200 @@ -5,7 +5,7 @@ - +

@@ -17,6 +17,7 @@ Writer2Latex Exportfilter Writer2LaTeX exportfilters Writer2LaTeX filtros para exportar + Writer2Latex vienti suodattimet Filtres d'exportation Writer2LaTeX Filtri di esportazione Writer2LaTeX Filtros de exportação do Writer2LaTeX @@ -33,6 +34,7 @@ + diff -Nru writer2latex-1.0/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties writer2latex-1.0.2/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties --- writer2latex-1.0/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties 1970-01-01 01:00:00.000000000 +0100 +++ writer2latex-1.0.2/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties 2010-06-03 08:50:50.000000000 +0200 @@ -0,0 +1,111 @@ +# LaTeXOptions strings=Your language +0.LaTeXOptions.HelpText= +1.LaTeXOptions.Title=LaTeX asetukset (Writer2LaTeX) +2.LaTeXOptions.FixedLine1.HelpText= +3.LaTeXOptions.FixedLine1.Label= +4.LaTeXOptions.GeneralLabel.HelpText= +5.LaTeXOptions.GeneralLabel.Label=Yleiset asetukset +6.LaTeXOptions.ConfigLabel.HelpText= +7.LaTeXOptions.ConfigLabel.Label=LaTeX formaatti +8.LaTeXOptions.Config.HelpText= +137.Config.StringItemList=Ultra-clean artikkeli +138.Config.StringItemList=Clean artikkeli +139.Config.StringItemList=Oletus +140.Config.StringItemList=Tulostukseen optimoitu +141.Config.StringItemList=N\u00e4yt\u00f6lle optimoitu (pdf) +142.Config.StringItemList=Custom +15.LaTeXOptions.BackendLabel.HelpText= +16.LaTeXOptions.BackendLabel.Label=Backend +17.LaTeXOptions.Backend.HelpText= +116.Backend.StringItemList=Generic +117.Backend.StringItemList=Pdf (pdfTeX) +118.Backend.StringItemList=Postscript (dvips) +119.Backend.StringItemList=Unspecified +22.LaTeXOptions.InputencodingLabel.HelpText= +23.LaTeXOptions.InputencodingLabel.Label=Merkist\u00f6n koodaus +24.LaTeXOptions.Inputencoding.HelpText= +120.Inputencoding.StringItemList=ASCII (US) +121.Inputencoding.StringItemList=L\u00e4nsi-Eurooppalainen (ISO 8859-1) +122.Inputencoding.StringItemList=It\u00e4-Eurooppalainen (ISO 8859-2) +123.Inputencoding.StringItemList=Latina/Kreikka (ISO 8859-7) +124.Inputencoding.StringItemList=Mircosoft It\u00e4-Eurooppa (CP1251) +125.Inputencoding.StringItemList=Miicrosoft Kyriilinen (CP1251) +126.Inputencoding.StringItemList=Ven\u00e4j\u00e4 (koi8-r) +127.Inputencoding.StringItemList=Unicode (UTF8) +33.LaTeXOptions.Multilingual.HelpText= +34.LaTeXOptions.Multilingual.Label=Salli monikielisyyden tuki +35.LaTeXOptions.GreekMath.HelpText= +36.LaTeXOptions.GreekMath.Label=K\u00e4yt\u00e4 Kreikkalaisia kirjaimia symbooleina +37.LaTeXOptions.AdditionalSymbols.HelpText= +38.LaTeXOptions.AdditionalSymbols.Label=Tue muita symbooleja +39.LaTeXOptions.BibliographyLabel.HelpText= +40.LaTeXOptions.BibliographyLabel.Label=Bibiliografia +41.LaTeXOptions.UseBibtex.HelpText= +42.LaTeXOptions.UseBibtex.Label=K\u00e4yt\u00e4 BibTeX:i\u00e4 bibliografiaan +43.LaTeXOptions.BibtexStyleLabel.HelpText= +44.LaTeXOptions.BibtexStyleLabel.Label=BibTeX tyyli +45.LaTeXOptions.BibtexStyle.HelpText= +46.BibtexStyle.StringItemList=plain +47.BibtexStyle.StringItemList=unsrt +48.BibtexStyle.StringItemList=alpha +49.BibtexStyle.StringItemList=abbrv +50.LaTeXOptions.BibtexStyle.Text= +51.LaTeXOptions.FilesLabel.HelpText= +52.LaTeXOptions.FilesLabel.Label=Tiedostot +53.LaTeXOptions.WrapLines.HelpText= +54.LaTeXOptions.WrapLines.Label=Automaattinen rivitys +55.LaTeXOptions.WrapLinesAfterLabel.HelpText= +56.LaTeXOptions.WrapLinesAfterLabel.Label=Merkin j\u00e4lkeen +57.LaTeXOptions.WrapLinesAfter.HelpText= +58.LaTeXOptions.SplitLinkedSections.HelpText= +59.LaTeXOptions.SplitLinkedSections.Label=Jaa dokumentti linkityksen kohdalla (linked sections) +60.LaTeXOptions.SplitToplevelSections.HelpText= +61.LaTeXOptions.SplitToplevelSections.Label=Jaa dokumentti lukujen kohdalta (top level sections) +62.LaTeXOptions.SaveImagesInSubdir.HelpText= +63.LaTeXOptions.SaveImagesInSubdir.Label=Tallenna kuvat alakansioon +64.LaTeXOptions.SpecialContentLabel.HelpText= +65.LaTeXOptions.SpecialContentLabel.Label=Muut asetukset +66.LaTeXOptions.NotesLabel.HelpText= +67.LaTeXOptions.NotesLabel.Label=Vie huomautukset +68.LaTeXOptions.Notes.HelpText= +128.Notes.StringItemList=\u00c4l\u00e4 vie +129.Notes.StringItemList=Kommenttina +130.Notes.StringItemList=Marginaaliin +131.Notes.StringItemList=PDF sivuhuomautuksena +73.LaTeXOptions.Metadata.HelpText= +74.LaTeXOptions.Metadata.Label=Vie dokumentin ominaisuudet (metadata) +75.LaTeXOptions.FiguresAndTablesLabel.HelpText= +76.LaTeXOptions.FiguresAndTablesLabel.Label=Kuviot ja taulukot +77.LaTeXOptions.OriginalImageSize.HelpText= +78.LaTeXOptions.OriginalImageSize.Label=K\u00e4yt\u00e4 alkuper\u00e4ist\u00e4 kokoa +79.LaTeXOptions.OptimizeSimpleTables.HelpText= +80.LaTeXOptions.OptimizeSimpleTables.Label=Optimoi yksinkertaiset taulukot +81.LaTeXOptions.SimpleTableLimitLabel.HelpText= +82.LaTeXOptions.SimpleTableLimitLabel.Label=Maksimi leveys merkkein\u00e4 +83.LaTeXOptions.SimpleTableLimit.HelpText= +84.LaTeXOptions.FloatTables.HelpText= +85.LaTeXOptions.FloatTables.Label=Kelluva taulukko +86.LaTeXOptions.FloatFigures.HelpText= +87.LaTeXOptions.FloatFigures.Label=Kelluva kuvio +88.LaTeXOptions.FloatOptionsLabel.HelpText= +89.LaTeXOptions.FloatOptionsLabel.Label=Objektin sijoitus +90.LaTeXOptions.FloatOptions.HelpText= +132.FloatOptions.StringItemList=Sivun yl\u00e4- tai alareunassa ([tb]) +133.FloatOptions.StringItemList=Sivun yl\u00e4reunassa ([t]) +134.FloatOptions.StringItemList=Sivun alareunassa ([b]) +135.FloatOptions.StringItemList=T\u00e4ss\u00e4 tai sivun yl\u00e4reunassa ([ht]) +136.FloatOptions.StringItemList=T\u00e4ss\u00e4 tai sivun alareunassa([hb]) +96.LaTeXOptions.AutoCorrectLabel.HelpText= +97.LaTeXOptions.AutoCorrectLabel.Label=Automaattinen korjaus +98.LaTeXOptions.IgnoreHardPageBreaks.HelpText= +99.LaTeXOptions.IgnoreHardPageBreaks.Label=Ohita pakotetut sivunvaihdot +100.LaTeXOptions.IgnoreHardLineBreaks.HelpText= +101.LaTeXOptions.IgnoreHardLineBreaks.Label=Ohita pakotettut rivinvaihdot +102.LaTeXOptions.IgnoreEmptyParagraphs.HelpText= +103.LaTeXOptions.IgnoreEmptyParagraphs.Label=Ohita tyhj\u00e4t kappaleet +104.LaTeXOptions.IgnoreDoubleSpaces.HelpText= +105.LaTeXOptions.IgnoreDoubleSpaces.Label=Ohita kaksoisv\u00e4lily\u00f6nnit +106.LaTeXOptions.ExportButton.HelpText= +107.LaTeXOptions.ExportButton.Label=Vie +108.LaTeXOptions.CancelButton.HelpText= +109.LaTeXOptions.CancelButton.Label=Peruuta diff -Nru writer2latex-1.0/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl writer2latex-1.0.2/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl --- writer2latex-1.0/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl 2010-06-03 08:50:50.000000000 +0200 @@ -64,7 +64,7 @@ - + diff -Nru writer2latex-1.0/source/oxt/writer2xhtml/desc_fi writer2latex-1.0.2/source/oxt/writer2xhtml/desc_fi --- writer2latex-1.0/source/oxt/writer2xhtml/desc_fi 1970-01-01 01:00:00.000000000 +0100 +++ writer2latex-1.0.2/source/oxt/writer2xhtml/desc_fi 2010-06-03 08:50:50.000000000 +0200 @@ -0,0 +1 @@ +Writer2xhtml:llä on mahdollista viedä sekä writerin että Calcin dokumentteja XHTML ja XHMTL+MathML muotoihin \ No hay ningún carácter de nueva línea al final del archivo diff -Nru writer2latex-1.0/source/oxt/writer2xhtml/description.xml writer2latex-1.0.2/source/oxt/writer2xhtml/description.xml --- writer2latex-1.0/source/oxt/writer2xhtml/description.xml 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/oxt/writer2xhtml/description.xml 2010-06-03 08:50:50.000000000 +0200 @@ -5,7 +5,7 @@ - +

@@ -17,6 +17,7 @@ Writer2xhtml Exportfilter Writer2xhtml exportfilters Writer2xhtml filtros para exportar + Writer2xhtml vienti suodattimet Filtres d'exportation Writer2xhtml Filtri di esportazione Writer2xhtml Filtros de exportação Writer2xhtml diff -Nru writer2latex-1.0/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_fi_FI.properties writer2latex-1.0.2/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_fi_FI.properties --- writer2latex-1.0/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_fi_FI.properties 1970-01-01 01:00:00.000000000 +0100 +++ writer2latex-1.0.2/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_fi_FI.properties 2010-06-03 08:50:50.000000000 +0200 @@ -0,0 +1,131 @@ +# Strings for Dialog Library W2XDialogs=Your language +0.XhtmlOptions.HelpText= +1.XhtmlOptions.Title=XHTML asetukset (Writer2xhtml) +2.XhtmlOptions.StyleLabel.HelpText= +3.XhtmlOptions.StyleLabel.Label=Tyylit +4.XhtmlOptions.ConfigLabel.HelpText= +5.XhtmlOptions.ConfigLabel.Label=K\u00e4yt\u00e4 tyyli\u00e4 +6.XhtmlOptions.Config.HelpText= +17.XhtmlOptions.ScalingLabel.HelpText= +18.XhtmlOptions.ScalingLabel.Label=Skaalaus +19.XhtmlOptions.Scaling.HelpText= +20.XhtmlOptions.ScalingPercentLabel.HelpText= +21.XhtmlOptions.ScalingPercentLabel.Label=% +22.XhtmlOptions.ColumnScalingLabel.HelpText= +23.XhtmlOptions.ColumnScalingLabel.Label=Sarakkeen skaalaus +24.XhtmlOptions.ColumnScaling.HelpText= +25.XhtmlOptions.ColumnScalingPercentLabel.HelpText= +26.XhtmlOptions.ColumnScalingPercentLabel.Label= +27.XhtmlOptions.ConvertToPx.HelpText= +28.XhtmlOptions.ConvertToPx.Label=Muunna yksik\u00f6t pikseleiksi (px) +29.XhtmlOptions.OriginalImageSize.HelpText= +30.XhtmlOptions.OriginalImageSize.Label=K\u00e4yt\u00e4 alkuper\u00e4ist\u00e4 kuvakokoa +31.XhtmlOptions.SpecialContentLabel.HelpText= +32.XhtmlOptions.SpecialContentLabel.Label=Muut asetukset +33.XhtmlOptions.Notes.HelpText= +34.XhtmlOptions.Notes.Label=Vie huomautukset +35.XhtmlOptions.UseDublinCore.HelpText= +36.XhtmlOptions.UseDublinCore.Label=Vie dokumentin ominaisuudet (Dublin Core Metadata) +37.XhtmlOptions.AutoCorrectLabel.HelpText= +38.XhtmlOptions.AutoCorrectLabel.Label=Automaattinen korjaus +39.XhtmlOptions.IgnoreHardLineBreaks.HelpText= +40.XhtmlOptions.IgnoreHardLineBreaks.Label=Ohita pakotetut rivinvaihdot +41.XhtmlOptions.IgnoreEmptyParagraphs.HelpText= +42.XhtmlOptions.IgnoreEmptyParagraphs.Label=Ohita tyhj\u00e4t kappaleet +43.XhtmlOptions.IgnoreDoubleSpaces.HelpText= +44.XhtmlOptions.IgnoreDoubleSpaces.Label=Ohita kaksoisv\u00e4lily\u00f6nnit +45.XhtmlOptions.FilesLabel.HelpText= +46.XhtmlOptions.FilesLabel.Label=Tiedostot +47.XhtmlOptions.Split.HelpText= +48.XhtmlOptions.Split.Label=Jaa dokumentti otsikon kohdalta +49.XhtmlOptions.SplitLevelLabel.HelpText= +50.XhtmlOptions.SplitLevelLabel.Label=Otsikkotasot +51.XhtmlOptions.SplitLevel.HelpText= +52.SplitLevel.StringItemList=1 +53.SplitLevel.StringItemList=2 +54.SplitLevel.StringItemList=3 +55.SplitLevel.StringItemList=4 +56.SplitLevel.StringItemList=5 +57.SplitLevel.StringItemList=6 +58.XhtmlOptions.RepeatLevelsLabel.HelpText= +59.XhtmlOptions.RepeatLevelsLabel.Label=Repeat heading levels +60.XhtmlOptions.RepeatLevels.HelpText= +61.RepeatLevels.StringItemList=0 +62.RepeatLevels.StringItemList=1 +63.RepeatLevels.StringItemList=2 +64.RepeatLevels.StringItemList=3 +65.RepeatLevels.StringItemList=4 +66.RepeatLevels.StringItemList=5 +67.XhtmlOptions.SaveImagesInSubdir.HelpText= +68.XhtmlOptions.SaveImagesInSubdir.Label=Tallenna kuva alakansioon +69.XhtmlOptions.XsltPathLabel.HelpText= +70.XhtmlOptions.XsltPathLabel.Label=XSLT polku +71.XhtmlOptions.XsltPath.HelpText= +72.XhtmlOptions.XsltPath.Text= +73.XhtmlOptions.ExportButton.HelpText= +74.XhtmlOptions.ExportButton.Label=Vie +75.XhtmlOptions.CancelButton.HelpText= +76.XhtmlOptions.CancelButton.Label=Peruuta +77.XhtmlOptionsCalc.HelpText= +78.XhtmlOptionsCalc.Title=XHTML asetukset (Calc2Latex) +79.XhtmlOptionsCalc.StyleLabel.HelpText= +80.XhtmlOptionsCalc.StyleLabel.Label=Tyyli +81.XhtmlOptionsCalc.ConfigLabel.HelpText= +82.XhtmlOptionsCalc.ConfigLabel.Label=K\u00e4yt\u00e4 tyyli\u00e4 +83.XhtmlOptionsCalc.Config.HelpText= +86.XhtmlOptionsCalc.ScalingLabel.HelpText= +87.XhtmlOptionsCalc.ScalingLabel.Label=Skaalaus +88.XhtmlOptionsCalc.Scaling.HelpText= +89.XhtmlOptionsCalc.ScalingPercentLabel.HelpText= +90.XhtmlOptionsCalc.ScalingPercentLabel.Label=% +91.XhtmlOptionsCalc.ColumnScalingLabel.HelpText= +92.XhtmlOptionsCalc.ColumnScalingLabel.Label=Sarakkeen skaalaus +93.XhtmlOptionsCalc.ColumnScaling.HelpText= +94.XhtmlOptionsCalc.ColumnScalingPercentLabel.HelpText= +95.XhtmlOptionsCalc.ColumnScalingPercentLabel.Label=% +96.XhtmlOptionsCalc.ConvertToPx.HelpText= +97.XhtmlOptionsCalc.ConvertToPx.Label=Muunna yksik\u00f6t pikseleiksi (px) +98.XhtmlOptionsCalc.OriginalImageSize.HelpText= +99.XhtmlOptionsCalc.OriginalImageSize.Label=K\u00e4yt\u00e4 alkuper\u00e4ist\u00e4 kuvakokoa +100.XhtmlOptionsCalc.SpecialContentLabel.HelpText= +101.XhtmlOptionsCalc.SpecialContentLabel.Label=Muut asetukset +102.XhtmlOptionsCalc.Notes.HelpText= +103.XhtmlOptionsCalc.Notes.Label=Vie huomautukset +104.XhtmlOptionsCalc.UseDublinCore.HelpText= +105.XhtmlOptionsCalc.UseDublinCore.Label=Vie dokumentin ominaisuudet (Dublin Core Metadata) +106.XhtmlOptionsCalc.SheetsLabel.HelpText= +107.XhtmlOptionsCalc.SheetsLabel.Label=Laskentataulukon sivu +108.XhtmlOptionsCalc.DisplayHiddenSheets.HelpText= +109.XhtmlOptionsCalc.DisplayHiddenSheets.Label=N\u00e4yt\u00e4 piiloitetut sivut +110.XhtmlOptionsCalc.DisplayHiddenRowsCols.HelpText= +111.XhtmlOptionsCalc.DisplayHiddenRowsCols.Label=N\u00e4yt\u00e4 piiloitetut sivut +112.XhtmlOptionsCalc.DisplayFilteredRowsCols.HelpText= +113.XhtmlOptionsCalc.DisplayFilteredRowsCols.Label=N\u00e4yt\u00e4 suodatetut rivit ja sarakkeet +114.XhtmlOptionsCalc.ApplyPrintRanges.HelpText= +115.XhtmlOptionsCalc.ApplyPrintRanges.Label=K\u00e4yt\u00e4 tulostusaluetta +116.XhtmlOptionsCalc.UseTitleAsHeading.HelpText= +117.XhtmlOptionsCalc.UseTitleAsHeading.Label=Use title as heading +118.XhtmlOptionsCalc.UseSheetNamesAsHeadings.HelpText= +119.XhtmlOptionsCalc.UseSheetNamesAsHeadings.Label=Use sheet names as headings +120.XhtmlOptionsCalc.FilesLabel.HelpText= +121.XhtmlOptionsCalc.FilesLabel.Label=Tiedostot +122.XhtmlOptionsCalc.CalcSplit.HelpText= +123.XhtmlOptionsCalc.CalcSplit.Label=Tallenna sivut omiksi tiedostoiksi +124.XhtmlOptionsCalc.SaveImagesInSubdir.HelpText= +125.XhtmlOptionsCalc.SaveImagesInSubdir.Label=Tallenna kuvat alakansioon +126.XhtmlOptionsCalc.ExportButton.HelpText= +127.XhtmlOptionsCalc.ExportButton.Label=Vie +128.XhtmlOptionsCalc.CancelButton.HelpText= +129.XhtmlOptionsCalc.CancelButton.Label=Peruuta +130.Config.StringItemList=Alkuper\u00e4inen muotoilu +131.Config.StringItemList=Suklaa +132.Config.StringItemList=Keskiy\u00f6 +133.Config.StringItemList=Moderni +134.Config.StringItemList=Vanhanaikainen +135.Config.StringItemList=Steely +136.Config.StringItemList=Sveitsil\u00e4inen +137.Config.StringItemList=Perinteinen +138.Config.StringItemList=Ultramariini +139.Config.StringItemList=Custom +140.Config.StringItemList=Alkuper\u00e4inen muotoilu +141.Config.StringItemList=Custom diff -Nru writer2latex-1.0/source/oxt/xhtml-config-sample/description.xml writer2latex-1.0.2/source/oxt/xhtml-config-sample/description.xml --- writer2latex-1.0/source/oxt/xhtml-config-sample/description.xml 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/oxt/xhtml-config-sample/description.xml 2010-06-03 08:50:50.000000000 +0200 @@ -2,5 +2,5 @@ - + diff -Nru writer2latex-1.0/source/readme-source.txt writer2latex-1.0.2/source/readme-source.txt --- writer2latex-1.0/source/readme-source.txt 2009-09-21 09:05:39.000000000 +0200 +++ writer2latex-1.0.2/source/readme-source.txt 2010-06-03 08:50:50.000000000 +0200 @@ -1,7 +1,7 @@ -Writer2LaTeX source version 1.0 -=============================== +Writer2LaTeX source version 1.0.2 +================================= -Writer2LaTeX is (c) 2002-2009 by Henrik Just. +Writer2LaTeX is (c) 2002-2010 by Henrik Just. The source is available under the terms and conditions of the GNU LESSER GENERAL PUBLIC LICENSE, version 2.1. Please see the file COPYING.TXT for details. @@ -61,7 +61,7 @@ clean -Henrik Just, September 2009 +Henrik Just, May 2010 Thanks to Michael Niedermair for writing the original ant build file