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

w2x: Better treatment of missing heading levels in EPUB table of contents

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@128 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2012-02-22 09:08:28 +00:00
parent c1d0cd4bf7
commit 715f9b97e7
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/distro/changelog.txt
View file

@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.9 ----------
[w2x] EPUB change: Missing heading levels are now treated more consistent in the toc. E.g. the sequence of heading levels
2-2-1-3-3-2 is now exported as toc levels 1-1-1-2-2-2 (before it was 1-2-1-2-3-2)
[w2l] Bugfix: Ignore headings inside footnotes (export as normal paragraph). Footnotes should not contain headings, and this
change avoids an infinite loop if such a footnote is within a table.

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

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2001-2010 by Henrik Just
* Copyright: 2001-2012 by Henrik Just
*
* All Rights Reserved.
*
* version 1.2 (2010-07-02)
* version 1.2 (2012-02-22)
*
*/
@ -106,6 +106,7 @@ public class NCXWriter extends NewDOMDocument {
Element currentContainer = ncx;
int nCurrentLevel = 0;
int nCurrentEntryLevel = 0; // This may differ from nCurrentLevel if the heading levels "jump" in then document
int nDepth = 0;
int nPlayOrder = 0;
@ -121,13 +122,15 @@ public class NCXWriter extends NewDOMDocument {
}
nCurrentLevel = nEntryLevel;
}
else if (nEntryLevel>nCurrentLevel) {
else if (nEntryLevel>nCurrentEntryLevel) {
// To lower level (always one step; a jump from e.g. heading 1 to heading 3 in the document
// is considered an error)
currentContainer = (Element) currentContainer.getLastChild();
nCurrentLevel++;
}
nCurrentEntryLevel = nEntryLevel;
Element navPoint = contentDOM.createElement("navPoint");
navPoint.setAttribute("playOrder", Integer.toString(++nPlayOrder));
navPoint.setAttribute("id", "text"+nPlayOrder);