litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Fixing a few problems

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@65 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2010-05-17 08:18:35 +00:00
parent 86e0b8d693
commit 7f4f47c98b
7 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/Readme.txt
View file

@ -14,5 +14,5 @@ Bugs and feature requests should be reported to
henrikjust (at) openoffice.org henrikjust (at) openoffice.org
April 2010 May 2010
Henrik Just Henrik Just

4
source/distro/changelog.txt
View file

@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.3 ---------- ---------- version 1.1.3 ----------
[w2x] The standard configuration cleanxhtml.xml now maps footnote and endnote references to <sup>
[w2x] EPUB bugfix: Now includes the entire heading in NCX even if it contains formatting (which is ignored)
[w2l] Added help content for custom format [w2l] Added help content for custom format
[all] Filter: Fixed bug with filenames containing spaces and other special characters [all] Filter: Fixed bug with filenames containing spaces and other special characters

BIN
source/distro/doc/user-manual.odt
View file

Binary file not shown.

2
source/java/writer2latex/xhtml/Converter.java
View file

@ -426,7 +426,7 @@ public class Converter extends ConverterBase {
} }
/* get inline text, ignoring any draw objects, footnotes, formatting and hyperlinks */ /* get inline text, ignoring any draw objects, footnotes, formatting and hyperlinks */
private String getPlainInlineText(Node node) { protected String getPlainInlineText(Node node) {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
Node child = node.getFirstChild(); Node child = node.getFirstChild();
while (child!=null) { while (child!=null) {

4
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2010-05-13) * Version 1.2 (2010-05-17)
* *
*/ */
@ -580,7 +580,7 @@ public class TextConverter extends ConverterHelper {
// Add in external content. For single file output we include all level 1 headings + their target // Add in external content. For single file output we include all level 1 headings + their target
// For multi-file output, the included heading levels depends on the split leve, and we don't include targets // For multi-file output, the included heading levels depends on the split leve, and we don't include targets
if (nLevel<=Math.max(nSplit,1)) { if (nLevel<=Math.max(nSplit,1)) {
converter.addContentEntry(sLabel+(sLabel.length()>0 ? " " : "")+Misc.getPCDATA(onode), nLevel, converter.addContentEntry(sLabel+(sLabel.length()>0 ? " " : "")+converter.getPlainInlineText(onode), nLevel,
nSplit==0 ? sTarget : null); nSplit==0 ? sTarget : null);
} }

5
source/java/writer2latex/xhtml/config/cleanxhtml.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- cleanxhtml.xml <!-- cleanxhtml.xml 2010-05-17
This is a sample configuration file for Writer2xhtml. This is a sample configuration file for Writer2xhtml.
The options are set to produce a clean XHTML file using The options are set to produce a clean XHTML file using
standard XHTML elements, using a custom style sheet for standard XHTML elements, using a custom style sheet for
@ -46,6 +46,9 @@ block-element="blockquote" block-css="(none)" element="p" css="(none)" />
<xhtml-style-map name="User entry" family="text" element="kbd" css="(none)" /> <xhtml-style-map name="User entry" family="text" element="kbd" css="(none)" />
<xhtml-style-map name="Variable" family="text" element="var" css="(none)" /> <xhtml-style-map name="Variable" family="text" element="var" css="(none)" />
<xhtml-style-map name="Footnote anchor" family="text" element="sup" css="(none)" />
<xhtml-style-map name="Endnote anchor" family="text" element="sup" css="(none)" />
<!-- map OOo hard formatting attributes to xhtml elements --> <!-- map OOo hard formatting attributes to xhtml elements -->
<xhtml-style-map name="bold" family="attribute" element="b" css="(none)" /> <xhtml-style-map name="bold" family="attribute" element="b" css="(none)" />
<xhtml-style-map name="italics" family="attribute" element="i" css="(none)" /> <xhtml-style-map name="italics" family="attribute" element="i" css="(none)" />

2
source/readme-source.txt
View file

@ -72,7 +72,7 @@ In addition to oxt, the build file supports the following targets:
clean clean
Henrik Just, April 2010 Henrik Just, May 2010
Thanks to Michael Niedermair for writing the original ant build file Thanks to Michael Niedermair for writing the original ant build file