A few minor bugfixes and improvements

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

source/distro/changelog.txt

@@ -2,6 +2,12 @@ Changelog for Writer2LaTeX version 1.2 -> 1.4
 
 ---------- version 1.3.2 alpha ----------
 
+[w2l] Replace usage of StringBuffer with StringBuilder everywhere (marginal optimization)
+
+[w2l] The standard configurations pdfprint.xml and pdfscreen.xml no longer requires ooomath.sty
+
+[w2l] A bookmark in a heading no longer results in an optional argument to \section commands 
+ 
 [w2l] New option display_hidden_text (default false) to toggle whether or not hidden text should be included in
   the export (there is currently no user interface for this option)
 

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

@@ -20,7 +20,7 @@
 *
 *  All Rights Reserved.
 * 
-*  Version 1.4 (2014-08-05)
+*  Version 1.4 (2014-09-16)
 *
 */ 
 
@@ -437,7 +437,7 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta
 					if (xIs!=null) {
 						InputStream is = new XInputStreamToInputStreamAdapter(xIs);
 						BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-						StringBuffer buf = new StringBuffer();
+						StringBuilder buf = new StringBuilder();
 						String sLine;
 						try {
 							while ((sLine = reader.readLine())!=null) {

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

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.3.1 (2014-08-04)
+ *  Version 1.4 (2014-09-16)
  *
  */ 
  
@@ -403,7 +403,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
         		Object resources = XPropertySetHelper.getPropertyValue(xCfgProps,"Resources");
         		XNameAccess xResourceNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,resources);
         		if (xResourceNameAccess!=null) {
-        			StringBuffer buf = new StringBuffer();
+        			StringBuilder buf = new StringBuilder();
         			String[] sResourceNames = xResourceNameAccess.getElementNames();
         			for (String sName : sResourceNames) {
         				Object resource = xResourceNameAccess.getByName(sName);

source/java/org/openoffice/da/comp/writer2latex/ConfigurationDialog.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2012-03-12)
+ *  Version 1.4 (2014-09-16)
  *
  */ 
  
@@ -434,7 +434,7 @@ public final class ConfigurationDialog extends ConfigurationDialogBase implement
 						sNextItems[i]=internalNames.get(sNextItems[i]);
 					}
 				}
-    			StringBuffer list = new StringBuffer();
+    			StringBuilder list = new StringBuilder();
     			for (int i=0; i<nLen; i++) {
     				if (i>0) list.append(';');
     				list.append(sNextItems[i]);

source/java/org/openoffice/da/comp/writer4latex/ApplicationsDialog.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-10-10)
+ *  Version 1.4 (2014-09-16)
  *
  */ 
  
@@ -229,7 +229,7 @@ public final class ApplicationsDialog
     }
     
     // Unix: Configure a certain application, reporting the availability
