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

Hack fix for div tags inside sections

Browse source
This commit is contained in:
Georgy Litvinov 2016-09-25 17:51:54 +03:00 • committed by Georgy Litvinov
parent 88fb27d55d
commit bb545bd4ff
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,7 @@ public class GreenstoneTags {
} }
} }
} }
private static Node closePage(Node hnode){ protected static Node closePage(Node hnode){
if (pageTags.equals(SECTIONS)){ if (pageTags.equals(SECTIONS)){
closeSection(hnode); closeSection(hnode);
} }
@ -209,7 +209,7 @@ public class GreenstoneTags {
pageOpened = false; pageOpened = false;
return hnode; return hnode;
} }
private static Node openPage(Node hnode, Integer pageNum){ protected static Node openPage(Node hnode, Integer pageNum){
if (pageTags.equals(SECTIONS)){ if (pageTags.equals(SECTIONS)){
openPageSection(hnode, pageNum); openPageSection(hnode, pageNum);
pageOpened = true; pageOpened = true;

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

@ -427,16 +427,29 @@ public class TextConverter extends ConverterHelper {
if (!bDisplayHiddenText && "none".equals(Misc.getAttribute(onode,XMLString.TEXT_DISPLAY))) { return hnode; } if (!bDisplayHiddenText && "none".equals(Misc.getAttribute(onode,XMLString.TEXT_DISPLAY))) { return hnode; }
String sName = Misc.getAttribute(onode,XMLString.TEXT_NAME); String sName = Misc.getAttribute(onode,XMLString.TEXT_NAME);
String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME); String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME);
////closePageSection
Element div = converter.createElement("div"); Element div = converter.createElement("div");
//close page before enter
hnode = GreenstoneTags.closePage(hnode);
hnode.appendChild(div); hnode.appendChild(div);
converter.addTarget(div,sName+"|region"); converter.addTarget(div,sName+"|region");
StyleInfo sectionInfo = new StyleInfo(); StyleInfo sectionInfo = new StyleInfo();
getSectionSc().applyStyle(sStyleName,sectionInfo); getSectionSc().applyStyle(sStyleName,sectionInfo);
applyStyle(sectionInfo,div); applyStyle(sectionInfo,div);
sections.push(onode); sections.push(onode);
//open page after enter
div = (Element) GreenstoneTags.openPage(div, pageNum);
Node newhnode = traverseBlockText(onode, div); Node newhnode = traverseBlockText(onode, div);
//close page before exit
newhnode = GreenstoneTags.closePage(newhnode);
Node result = newhnode.getParentNode();
//Open page after exit
result = (Element) GreenstoneTags.openPage(result, pageNum);
sections.pop(); sections.pop();
return newhnode.getParentNode(); return result;
} }
private void handleHeading(Element onode, Element hnode, boolean bAfterSplit) { private void handleHeading(Element onode, Element hnode, boolean bAfterSplit) {

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

@ -293,7 +293,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
options[UPLINK] = new Option("uplink",""); options[UPLINK] = new Option("uplink","");
options[DIRECTORY_ICON] = new Option("directory_icon",""); options[DIRECTORY_ICON] = new Option("directory_icon","");
options[DOCUMENT_ICON] = new Option("document_icon",""); options[DOCUMENT_ICON] = new Option("document_icon","");
options[HEADING_TAGS] = new Option("heading_tags","none"); options[HEADING_TAGS] = new Option("heading_tags","sections");
options[PAGE_TAGS] = new Option("page_tags","div"); options[PAGE_TAGS] = new Option("page_tags","div");
} }