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

Support toc entries without headings in EPUB export

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@107 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2011-06-05 11:26:24 +00:00
parent f7dd0f8085
commit 2ad8f3b7a2
5 changed files with 138 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.xml
View file

@ -35,7 +35,7 @@
<!-- configure the directories --> <!-- configure the directories -->
<property name="jarfile" value="writer2latex"/> <property name="jarfile" value="writer2latex"/>
<property name="basename" value="writer2latex11"/> <property name="basename" value="writer2latex11"/>
<property name="distrofile" value="${basename}7alpha.zip" /> <property name="distrofile" value="${basename}8alpha.zip" />
<!--<property name="sourcedistrofile" value="${basename}source.zip" />--> <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
<property name="src" location="source/java"/> <property name="src" location="source/java"/>
<property name="source.distro" location="source/distro" /> <property name="source.distro" location="source/distro" />

2
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.8 ---------- ---------- version 1.1.8 ----------
[w2x] Crossed out headings are ignored in EPUB export, but retained in the external toc
[all] Added Farsi translation from Mostafa Barmshory [all] Added Farsi translation from Mostafa Barmshory
[w2l] Added support for xepersian.sty (fa_IR locale, requires XeTeX backend and multilingual=true) [w2l] Added support for xepersian.sty (fa_IR locale, requires XeTeX backend and multilingual=true)

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

