diff --git a/build.xml b/build.xml index 5a1e82e..8636ebc 100644 --- a/build.xml +++ b/build.xml @@ -35,7 +35,7 @@ - + diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index b0c5c06..155ee40 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -1,5 +1,21 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 +---------- version 1.1.7 ---------- + +[w2x] Standard meta data as well as custom meta data can now be edited directly from the EPUB export dialog + +[w2x] New option use_custom_metadata (default true) making the inclusion of custom meta data in EPUB export optional + +[w2x] Revised the internal structure of EPUB files: Text files are named chapter.xhtml, images are placed in the + subdirectory images and name image, styles are placed in the subdirectory styles and names styles.css (custom + style sheet) and styles1.css (generated style sheet) + +[w2x] Use relative font size is now selected per default in EPUB export dialog + +[w2x] Default value of the option formulas changed to image+starmath + +[w2x] Default value of the option use_default_font changed to false (was true by mistake) + ---------- version 1.1.6 ---------- [all] Changed w2l.bat to use %~dp0 as suggested by Dave Jarvis (this leaves out any (probably none) win 9x users) diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 05a0d39..73dba4e 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java index 9f0d0d9..d49a78d 100644 --- a/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java @@ -16,24 +16,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-29) + * Version 1.2 (2011-02-20) * */ -// TODO: Add to doc: -// New options relative_font_size, font_scaling, use_default_font, default_font_name, split_after, page_break_split, include_toc -// Also add to list of possible locked options external_toc_depth, display_hidden_text - package org.openoffice.da.comp.writer2xhtml; import java.awt.GraphicsEnvironment; import com.sun.star.awt.XDialog; +import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; +import com.sun.star.frame.XDesktop; +import com.sun.star.frame.XDispatchHelper; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XFrame; +import com.sun.star.lang.XMultiComponentFactory; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.Exception; +import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper; @@ -88,16 +93,17 @@ public class EpubOptionsDialog extends OptionsDialogBase { setListBoxStringItemList("DefaultFontName", GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames()); - // Special content - loadCheckBoxOption(xProps, "DisplayHiddenText"); - loadCheckBoxOption(xProps, "Notes"); - loadCheckBoxOption(xProps, "UseDublinCore"); - // AutoCorrect loadCheckBoxOption(xProps, "IgnoreHardLineBreaks"); loadCheckBoxOption(xProps, "IgnoreEmptyParagraphs"); loadCheckBoxOption(xProps, "IgnoreDoubleSpaces"); + // Special content + loadCheckBoxOption(xProps, "DisplayHiddenText"); + loadCheckBoxOption(xProps, "Notes"); + loadCheckBoxOption(xProps, "UseDublinCore"); + loadCheckBoxOption(xProps, "UseCustomMetadata"); + // Document division loadCheckBoxOption(xProps, "Split"); loadListBoxOption(xProps, "SplitLevel"); @@ -135,16 +141,17 @@ public class EpubOptionsDialog extends OptionsDialogBase { saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size"); - // Special content - saveCheckBoxOption(xProps, helper, "DisplayHiddenText", "display_hidden_text"); - saveCheckBoxOption(xProps, helper, "Notes", "notes"); - saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); - // AutoCorrect saveCheckBoxOption(xProps, helper, "IgnoreHardLineBreaks", "ignore_hard_line_breaks"); saveCheckBoxOption(xProps, helper, "IgnoreEmptyParagraphs", "ignore_empty_paragraphs"); saveCheckBoxOption(xProps, helper, "IgnoreDoubleSpaces", "ignore_double_spaces"); + // Special content + saveCheckBoxOption(xProps, helper, "DisplayHiddenText", "display_hidden_text"); + saveCheckBoxOption(xProps, helper, "Notes", "notes"); + saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); + saveCheckBoxOption(xProps, helper, "UseCustomMetadata", "use_custom_metadata"); + // Document division boolean bSplit = saveCheckBoxOption(xProps, "Split"); short nSplitLevel = saveListBoxOption(xProps, "SplitLevel"); @@ -202,6 +209,12 @@ public class EpubOptionsDialog extends OptionsDialogBase { else if (sMethod.equals("UseDefaultFontChange")) { useDefaultFontChange(); } + else if (sMethod.equals("EditMetadataClick")) { + editMetadataClick(); + } + else if (sMethod.equals("EditCustomMetadataClick")) { + editCustomMetadataClick(); + } else if (sMethod.equals("SplitChange")) { splitChange(); } @@ -216,6 +229,7 @@ public class EpubOptionsDialog extends OptionsDialogBase { @Override public String[] getSupportedMethodNames() { String[] sNames = { "ConfigChange", "RelativeFontSizeChange", "UseDefaultFontChange", + "EditMetadataClick", "EditCustomMetadataClick", "SplitChange", "UsePageBreakSplitChange", "UseSplitAfterChange" }; return sNames; } @@ -242,15 +256,16 @@ public class EpubOptionsDialog extends OptionsDialogBase { setControlEnabled("ConvertToPx",!isLocked("convert_to_px")); setControlEnabled("OriginalImageSize",!isLocked("original_image_size")); - // Special content - setControlEnabled("Notes",!isLocked("notes")); - setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); - // AutoCorrect setControlEnabled("IgnoreHardLineBreaks",!isLocked("ignore_hard_line_breaks")); setControlEnabled("IgnoreEmptyParagraphs",!isLocked("ignore_empty_paragraphs")); setControlEnabled("IgnoreDoubleSpaces",!isLocked("ignore_double_spaces")); + // Special content + setControlEnabled("Notes",!isLocked("notes")); + setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); + setControlEnabled("UseCustomMetadata",!isLocked("use_custom_metadata")); + // Document division boolean bSplit = getCheckBoxStateAsBoolean("Split"); setControlEnabled("Split",!isLocked("split_level")); @@ -289,6 +304,43 @@ public class EpubOptionsDialog extends OptionsDialogBase { setControlEnabled("DefaultFontName", bState); } } + + private void editMetadataClick() { + // Get the DispatchHelper service + XMultiComponentFactory xMCF = xContext.getServiceManager(); + XMultiServiceFactory xFactory = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xMCF); + Object dispatchHelper; + try { + dispatchHelper = xFactory.createInstance("com.sun.star.frame.DispatchHelper"); + } catch (Exception e) { + // Failed to get dispatch helper, cannot execute dispatch + System.out.println("Failed to get dispatch helper"); + return; + } + XDispatchHelper helper = (XDispatchHelper) UnoRuntime.queryInterface(XDispatchHelper.class, dispatchHelper); + + // Get the current frame + Object desktop; + try { + desktop = xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext); + } catch (Exception e) { + // Failed to get desktop + System.out.println("Failed to get desktop"); + return; + } + XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface(com.sun.star.frame.XDesktop.class, desktop); + XFrame xFrame =xDesktop.getCurrentFrame(); + + // Get the DispatchProvider for the current frame + XDispatchProvider xDispatchProvider = (XDispatchProvider)UnoRuntime.queryInterface(XDispatchProvider.class, xFrame); + PropertyValue[] props = new PropertyValue[0]; + helper.executeDispatch(xDispatchProvider, ".uno:SetDocumentProperties","", 0, props); + } + + private void editCustomMetadataClick() { + // Stub, TODO + System.out.println("Edit custom metadata"); + } private void splitChange() { if (!isLocked("split_level")) { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 817011a..cdd7019 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.2 (2011-02-14) + * Version 1.2 (2011-02-20) * */ @@ -32,8 +32,8 @@ package writer2latex.api; public class ConverterFactory { // Version information - private static final String VERSION = "1.1.6"; - private static final String DATE = "2011-02-14"; + private static final String VERSION = "1.1.7"; + private static final String DATE = "2011-02-20"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/base/ConverterBase.java b/source/java/writer2latex/base/ConverterBase.java index e1624b1..3617dc5 100644 --- a/source/java/writer2latex/base/ConverterBase.java +++ b/source/java/writer2latex/base/ConverterBase.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-21) + * Version 1.2 (2011-02-19) * */ @@ -97,7 +97,7 @@ public abstract class ConverterBase implements Converter { odDoc.read(is); ofr = new OfficeReader(odDoc,false); metaData = new MetaData(odDoc); - imageLoader = new ImageLoader(odDoc,sTargetFileName,true); + imageLoader = new ImageLoader(odDoc,true); imageLoader.setGraphicConverter(graphicConverter); // Prepare output diff --git a/source/java/writer2latex/epub/EPUBConverter.java b/source/java/writer2latex/epub/EPUBConverter.java index 3f19968..5d1952c 100644 --- a/source/java/writer2latex/epub/EPUBConverter.java +++ b/source/java/writer2latex/epub/EPUBConverter.java @@ -45,7 +45,7 @@ public final class EPUBConverter extends Xhtml11Converter { @Override public ConverterResult convert(InputStream is, String sTargetFileName) throws IOException { setOPS(true); - ConverterResult xhtmlResult = super.convert(is, sTargetFileName); + ConverterResult xhtmlResult = super.convert(is, "chapter"); ConverterResultImpl epubResult = new ConverterResultImpl(); epubResult.addDocument(new EPUBWriter(xhtmlResult,sTargetFileName,getXhtmlConfig())); diff --git a/source/java/writer2latex/epub/EPUBWriter.java b/source/java/writer2latex/epub/EPUBWriter.java index b3a8118..e520533 100644 --- a/source/java/writer2latex/epub/EPUBWriter.java +++ b/source/java/writer2latex/epub/EPUBWriter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2001-2010 by Henrik Just + * Copyright: 2001-2011 by Henrik Just * * All Rights Reserved. * - * version 1.2 (2010-12-20) + * version 1.2 (2011-02-17) * */ @@ -89,7 +89,7 @@ public class EPUBWriter implements OutputFile { zos.closeEntry(); // Then manifest - OPFWriter manifest = new OPFWriter(xhtmlResult, config.xhtmlUseDublinCore()); + OPFWriter manifest = new OPFWriter(xhtmlResult, config.xhtmlUseDublinCore(), config.useCustomMetadata()); ZipEntry manifestEntry = new ZipEntry("OEBPS/book.opf"); zos.putNextEntry(manifestEntry); writeZipEntry(manifest,zos); diff --git a/source/java/writer2latex/epub/OPFWriter.java b/source/java/writer2latex/epub/OPFWriter.java index 633e32c..4a82361 100644 --- a/source/java/writer2latex/epub/OPFWriter.java +++ b/source/java/writer2latex/epub/OPFWriter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2001-2010 by Henrik Just + * Copyright: 2001-2011 by Henrik Just * * All Rights Reserved. * - * version 1.2 (2010-12-20) + * version 1.2 (2011-02-17) * */ @@ -51,7 +51,7 @@ import writer2latex.xmerge.NewDOMDocument; public class OPFWriter extends NewDOMDocument { private String sUID=null; - public OPFWriter(ConverterResult cr, boolean bUseDublinCore) { + public OPFWriter(ConverterResult cr, boolean bUseDublinCore, boolean bUseCustomMetadata) { super("book", "opf"); // create DOM @@ -108,84 +108,86 @@ public class OPFWriter extends NewDOMDocument { boolean bHasIdentifier = false; boolean bHasCreator = false; boolean bHasDate = false; - // First rearrange the user-defined meta data - Map userDefinedMetaData = cr.getMetaData().getUserDefinedMetaData(); - Map dc = new HashMap(); - for (String sKey : userDefinedMetaData.keySet()) { - if (sKey.length()>0) { - String[] sValue = new String[2]; - sValue[0] = userDefinedMetaData.get(sKey); - String sNewKey; - int nDot = sKey.indexOf("."); - if (nDot>0) { - sNewKey = sKey.substring(0, nDot).toLowerCase(); - sValue[1] = sKey.substring(nDot+1); - } - else { - sNewKey = sKey.toLowerCase(); - sValue[1] = null; - } - dc.put(sNewKey, sValue); - } - } - // Then export it - String[] sKeys = Misc.sortStringSet(dc.keySet()); - for (String sKey : sKeys) { - String sValue = dc.get(sKey)[0]; - String sAttributeValue = dc.get(sKey)[1]; - if (sKey.startsWith("identifier")) { - Element identifier = appendElement(contentDOM, metadata, "dc:identifier", sValue); - if (!bHasIdentifier) { // The first identifier is the unique ID - identifier.setAttribute("id", "BookId"); - sUID = sValue; - } - if (sAttributeValue!=null) { - identifier.setAttribute("opf:scheme", sAttributeValue); - } - bHasIdentifier = true; - } - else if (sKey.startsWith("creator")) { - Element creator = appendElement(contentDOM, metadata, "dc:creator", sValue); - if (sAttributeValue!=null) { - creator.setAttribute("opf:role", sAttributeValue); - } - bHasCreator = true; - } - else if (sKey.startsWith("contributor")) { - Element contributor = appendElement(contentDOM, metadata, "dc:contributor", sValue); - if (sAttributeValue!=null) { - contributor.setAttribute("opf:role", sAttributeValue); + if (bUseCustomMetadata) { + // First rearrange the user-defined meta data + Map userDefinedMetaData = cr.getMetaData().getUserDefinedMetaData(); + Map dc = new HashMap(); + for (String sKey : userDefinedMetaData.keySet()) { + if (sKey.length()>0) { + String[] sValue = new String[2]; + sValue[0] = userDefinedMetaData.get(sKey); + String sNewKey; + int nDot = sKey.indexOf("."); + if (nDot>0) { + sNewKey = sKey.substring(0, nDot).toLowerCase(); + sValue[1] = sKey.substring(nDot+1); + } + else { + sNewKey = sKey.toLowerCase(); + sValue[1] = null; + } + dc.put(sNewKey, sValue); } } - else if (sKey.startsWith("date")) { - Element date = appendElement(contentDOM, metadata, "dc:date", sValue); - if (sAttributeValue!=null) { - date.setAttribute("opf:event", sAttributeValue); + // Then export it + String[] sKeys = Misc.sortStringSet(dc.keySet()); + for (String sKey : sKeys) { + String sValue = dc.get(sKey)[0]; + String sAttributeValue = dc.get(sKey)[1]; + if (sKey.startsWith("identifier")) { + Element identifier = appendElement(contentDOM, metadata, "dc:identifier", sValue); + if (!bHasIdentifier) { // The first identifier is the unique ID + identifier.setAttribute("id", "BookId"); + sUID = sValue; + } + if (sAttributeValue!=null) { + identifier.setAttribute("opf:scheme", sAttributeValue); + } + bHasIdentifier = true; } - bHasDate = true; - } - // Remaining properties must be unique and has not attributes, hence - else if (sAttributeValue==null) { - if ("publisher".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:publisher", sValue); + else if (sKey.startsWith("creator")) { + Element creator = appendElement(contentDOM, metadata, "dc:creator", sValue); + if (sAttributeValue!=null) { + creator.setAttribute("opf:role", sAttributeValue); + } + bHasCreator = true; } - else if ("type".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:type", sValue); + else if (sKey.startsWith("contributor")) { + Element contributor = appendElement(contentDOM, metadata, "dc:contributor", sValue); + if (sAttributeValue!=null) { + contributor.setAttribute("opf:role", sAttributeValue); + } } - else if ("format".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:format", sValue); + else if (sKey.startsWith("date")) { + Element date = appendElement(contentDOM, metadata, "dc:date", sValue); + if (sAttributeValue!=null) { + date.setAttribute("opf:event", sAttributeValue); + } + bHasDate = true; } - else if ("source".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:source", sValue); - } - else if ("relation".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:relation", sValue); - } - else if ("coverage".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:coverage", sValue); - } - else if ("rights".equals(sKey)) { - appendElement(contentDOM, metadata, "dc:rights", sValue); + // Remaining properties must be unique and has not attributes, hence + else if (sAttributeValue==null) { + if ("publisher".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:publisher", sValue); + } + else if ("type".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:type", sValue); + } + else if ("format".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:format", sValue); + } + else if ("source".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:source", sValue); + } + else if ("relation".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:relation", sValue); + } + else if ("coverage".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:coverage", sValue); + } + else if ("rights".equals(sKey)) { + appendElement(contentDOM, metadata, "dc:rights", sValue); + } } } } diff --git a/source/java/writer2latex/latex/ConverterPalette.java b/source/java/writer2latex/latex/ConverterPalette.java index 668a16e..11d93c8 100644 --- a/source/java/writer2latex/latex/ConverterPalette.java +++ b/source/java/writer2latex/latex/ConverterPalette.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-11-21) + * Version 1.2 (2011-02-19) * */ @@ -124,9 +124,11 @@ public final class ConverterPalette extends ConverterBase { // fill out inner converter method public void convertInner() throws IOException { sTargetFileName = Misc.trimDocumentName(sTargetFileName,".tex"); - imageLoader.setOutFileName(new ExportNameCollection(true).getExportName(sTargetFileName)); - - imageLoader.setUseSubdir(config.saveImagesInSubdir()); + String sSafeTargetFileName = new ExportNameCollection(true).getExportName(sTargetFileName); + imageLoader.setBaseFileName(sSafeTargetFileName+"-img"); + if (config.saveImagesInSubdir()) { + imageLoader.setUseSubdir(sSafeTargetFileName+"-img"); + } // Set graphics formats depending on backend if (config.getBackend()==LaTeXConfig.PDFTEX || config.getBackend()==LaTeXConfig.XETEX) { diff --git a/source/java/writer2latex/office/ImageLoader.java b/source/java/writer2latex/office/ImageLoader.java index fe51593..bfa2cd3 100644 --- a/source/java/writer2latex/office/ImageLoader.java +++ b/source/java/writer2latex/office/ImageLoader.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-12-07) + * Version 1.2 (2011-02-19) * */ @@ -55,8 +55,8 @@ public final class ImageLoader { private OfficeDocument oooDoc; // Data for file name generation - private String sOutFileName; - private boolean bUseSubdir = false; + private String sBaseFileName = ""; + private String sSubDirName = ""; private int nImageCount = 0; private NumberFormat formatter; @@ -70,17 +70,16 @@ public final class ImageLoader { private String sDefaultVectorFormat = null; private HashSet acceptedFormats = new HashSet(); - public ImageLoader(OfficeDocument oooDoc, String sOutFileName, boolean bExtractEPS) { + public ImageLoader(OfficeDocument oooDoc, boolean bExtractEPS) { this.oooDoc = oooDoc; - this.sOutFileName = sOutFileName; this.bExtractEPS = bExtractEPS; this.formatter = new DecimalFormat("000"); } - public void setOutFileName(String sOutFileName) { this.sOutFileName = sOutFileName; } + public void setBaseFileName(String sBaseFileName) { this.sBaseFileName = sBaseFileName; } + + public void setUseSubdir(String sSubDirName) { this.sSubDirName = sSubDirName+"/"; } - public void setUseSubdir(boolean bUseSubdir) { this.bUseSubdir = bUseSubdir; } - public void setAcceptOtherFormats(boolean b) { bAcceptOtherFormats = b; } public void setDefaultFormat(String sMime) { @@ -146,8 +145,7 @@ public final class ImageLoader { if (blob==null) { return null; } // Assign a name (without extension) - String sName = sOutFileName+"-img"+formatter.format(++nImageCount); - if (bUseSubdir) { sName = sOutFileName + "-img/" + sName; } + String sName = sSubDirName+sBaseFileName+formatter.format(++nImageCount); BinaryGraphicsDocument bgd = null; diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java index ad0fcf4..3d8c549 100644 --- a/source/java/writer2latex/xhtml/Converter.java +++ b/source/java/writer2latex/xhtml/Converter.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-21) + * Version 1.2 (2011-02-19) * */ @@ -60,7 +60,7 @@ import writer2latex.util.ExportNameCollection; import writer2latex.util.Misc; /** - *

