Writer2xhtml custom config ui

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

source/distro/changelog.txt

@@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.2 ----------
 
+[all] API change: Added the method readStyleSheet to the Converter interface
+
 [w2x] The custom configuration now supports an optional xhtml template (writer2xhtml-template.xhtml)
   in the same directory as writer2xhtml.xml
 

source/java/org/openoffice/da/comp/w2lcommon/filter/FilterDataParser.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-2010 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-11-22)
+ *  Version 1.2 (2010-04-12)
  *
  */ 
  
@@ -108,7 +108,7 @@ public class FilterDataParser {
         
         PropertyHelper props = new PropertyHelper(filterData);
         
-        // Get the special properties TemplateURL, ConfigURL and AutoCreate
+        // Get the special properties TemplateURL, StyleSheetURL, ConfigURL and AutoCreate
         Object tpl = props.get("TemplateURL");
         String sTemplate = null;
         if (tpl!=null && AnyConverter.isString(tpl)) {
@@ -120,6 +120,17 @@ public class FilterDataParser {
             }
         }
         
+        Object styles = props.get("StyleSheetURL");
+        String sStyleSheet = null;
+        if (styles!=null && AnyConverter.isString(styles)) {
+            try {
+                sStyleSheet = substituteVariables(AnyConverter.toString(styles));
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e) {
+                // Failed to convert to String; should not happen - ignore   
+            }
+        }
+
         Object auto = props.get("AutoCreate");
         boolean bAutoCreate = false;
         if (auto!=null && AnyConverter.isString(auto)) {
@@ -169,6 +180,31 @@ public class FilterDataParser {
             }
         }
 
+        // Load the style sheet from the specified URL, if any
+        if (sfa2!=null && sStyleSheet!=null && sStyleSheet.length()>0) {
+            try {
+                XInputStream xIs = sfa2.openFileRead(sStyleSheet);
+                if (xIs!=null) {
+                    InputStream is = new XInputStreamToInputStreamAdapter(xIs);
+                    converter.readStyleSheet(is);
+                    is.close();
+                    xIs.closeInput();
+                }
+            }
+            catch (IOException e) {
+                // ignore
+            }
+            catch (NotConnectedException e) {
+                // ignore
+            }
+            catch (CommandAbortedException e) {
+                // ignore
+            }
+            catch (com.sun.star.uno.Exception e) {
+                // ignore
+            }
+        }
+
         // Create config if required
         try {
             if (bAutoCreate && sfa2!=null && sConfig!=null && !sConfig.startsWith("*") && !sfa2.exists(sConfig)) {
@@ -235,7 +271,7 @@ public class FilterDataParser {
         Enumeration<String> keys = props.keys();
         while (keys.hasMoreElements()) {
             String sKey = keys.nextElement();
-            if (!"ConfigURL".equals(sKey) && !"TemplateURL".equals(sKey) && !"AutoCreate".equals(sKey)) {
+            if (!"ConfigURL".equals(sKey) && !"TemplateURL".equals(sKey) && !"StyleSheetURL".equals(sKey) && !"AutoCreate".equals(sKey)) {
                 Object value = props.get(sKey);
                 if (AnyConverter.isString(value)) {
                     try {

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

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2019 by Henrik Just
+ *  Copyright: 2002-2010 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-12)
+ *  Version 1.2 (2010-04-12)
  *
  */ 
  
@@ -401,6 +401,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
                 MacroExpander expander = new MacroExpander(xContext);
                 filterData.put("ConfigURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL")));
                 filterData.put("TemplateURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"TargetTemplateURL")));
+                filterData.put("StyleSheetURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"StyleSheetURL")));
                 XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]);
                 bFound = true;
             }

source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-04-11)
+ *  Version 1.2 (2010-04-12)
  *
  */ 
  
@@ -109,13 +109,12 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
             case 6:
             case 7:
             case 8: helper.put("ConfigURL","*cleanxhtml.xml");
-                    helper.put("custom_stylesheet",
+                    helper.put("custom_stylesheet", "http://www.w3.org/StyleSheets/Core/"+sCoreStyles[nConfig-1]);
-                        "http://www.w3.org/StyleSheets/Core/"+sCoreStyles[nConfig-1]);
                     break;
             case 9: helper.put("ConfigURL","$(user)/writer2xhtml.xml");
+            		helper.put("AutoCreate","true");
             		helper.put("TemplateURL", "$(user)/writer2xhtml-template.xhtml");
-            		//helper.put("StyleSheetURL", "$(user)/writer2xhtml-style.css");
+            		helper.put("StyleSheetURL", "$(user)/writer2xhtml-styles.css");
-                    helper.put("AutoCreate","true");
         }
 		
         saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");

source/java/writer2latex/Application.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-29) 
+ *  Version 1.2 (2010-04-12) 
  *
  */
  
@@ -58,6 +58,7 @@ import writer2latex.util.Misc;
  * <code>-pdfprint</code>, <code>-cleanxhtml</code>
  * <li><code>-config[=]filename</code>
  * <li><code>-template[=]filename</code>
+ * <li><code>-stylesheet[=]filename</code>
  * <li><code>-option[=]value</code>
  * </ul>
  * <p>where <code>option</code> can be any simple option known to Writer2LaTeX
@@ -70,6 +71,7 @@ public final class Application {
     private boolean bRecurse = false;
     private Vector<String> configFileNames = new Vector<String>();
     private String sTemplateFileName = null;
+    private String sStyleSheetFileName = null;
     private Hashtable<String,String> options = new Hashtable<String,String>();
     private String sSource = null;
     private String sTarget = null;
@@ -155,7 +157,7 @@ public final class Application {
             batchCv.setConverter(converter);
         }
 		
-        // Step 5: Read template
+        // Step 5a: Read template
         if (sTemplateFileName!=null) {
             try {
                 System.out.println("Reading template "+sTemplateFileName);
@@ -176,6 +178,23 @@ public final class Application {
             }
         }
 		
+        // Step 5b: Read style sheet
+        if (sStyleSheetFileName!=null) {
+            try {
+                System.out.println("Reading style sheet "+sStyleSheetFileName);
+                byte [] styleSheetBytes = Misc.inputStreamToByteArray(new FileInputStream(sStyleSheetFileName));
+                converter.readStyleSheet(new ByteArrayInputStream(styleSheetBytes));
+            }
+            catch (FileNotFoundException e) {
+                System.out.println("--> This file does not exist!");
+                System.out.println("    "+e.getMessage());
+            }
+            catch (IOException e) {
+                System.out.println("--> Failed to read the style sheet file!");
+                System.out.println("    "+e.getMessage());
+            }
+        }
+		
         // Step 6: Read config
         for (int i=0; i<configFileNames.size(); i++) {
             String sConfigFileName = (String) configFileNames.get(i);
@@ -282,6 +301,7 @@ public final class Application {
         System.out.println("   -epub");
         System.out.println("   -recurse");
         System.out.println("   -template[=]<template file>");
+        System.out.println("   -stylesheet[=]<style sheet file>");
         System.out.println("   -ultraclean");
         System.out.println("   -clean");
         System.out.println("   -pdfprint");
@@ -332,6 +352,7 @@ public final class Application {
                     }
                     if ("-config".equals(sArg)) { configFileNames.add(sArg2); }
                     else if ("-template".equals(sArg)) { sTemplateFileName = sArg2; }
+                    else if ("-stylesheet".equals(sArg)) { sStyleSheetFileName = sArg2; }
                     else { // configuration option
                         options.put(sArg.substring(1),sArg2);
                     }

source/java/writer2latex/api/Converter.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-2010 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-11-23)
+ *  Version 1.2 (2010-04-12)
  *
  */
  
@@ -71,6 +71,25 @@ public interface Converter {
      */
     public void readTemplate(File file) throws IOException;
 
+    /** Read a style sheet to <em>include</em> with the converted document.
+     *  The format of the style sheet depends on the <code>Converter</code>
+     *  implementation.
+     *
+     *  @param is an <code>InputStream</code> from which to read the style sheet
+     *  @throws IOException if some exception occurs while reading the style sheet
+     */
+    public void readStyleSheet(InputStream is) throws IOException;
+
+    /** Read a style sheet to <em>include</em> with the converted document.
+     *  The format of the style sheet depends on the <code>Converter</code>
+     *  implementation.
+     *
+     *  @param file a file from which to read the style sheet
+     *  @throws IOException if the file does not exist or some exception occurs
+     *  while reading the style sheet
+     */
+    public void readStyleSheet(File file) throws IOException;
+
     /** Convert a document
      *
      *  @param is an <code>InputStream</code> from which to read the source document.

source/java/writer2latex/base/ConverterBase.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-29)
+ *  Version 1.2 (2010-04-12)
  *
  */
 
@@ -75,6 +75,12 @@ public abstract class ConverterBase implements Converter {
     // Provide a do noting fallback method
     public void readTemplate(File file) throws IOException { }
 
+    // Provide a do noting fallback method
+    public void readStyleSheet(InputStream is) throws IOException { }
+	
+    // Provide a do noting fallback method
+    public void readStyleSheet(File file) throws IOException { }
+
     public ConverterResult convert(File source, String sTargetFileName) throws FileNotFoundException,IOException {
         return convert(new FileInputStream(source), sTargetFileName);
     }

source/java/writer2latex/xhtml/Converter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-03-31)
+ *  Version 1.2 (2010-04-12)
  *
  */
 
@@ -79,6 +79,9 @@ public class Converter extends ConverterBase {
 	
     // The template
     private XhtmlDocument template = null;
+    
+    // The included style sheet
+    private CssDocument styleSheet = null;
 
     // The xhtml output file(s)
     protected int nType = XhtmlDocument.XHTML10; // the doctype
@@ -104,16 +107,27 @@ public class Converter extends ConverterBase {
         this.nType = nType;
     }
 
-    // override
+    // override methods to read templates and style sheets
-    public void readTemplate(InputStream is) throws IOException {
+    @Override public void readTemplate(InputStream is) throws IOException {
         template = new XhtmlDocument("Template",nType);
         template.read(is);
     }
 	
-    public void readTemplate(File file) throws IOException {
+    @Override public void readTemplate(File file) throws IOException {
         readTemplate(new FileInputStream(file));
     }
 
+    @Override public void readStyleSheet(InputStream is) throws IOException {
+    	if (styleSheet==null) {
+    		styleSheet = new CssDocument("styles.css");
+    	}
+    	styleSheet.read(is);
+    }
+	
+    @Override public void readStyleSheet(File file) throws IOException {
+        readStyleSheet(new FileInputStream(file));
+    }
+
     protected StyleConverter getStyleCv() { return styleCv; }
 	
     protected TextConverter getTextCv() { return textCv; }
@@ -223,6 +237,11 @@ public class Converter extends ConverterBase {
             }
         }
 
+        // Add included style sheet, if any
+        if (styleSheet!=null) {
+        	converterResult.addDocument(styleSheet);
+        }
+        
         // Export styles (temp.)
         for (int i=0; i<=nOutFileIndex; i++) {
             Document dom = outFiles.get(i).getContentDOM();
@@ -564,6 +583,17 @@ public class Converter extends ConverterBase {
         }*/
         // Note: For single output file, styles are exported to the doc at the end.
 
+        // Add link to included style sheet
+        if (styleSheet!=null) {
+        	Element sty = htmlDOM.createElement("link");
+        	sty.setAttribute("rel", "stylesheet");
+        	sty.setAttribute("type", "text/css");
+        	sty.setAttribute("media", "all");
+        	sty.setAttribute("href", styleSheet.getFileName());
+        	htmlDoc.getHeadNode().appendChild(sty);
+        }
+
+        
         // Recreate nested sections, if any
         if (!textCv.sections.isEmpty()) {
             Iterator<Node> iter = textCv.sections.iterator();

source/java/writer2latex/xhtml/CssDocument.java

@@ -0,0 +1,95 @@
+/************************************************************************
+ *
+ *  CssDocument.java
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *  Copyright: 2002-2010 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.2 (2010-04-12)
+ *
+ */
+ 
+package writer2latex.xhtml;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import writer2latex.api.OutputFile;
+
+/**
+ *  An implementation of <code>OutputFile</code> for CSS documents.
+ *  (Actually this is a trivial implementation which never parses the files)
+ */
+public class CssDocument implements OutputFile {
+	
+    // Content
+	private String sName;
+	private String sContent;
+    
+    /**
+     *  Constructor (creates an empty document)
+     *  @param  name  <code>Document</code> name.
+     */
+    public CssDocument(String sName) {
+    	this.sName = sName;
+    	sContent = "";
+    }
+
+	public String getFileName() {
+		return sName;
+	}
+
+	public String getMIMEType() {
+		return "text/css";
+	}
+
+	public boolean isMasterDocument() {
+		return false;
+	}
+
+	public void write(OutputStream os) throws IOException {
+        OutputStreamWriter osw = new OutputStreamWriter(os,"UTF-8");
+        osw.write(sContent);
+        osw.flush();
+        osw.close();
+	}
+	
+	public void read(InputStream is) throws IOException {
+		BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
+		StringBuffer buf = new StringBuffer();
+		String sLine;
+		while ((sLine=reader.readLine())!=null) {
+			buf.append(sLine).append('\n');
+		}
+		sContent = buf.toString();
+	}
+    
+    
+}
+
+
+
+        
+
+
+
+