Various work on w2l 1.2

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

source/distro/changelog.txt

@@ -2,6 +2,15 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.1 ----------
 
+[all] Filter: Filters out characters that are illegal in xml
+  (this fixes a problem with rtf documents imported in OOo)
+
+[w2x] Introduced hack to set link attributes using the link name
+  accepts a semicolon separated list of name=value, for example
+  title=link to next page;rel=next
+
+[all] Added icon and publisher information to the extensions
+
 [w2l] Added XeTeX as possible backend in dialog
 
 [all] Bugfix: Paragraphs containing only fields are no longer lost

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

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  *  
- *  Version 1.0 (2008-11-24)
+ *  Version 1.2 (2009-04-23)
  *  
  */
  
@@ -132,38 +132,34 @@ public abstract class ExportFilterBase implements
             return name;
         }
 		
-        public String replace(String origString, String origChar, String replaceChar){
-	        String tmp="";	
-	        int index=origString.indexOf(origChar);
-	        if(index !=-1){
-                while (index !=-1){
-		            String first =origString.substring(0,index);
-		            first=first.concat(replaceChar);
-                    tmp=tmp.concat(first);
-                    origString=origString.substring(index+1,origString.length());
- 		            index=origString.indexOf(origChar);
-         	        if(index==-1) {
-                        tmp=tmp.concat(origString);
-                    }
-        	    }
-	        }
-	        return tmp;
-        }
-	   
         public String needsMask(String origString) {
-            if (origString.indexOf("&")!=-1){
+        	StringBuffer buf = new StringBuffer();
-                origString=replace(origString,"&","&");
+        	int nLen = origString.length();
-     	    }    
+        	for (int i=0; i<nLen; i++) {
-	        if (origString.indexOf("\"")!=-1){
+        		char c = origString.charAt(i);
-        		origString=replace(origString,"\"","&quot;");
+                if (c=='&'){
-    	    }    
+                    buf.append("&amp;");
-	        if (origString.indexOf("<")!=-1){
+         	    }    
-        		origString=replace(origString,"<","&lt;");
+    	        if (c=='\"'){
-    	    }  
+            		buf.append("&quot;");
-    	    if (origString.indexOf(">")!=-1){
+        	    }    
-	        	origString=replace(origString,">","&gt;");
+    	        if (c=='<'){
-    	    }  
+            		buf.append("&lt;");
-	        return origString;
+        	    }  
+        	    if (c=='>'){
+    	        	buf.append("&gt;");
+        	    }  
+        	    else if (c=='\u0009' || c=='\n' || c=='\r' || (c>='\u0020' && c<='\uD7FF') || (c>='\uE000' && c<'\uFFFD')) {
+        			// Valid characters found at xml.com
+        			// Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+        	    	buf.append(c);
+        	    }
+        	    else {
+        	    	// Found illegal character
+        	    	System.out.println("Illegal character : "+Integer.toHexString(c));
+        	    }
+        	}
+	        return buf.toString();
 	  
         }
 
@@ -233,7 +229,7 @@ public abstract class ExportFilterBase implements
         // Implementation of XDocumentHandler:
         // Flat xml is created by the sax events and passed through the pipe
         // created by exporter()
-
+        
         public void  startDocument () {
  	        //Do nothing
         }
@@ -301,6 +297,7 @@ public abstract class ExportFilterBase implements
 	}
 	public void characters(String str){
 	    str=needsMask(str);
+
 	    try{
 		 xOutStream.writeBytes(str.getBytes("UTF-8"));
 	    }
@@ -370,12 +367,12 @@ public abstract class ExportFilterBase implements
             converter.setGraphicConverter(new GraphicConverterImpl(xComponentContext));
             
             ConverterResult dataOut = null;
-            try {
+            //try {
                 dataOut = converter.convert(xis,sName);
-            }
+            //}
-            catch (IOException e) {
+            //catch (IOException e) {
                 // Fail silently
-            }
+            //}
 
             // Write out files
             Iterator<OutputFile> docEnum = dataOut.iterator();

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

@@ -20,14 +20,16 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-03-30)
+ *  Version 1.2 (2009-04-23)
  *
  */ 
  
 package org.openoffice.da.comp.writer4latex;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
+import java.util.Vector;
 
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlContainer;
@@ -199,32 +201,99 @@ public final class ConfigurationDialog
         }
         return true;
     }