Binary file not shown.

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2011-05-09) * Version 1.2 (2011-06-05)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.8"; private static final String VERSION = "1.1.8";
private static final String DATE = "2011-05-09"; private static final String DATE = "2011-06-05";
/** 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/>

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2011-03-09) * Version 1.2 (2011-06-05)
* *
*/ */
@ -610,18 +610,6 @@ public class TextConverter extends ConverterHelper {
private void handleHeading(Element onode, Node hnode, boolean bAfterSplit, private void handleHeading(Element onode, Node hnode, boolean bAfterSplit,
ListStyle listStyle, int nListLevel, boolean bUnNumbered, ListStyle listStyle, int nListLevel, boolean bUnNumbered,
boolean bRestart, int nStartValue) { boolean bRestart, int nStartValue) {
String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME);
StyleWithProperties style = ofr.getParStyle(sStyleName);
if (!bDisplayHiddenText && style!=null && "none".equals(style.getProperty(XMLString.TEXT_DISPLAY))) { return; }
if (!bUnNumbered) {
// If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered
if (style!=null) {
String sListStyleName = style.getListStyleName();
if (sListStyleName!=null && sListStyleName.length()==0) {
bUnNumbered = true;
}
}
}
// Note: nListLevel may in theory be different from the outline level, // Note: nListLevel may in theory be different from the outline level,
// though the ui in OOo does not allow this // though the ui in OOo does not allow this
@ -632,31 +620,66 @@ public class TextConverter extends ConverterHelper {
// Note: Conditional styles are not supported // Note: Conditional styles are not supported
int nLevel = getOutlineLevel(onode); int nLevel = getOutlineLevel(onode);
if (nLevel<=6) { if (nLevel<=6) { // Export as heading
if (nLevel==1) { currentChapter = onode; } String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME);
// If split output, add headings of higher levels StyleWithProperties style = ofr.getParStyle(sStyleName);
if (bAfterSplit && nSplit>0) {
int nFirst = nLevel-nRepeatLevels; // Check for hidden text
if (nFirst<0) { nFirst=0; } if (!bDisplayHiddenText && style!=null && "none".equals(style.getProperty(XMLString.TEXT_DISPLAY))) { return; }
for (int i=nFirst; i<nLevel; i++) {
if (currentHeading[i]!=null) {
hnode.appendChild(converter.importNode(currentHeading[i],true));
}
}
}
// Apply style // Numbering
StyleInfo info = new StyleInfo(); if (!bUnNumbered) {
info.sTagName = "h"+nLevel; // If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered
getHeadingSc().applyStyle(nLevel, sStyleName, info); if (style!=null) {
String sListStyleName = style.getListStyleName();
if (sListStyleName!=null && sListStyleName.length()==0) {
bUnNumbered = true;
}
}
}
ListCounter counter = null;
String sLabel="";
if (!bUnNumbered) {
counter = getListCounter(listStyle);
if (bRestart) { counter.restart(nListLevel,nStartValue); }
sLabel = counter.step(nListLevel).getLabel();
}
// In EPUB export, a striked out heading will only appear in the external toc
boolean bTocOnly = false;
if (converter.isOPS() && style!=null) {
String sStrikeOut = style.getProperty(XMLString.STYLE_TEXT_LINE_THROUGH_STYLE, true);
if (sStrikeOut!=null && !"none".equals(sStrikeOut)) {
bTocOnly = true;
}
}
// add root element // Export the heading
Element heading = converter.createElement(info.sTagName); if (!bTocOnly) {
hnode.appendChild(heading); if (nLevel==1) { currentChapter = onode; }
applyStyle(info,heading); // If split output, add headings of higher levels
traverseFloats(onode,hnode,heading); if (bAfterSplit && nSplit>0) {
// Apply writing direction int nFirst = nLevel-nRepeatLevels;
/*String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME); if (nFirst<0) { nFirst=0; }
for (int i=nFirst; i<nLevel; i++) {
if (currentHeading[i]!=null) {
hnode.appendChild(converter.importNode(currentHeading[i],true));
}
}
}
// Apply style
StyleInfo info = new StyleInfo();
info.sTagName = "h"+nLevel;
getHeadingSc().applyStyle(nLevel, sStyleName, info);
// add root element
Element heading = converter.createElement(info.sTagName);
hnode.appendChild(heading);
applyStyle(info,heading);
traverseFloats(onode,hnode,heading);
// Apply writing direction
/*String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME);
StyleWithProperties style = ofr.getParStyle(sStyleName); StyleWithProperties style = ofr.getParStyle(sStyleName);
if (style!=null) { if (style!=null) {
StyleInfo headInfo = new StyleInfo(); StyleInfo headInfo = new StyleInfo();
@ -664,63 +687,82 @@ public class TextConverter extends ConverterHelper {
getParSc().applyStyle(headInfo,heading); getParSc().applyStyle(headInfo,heading);
}*/ }*/
// Prepend asapNode // Prepend asapNode
prependAsapNode(heading); prependAsapNode(heading);
// Prepend numbering
String sLabel="";
if (!bUnNumbered) {
ListCounter counter = getListCounter(listStyle);
if (bRestart) { counter.restart(nListLevel,nStartValue); }
sLabel = counter.step(nListLevel).getLabel();
if (config.zenHack() && nLevel==2) {
// Hack for ePub Zen Garden: Special style for the prefix at level 2
// TODO: Replace by some proper style map construct...
insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading);
}
else {
insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading);
}
}
// Add to toc // Prepend numbering
if (!bInToc) { if (!bUnNumbered) {
String sTarget = "toc"+(++nTocIndex); if (config.zenHack() && nLevel==2) {
converter.addTarget(heading,sTarget); // Hack for ePub Zen Garden: Special style for the prefix at level 2
// TODO: Replace by some proper style map construct...
// Add in external content. For single file output we include all level 1 headings + their target insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading);
// Targets are added only when the toc level is deeper than the split level }
if (nLevel<=nExternalTocDepth) { else {
converter.addContentEntry(sLabel+converter.getPlainInlineText(onode), nLevel, insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading);
nLevel>nSplit ? sTarget : null); }
}
// Add to toc
if (!bInToc) {
String sTarget = "toc"+(++nTocIndex);
converter.addTarget(heading,sTarget);
// Add in external content. For single file output we include all level 1 headings + their target
// Targets are added only when the toc level is deeper than the split level
if (nLevel<=nExternalTocDepth) {
converter.addContentEntry(sLabel+converter.getPlainInlineText(onode), nLevel,
nLevel>nSplit ? sTarget : null);
}
// Add to real toc
TocEntry entry = new TocEntry();
entry.onode = onode;
entry.sLabel = sLabel;
entry.nFileIndex = converter.getOutFileIndex();
entry.nOutlineLevel = nLevel;
entry.nOutlineNumber = naturalOutline.step(nLevel).getValues();
tocEntries.add(entry);
}
// Convert content
StyleInfo innerInfo = new StyleInfo();
getHeadingSc().applyInnerStyle(nLevel, sStyleName, innerInfo);
Element content = heading;
if (innerInfo.sTagName!=null && innerInfo.sTagName.length()>0) {
content = converter.createElement(innerInfo.sTagName);
heading.appendChild(content);
applyStyle(innerInfo, content);
}
traverseInlineText(onode,content);
// Keep track of current headings for split output
currentHeading[nLevel] = heading;
for (int i=nLevel+1; i<=6; i++) {
currentHeading[i] = null;
} }
}
// Add to real toc else {
TocEntry entry = new TocEntry(); if (!bInToc) {
entry.onode = onode; // Add in external content. For single file output we include all level 1 headings + their target
entry.sLabel = sLabel; // Targets are added only when the toc level is deeper than the split level
entry.nFileIndex = converter.getOutFileIndex(); if (nLevel<=nExternalTocDepth) {
entry.nOutlineLevel = nLevel; // Add an empty div to use as target, if required
entry.nOutlineNumber = naturalOutline.step(nLevel).getValues(); String sTarget = null;
tocEntries.add(entry); if (nLevel>nSplit) {
} Element div = converter.createElement("div");
hnode.appendChild(div);
// Convert content sTarget = "toc"+(++nTocIndex);
StyleInfo innerInfo = new StyleInfo(); converter.addTarget(div,sTarget);
getHeadingSc().applyInnerStyle(nLevel, sStyleName, innerInfo); }
Element content = heading; converter.addContentEntry(sLabel+converter.getPlainInlineText(onode), nLevel, sTarget);
if (innerInfo.sTagName!=null && innerInfo.sTagName.length()>0) { }
content = converter.createElement(innerInfo.sTagName); }
heading.appendChild(content); // Keep track of current headings for split output
applyStyle(innerInfo, content); currentHeading[nLevel] = null;
} for (int i=nLevel+1; i<=6; i++) {
traverseInlineText(onode,content); currentHeading[i] = null;
}
// Keep track of current headings for split output
currentHeading[nLevel] = heading; }
for (int i=nLevel+1; i<=6; i++) {
currentHeading[i] = null;
}
} }
else { // beyond h6 - export as ordinary paragraph else { // beyond h6 - export as ordinary paragraph
handleParagraph(onode,hnode); handleParagraph(onode,hnode);