diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt index bd85948..9f96f77 100644 --- a/source/distro/Readme.txt +++ b/source/distro/Readme.txt @@ -14,5 +14,5 @@ Bugs and feature requests should be reported to writer2latex (at) gmail.com -February 2015 +May 2015 Henrik Just diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 1c6f212..fff1bea 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/writer2latex/LaTeXOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java index a0aa131..3616925 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2014 by Henrik Just + * Copyright: 2002-2015 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2014-11-14) + * Version 1.6 (2015-05-12) * */ @@ -28,10 +28,6 @@ package org.openoffice.da.comp.writer2latex; import com.sun.star.awt.XDialog; import com.sun.star.beans.XPropertySet; -//import com.sun.star.frame.XDesktop; -//import com.sun.star.lang.XComponent; -//import com.sun.star.text.XTextFieldsSupplier; -//import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; @@ -56,19 +52,19 @@ public class LaTeXOptionsDialog extends OptionsDialogBase { private static final String[] FONT_VALUES = { "default", "cmbright", "ccfonts", "ccfonts-euler", "iwona", "kurier", "anttor", "kmath-kerkis", - "millennial", "fouriernc", + "fouriernc", "pxfonts", "mathpazo", "mathpple", - "txfonts", "mathtime", "mathptmx", - "mbtimes", "arev", - "charter-mathdesign", "garamond-mathdesign", "utopia-mathdesign", "fourier" }; + "txfonts", "mathptmx", + "arev", + "charter-mathdesign", "utopia-mathdesign", "fourier" }; private static final String[] FONT_NAMES = { "Default (Computer Modern)", "CM Bright", "Concrete", "Concrete + Euler Math", "Iwona", "Kurier", "Antykwa Toru\u0144ska", "Kerkis", - "New Century Schoolbook + Millennial Math", "New Century Schoolbook + Fourier Math", + "New Century Schoolbook + Fourier Math", "Palatino + PXfonts Math", "Palatino + Pazo Math", "Palatino + Euler Math", - "Times + TXfonts Math", "Times + Belleek Math", "Times + Symbol", - "Omega Serif + Omega Math", "Arev Sans + Arev Math", - "Bitstream Charter + Math Design", "URW Garamond + Math Design", "Utopia + Math Design", "Utopia + Fourier Math" }; + "Times + TXfonts Math", "Times + Symbol", + "Arev Sans + Arev Math", + "Bitstream Charter + Math Design", "Utopia + Math Design", "Utopia + Fourier Math" }; /** The component will be registered under this name. */ diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 1ffcec4..6e35579 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.6 (2015-05-05) + * Version 1.6 (2015-05-12) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.5.2"; - private static final String DATE = "2015-05-05"; + private static final String DATE = "2015-05-12"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/latex/i18n/ClassicI18n.java b/source/java/writer2latex/latex/i18n/ClassicI18n.java index 94a8bf2..d0ff3e2 100644 --- a/source/java/writer2latex/latex/i18n/ClassicI18n.java +++ b/source/java/writer2latex/latex/i18n/ClassicI18n.java @@ -16,32 +16,32 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2014 by Henrik Just + * Copyright: 2002-2015 by Henrik Just * * All Rights Reserved. * - * Version 1.6 (2014-11-14) + * Version 1.6 (2015-05-12) * */ package writer2latex.latex.i18n; -import java.io.*; +import java.io.InputStream; import java.util.Hashtable; import java.util.Stack; -//import java.util.Vector; -//import java.util.Enumeration; import java.util.Iterator; import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParser; import writer2latex.util.CSVList; -import writer2latex.office.*; import writer2latex.latex.LaTeXConfig; import writer2latex.latex.LaTeXDocumentPortion; import writer2latex.latex.ConverterPalette; import writer2latex.latex.util.BeforeAfter; +import writer2latex.office.OfficeReader; +import writer2latex.office.StyleWithProperties; +import writer2latex.office.XMLString; /** This class (and the helpers in the same package) takes care of i18n in * Writer2LaTeX. In classic LaTeX, i18n is a mixture of inputencodings, fontencodings @@ -292,9 +292,9 @@ public class ClassicI18n extends I18n { */ public void appendDeclarations(LaTeXDocumentPortion pack, LaTeXDocumentPortion decl) { useInputenc(pack); - useBabel(pack); useSymbolFonts(pack); useTextFonts(pack); + useBabel(pack); } private void useInputenc(LaTeXDocumentPortion ldp) { @@ -428,9 +428,6 @@ public class ClassicI18n extends I18n { else if ("kmath-kerkis".equals(sFont)) { // Kerkis ldp.append("\\usepackage{kmath,kerkis}"); } - else if ("millennial".equals(sFont)) { // New Century Schoolbook + Millennial - ldp.append("\\usepackage{millennial}"); - } else if ("fouriernc".equals(sFont)) { // New Century Schoolbook + Fourier ldp.append("\\usepackage{fouriernc}"); } @@ -446,24 +443,15 @@ public class ClassicI18n extends I18n { else if ("txfonts".equals(sFont)) { // Times + txfonts math ldp.append("\\usepackage[varg]{txfonts}"); } - else if ("mathtime".equals(sFont)) { // Times + Beleek math - ldp.append("\\usepackage{mathtime}"); - } else if ("mathptmx".equals(sFont)) { // Times + Symbol ldp.append("\\usepackage{mathptmx}"); } - else if ("mbtimes".equals(sFont)) { // Omega serif + Omega math - ldp.append("\\usepackage{mbtimes}"); - } else if ("arev".equals(sFont)) { // Arev Sans + Arev math ldp.append("\\usepackage{arev}"); } else if ("charter-mathdesign".equals(sFont)) { // Bitstream Charter + Math Design ldp.append("\\usepackage[charter]{mathdesign}"); } - else if ("garamond-mathdesign".equals(sFont)) { // URW Garamond + Math Design - ldp.append("\\usepackage[garamond]{mathdesign}"); - } else if ("utopia-mathdesign".equals(sFont)) { // Utopia + Math Design ldp.append("\\usepackage[utopia]{mathdesign}"); } diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp index 4c3a77f..b192419 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp @@ -118,7 +118,64 @@ Font Select a font scheme to use in the LaTeX document Use this option to select a font scheme to use in the LaTeX document. - (TODO) + + + + Default (Computer Modern) Computer Modern is + the original default font for TeX. + + + CM Bright + + + Concrete + + + Concrete + Euler Math + + + Iwona + + + Kurier + + + Antykwa Toruńska + + + Kerkis + + + New Century Schoolbook + Fourier Math + + + Palatino + PXfonts Math + + + Palatino + Pazo Math + + + Palatino + Euler Math + + + Times + TXfonts Math + + + Times + Symbol + + + Arev Sans + Arev Math + + + Bitstream Charter + Math Design + + + Utopia + Math Design + + + Utopia + Fourier Math + + Use greek letters as symbols diff --git a/source/readme-source.txt b/source/readme-source.txt index 25af01b..83b2287 100644 --- a/source/readme-source.txt +++ b/source/readme-source.txt @@ -124,7 +124,7 @@ In addition to oxt, the build file supports the following targets: clean -Henrik Just, February 2015 +Henrik Just, May 2015 Thanks to Michael Niedermair for writing the original ant build file