diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 70e1938..225c18d 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.1 ---------- +[w2x] Added two attribute style maps: "underline" and "overstrike" + +[w2l] Style maps now (again) works in tables + [w2l] Bugfix: Font is now selected correctly in list labels [w2x] New option formulas (values starmath, latex, image+starmath (default), image+latex) diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index fe75eb9..5b6dc9d 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/distro/samples/latex/sample-article.odt b/source/distro/samples/latex/sample-article.odt index 24baac4..2c23880 100644 Binary files a/source/distro/samples/latex/sample-article.odt and b/source/distro/samples/latex/sample-article.odt differ diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java index 15e0b8c..d14022c 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java +++ b/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-2009 by Henrik Just + * Copyright: 2002-2019 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-05-01) + * Version 1.2 (2010-03-12) * */ @@ -36,7 +36,6 @@ import com.sun.star.container.XNameAccess; import com.sun.star.document.XDocumentInfoSupplier; import com.sun.star.frame.XDesktop; import com.sun.star.lang.XComponent; -import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.XServiceInfo; import com.sun.star.lang.XServiceName; @@ -46,9 +45,9 @@ import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XChangesBatch; -import com.sun.star.util.XMacroExpander; import org.openoffice.da.comp.w2lcommon.helper.DialogBase; +import org.openoffice.da.comp.w2lcommon.helper.MacroExpander; import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper; @@ -170,26 +169,6 @@ public abstract class OptionsDialogBase extends DialogBase implements ////////////////////////////////////////////////////////////////////////// // Some private utility methods - // Perform macro extansion - private String expandMacros(String s) { - if (s.startsWith("vnd.sun.star.expand:")) { - // The string contains a macro, usually as a result of using %origin% in the registry - s = s.substring(20); - Object expander = xContext.getValueByName("/singletons/com.sun.star.util.theMacroExpander"); - XMacroExpander xExpander = (XMacroExpander) UnoRuntime.queryInterface (XMacroExpander.class, expander); - try { - return xExpander.expandMacros(s); - } - catch (IllegalArgumentException e) { - // Unknown macro name found, proceed and hope for the best - return s; - } - } - else { - return s; - } - } - // Get the template name from the document with ui focus private String getTemplateName() { try { @@ -419,8 +398,9 @@ public abstract class OptionsDialogBase extends DialogBase implements Object config = xNameAccess.getByName(sConfigNames[i]); XPropertySet xCfgProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,config); - filterData.put("ConfigURL",expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL"))); - filterData.put("TemplateURL",expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"TargetTemplateURL"))); + MacroExpander expander = new MacroExpander(xContext); + filterData.put("ConfigURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL"))); + filterData.put("TemplateURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"TargetTemplateURL"))); XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]); bFound = true; } diff --git a/source/java/org/openoffice/da/comp/w2lcommon/helper/MacroExpander.java b/source/java/org/openoffice/da/comp/w2lcommon/helper/MacroExpander.java new file mode 100644 index 0000000..184df94 --- /dev/null +++ b/source/java/org/openoffice/da/comp/w2lcommon/helper/MacroExpander.java @@ -0,0 +1,69 @@ +/************************************************************************ + * + * OptionsDialogBase.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-03-12) + * + */ + +package org.openoffice.da.comp.w2lcommon.helper; + +import com.sun.star.lang.IllegalArgumentException; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.util.XMacroExpander; + +public class MacroExpander { + + private XMacroExpander xExpander; + + /** Convenience wrapper class for the UNO Macro Expander singleton + * + * @param xContext the UNO component context from which "theMacroExpander" can be created + */ + public MacroExpander(XComponentContext xContext) { + Object expander = xContext.getValueByName("/singletons/com.sun.star.util.theMacroExpander"); + xExpander = (XMacroExpander) UnoRuntime.queryInterface (XMacroExpander.class, expander); + } + + /** Expand macros in a string + * + * @param s the string + * @return the expanded string + */ + public String expandMacros(String s) { + if (xExpander!=null && s.startsWith("vnd.sun.star.expand:")) { + // The string contains a macro, usually as a result of using %origin% in the registry + s = s.substring(20); + try { + return xExpander.expandMacros(s); + } + catch (IllegalArgumentException e) { + // Unknown macro name found, proceed and hope for the best + return s; + } + } + else { + return s; + } + } + +} diff --git a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java index 3ccc1ad..1174e83 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java +++ b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java @@ -401,6 +401,7 @@ public final class ConfigurationDialog // Maybe add some info for Ubuntu users // sudo apt-get install texlive // sudo apt-get install texlive-xetex + // sudo apt-get install texlive-latex-extra // sudo apt-get install tex4ht displayAutoConfigInfo(info.toString()); changeApplication(xWindow); diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java index a7d9ffc..e84d974 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java +++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-11-19) + * Version 1.2 (2010-03-12) * */ @@ -34,6 +34,7 @@ import java.net.URISyntaxException; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertyAccess; import com.sun.star.beans.XPropertySet; +import com.sun.star.container.XNameAccess; import com.sun.star.frame.XController; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; @@ -46,6 +47,7 @@ import com.sun.star.ui.dialogs.XExecutableDialog; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; +import org.openoffice.da.comp.w2lcommon.helper.MacroExpander; import org.openoffice.da.comp.w2lcommon.helper.MessageBox; import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; @@ -378,7 +380,16 @@ public final class Writer4LaTeX extends WeakBase case 5: filterData.put("ConfigURL","$(user)/writer2latex.xml"); filterData.put("AutoCreate","true"); break; default: - loadOption(xProps,filterData,"ConfigName","ConfigURL"); + // Get the actual URL from the registry + String sConfigName = XPropertySetHelper.getPropertyValueAsString(xProps, "ConfigName"); + + Object configurations = XPropertySetHelper.getPropertyValue(xProps,"Configurations"); + XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,configurations); + Object config = xNameAccess.getByName(sConfigName); + XPropertySet xCfgProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,config); + + MacroExpander expander = new MacroExpander(m_xContext); + filterData.put("ConfigURL",expander.expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL"))); } // Read the options diff --git a/source/java/writer2latex/latex/ParConverter.java b/source/java/writer2latex/latex/ParConverter.java index d16e991..092b890 100644 --- a/source/java/writer2latex/latex/ParConverter.java +++ b/source/java/writer2latex/latex/ParConverter.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-03-12) * */ @@ -179,7 +179,9 @@ public class ParConverter extends StyleConverter { // Add newline if *between* paragraphs if (!bLastInBlock) { ba.add("","\n"); } - + + context.setVerbatim(false); + if (context.isInSimpleTable()) { if (config.formatting()!=LaTeXConfig.IGNORE_ALL) { // only character formatting! @@ -191,6 +193,20 @@ public class ParConverter extends StyleConverter { } } } + else if (config.getParStyleMap().contains(ofr.getParStyles().getDisplayName(sName))) { + // We have a style map in the configuration + StyleMap sm = config.getParStyleMap(); + String sDisplayName = ofr.getParStyles().getDisplayName(sName); + String sBefore = sm.getBefore(sDisplayName); + String sAfter = sm.getAfter(sDisplayName); + ba.add(sBefore, sAfter); + // Add line breaks inside? + if (sm.getLineBreak(sDisplayName)) { + if (sBefore.length()>0) { ba.add("\n",""); } + if (sAfter.length()>0 && !"}".equals(sAfter)) { ba.add("","\n"); } + } + if (sm.getVerbatim(sDisplayName)) { context.setVerbatim(true); } + } else if (bNoTextPar && (config.formatting()==LaTeXConfig.CONVERT_BASIC || config.formatting()==LaTeXConfig.IGNORE_MOST) ) { // only alignment! StyleWithProperties style = ofr.getParStyle(sName); @@ -251,7 +267,6 @@ public class ParConverter extends StyleConverter { StyleWithProperties style = ofr.getParStyle(sName); if (style==null) { return; } context.updateFormattingFromStyle(style); - context.setVerbatim(styleMap.getVerbatim(sName)); } diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java index 990d858..43887da 100644 --- a/source/java/writer2latex/xhtml/TextConverter.java +++ b/source/java/writer2latex/xhtml/TextConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-12-15) + * Version 1.2 (2010-03-12) * */ @@ -40,6 +40,7 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Element; import writer2latex.util.Misc; +import writer2latex.office.FontDeclaration; import writer2latex.office.XMLString; import writer2latex.office.IndexMark; import writer2latex.office.ListCounter; @@ -1725,7 +1726,86 @@ public class TextConverter extends ConverterHelper { /////////////////////////////////////////////////////////////////////////// // UTILITY METHODS /////////////////////////////////////////////////////////////////////////// + + // Methods to query individual formatting properties (no inheritance) + + // Does this style contain the bold attribute? + private boolean isBold(StyleWithProperties style) { + String s = style.getProperty(XMLString.FO_FONT_WEIGHT,false); + return s!=null && "bold".equals(s); + } + // Does this style contain the italics/oblique attribute? + private boolean isItalics(StyleWithProperties style) { + String s = style.getProperty(XMLString.FO_FONT_STYLE,false); + return s!=null && !"normal".equals(s); + } + + // Does this style contain a fixed pitch font? + private boolean isFixed(StyleWithProperties style) { + String s = style.getProperty(XMLString.STYLE_FONT_NAME,false); + String s2 = null; + String s3 = null; + if (s!=null) { + FontDeclaration fd = (FontDeclaration) ofr.getFontDeclarations().getStyle(s); + if (fd!=null) { + s2 = fd.getFontFamilyGeneric(); + s3 = fd.getFontPitch(); + } + } + else { + s = style.getProperty(XMLString.FO_FONT_FAMILY,false); + s2 = style.getProperty(XMLString.STYLE_FONT_FAMILY_GENERIC,false); + s3 = style.getProperty(XMLString.STYLE_FONT_PITCH,false); + } + if ("fixed".equals(s3)) { return true; } + if ("modern".equals(s2)) { return true; } + return false; + } + + // Does this style specify superscript? + private boolean isSuperscript(StyleWithProperties style) { + String sPos = style.getProperty(XMLString.STYLE_TEXT_POSITION,false); + if (sPos==null) return false; + if (sPos.startsWith("sub")) return false; + if (sPos.startsWith("-")) return false; + if (sPos.startsWith("0%")) return false; + return true; + } + + // Does this style specify subscript? + private boolean isSubscript(StyleWithProperties style) { + String sPos = style.getProperty(XMLString.STYLE_TEXT_POSITION,false); + if (sPos==null) return false; + if (sPos.startsWith("sub")) return true; + if (sPos.startsWith("-")) return true; + return false; + } + + // Does this style specify underline? + private boolean isUnderline(StyleWithProperties style) { + String s; + if (ofr.isOpenDocument()) { + s = style.getProperty(XMLString.STYLE_TEXT_UNDERLINE_STYLE,false); + } + else { + s = style.getProperty(XMLString.STYLE_TEXT_UNDERLINE,false); + } + return s!=null && !"none".equals(s); + } + + // Does this style specify overstrike? + private boolean isOverstrike(StyleWithProperties style) { + String s; + if (ofr.isOpenDocument()) { + s = style.getProperty(XMLString.STYLE_TEXT_LINE_THROUGH_STYLE,false); + } + else { + s = style.getProperty(XMLString.STYLE_TEXT_CROSSING_OUT,false); + } + return s!=null && !"none".equals(s); + } + /* apply hard formatting attribute style maps */ private Element applyAttributes(Element node, StyleWithProperties style) { // Do nothing if we convert hard formatting @@ -1733,11 +1813,13 @@ public class TextConverter extends ConverterHelper { // Do nothing if this is not an automatic style if (style==null) { return node; } if (!style.isAutomatic()) { return node; } - node = applyAttribute(node,"bold",getTextSc().isBold(style)); - node = applyAttribute(node,"italics",getTextSc().isItalics(style)); - node = applyAttribute(node,"fixed",getTextSc().isFixed(style)); - node = applyAttribute(node,"superscript",getTextSc().isSuperscript(style)); - node = applyAttribute(node,"subscript",getTextSc().isSubscript(style)); + node = applyAttribute(node,"bold",isBold(style)); + node = applyAttribute(node,"italics",isItalics(style)); + node = applyAttribute(node,"fixed",isFixed(style)); + node = applyAttribute(node,"superscript",isSuperscript(style)); + node = applyAttribute(node,"subscript",isSubscript(style)); + node = applyAttribute(node,"underline",isUnderline(style)); + node = applyAttribute(node,"overstrike",isOverstrike(style)); return node; } diff --git a/source/java/writer2latex/xhtml/TextStyleConverter.java b/source/java/writer2latex/xhtml/TextStyleConverter.java index 628c86c..19360bd 100644 --- a/source/java/writer2latex/xhtml/TextStyleConverter.java +++ b/source/java/writer2latex/xhtml/TextStyleConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2010-02-14) + * Version 1.2 (2010-03-12) * */ @@ -198,61 +198,6 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { cssText(style,props,bInherit); } - // Methods to query individual formatting properties (no inheritance) - - // Does this style contain the bold attribute? - public boolean isBold(StyleWithProperties style) { - String s = style.getProperty(XMLString.FO_FONT_WEIGHT,false); - return s!=null && "bold".equals(s); - } - - // Does this style contain the italics/oblique attribute? - public boolean isItalics(StyleWithProperties style) { - String s = style.getProperty(XMLString.FO_FONT_STYLE,false); - return s!=null && !"normal".equals(s); - } - - // Does this style contain a fixed pitch font? - public boolean isFixed(StyleWithProperties style) { - String s = style.getProperty(XMLString.STYLE_FONT_NAME,false); - String s2 = null; - String s3 = null; - if (s!=null) { - FontDeclaration fd = (FontDeclaration) ofr.getFontDeclarations().getStyle(s); - if (fd!=null) { - s2 = fd.getFontFamilyGeneric(); - s3 = fd.getFontPitch(); - } - } - else { - s = style.getProperty(XMLString.FO_FONT_FAMILY,false); - s2 = style.getProperty(XMLString.STYLE_FONT_FAMILY_GENERIC,false); - s3 = style.getProperty(XMLString.STYLE_FONT_PITCH,false); - } - if ("fixed".equals(s3)) { return true; } - if ("modern".equals(s2)) { return true; } - return false; - } - - // Does this style specify superscript? - public boolean isSuperscript(StyleWithProperties style) { - String sPos = style.getProperty(XMLString.STYLE_TEXT_POSITION,false); - if (sPos==null) return false; - if (sPos.startsWith("sub")) return false; - if (sPos.startsWith("-")) return false; - if (sPos.startsWith("0%")) return false; - return true; - } - - // Does this style specify subscript? - public boolean isSubscript(StyleWithProperties style) { - String sPos = style.getProperty(XMLString.STYLE_TEXT_POSITION,false); - if (sPos==null) return false; - if (sPos.startsWith("sub")) return true; - if (sPos.startsWith("-")) return true; - return false; - } - //////////////////////////////////////////////////////////////////////////// // OpenDocument text properties // Text properties can be applied to text, paragraph, cell, graphic and diff --git a/source/java/writer2latex/xhtml/XhtmlDocument.java b/source/java/writer2latex/xhtml/XhtmlDocument.java index dbfb852..804c875 100644 --- a/source/java/writer2latex/xhtml/XhtmlDocument.java +++ b/source/java/writer2latex/xhtml/XhtmlDocument.java @@ -292,7 +292,7 @@ public class XhtmlDocument extends DOMDocument { String[] sTemplateIds = config.templateIds().split(","); int nIdCount = sTemplateIds.length; - if (nIdCount>0) sContentId = sTemplateIds[0].trim(); else sContentId = "content"; + if (nIdCount>0 && sTemplateIds[0].trim().length()>0) sContentId = sTemplateIds[0].trim(); else sContentId = "content"; if (nIdCount>1) sHeaderId = sTemplateIds[1].trim(); else sHeaderId = "header"; if (nIdCount>2) sFooterId = sTemplateIds[2].trim(); else sFooterId = "footer"; if (nIdCount>3) sPanelId = sTemplateIds[3].trim(); else sPanelId = "panel"; diff --git a/source/oxt/writer4latex/config/article.xml b/source/oxt/writer4latex/config/article.xml index c41a711..793c3ef 100644 --- a/source/oxt/writer4latex/config/article.xml +++ b/source/oxt/writer4latex/config/article.xml @@ -2,7 +2,7 @@ @@ -32,6 +32,10 @@