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

A few w2x fixes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@71 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2010-07-02 11:12:11 +00:00
parent a799097caa
commit f6ce71c6a5
5 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.4 ---------- ---------- version 1.1.4 ----------
[w2x] EPUB bugfix: Fixed problem with URL encoding of fragment identifier in links to document parts
[w2x] New option endnotes_heading: The value of this (if non-empty) is used as heading for the endnotes [w2x] New option endnotes_heading: The value of this (if non-empty) is used as heading for the endnotes
[w2x] The option add_bom now only has effect if the encoding is UTF-8 [w2x] The option add_bom now only has effect if the encoding is UTF-8

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2010-06-20) * Version 1.2 (2010-07-02)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.4"; private static final String VERSION = "1.1.4";
private static final String DATE = "2010-06-20"; private static final String DATE = "2010-07-02";
/** Return the Writer2LaTeX version in the form /** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)<br/> * (major version).(minor version).(patch level)<br/>

6
source/java/writer2latex/epub/NCXWriter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* version 1.2 (2010-05-13) * version 1.2 (2010-07-02)
* *
*/ */
@ -140,9 +140,9 @@ public class NCXWriter extends NewDOMDocument {
navLabelText.appendChild(contentDOM.createTextNode(entry.getTitle())); navLabelText.appendChild(contentDOM.createTextNode(entry.getTitle()));
Element navPointContent = contentDOM.createElement("content"); Element navPointContent = contentDOM.createElement("content");
String sHref = entry.getFile().getFileName(); String sHref = Misc.makeHref(entry.getFile().getFileName());
if (entry.getTarget()!=null) { sHref+="#"+entry.getTarget(); } if (entry.getTarget()!=null) { sHref+="#"+entry.getTarget(); }
navPointContent.setAttribute("src", Misc.makeHref(sHref)); navPointContent.setAttribute("src", sHref);
navPoint.appendChild(navPointContent); navPoint.appendChild(navPointContent);
nDepth = Math.max(nDepth, nCurrentLevel); nDepth = Math.max(nDepth, nCurrentLevel);

6
source/java/writer2latex/epub/OPFWriter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* version 1.2 (2010-05-13) * version 1.2 (2010-07-02)
* *
*/ */
@ -145,9 +145,9 @@ public class OPFWriter extends NewDOMDocument {
Element reference = contentDOM.createElement("reference"); Element reference = contentDOM.createElement("reference");
reference.setAttribute("type", sType); reference.setAttribute("type", sType);
reference.setAttribute("title", entry.getTitle()); reference.setAttribute("title", entry.getTitle());
String sHref = entry.getFile().getFileName(); String sHref = Misc.makeHref(entry.getFile().getFileName());
if (entry.getTarget()!=null) { sHref+="#"+entry.getTarget(); } if (entry.getTarget()!=null) { sHref+="#"+entry.getTarget(); }
reference.setAttribute("href", Misc.makeHref(sHref)); reference.setAttribute("href", sHref);
guide.appendChild(reference); guide.appendChild(reference);
} }
} }

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2010-06-20) * Version 1.2 (2010-07-02)
* *
*/ */
@ -1621,11 +1621,22 @@ public class TextConverter extends ConverterHelper {
int n = endnotes.size(); int n = endnotes.size();
if (n>0) { if (n>0) {
if (nSplit>0) { hnode = converter.nextOutFile(); } if (nSplit>0) { hnode = converter.nextOutFile(); }
String sHeading = config.getEndnotesHeading(); String sHeading = config.getEndnotesHeading();
if (sHeading.length()>0) { if (sHeading.length()>0) {
Element heading = converter.createElement("h1"); Element heading = converter.createElement("h1");
hnode.appendChild(heading); hnode.appendChild(heading);
heading.appendChild(converter.createTextNode(sHeading)); heading.appendChild(converter.createTextNode(sHeading));
// Add to external content.
if (nSplit>0) {
converter.addContentEntry(sHeading, 1, null);
}
else {
//For single output file we need a target
converter.addTarget(heading,"endnotes");
converter.addContentEntry(sHeading, 1, "endnotes");
}
} }
for (int i=0; i<n; i++) { for (int i=0; i<n; i++) {
Node endnote = endnotes.get(i); Node endnote = endnotes.get(i);