-	
+    
-    private boolean autoConfigure(XWindow xWindow) {
+    // Unix: Test to determine wether a certain application is available in the OS
-		externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
+    // Requires "which", hence unix only
-		externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
+    private boolean hasApp(String sAppName) {
-		externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
+        try {
-		externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s");
+			Vector<String> command = new Vector<String>();
-		externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s");
+			command.add("which");
-		externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s");
+			command.add(sAppName);
-		externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s");
+			
+            ProcessBuilder pb = new ProcessBuilder(command);
+            Process proc = pb.start();        
 
+            // Gobble the error stream of the application
+            StreamGobbler errorGobbler = new 
+                StreamGobbler(proc.getErrorStream(), "ERROR");            
+            
+            // Gooble the output stream of the application
+            StreamGobbler outputGobbler = new 
+                StreamGobbler(proc.getInputStream(), "OUTPUT");
+                
+            errorGobbler.start();
+            outputGobbler.start();
+                                    
+            // The application exists if the process exits with 0
+            return proc.waitFor()==0;
+        }
+        catch (InterruptedException e) {
+            return false;
+        }
+        catch (IOException e) {
+            return false;
+        }
+    }
+    
+    // Unix: Configure a certain application testing the availability
+    private boolean configureApp(String sName, String sAppName, String sArguments) {
+    	if (hasApp(sAppName)) {
+    		externalApps.setApplication(sName, sAppName, sArguments);
+    		return true;
+    	}
+    	else {
+    		externalApps.setApplication(sName, "???", "???");
+    		return false;
+    	}
+    }
+    
+    // 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) {
+    	for (String sAppName : sAppNames) {
+    		if (configureApp(sName, sAppName, sArguments)) { return true; }
+    	}
+    	return false;
+    }
+	
+    // Configure the applications automatically (OS dependent)
+    private boolean autoConfigure(XWindow xWindow) {
 		String sOsName = System.getProperty("os.name");
     	if ("Linux".equals(sOsName)) {
-    		// TODO: Search for applications (which...)
+    		configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
-    		// Viewers may be evince, okular, xdvi, xpdf, ghostview or...
+    		configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
-    		externalApps.setApplication(ExternalApps.DVIVIEWER, "evince", "%s");
+    		configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
-    		externalApps.setApplication(ExternalApps.PDFVIEWER, "evince", "%s");
+    		configureApp(ExternalApps.DVIPS, "dvips", "%s");
-    		externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "evince", "%s");
+    		configureApp(ExternalApps.BIBTEX, "bibtex", "%s");
+    		configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s");
+    		configureApp(ExternalApps.OOLATEX, "oolatex", "%s");    		
+    		// We have several possible viewers
+    		String[] sDviViewers = {"evince", "okular", "xdvi"};
+    		configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s");
+    		String[] sPdfViewers =  {"evince", "okular", "xpdf"};
+    		configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s");
+    		String[] sPsViewers =  {"evince", "okular", "ghostview"};
+    		configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s");
     	}
     	else if ("Windows".equals(sOsName)) {
+    		// TODO: Get information from the windows registry
     		// Assume MikTeX
+    		externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
+    		externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
+    		externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
+    		externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s");
+    		externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s");
+    		externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s");
+    		externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s");
     		externalApps.setApplication(ExternalApps.DVIVIEWER, "yap", "--single-instance %s");
     		// And assume gsview for pdf and ps
     		// gsview32 may not be in the path, but at least this helps a bit
     		externalApps.setApplication(ExternalApps.PDFVIEWER, "gsview32.exe", "-e \"%s\"");
     		externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "gsview32.exe", "-e \"%s\"");    		
     	}
+    	else {
+    		// Unsupported OS
+    	}
     	changeApplication(xWindow);
         return true;
     }

source/java/writer2latex/api/ConverterFactory.java

@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.1";
-    private static final String DATE = "2008-03-30";
+    private static final String DATE = "2008-04-23";
 	
     /** Return version information
      *  @return the Writer2LaTeX version in the form

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-03-02)
+ *  Version 1.2 (2009-03-02)
  *
  */
 