This class converts an OpenDocument file to an XHTML(+MathML) document.

+ *

This class converts an OpenDocument file to an XHTML(+MathML) or EPUB document.

* */ public class Converter extends ConverterBase { @@ -87,7 +87,7 @@ public class Converter extends ConverterBase { // The included style sheet and associated resources private CssDocument styleSheet = null; private Set resources = new HashSet(); - + // The xhtml output file(s) protected int nType = XhtmlDocument.XHTML10; // the doctype private boolean bOPS = false; // Do we need to be OPS conforming? @@ -124,7 +124,7 @@ public class Converter extends ConverterBase { @Override public void readStyleSheet(InputStream is) throws IOException { if (styleSheet==null) { - styleSheet = new CssDocument("styles.css"); + styleSheet = new CssDocument("styles/styles.css"); } styleSheet.read(is); } @@ -201,7 +201,16 @@ public class Converter extends ConverterBase { l10n = new L10n(); - imageLoader.setUseSubdir(config.saveImagesInSubdir()); + if (isOPS()) { + imageLoader.setBaseFileName("image"); + imageLoader.setUseSubdir("images"); + } + else { + imageLoader.setBaseFileName(sTargetFileName+"-img"); + if (config.saveImagesInSubdir()) { + imageLoader.setUseSubdir(sTargetFileName+"-img"); + } + } imageLoader.setDefaultFormat(MIMETypes.PNG); imageLoader.addAcceptedFormat(MIMETypes.JPEG); @@ -272,13 +281,15 @@ public class Converter extends ConverterBase { } } - // Export styles (temp.) - for (int i=0; i<=nOutFileIndex; i++) { - Element head = outFiles.get(i).getHeadNode(); - if (head!=null) { - Node styles = styleCv.exportStyles(outFiles.get(i).getContentDOM()); - if (styles!=null) { - head.appendChild(styles); + // Export styles (XHTML) + if (!isOPS()) { + for (int i=0; i<=nOutFileIndex; i++) { + Element head = outFiles.get(i).getHeadNode(); + if (head!=null) { + Node styles = styleCv.exportStyles(outFiles.get(i).getContentDOM()); + if (styles!=null) { + head.appendChild(styles); + } } } } @@ -407,6 +418,12 @@ public class Converter extends ConverterBase { } } + // Export styles (EPUB) + if (isOPS()) { + CssDocument cssDoc = new CssDocument("styles/styles1.css"); + cssDoc.read(styleCv.exportStyles(false)); + converterResult.addDocument(cssDoc); + } } private void addNavigationLink(Document dom, Node node, String s, int nIndex) { @@ -617,7 +634,7 @@ public class Converter extends ConverterBase { } } - // Add link to stylesheet, if producing nomral XHTML + // Add link to custom stylesheet, if producing normal XHTML if (!bOPS && config.xhtmlCustomStylesheet().length()>0) { Element htmlStyle = htmlDOM.createElement("link"); htmlStyle.setAttribute("rel","stylesheet"); @@ -626,26 +643,28 @@ public class Converter extends ConverterBase { htmlStyle.setAttribute("href",config.xhtmlCustomStylesheet()); head.appendChild(htmlStyle); } - /* later.... - if (nSplit>0 && !config.xhtmlIgnoreStyles()) { - Element htmlStyle = htmlDOM.createElement("link"); - htmlStyle.setAttribute("rel","stylesheet"); - htmlStyle.setAttribute("type","text/css"); - htmlStyle.setAttribute("media","all"); - htmlStyle.setAttribute("href",oooDoc.getName()+"-styles.css"); - htmlHead.appendChild(htmlStyle); - }*/ - // Note: For single output file, styles are exported to the doc at the end. - + // Add link to included style sheet if producing OPS content if (bOPS && 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()); + sty.setAttribute("href", "stylesheet/"+styleSheet.getFileName()); head.appendChild(sty); } + + // Add link to generated stylesheet if producing OPS content + if (isOPS() && config.xhtmlFormatting()>XhtmlConfig.IGNORE_STYLES) { + Element htmlStyle = htmlDOM.createElement("link"); + htmlStyle.setAttribute("rel","stylesheet"); + htmlStyle.setAttribute("type","text/css"); + htmlStyle.setAttribute("media","all"); + htmlStyle.setAttribute("href","styles/styles1.css"); + head.appendChild(htmlStyle); + } + // Note: For XHTML, generated styles are exported to the doc at the end. + } // Recreate nested sections, if any diff --git a/source/java/writer2latex/xhtml/CssDocument.java b/source/java/writer2latex/xhtml/CssDocument.java index 4be4f39..e8882dc 100644 --- a/source/java/writer2latex/xhtml/CssDocument.java +++ b/source/java/writer2latex/xhtml/CssDocument.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-04-12) + * Version 1.2 (2011-02-17) * */ @@ -82,6 +82,10 @@ public class CssDocument implements OutputFile { } sContent = buf.toString(); } + + public void read(String s) { + sContent = s; + } } diff --git a/source/java/writer2latex/xhtml/StyleConverter.java b/source/java/writer2latex/xhtml/StyleConverter.java index b962de5..a1ac1ed 100644 --- a/source/java/writer2latex/xhtml/StyleConverter.java +++ b/source/java/writer2latex/xhtml/StyleConverter.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-29) + * Version 1.2 (2011-02-17) * */ @@ -121,11 +121,10 @@ class StyleConverter extends ConverterHelper { applyStyle(info,node); } } - - // Export used styles to CSS - public Node exportStyles(Document htmlDOM) { - String sIndent = config.prettyPrint() ? " " : ""; - + + public String exportStyles(boolean bIndent) { + String sIndent = bIndent ? " " : ""; + StringBuffer buf = new StringBuffer(); // Export default style @@ -163,21 +162,26 @@ class StyleConverter extends ConverterHelper { buf.append(getFrameSc().getStyleDeclarations(sIndent)); buf.append(getPresentationSc().getStyleDeclarations(sIndent)); buf.append(getPageSc().getStyleDeclarations(sIndent)); + return buf.toString(); + } + + // Export used styles to CSS + public Node exportStyles(Document htmlDOM) { + String sStyles = exportStyles(config.prettyPrint()); // Create node - if (buf.length()>0) { + if (sStyles.length()>0) { Element htmlStyle = htmlDOM.createElement("style"); htmlStyle.setAttribute("media","all"); htmlStyle.setAttribute("type","text/css"); htmlStyle.appendChild(htmlDOM.createTextNode(config.prettyPrint() ? "\n" : " ")); - htmlStyle.appendChild(htmlDOM.createTextNode(buf.toString())); + htmlStyle.appendChild(htmlDOM.createTextNode(sStyles)); if (config.prettyPrint()) { htmlStyle.appendChild(htmlDOM.createTextNode(" ")); } return htmlStyle; } else { return null; } - } } \ No newline at end of file diff --git a/source/java/writer2latex/xhtml/XhtmlConfig.java b/source/java/writer2latex/xhtml/XhtmlConfig.java index ca249bc..f7ce56a 100644 --- a/source/java/writer2latex/xhtml/XhtmlConfig.java +++ b/source/java/writer2latex/xhtml/XhtmlConfig.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-2011 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-12-28) + * Version 1.2 (2011-02-17) * */ @@ -41,7 +41,7 @@ import writer2latex.util.Misc; public class XhtmlConfig extends writer2latex.base.ConfigBase { // Implement configuration methods - protected int getOptionCount() { return 53; } + protected int getOptionCount() { return 54; } protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; } // Override setOption: To be backwards compatible, we must accept options @@ -106,36 +106,37 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { private static final int USE_DEFAULT_FONT = 20; private static final int DEFAULT_FONT_NAME = 21; private static final int USE_DUBLIN_CORE = 22; - private static final int NOTES = 23; - private static final int DISPLAY_HIDDEN_TEXT = 24; - private static final int CONVERT_TO_PX = 25; - private static final int SCALING = 26; - private static final int COLUMN_SCALING = 27; - private static final int RELATIVE_FONT_SIZE = 28; - private static final int FONT_SCALING = 29; - private static final int FLOAT_OBJECTS = 30; - private static final int TABSTOP_STYLE = 31; - private static final int FORMULAS = 32; - private static final int ENDNOTES_HEADING = 33; - private static final int EXTERNAL_TOC_DEPTH = 34; - private static final int INCLUDE_TOC = 35; - private static final int SPLIT_LEVEL = 36; - private static final int REPEAT_LEVELS = 37; - private static final int PAGE_BREAK_SPLIT = 38; - private static final int SPLIT_AFTER = 39; - private static final int CALC_SPLIT = 40; - private static final int DISPLAY_HIDDEN_SHEETS = 41; - private static final int DISPLAY_HIDDEN_ROWS_COLS = 42; - private static final int DISPLAY_FILTERED_ROWS_COLS = 43; - private static final int APPLY_PRINT_RANGES = 44; - private static final int USE_TITLE_AS_HEADING = 45; - private static final int USE_SHEET_NAMES_AS_HEADINGS = 46; - private static final int XSLT_PATH = 47; - private static final int SAVE_IMAGES_IN_SUBDIR = 48; - private static final int UPLINK = 49; - private static final int DIRECTORY_ICON = 50; - private static final int DOCUMENT_ICON = 51; - private static final int ZEN_HACK = 52; // temporary hack for ePub Zen Garden styles + private static final int USE_CUSTOM_METADATA = 23; + private static final int NOTES = 24; + private static final int DISPLAY_HIDDEN_TEXT = 25; + private static final int CONVERT_TO_PX = 26; + private static final int SCALING = 27; + private static final int COLUMN_SCALING = 28; + private static final int RELATIVE_FONT_SIZE = 29; + private static final int FONT_SCALING = 30; + private static final int FLOAT_OBJECTS = 31; + private static final int TABSTOP_STYLE = 32; + private static final int FORMULAS = 33; + private static final int ENDNOTES_HEADING = 34; + private static final int EXTERNAL_TOC_DEPTH = 35; + private static final int INCLUDE_TOC = 36; + private static final int SPLIT_LEVEL = 37; + private static final int REPEAT_LEVELS = 38; + private static final int PAGE_BREAK_SPLIT = 39; + private static final int SPLIT_AFTER = 40; + private static final int CALC_SPLIT = 41; + private static final int DISPLAY_HIDDEN_SHEETS = 42; + private static final int DISPLAY_HIDDEN_ROWS_COLS = 43; + private static final int DISPLAY_FILTERED_ROWS_COLS = 44; + private static final int APPLY_PRINT_RANGES = 45; + private static final int USE_TITLE_AS_HEADING = 46; + private static final int USE_SHEET_NAMES_AS_HEADINGS = 47; + private static final int XSLT_PATH = 48; + private static final int SAVE_IMAGES_IN_SUBDIR = 49; + private static final int UPLINK = 50; + private static final int DIRECTORY_ICON = 51; + private static final int DOCUMENT_ICON = 52; + private static final int ZEN_HACK = 53; // temporary hack for ePub Zen Garden styles protected ComplexOption xheading = addComplexOption("heading-map"); protected ComplexOption xpar = addComplexOption("paragraph-map"); @@ -174,9 +175,10 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { else { nValue = CSS1; } } }; - options[USE_DEFAULT_FONT] = new BooleanOption("use_default_font","true"); + options[USE_DEFAULT_FONT] = new BooleanOption("use_default_font","false"); options[DEFAULT_FONT_NAME] = new BooleanOption("default_font_name",""); options[USE_DUBLIN_CORE] = new BooleanOption("use_dublin_core","true"); + options[USE_CUSTOM_METADATA] = new BooleanOption("use_custom_metadata","true"); options[NOTES] = new BooleanOption("notes","true"); options[DISPLAY_HIDDEN_TEXT] = new BooleanOption("display_hidden_text", "false"); options[CONVERT_TO_PX] = new BooleanOption("convert_to_px","true"); @@ -187,7 +189,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { options[FLOAT_OBJECTS] = new BooleanOption("float_objects","true"); options[TABSTOP_STYLE] = new Option("tabstop_style",""); options[ENDNOTES_HEADING] = new Option("endnotes_heading",""); - options[FORMULAS] = new IntegerOption("formulas","starmath") { + options[FORMULAS] = new IntegerOption("formulas","image+starmath") { @Override public void setString(String sValue) { super.setString(sValue); if ("latex".equals(sValue)) { nValue = LATEX; } @@ -341,6 +343,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase { public boolean useDefaultFont() { return ((BooleanOption) options[USE_DEFAULT_FONT]).getValue(); } public String defaultFontName() { return options[DEFAULT_FONT_NAME].getString(); } public boolean xhtmlUseDublinCore() { return ((BooleanOption) options[USE_DUBLIN_CORE]).getValue(); } + public boolean useCustomMetadata() { return ((BooleanOption) options[USE_CUSTOM_METADATA]).getValue(); } public boolean xhtmlNotes() { return ((BooleanOption) options[NOTES]).getValue(); } public boolean displayHiddenText() { return ((BooleanOption) options[DISPLAY_HIDDEN_TEXT]).getValue(); } public boolean xhtmlConvertToPx() { return ((BooleanOption) options[CONVERT_TO_PX]).getValue(); } diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml index 3b88e5c..53802bc 100644 --- a/source/oxt/writer2latex/description.xml +++ b/source/oxt/writer2latex/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/Options.xcs b/source/oxt/writer2xhtml/Options.xcs index 75c7cfc..f8bb42a 100644 --- a/source/oxt/writer2xhtml/Options.xcs +++ b/source/oxt/writer2xhtml/Options.xcs @@ -62,14 +62,15 @@ - - - - + + + + + diff --git a/source/oxt/writer2xhtml/Options.xcu b/source/oxt/writer2xhtml/Options.xcu index ef66302..c2748f3 100644 --- a/source/oxt/writer2xhtml/Options.xcu +++ b/source/oxt/writer2xhtml/Options.xcu @@ -74,7 +74,7 @@ false - false + true 100 @@ -85,6 +85,15 @@ + + false + + + false + + + false + false @@ -94,14 +103,8 @@ true - - false - - - false - - - false + + true false diff --git a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl index 368cbfd..efd7497 100755 --- a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl @@ -1,6 +1,6 @@ - + @@ -16,21 +16,21 @@ - + - - - - - - - - + + + + + + + + - - + + @@ -40,41 +40,41 @@ - - - - - + + + + + - + - - + + - + - - + + - - + + - - + + - - - - + + + + @@ -88,7 +88,14 @@ - - + + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index f328c54..11e71af 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - + diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp index 77398eb..9323567 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp @@ -85,6 +85,23 @@ Check this to use the natural size of images rather than the size defined in the document + AutoCorrect + + + Ignore hard line breaks + Check this if you don't want to export hard (manual) line breaks + Sometimes hard (or manual) line breaks are used in Writer to optimize + the placement of the line breaks. Since line breaking in an EPUB reader is completely different, you may want to ignore + all hard line breaks by selecting this option. + + + Check this if you don't want to export empty paragraphs + + + + Check this to treat several spaces as a single space in the export + + @@ -105,26 +122,15 @@ Export optional document properties If you select this option, all the document properties (File – Properties) are exported, otherwise only the title is exported. - The EPUB format supports a number of additional meta data elements. - You can define these using user-defined properties. - + Click Edit to open the dialog to edit the document properties. - AutoCorrect - - - Ignore hard line breaks - Check this if you don't want to export hard (manual) line breaks - Sometimes hard (or manual) line breaks are used in Writer to optimize - the placement of the line breaks. Since line breaking in an EPUB reader is completely different, you may want to ignore - all hard line breaks by selecting this option. - - - Check this if you don't want to export empty paragraphs - - - - Check this to treat several spaces as a single space in the export - + + Check this if you want to export custom document properties + Export custom document properties + The EPUB format supports a number of additional document properties, which can be + defined using custom document properties in %PRODUCTNAME Writer. + If you select this option, these properties will be exported. + Click Edit to edit the custom document properties. Document division Technically an EPUB document consists of several document parts in XHTML format. diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml index 0e56167..9f2c6de 100644 --- a/source/oxt/writer4latex/description.xml +++ b/source/oxt/writer4latex/description.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml index a769646..6e42dc0 100644 --- a/source/oxt/xhtml-config-sample/description.xml +++ b/source/oxt/xhtml-config-sample/description.xml @@ -2,5 +2,5 @@ - +