LaTeX font schemes

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

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

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",
+    		"txfonts", "mathptmx",
-    		"mbtimes", "arev",
+    		"arev",
-    		"charter-mathdesign", "garamond-mathdesign", "utopia-mathdesign", "fourier" };
+    		"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",
+    		"Times + TXfonts Math", "Times + Symbol",
-    		"Omega Serif + Omega Math", "Arev Sans + Arev Math",
+    		"Arev Sans + Arev Math",
-    		"Bitstream Charter + Math Design", "URW Garamond + Math Design", "Utopia + Math Design", "Utopia + Fourier Math" };    
+    		"Bitstream Charter + Math Design", "Utopia + Math Design", "Utopia + Fourier Math" };    
     
     /** The component will be registered under this name.
      */

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)<br/>

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}");
     	}

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

@@ -118,7 +118,64 @@
         <paragraph role="heading" level="3" xml-lang="en-US">Font</paragraph>
    		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:Font" visibility="hidden">Select a font scheme to use in the LaTeX document</ahelp></paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Use this option to select a font scheme to use in the LaTeX document.
-        (TODO)</paragraph>
+        </paragraph>
+        <list type="unordered">
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Default (Computer Modern)</emph> Computer Modern is
+				the original default font for TeX.</paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>CM Bright</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Concrete</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Concrete + Euler Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Iwona</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Kurier</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Antykwa Toru&#x0144;ska</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Kerkis</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>New Century Schoolbook + Fourier Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Palatino + PXfonts Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Palatino + Pazo Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Palatino + Euler Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Times + TXfonts Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Times + Symbol</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Arev Sans + Arev Math</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Bitstream Charter + Math Design</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Utopia + Math Design</emph> </paragraph>
+			</listitem>
+			<listitem>
+				<paragraph role="paragraph" xml-lang="en-US"><emph>Utopia + Fourier Math</emph> </paragraph>
+			</listitem>
+		</list>        
         
     	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:OptionsGreekMath" id="bm_options_greekmath"/>
         <paragraph role="heading" level="3" xml-lang="en-US">Use greek letters as symbols</paragraph>

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