diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt
index 50b64c6..18d2ef4 100644
--- a/source/distro/Readme.txt
+++ b/source/distro/Readme.txt
@@ -14,5 +14,5 @@ Bugs and feature requests should be reported to
henrikjust (at) openoffice.org
-November 2010
+January 2011
Henrik Just
diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 58dd4ed..f0c8adf 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -13,7 +13,7 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
[w2x] New options relative_font_size (default false) and font_scaling (default 100%) for EPUB export.
If the former is true, relative font sizes are used, scaled by the percentage given by the latter
-[w2x] EPUB export now has its own export dialog
+[w2x] EPUB export now has its own export dialog and own help content
[all] *API change: Added the method readResource to the Converter interface (only used by EPUB export currently)
diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt
index ca0d8a8..40f7c8a 100644
Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 03f4b8d..c42b812 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 (2010-12-29)
+ * Version 1.2 (2011-01-12)
*
*/
@@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.1.9";
- private static final String DATE = "2010-12-29";
+ private static final String DATE = "2011-01-12";
/** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
index 29e9488..368cbfd 100755
--- a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
+++ b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
@@ -1,36 +1,36 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -42,39 +42,39 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -88,7 +88,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/help/en/help.tree b/source/oxt/writer2xhtml/help/en/help.tree
index bbb6cad..98aed3a 100644
--- a/source/oxt/writer2xhtml/help/en/help.tree
+++ b/source/oxt/writer2xhtml/help/en/help.tree
@@ -2,9 +2,9 @@
- XHTML and EPUB Export (Writer)
+ XHTML Export (Writer)XHTML Export (Calc)
- EPUB meta data (Writer)
+ EPUB Export (Writer)IntroductionGeneral
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub.xhp
deleted file mode 100644
index 0f1a298..0000000
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub.xhp
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
- EPUB meta data
- org.openoffice.da.writer2xhtml.oxt/epub.xhp
-
-
-
-
- EPUB meta data
-
- The EPUB standard specifies a number of meta data elements not supported by ODF.
- Writer2xhtml supports these elements using user-defined meta data. To add user-defined meta data choose
- File-Properties, User-defined properties. The following properties are supported:
-
-
- Identifier: Each EPUB document must have a unique ID.
- Normally Writer2xhtml generates a Universal Unique ID (UUID) for this purpose, but you may override this with
- your own ID.
- To do this add a new property, enter Identifier
- (case is not important) as name and the ID as value.
- An identifier may follow a specific identification scheme, e.g. ISBN.
- To specify an identification scheme, append this to the name separated by a period, e.g. Identifier.ISBN.
-
- It is possible to have several identifiers, in this case append a number
- to the name, e.g. Identifier1.ISBN and Identifier2. The first identifier is used as the unique ID.
-
-
-
- Creator: A primary creator or author of the publication.
-
- Enter Creator as name and the creator's name as value.
-
- A creator may have a special role, you can specify this with a three
- letter code after the word creator, e.g. creator.aut for the author or creator.ill
- for the illustrator. For the complete list of three letter codes see the
- EPUB specification.
- You can define several creators, in this case add a number to the word creator,
- e.g. creator1.aut and creator2. The creators will be sorted according to the numbers.
- Note that some readers may only present the first creator.
-
-
-
- Contributor: A party whose contribution to the publication is secondary
- to those named in creator elements. Otherwise it is handled like Creator, and the same rules apply.
-
-
-
- Date: Date of publication. The date must be in the format YYYY-MM-DD
- (year-month-date) or more generally in the format specified in
- http://www.w3.org/TR/NOTE-datetime.
-
- A date may be associated with a special event such as creation,
- publication or modification. To define this, add the event after the word date, e.g. date.publication.
-
- You can give several dates, in this case add a number to the word date,
- e.g. date1.creation, date2.modification.
-
-
-
- You can only have one instance of the remaining properties,
- hence they cannot be numbered. Also no additional data can be appended to the name.
-
-
-
- Publisher: The publisher of the document.
-
-
-
- Type: Terms describing general categories, functions, genres, or aggregation levels for content.
-
-
-
- Format: The media type or dimensions of the resource.
-
-
-
- Source: Information regarding a prior resource from which the publication was derived.
-
-
-
- Relation: An identifier of an auxiliary resource and its relationship to the publication.
-
-
-
- Coverage: The extent or scope of the publication’s content.
-
-
-
- Rights: A statement about rights, or a reference to one.
-
-
-
-
-
-
-
-
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
new file mode 100644
index 0000000..77398eb
--- /dev/null
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp
@@ -0,0 +1,286 @@
+
+
+
+
+ EPUB Export (Writer)
+ org.openoffice.da.writer2xhtml.oxt/epub_export.xhp
+
+
+
+
+ EPUB Export (Writer)
+ Exports the current document to EPUB format.
+
+ Choose File - Export - EPUB
+
+
+ Style
+
+
+ Select the style to use for the EPUB document
+ Use style
+ This option allows you to choose between various styles to apply to the
+ EPUB document.
+
+
+ Original formatting produces an EPUB document which uses
+ the same style as the original document. The document will look quite similar to the original when viewed
+ with an EPUB reader.
+
+
+ Custom is a user defined format. You can define your own
+ style by providing a CSS style sheet and a mapping from Writer styles to your CSS styles.
+ To configure the custom format, choose Tools - Options - Writer2xhtml.
+
+
+
+
+
+ Select a scaling to apply to all dimensions in the document
+
+ Viewing the document with an EPUB reader will often require different dimensions
+ (e.g. margins) than the original document.
+
+
+
+ Select a scaling to apply to all column dimensions in the document
+
+
+
+ Check this to export all font sizes as percentages
+ Use relative font size
+ For EPUB it is recommended to use relative font sizes, and using this option will
+ export all font sizes as percentages. In some EPUB readers this will enable the user to scale the fonts.
+
+
+ Select a scaling factor to apply to all font sizes
+ Scaling
+ The relative font size is calculated relative to the default font size in the
+ document. Using this option you can define a percentage used to scale all font sizes.
+ Thus with the setting 140, all font sizes will be 40% larger.
+
+
+ Check this to replace all fonts with a single font
+ Use a single font for the entire document
+ Some style guides recommend to use a single font for the entire EPUB document.
+ Check this option to ignore all font information in the original document and export a single font.
+
+
+ Enter or select the font name to use (or leave blank to use the EPUB reader's default font)
+ Font name
+ Enter a font name or select a font name in the list. This font will be used for
+ all text in the EPUB document. You can also leave the field blank: In this case no font information will be exported, and
+ the EPUB reader will choose a default font.
+
+
+ Check this if you want to convert all units to px rather than using the original units
+
+
+ For EPUB it is recommended to use the unit px instead, and using this option you can require that
+ all dimensions are converted to px.
+
+
+
+ Check this to use the natural size of images rather than the size defined in the document
+
+
+
+
+
+ Check this to export and display all hidden text
+ Display hidden text
+ If sections or text fragments are hidden in the original document they will normally
+ not be exported. If you check this option, hidden text will be exported to visible text in the EPUB document.
+
+
+ Check this if you want to export notes (annotations) in the document
+
+ If you select this option, notes (also known as annotations) in the
+ %PRODUCTNAME document are exported as comments in the EPUB document. They will not be directly visible in the reader.
+ If the option is not selected, notes are completely ignored.
+
+
+ Check this if you want to export all document properties
+ 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.
+
+
+ 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
+
+
+ Document division
+ Technically an EPUB document consists of several document parts in XHTML format.
+ In principle you can have only one part, but this is not recommended. For performance reasons and because some EPUB readers have
+ a limitation on the size of the individual files in the doucment you should select one of the following options to split the document.
+
+
+
+ Split document at headings
+ Check this to create a new document part for each heading
+ Use this option to split the document at headings. This is the most common way
+ to split the document.
+ Note that this option has no effect for headings
+ inside tables.
+
+
+ Select the heading level at which spliting should occur
+
+
+
+ Split document at page breaks
+ Check this to create a new document par at page breaks
+ Use this option to split the document at the original page breaks.
+
+
+ Types of page break
+ Select the types of page breaks at which splitting should occur
+ If you have chosen to split the document at page break, use this option to select
+ the types of page breaks to use:
+
+
+ Select Defined by styles to split at page breaks defined
+ in paragraph styles.
+
+
+ Select All explicit to also split at manual page breaks
+ (Insert - Manual Break - Page Break).
+
+
+ Select All to split at all page breaks in the document. This
+ includes automatic page breaks, but Writer2xhtml will never split the document inside a paragraph, list or table.
+
+
+
+
+ Automatic split of long documents
+ Check this to enable automatic split of long documents based on the number of characters
+ Use this option to limit the size of each document part.
+
+
+ After (in 1000 characters)
+ Enter the number of characters after which an automatic split should occur
+ Enter the number of characters after which an automatic split should occur.
+ Writer2xhtml will split the document at the first possible break point after this number of characters.
+
+ Navigation table
+
+
+ Number of heading levels to include
+ Select the number of heading levels to include in the content table in the EPUB document
+ An EPUB document contains a content table, which the EPUB reader can use to let the
+ user navigate through the document. Writer2xhtml generates this table based on the headings in the document.
+ You can select the number of heading levels to include.
+
+
+ Also include original table of contents
+ Check this to include the original table of contents in addition to the EPUB content table
+ Your document may also include a normal table of contents.
+ Check this if you want to include this table of contents in addition to the navigation table.
+
+ EPUB meta data
+
+ The EPUB standard specifies a number of meta data elements not supported by ODF.
+ Writer2xhtml supports these elements using user-defined meta data. To add user-defined meta data choose
+ File-Properties, User-defined properties. The following properties are supported:
+
+
+ Identifier: Each EPUB document must have a unique ID.
+ Normally Writer2xhtml generates a Universal Unique ID (UUID) for this purpose, but you may override this with
+ your own ID.
+ To do this add a new property, enter Identifier
+ (case is not important) as name and the ID as value.
+ An identifier may follow a specific identification scheme, e.g. ISBN.
+ To specify an identification scheme, append this to the name separated by a period, e.g. Identifier.ISBN.
+
+ It is possible to have several identifiers, in this case append a number
+ to the name, e.g. Identifier1.ISBN and Identifier2. The first identifier is used as the unique ID.
+
+
+
+ Creator: A primary creator or author of the publication.
+
+ Enter Creator as name and the creator's name as value.
+
+ A creator may have a special role, you can specify this with a three
+ letter code after the word creator, e.g. creator.aut for the author or creator.ill
+ for the illustrator. For the complete list of three letter codes see the
+ EPUB specification.
+ You can define several creators, in this case add a number to the word creator,
+ e.g. creator1.aut and creator2. The creators will be sorted according to the numbers.
+ Note that some readers may only present the first creator.
+
+
+
+ Contributor: A party whose contribution to the publication is secondary
+ to those named in creator elements. Otherwise it is handled like Creator, and the same rules apply.
+
+
+
+ Date: Date of publication. The date must be in the format YYYY-MM-DD
+ (year-month-date) or more generally in the format specified in
+ http://www.w3.org/TR/NOTE-datetime.
+
+ A date may be associated with a special event such as creation,
+ publication or modification. To define this, add the event after the word date, e.g. date.publication.
+
+ You can give several dates, in this case add a number to the word date,
+ e.g. date1.creation, date2.modification.
+
+
+
+ You can only have one instance of the remaining properties,
+ hence they cannot be numbered. Also no additional data can be appended to the name.
+
+
+
+ Publisher: The publisher of the document.
+
+
+
+ Type: Terms describing general categories, functions, genres, or aggregation levels for content.
+
+
+
+ Format: The media type or dimensions of the resource.
+
+
+
+ Source: Information regarding a prior resource from which the publication was derived.
+
+
+
+ Relation: An identifier of an auxiliary resource and its relationship to the publication.
+
+
+
+ Coverage: The extent or scope of the publication’s content.
+
+
+
+ Rights: A statement about rights, or a reference to one.
+
+
+
+
+
+
+
+
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
index dd582eb..e579855 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
@@ -2,26 +2,25 @@
- XHTML and EPUB Export (Writer)
+ XHTML Export (Writer)org.openoffice.da.writer2xhtml.oxt/export.xhpXHTML Export (Writer)
- Exports the current document to XHTML or EPUB format.
+ Exports the current document to XHTML format.
Choose File - Export - XHTML 1.0 strict
or File - Export - XHTML 1.1
or File - Export - XHTML 1.1 + MathML 2.0
- or File - Export - XHTML 1.1 + MathML 2.0 (xsl)
- or File - Export - EPUB
+ or File - Export - XHTML 1.1 + MathML 2.0 (xsl)Style
- Select the style to use for the XHTML document
+ Select the style to use for the XHTML documentUse styleThis option allows you to choose between various styles to apply to the
@@ -55,18 +54,23 @@
- Select a scaling to apply to all dimensions in the document
-
+ Select a scaling to apply to all dimensions in the document
+ Scaling
+
+ Viewing the document in a web browser may require different dimensions
- (e.g. font sizes) than the original document. Using this option you can define a percentage used to scale all
- dimensions, thus with the setting 140, all dimensions will be 40% larger than in the original document. Depending on the
+ (e.g. font sizes) than the original document.
+
+
+ Using this option you can define a percentage used to scale all
+ dimensions. Thus with the setting 140, all dimensions will be 40% larger than in the original document. Depending on the
style you have selected and on the option Use original image size, some dimensions may be unaffected by
this option.
- Select a scaling to apply to all column dimensions in the document
+ Select a scaling to apply to all column dimensions in the documentColumn scalingThis is a similar option, which only affects table columns. Thus you can further
@@ -74,22 +78,28 @@
- Check this if you want to convert all units to px rather than using the original units
-
+ Check this if you want to convert all units to px rather than using the original units
+ Convert units to px (pixels)
+
+ In %PRODUCTNAME, font sizes are usually given in points and other dimensions
- in e.g. cm or inches. For XHTML it is recommended to use the unit px instead, and using this option you can require that
- all dimensions are converted to px. For EPUB it is recommended to use relative font sizes, and using this option will
- export all font sizes as percentages (and use px for all other dimensions).
- If you choose not to check this option,the original units will always be used.
+ in e.g. cm or inches.
+
+
+ For XHTML it is recommended to use the unit px instead, and using this option you can require that
+ all dimensions are converted to px.
+
+
+ If you choose not to check this option, the original units will always be used.
- Check this to use the natural size of images rather than the size defined in the document
+ Check this to use the natural size of images rather than the size defined in the documentUse original image sizeOften images in a %PRODUCTNAME document are scaled up or down from their original size.
- Normally the same scaling will be used in the XHTML document, but if you select this option, the original (unscaled) image
+ Normally the same scaling will be used in the exported document, but if you select this option, the original (unscaled) image
size will be used.
@@ -98,47 +108,50 @@
- Check this if you want to export notes (annotations) in the document
-
+ Check this if you want to export notes (annotations) in the document
+ Export notes
+
+ If you select this option, notes (also known as annotations) in the
%PRODUCTNAME document are exported as comments in the XHTML document. They will not be directly visible in the browser,
only in the XHTML source. If the option is not selected, notes are completely ignored.
- Check this if you want to export all meta data (using the Dublin Core standard)
+ Check this if you want to export all meta data (using the Dublin Core standard)Export document properties (Dublin Core Meta data)If you select this option, the document properties (File – Properties)
are exported using
the Dublin Core standard.
- The EPUB format supports a number of additional meta data elements.
- You can define these using user-defined properties.
- AutoCorrectIgnore hard line breaks
- Check this if you don't want to export hard (manual) line breaks
+ Check this if you don't want to export hard (manual) line breaksSometimes hard (or manual) line breaks are used in Writer to optimize
the placement of the line breaks. Since line breaking in a browser is completely different, you may want to ignore
all hard line breaks by selecting this option.
- Ignore empty paragraphs
- Check this if you don't want to export empty paragraphs
- Empty paragraphs are sometimes used a simple means to create vertical
- spacing in Writer. In a well-structured document, an empty paragraph is probably a mistake. Hence you can select
- this option to ignore empty paragraphs in the document in the export.
+ Check this if you don't want to export empty paragraphs
+
+ Ignore empty paragraphs
+ Empty paragraphs are sometimes used a simple means to create vertical
+ spacing in Writer. In a well-structured document, an empty paragraph is probably a mistake. Hence you can select
+ this option to ignore empty paragraphs in the document in the export.
+
- Ignore double spaces
- Check this to treat several spaces as a single space in the export
- For similar reasons you can choose to ignore two or more spaces in a
- row using this option.
+ Check this to treat several spaces as a single space in the export
+
+ Ignore double spaces
+ For similar reasons you can choose to ignore two or more spaces in a
+ row using this option.
+ Files
@@ -149,33 +162,30 @@
Check this to create a new document for each headingTo make a long Writer document easier to read in the browser, you can use
this option to split the document in several small files.
- For the XHTML export, Writer2xhtml will add a simple navigation panel that lets you
+ Writer2xhtml will add a simple navigation panel that lets you
move between pages. The navigation links will be in the same language as the document (as defined
under Tools – Options – Language Settings – Languages).
- For the EPUB export it is highly recommended that you split at headings.
- Some EPUB readers have a limitation on the size of the individual files in the document.
- To avoid this, Writer2xhtml will always split your document to avoid very large files. This happens even if you have set the
- heading level to 0 here.Note that this option has no effect for headings
inside tables.
- Heading level
- Select the heading level at which the spliting should occur
- If you have chosen to split the document at headings, you can use this option
- to define at which level splitting should occur. For example 2 to split the document at all headings of level 1 or 2.
-
+ Select the heading level at which the spliting should occur
+
+ Heading level
+ If you have chosen to split the document at headings, you can use this option
+ to define at which level splitting should occur. For example 2 to split the document at all headings of level 1 or 2.
+
+
Repeat heading levels
- Select the number of heading levels to repeat at the top of new documents
+ Select the number of heading levels to repeat at the top of new documentsTo help the reader to identify the current position within the document,
you can use this option to repeat the parent headings whenever the document is split. If you for example split at
headings of level 3 and set this option to 2, the headings of level 1 and 2 will be repeated before the heading of level 3,
providing precise information as to where in the document the section belongs.
- For the EPUB export it is recommended to set this option to 0.
- Check this to save images in a subdirectory relative to the exported document
+ Check this to save images in a subdirectory relative to the exported documentSave images in subdirectoryWriter2xhtml normally saves images associated with the document in the same
@@ -186,7 +196,7 @@
XSLT path
- Enter the path to pmathml.xsl and pmathmlcss.xsl
+ Enter the path to pmathml.xsl and pmathmlcss.xslIf you choose the export filter
XHTML 1.1 + MathML 2.0 (xsl), two XSLT style sheets provided by the World Wide Web Consortium are required.
If they are not available in the same directory as the exported document, you can give the path here.
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
index b16ef3f..9ecd789 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
@@ -32,7 +32,9 @@
Select a scaling to apply to all dimensions in the document
-
+
+
+
Select a scaling to apply to all column dimensions in the document
@@ -40,7 +42,10 @@
Check this if you want to convert all units to px rather than using the original units
-
+
+
+
+
Check this to use the natural size of images rather than the size defined in the document
@@ -50,7 +55,8 @@
Check this if you want to export notes (annotations) in the document
-
+
+
Check this if you want to export all meta data (using the Dublin Core standard)
diff --git a/source/readme-source.txt b/source/readme-source.txt
index cc4f131..9fa653e 100644
--- a/source/readme-source.txt
+++ b/source/readme-source.txt
@@ -1,7 +1,7 @@
Writer2LaTeX source version 1.1.9
=================================
-Writer2LaTeX is (c) 2002-2010 by Henrik Just.
+Writer2LaTeX is (c) 2002-2011 by Henrik Just.
The source is available under the terms and conditions of the
GNU LESSER GENERAL PUBLIC LICENSE, version 2.1.
Please see the file COPYING.TXT for details.
@@ -95,7 +95,7 @@ In addition to oxt, the build file supports the following targets:
clean
-Henrik Just, November 2010
+Henrik Just, January 2011
Thanks to Michael Niedermair for writing the original ant build file