-    private boolean configureApp(String sName, String sAppName, String sArguments, StringBuffer info) {
+    private boolean configureApp(String sName, String sAppName, String sArguments, StringBuilder info) {
     	if (hasApp(sAppName)) {
     		externalApps.setApplication(sName, sAppName, sArguments);
     		info.append("Found "+sAppName+" - OK\n");
@@ -244,7 +244,7 @@ public final class ApplicationsDialog
     
     // Unix: Configure a certain application testing the availability
     // This variant uses an array of potential apps
-    private boolean configureApp(String sName, String[] sAppNames, String sArguments, StringBuffer info) {
+    private boolean configureApp(String sName, String[] sAppNames, String sArguments, StringBuilder info) {
     	for (String sAppName : sAppNames) {
     		if (configureApp(sName, sAppName, sArguments)) {
     			info.append("Found "+sName+": "+sAppName+" - OK\n");
@@ -266,7 +266,7 @@ public final class ApplicationsDialog
     }
 	
     // Windows: Configure a certain MikTeX application
-    private boolean configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuffer info, boolean bRequired) {
+    private boolean configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuilder info, boolean bRequired) {
     	File app = new File(new File(sPath),sAppName+".exe");
     	if (app.exists()) {
     		externalApps.setApplication(sName, sAppName, sArguments);
@@ -285,7 +285,7 @@ public final class ApplicationsDialog
 		String sOsName = System.getProperty("os.name");
 		String sOsVersion = System.getProperty("os.version");
 		String sOsArch = System.getProperty("os.arch");
-		StringBuffer info = new StringBuffer();
+		StringBuilder info = new StringBuilder();
 		info.append("Results of configuration:\n\n");
 		info.append("Your system identifies itself as "+sOsName+" version "+sOsVersion+ " (" + sOsArch +")\n\n");
     	if (sOsName.startsWith("Windows")) {

source/java/org/openoffice/da/comp/writer4latex/LogViewerDialog.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2011 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-02-23)
+ *  Version 1.4 (2014-09-16)
  *
  */ 
  
@@ -117,7 +117,7 @@ public class LogViewerDialog extends DialogBase
     // Utility methods
 	
     private String readTextFile(String sUrl) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         try {
             File file = new File(new URI(sUrl));
             if (file.exists() && file.isFile()) {

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-08)
+ *  Version 1.4 (2014-09-16)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.3.2";
-    private static final String DATE = "2014-09-08";
+    private static final String DATE = "2014-09-16";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>

source/java/writer2latex/base/ImageConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-05)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -240,7 +240,7 @@ public final class ImageConverter {
     	if (blob==null) {
 	        Node obd = Misc.getChildByTagName(node,XMLString.OFFICE_BINARY_DATA);
 	        if (obd!=null) {
-	            StringBuffer buf = new StringBuffer();
+	            StringBuilder buf = new StringBuilder();
 	            NodeList nl = obd.getChildNodes();
 	            int nLen = nl.getLength();
 	            for (int i=0; i<nLen; i++) {

source/java/writer2latex/latex/FieldConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2012-03-05)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -969,7 +969,7 @@ public class FieldConverter extends ConverterHelper {
 
     // For the argument to a href, we have to escape or encode certain characters
     private String escapeHref(String s, boolean bInFootnote) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i=0; i<s.length(); i++) {
             if (bInFootnote && s.charAt(i)=='#') { buf.append("\\#"); }
             else if (bInFootnote && s.charAt(i)=='%') { buf.append("\\%"); }

source/java/writer2latex/latex/HeadingConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-08)
+ *  Version 1.4 (2014-09-15)
  *
  */
 
@@ -409,7 +409,8 @@ public class HeadingConverter extends ConverterHelper {
         for (int i = 0; i < nLen; i++) {
             Node child = list.item(i);
             if (child.getNodeType()==Node.ELEMENT_NODE && 
-                !child.getNodeName().startsWith(XMLString.TEXT_REFERENCE_MARK)) {
+                !(child.getNodeName().startsWith(XMLString.TEXT_REFERENCE_MARK) ||
+                		child.getNodeName().startsWith(XMLString.TEXT_BOOKMARK))) {
                 return true;
             }
         }

source/java/writer2latex/latex/LaTeXConfig.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-08)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -483,7 +483,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
             mathSymbols.put(sName, attr);
         }
         else if (elm.getTagName().equals("custom-preamble")) {
-        	StringBuffer buf = new StringBuffer();
+        	StringBuilder buf = new StringBuilder();
             Node child = elm.getFirstChild();
             while (child!=null) {
                 if (child.getNodeType()==Node.TEXT_NODE) {

source/java/writer2latex/latex/LaTeXDocumentPortion.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-03)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -38,7 +38,7 @@ public class LaTeXDocumentPortion {
 
     private Vector<Object> nodes; // The collection of all nodes in this portion
 
-    private StringBuffer curText; // The currently active node (always the last node)
+    private StringBuilder curText; // The currently active node (always the last node)
     private boolean bEmpty; // Is the active node empty?
 
     private boolean bWrap; // Do we allow line wrap in this portion?
@@ -50,7 +50,7 @@ public class LaTeXDocumentPortion {
     public LaTeXDocumentPortion(boolean bWrap){
         this.bWrap = bWrap;
         nodes = new Vector<Object>();
-        curText = new StringBuffer();
+        curText = new StringBuilder();
         bEmpty = true;
     }
 	
@@ -63,7 +63,7 @@ public class LaTeXDocumentPortion {
         if (!bEmpty) {
             // add the current node to the node list and create new current node
             nodes.add(curText);
-            curText = new StringBuffer();
+            curText = new StringBuilder();
             bEmpty = true;
         }
         nodes.add(ldp);
@@ -96,8 +96,8 @@ public class LaTeXDocumentPortion {
         for (int i=nStart; i<nEnd; i++) { osw.write(s.charAt(i)); }
     }
 	
-    /** write the contents of a StringBuffer to the output */
+    /** write the contents of a StringBuilder to the output */
-    private void writeBuffer(StringBuffer text, OutputStreamWriter osw, int nLineLen, String sNewline) throws IOException {
+    private void writeBuffer(StringBuilder text, OutputStreamWriter osw, int nLineLen, String sNewline) throws IOException {
         String s = text.toString();
         int nLen = s.length();
 
@@ -157,8 +157,8 @@ public class LaTeXDocumentPortion {
         }
     }
 	
-    /** write the contents of a StringBuffer to the output without wrap */
+    /** write the contents of a StringBuilder to the output without wrap */
-    private void writeBuffer(StringBuffer text, OutputStreamWriter osw, String sNewline) throws IOException {
+    private void writeBuffer(StringBuilder text, OutputStreamWriter osw, String sNewline) throws IOException {
         String s = text.toString();
         int nLen = s.length();
 
@@ -193,10 +193,10 @@ public class LaTeXDocumentPortion {
                 ((LaTeXDocumentPortion) nodes.get(i)).write(osw,nLineLen,sNewline);
             }
             else if (bWrap && nLineLen>0) {
-                writeBuffer((StringBuffer) nodes.get(i),osw,nLineLen,sNewline);
+                writeBuffer((StringBuilder) nodes.get(i),osw,nLineLen,sNewline);
             }
             else {
-                writeBuffer((StringBuffer) nodes.get(i),osw,sNewline);
+                writeBuffer((StringBuilder) nodes.get(i),osw,sNewline);
             }
         }
         if (!bEmpty) { // write current node as well
@@ -214,14 +214,14 @@ public class LaTeXDocumentPortion {
      *  @return a string representation of the <code>LaTeXDocumentPortion</code>
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         int n = nodes.size();
         for (int i=0; i<n; i++) {
             if (nodes.get(i) instanceof LaTeXDocumentPortion) {
                 buf.append(((LaTeXDocumentPortion) nodes.get(i)).toString());
             }
             else {
-                buf.append((StringBuffer) nodes.get(i));
+                buf.append((StringBuilder) nodes.get(i));
             }
         }
         if (!bEmpty) { // write current node as well

source/java/writer2latex/latex/StarMathConverter.java

@@ -18,7 +18,7 @@
  *
  *  Copyright: 2002-2014 by Henrik Just
  *  
- *  Version 1.4 (2014-09-08)
+ *  Version 1.4 (2014-09-16)
  *
  *  All Rights Reserved.
  */
@@ -1051,7 +1051,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     // Grammar
     
     private String table(float fSize, Token eAlign){
-        StringBuffer bufTable=new StringBuffer();
+        StringBuilder bufTable=new StringBuilder();
         String sLine=line(fSize,eAlign,true);
         if (curToken.eType==Token.NEWLINE){ // more than one line
             bufTable.append("\\begin{gathered}").append(sLine);
@@ -1126,7 +1126,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     }
     
     private String expression(float fSize, Token eAlign){
-        StringBuffer bufExpression=new StringBuffer().append(relation(fSize,eAlign));
+        StringBuilder bufExpression=new StringBuilder().append(relation(fSize,eAlign));
         while (curToken.nLevel>=5){
             bufExpression.append(relation(fSize,eAlign));
         }
@@ -1134,7 +1134,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     }
     
     private String relation(float fSize, Token eAlign){
-        StringBuffer bufRelation=new StringBuffer().append(sum(fSize,eAlign));
+        StringBuilder bufRelation=new StringBuilder().append(sum(fSize,eAlign));
         while (tokenInGroup(TGroup.RELATION)){
             if (curToken.eType==Token.TRANSL) { bMultimapdotbothA=true; }
             else if (curToken.eType==Token.TRANSR) { bMultimapdotbothB=true; }
@@ -1145,7 +1145,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     }
     
     private String sum(float fSize, Token eAlign){
-        StringBuffer bufSum=new StringBuffer().append(product(fSize,eAlign));
+        StringBuilder bufSum=new StringBuilder().append(product(fSize,eAlign));
         while (tokenInGroup(TGroup.SUM)){
             bufSum.append(opsubsup(fSize,eAlign)).append(product(fSize,eAlign));
         }
@@ -1262,7 +1262,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     }
     
     private String blank(){
-        StringBuffer bufBlank=new StringBuffer();
+        StringBuilder bufBlank=new StringBuilder();
         while (tokenInGroup(TGroup.BLANK)){
             bufBlank.append(curToken.sLaTeX);
             nextToken();
@@ -1608,7 +1608,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     private String stack(float fSize, Token eAlign){
         nextToken();
         if (curToken.eType==Token.LGROUP){
-            StringBuffer bufStack=new StringBuffer().append("\\begin{matrix}");
+            StringBuilder bufStack=new StringBuilder().append("\\begin{matrix}");
             nextToken();
             bufStack.append(align(fSize,eAlign,true,true));
             while (curToken.eType==Token.POUND) {
@@ -1631,7 +1631,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
     private String matrix(float fSize, Token eAlign){
         nextToken();
         if (curToken.eType==Token.LGROUP){
-            StringBuffer bufMatrix = new StringBuffer().append("\\begin{matrix}");
+            StringBuilder bufMatrix = new StringBuilder().append("\\begin{matrix}");
             int nCols = 1;
             boolean bProtect = false;
             do {

source/java/writer2latex/latex/TableFormatter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2011 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  *  
- *  Version 1.2 (2011-04-20)
+ *  Version 1.4 (2014-09-16)
  *  
  */
  
@@ -402,7 +402,7 @@ public class TableFormatter extends ConverterHelper {
             return "\\hline";
         }
         else { // individual borders for each column
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("\\hhline{");
             for (int nCol=0; nCol<nColCount; nCol++) {
                 if (bHBorder[nRow][nCol]) { buf.append("-"); }

source/java/writer2latex/latex/config/pdfprint.xml

@@ -10,7 +10,7 @@
   <option name="inputencoding" value="ascii" />
   <option name="use_geometry" value="true" />
   <option name="use_fancyhdr" value="true" />
-  <option name="use_ooomath" value="true" />
+  <option name="use_ooomath" value="false" />
   <option name="use_pifont" value="true" />
   <option name="use_ifsym" value="true" />
   <option name="use_wasysym" value="true" />

source/java/writer2latex/latex/config/pdfscreen.xml

@@ -10,7 +10,7 @@
   <option name="documentclass" value="article" />
   <option name="backend" value="pdftex" />
   <option name="inputencoding" value="ascii" />
-  <option name="use_ooomath" value="true" />
+  <option name="use_ooomath" value="false" />
   <option name="use_pifont" value="true" />
   <option name="use_ifsym" value="true" />
   <option name="use_wasysym" value="true" />

source/java/writer2latex/latex/i18n/ClassicI18n.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2011 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-05-07) 
+ *  Version 1.4 (2014-09-16) 
  * 
  */
 
@@ -453,7 +453,7 @@ public class ClassicI18n extends I18n {
      */
     public String convert(String s, boolean bMathMode, String sLang){
         if (!bAlwaysUseDefaultLang && sLang!=null) { languages.add(sLang); }
-        StringBuffer buf=new StringBuffer();
+        StringBuilder buf=new StringBuilder();
         int nFontenc = bAlwaysUseDefaultLang ? nDefaultFontenc : getFontenc(sLang);
         int nLen = s.length();
         int i = 0;
@@ -485,7 +485,7 @@ public class ClassicI18n extends I18n {
         return buf.toString();
     }
 	
-    private void convert(String s, int nStart, int nEnd, boolean bMathMode, String sLang, StringBuffer buf, int nFontenc) {
+    private void convert(String s, int nStart, int nEnd, boolean bMathMode, String sLang, StringBuilder buf, int nFontenc) {
         int nCurFontenc = nFontenc;
         ucparser.reset(table,s,nStart,nEnd);
         boolean bIsFirst = true; // Protect all dangerous characters at the start

source/java/writer2latex/latex/i18n/XeTeXI18n.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2012-02-27)
+ *  Version 1.4 (2014-09-16)
  * 
  */
 
@@ -134,7 +134,7 @@ public class XeTeXI18n extends I18n {
      *  @return the LaTeX string
      */
     public String convert(String s, boolean bMathMode, String sLang){
-    	StringBuffer buf = new StringBuffer();
+    	StringBuilder buf = new StringBuilder();
     	int nLen = s.length();
         char c;
         if (bMathMode) {
@@ -190,7 +190,7 @@ public class XeTeXI18n extends I18n {
         return buf.toString();
     }
     
-    private void convert(char c, StringBuffer buf) {
+    private void convert(char c, StringBuilder buf) {
 		switch (c) {
 		case '#' : buf.append("\\#"); break; // Parameter
 		case '$' : buf.append("\\$"); break; // Math shift

source/java/writer2latex/office/IndexMark.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-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-11-22)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -66,7 +66,7 @@ public final class IndexMark {
     }
 
     private final static String collectMark(Node node) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         String sId = Misc.getAttribute(node,XMLString.TEXT_ID);
         node = getRightNode(node);
         while (node!=null) {

source/java/writer2latex/office/MetaData.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-29)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -174,7 +174,7 @@ public class MetaData implements writer2latex.api.MetaData {
     public Map<String,String> getUserDefinedMetaData() { return userdefined; }
 
     private String getContent(Node node) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         Node child = node.getFirstChild();
         while (child!=null) {
            if (child.getNodeType()==Node.TEXT_NODE) {

source/java/writer2latex/util/CSVList.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 0.4 (2004-08-10)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -31,7 +31,7 @@ public class CSVList{
     private String sSep;
     private String sNameValueSep;
     private boolean bEmpty = true;
-    private StringBuffer buf = new StringBuffer();
+    private StringBuilder buf = new StringBuilder();
 	
     public CSVList(String sSep, String sNameValueSep) {
         this.sSep=sSep;

source/java/writer2latex/util/ExportNameCollection.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-10-27)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -58,7 +58,7 @@ public class ExportNameCollection{
     
     public void addName(String sName){
         if (containsName(sName)) { return; }
-        StringBuffer outbuf=new StringBuffer();
+        StringBuilder outbuf=new StringBuilder();
         SimpleInputBuffer inbuf=new SimpleInputBuffer(sName);
 		
         // Don't start with a digit

source/java/writer2latex/util/Misc.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-08-27)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -91,7 +91,7 @@ public class Misc{
 	
     public static final String int2roman(int number) {
     	assert number>0; // Only works for positive numbers!
-        StringBuffer roman=new StringBuffer();
+        StringBuilder roman=new StringBuilder();
         while (number>=1000) { roman.append('m'); number-=1000; }
         if (number>=900) { roman.append("cm"); number-=900; }
         if (number>=500) { roman.append('d'); number-=500; }
@@ -404,7 +404,7 @@ public class Misc{
 	
     /* utility method that collects PCDATA content of an element */
     public static String getPCDATA(Node node) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (node.hasChildNodes()) {
             NodeList nl = node.getChildNodes();
             int nLen = nl.getLength();

source/java/writer2latex/util/SimpleDOMBuilder.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2012-03-22)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -40,6 +40,7 @@ import org.w3c.dom.Element;
 public class SimpleDOMBuilder {
 	private Document dom=null;
 	private Element currentElement=null;
+	private StringBuilder charBuffer=new StringBuilder();
 	
 	/**
 	 * Append an element to the current element and set this new element to be the current element.
@@ -51,6 +52,7 @@ public class SimpleDOMBuilder {
 	 */
 	public boolean startElement(String sTagName) {
 		if (currentElement!=null) {
+			flushCharacters();
 			currentElement = (Element) currentElement.appendChild(dom.createElement(sTagName));
 		}
 		else {
@@ -74,6 +76,7 @@ public class SimpleDOMBuilder {
 	 */
 	public boolean endElement() {
 		if (currentElement!=null) {
+			flushCharacters();
 			if (currentElement!=dom.getDocumentElement()) {
 				currentElement=(Element) currentElement.getParentNode();
 			}
@@ -100,18 +103,26 @@ public class SimpleDOMBuilder {
 	}
 	
 	/**
-	 * Add characters to the currentElement
+	 * Add characters to the currentElement. The actual writing of characters to the DOM is delayed until the
+	 * <code>startElement</code> or <code>endElement</code> methods are invoked
 	 * @param sText
 	 * @return true on success, false if there is no current element
 	 */
 	public boolean characters(String sText) {
 		if (currentElement!=null) {
-			currentElement.appendChild(dom.createTextNode(sText));
+			charBuffer.append(sText);
 			return true;
 		}
 		return false;
 	}
 	
+	private void flushCharacters() {
+		if (charBuffer.length()>0) {
+			currentElement.appendChild(dom.createTextNode(charBuffer.toString()));
+			charBuffer.setLength(0);
+		}
+	}
+	
 	/**
 	 * Get the DOM tree
 	 * 

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-05)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -538,7 +538,7 @@ public class Converter extends ConverterBase {
     
     /* get inline text, ignoring any draw objects, footnotes, formatting and hyperlinks */
     protected String getPlainInlineText(Node node) {
-    	StringBuffer buf = new StringBuffer();
+    	StringBuilder buf = new StringBuilder();
         Node child = node.getFirstChild();
         while (child!=null) {
             short nodeType = child.getNodeType();
@@ -575,7 +575,7 @@ public class Converter extends ConverterBase {
     public void handleOfficeAnnotation(Node onode, Node hnode) {
         if (config.xhtmlNotes()) {
             // Extract the text from the paragraphs, separate paragraphs with newline
-        	StringBuffer buf = new StringBuffer();
+        	StringBuilder buf = new StringBuilder();
         	Element creator = null;
         	Element date = null;
         	Node child = onode.getFirstChild();

source/java/writer2latex/xhtml/CssDocument.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2011 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-02-17)
+ *  Version 1.4 (2014-09-16)
  *
  */
  
@@ -75,7 +75,7 @@ public class CssDocument implements OutputFile {
 	
 	public void read(InputStream is) throws IOException {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		String sLine;
 		while ((sLine=reader.readLine())!=null) {
 			buf.append(sLine).append('\n');

source/java/writer2latex/xhtml/FrameStyleConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-07)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -62,7 +62,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
      */
     public String getStyleDeclarations(String sIndent) {
         if (bConvertStyles) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append(super.getStyleDeclarations(sIndent));
             Enumeration<String> names = styleNames.keys();
             while (names.hasMoreElements()) {
@@ -267,7 +267,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
     // Scale the border with while preserving the rest of the attribute
     public String borderScale(String sBorder) {
         SimpleInputBuffer in = new SimpleInputBuffer(sBorder);
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
         while (in.peekChar()!='\0') {
             // Skip spaces
             while(in.peekChar()==' ') { out.append(" "); in.getChar(); }
@@ -287,7 +287,7 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
 	
     // Must escape certain characters in the url property	
     private String escapeUrl(String sUrl) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         int nLen = sUrl.length();
         for (int i=0; i<nLen; i++) {
             char c = sUrl.charAt(i);

source/java/writer2latex/xhtml/HeadingStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-05-09)
+ *  Version 1.4 (2014-09-16)
  *
  */package writer2latex.xhtml;
 
@@ -42,7 +42,7 @@ public class HeadingStyleConverter extends StyleConverterHelper {
 	@Override
 	public String getStyleDeclarations(String sIndent) {
         if (bConvertStyles) {
-        	StringBuffer buf = new StringBuffer();
+        	StringBuilder buf = new StringBuilder();
         	for (int i=1; i<=6; i++) {
         		if (ofr.getHeadingStyle(i)!=null) {
         			CSVList props = new CSVList(";");

source/java/writer2latex/xhtml/ListStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2012-03-07)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -86,7 +86,7 @@ public class ListStyleConverter extends StyleConverterHelper {
      */
     public String getStyleDeclarations(String sIndent) {
         if (bConvertStyles) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             Enumeration<String> names = styleNames.keys();
             while (names.hasMoreElements()) {
                 String sDisplayName = names.nextElement();

source/java/writer2latex/xhtml/MathConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-01)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -259,7 +259,7 @@ public class MathConverter extends ConverterHelper {
     // with real unicode positions.
     private String replacePrivateChars(String s) {        
         int nLen = s.length();
-        StringBuffer buf = new StringBuffer(nLen);
+        StringBuilder buf = new StringBuilder(nLen);
         for (int i=0; i<nLen; i++) {
             buf.append(replacePrivateChar(s.charAt(i)));
         }

source/java/writer2latex/xhtml/PageStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2011 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-21)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -130,7 +130,7 @@ public class PageStyleConverter extends StyleConverterHelper {
      *  @param sIndent a String of spaces to add before each line
      */
     public String getStyleDeclarations(String sIndent) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         // This will be master pages for presentations only
         Enumeration<String> names = styleNames.keys();

source/java/writer2latex/xhtml/PresentationStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-01)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -85,7 +85,7 @@ public class PresentationStyleConverter extends FrameStyleConverter {
      */
     public String getStyleDeclarations(String sIndent) {
         if (bConvertStyles) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append(super.getStyleDeclarations(sIndent));
             Enumeration<String> names = outlineStyleNames.keys();
             while (names.hasMoreElements()) {

source/java/writer2latex/xhtml/StyleConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-08-13)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -123,7 +123,7 @@ class StyleConverter extends ConverterHelper {
     public String exportStyles(boolean bIndent) {
     	String sIndent = bIndent ? "      " : "";
     	
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         
         // Export default style
         if (config.xhtmlCustomStylesheet().length()==0 &&

source/java/writer2latex/xhtml/StyleWithPropertiesConverterHelper.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2012-03-07)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -94,7 +94,7 @@ public abstract class StyleWithPropertiesConverterHelper
      */
     public String getStyleDeclarations(String sIndent) {
         if (bConvertStyles) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             Enumeration<String> names = styleNames.keys();
             while (names.hasMoreElements()) {
                 String sDisplayName = names.nextElement();

source/java/writer2latex/xhtml/TextStyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2014 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-12-29)
+ *  Version 1.4 (2014-09-16)
  *
  */
 
@@ -136,7 +136,7 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
      *  @param sIndent a String of spaces to add before each line
      */
     public String getStyleDeclarations(String sIndent) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append(super.getStyleDeclarations(sIndent));
         if (bConvertStyles) {
             // Export anchor styles