@@ -597,8 +597,23 @@ public class Converter extends ConverterBase {
             anchor.setAttribute("href",sHref);
             String sName = Misc.getAttribute(onode,XMLString.OFFICE_NAME);
             if (sName!=null) {
-                anchor.setAttribute("name",sName);
+            	// The name attribute is rarely use (usually the user will insert a bookmark)
-                anchor.setAttribute("title",sName); // OOo does not have title...
+            	// Hence we (mis)use it to set additional attributes that are not supported by OOo
+            	if (sName.indexOf(";")==-1 && sName.indexOf("=")==-1) {
+            		// Simple case, use the value to set name and title
+                    anchor.setAttribute("name",sName);
+                    anchor.setAttribute("title",sName);
+            	}
+            	else {
+                	// Complex case - using the syntax: name=value;name=value;...
+            		String[] sElements = sName.split(";");
+            		for (String sElement : sElements) {
+            			String[] sNameVal = sElement.split("=");
+            			if (sNameVal.length>=2) {
+            				anchor.setAttribute(sNameVal[0],sNameVal[1]);
+            			}
+            		}
+            	}
             }
             // TODO: target has been deprecated in xhtml 1.0 strict
             String sTarget = Misc.getAttribute(onode,XMLString.OFFICE_TARGET_FRAME_NAME);

source/oxt/writer2latex/description.xml

@@ -10,7 +10,12 @@
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
   </dependencies>
-
+  
+  <publisher>
+    <name xlink:href="http://writer2latex.sourceforge.net" 
+    lang="en">Writer2LaTeX</name>
+  </publisher>
+  
   <display-name>
     <name lang="da">Writer2LaTeX eksportfiltre</name>
     <name lang="en">Writer2LaTeX export filters</name>
@@ -21,6 +26,12 @@
     <name lang="uk">Фільтри експорту Writer2LaTeX</name>
   </display-name>
   
+  <icon>
+    <default xlink:href="images/w2licon.png" />
+    <high-contrast xlink:href="images/w2lhcicon.png" />
+  </icon>
+  
+  
   <extension-description>
     <src xlink:href="desc_da.txt" lang="da" />
     <src xlink:href="desc_en.txt" lang="en" />

source/oxt/writer2xhtml/description.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006"
-             xmlns:d="http://openoffice.org/extensions/description/2006">
+             xmlns:d="http://openoffice.org/extensions/description/2006"
+             xmlns:xlink="http://www.w3.org/1999/xlink">
 			 
   <identifier value="org.openoffice.da.writer2xhtml.oxt" />
   
@@ -10,6 +11,11 @@
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
   </dependencies>
   
+  <publisher>
+    <name xlink:href="http://writer2latex.sourceforge.net" 
+    lang="en">Writer2LaTeX</name>
+  </publisher>
+  
   <display-name>
     <name lang="da">Writer2xhtml eksportfiltre</name>
     <name lang="en">Writer2xhtml export filters</name>
@@ -20,6 +26,12 @@
     <name lang="uk">Фільтри експорту Writer2xhtml</name>
   </display-name>
   
+  <icon>
+    <default xlink:href="images/w2licon.png" />
+    <high-contrast xlink:href="images/w2hclicon.png" />
+  </icon>
+  
+  
   <extension-description>
     <src xlink:href="desc_da.txt" lang="da" />
     <src xlink:href="desc_en.txt" lang="en" />

source/oxt/writer4latex/description.xml

@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006"
-             xmlns:d="http://openoffice.org/extensions/description/2006">
+             xmlns:d="http://openoffice.org/extensions/description/2006"
+             xmlns:xlink="http://www.w3.org/1999/xlink">
+
   <identifier value="org.openoffice.da.writer4latex.oxt" />
   <version value="1.1.1" />
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
   </dependencies>
+  
+  <publisher>
+    <name xlink:href="http://writer2latex.sourceforge.net" 
+    lang="en">Writer2LaTeX</name>
+  </publisher>
+  
+  <display-name>
+    <name lang="da">Writer4LaTeX frontend</name>
+    <name lang="en">Writer4LaTeX frontend</name>
+  </display-name>
+  
+  <extension-description>
+    <src xlink:href="descriptions/desc_da.txt" lang="da" />
+    <src xlink:href="descriptions/desc_en.txt" lang="en" />
+  </extension-description>
+  
+  <icon>
+    <default xlink:href="images/w2licon.png" />
+    <high-contrast xlink:href="images/w2lhcicon.png" />
+  </icon>
+  
 </description> 

source/oxt/writer4latex/descriptions/desc_da.txt

@@ -0,0 +1,3 @@
+Writer4LaTeX integrerer Writer med din LaTeX distribution. 
+
+Sammen med Writer2LaTeX eksportfilteret (som også skal være installeret) giver det dig mulighed for at bruge Writer som LaTeX frontend

source/oxt/writer4latex/descriptions/desc_en.txt

@@ -0,0 +1,3 @@
+Writer4LaTeX integrates Writer with your LaTeX distribution. 
+
+Working together with the Writer2LaTeX export filter (which must be installed) this enables you to use Writer as a LaTeX frontend