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

Finished none headings pages headings-pages options for Greenstone tags

Browse source
This commit is contained in:
Georgy Litvinov 2016-08-12 14:15:10 +03:00 • committed by Georgy Litvinov
parent 14bcb2c088
commit 84ed16b35d
2 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,32 +35,26 @@ public class GreenstoneTags {
pageSection = false; pageSection = false;
} }
//If stack not empty closeHeadingSections(hnode, nLevel);
//Close all sections with level less than current
if (!headerStack.isEmpty()) {
while (nLevel <= headerStack.peek()){
closeSection(hnode);
headerStack.poll();
if (headerStack.isEmpty()){ break;}
}
}
//System.out.println(sLevel +">" +headerStack.peek() );
Node nextNode = currentNode.getNextSibling(); Node nextNode = currentNode.getNextSibling();
//Useless to open section if we are at end of the document //Useless to open section if we are at end of the document
if (nextNode != null){ if (nextNode != null){
//Open Heading section
String title = getTitle(currentNode); String title = getTitle(currentNode);
//Open Heading section
openSection(hnode, title); openSection(hnode, title);
headerStack.offerFirst(Integer.parseInt(sLevel)); headerStack.offerFirst(Integer.parseInt(sLevel));
//System.out.println("Current " + sLevel + " stack " + headerStack.peek() + "SUM" + headerStack.size()); //If next node is not a heading element with outline number and tags type is headings-pages
//Then open paged section
if (!(nextNode.getNodeType() == Node.ELEMENT_NODE if (!(
&& nextNode.getNodeName().equals(XMLString.TEXT_H) nextNode.getNodeType() == Node.ELEMENT_NODE
&& Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL) != null && nextNode.getNodeName().equals(XMLString.TEXT_H)
&& !Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty())) { && Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL) != null
openSection(hnode, pageNum); && !Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
)
&& tagsType.equals("headings-pages")
) {
//Open page section
openSection(hnode, pageNum);
} }
} }
@ -93,12 +87,17 @@ public class GreenstoneTags {
} }
} }
//Method to open main document tag //Method to open main document tag
protected static void StartDocument(Node hnode, String title, String type){ protected static void StartDocument(Node hnode, String title, String type, int pageNum){
tagsType = type; tagsType = type;
if (tagsType.equals("none")){ if (tagsType.equals("none")){
return; return;
} }
//Create main document section
openSection(hnode, title); openSection(hnode, title);
if (tagsType.equals("pages")){
//Open page section
openSection(hnode, pageNum);
}
} }
@ -112,6 +111,8 @@ public class GreenstoneTags {
pageSection = false; pageSection = false;
} }
closeSection(hnode); closeSection(hnode);
//Clean stack, close all sections
closeHeadingSections(hnode, 0);
} }
private static String getTitle(Node currentNode) { private static String getTitle(Node currentNode) {
@ -145,7 +146,6 @@ public class GreenstoneTags {
String commentText = "<Section>\n<Description>\n<Metadata name=\"Title\">" + pageNum String commentText = "<Section>\n<Description>\n<Metadata name=\"Title\">" + pageNum
+ "</Metadata>\n<Metadata name=\"Page\">" + pageNum + "</Metadata>\n</Description>"; + "</Metadata>\n<Metadata name=\"Page\">" + pageNum + "</Metadata>\n</Description>";
Node openSection = doc.createComment(commentText); Node openSection = doc.createComment(commentText);
//Node openSection = doc.createTextNode(commentText);
// insert open section comment before header node // insert open section comment before header node
hnode.appendChild(openSection); hnode.appendChild(openSection);
pageSection = true; pageSection = true;
@ -166,4 +166,21 @@ public class GreenstoneTags {
//insert open section comment before header node //insert open section comment before header node
hnode.appendChild(closeSection); hnode.appendChild(closeSection);
} }
private static void closeHeadingSections(Node hnode, int nLevel){
if (headerStack.isEmpty()) {
return;
}
//Close all sections with level less than current
while (nLevel <= headerStack.peek()) {
closeSection(hnode);
headerStack.poll();
if (headerStack.isEmpty()) {
break;
}
}
}
} }

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

@ -1582,7 +1582,7 @@ public class TextConverter extends ConverterHelper {
//Start tagging //Start tagging
String sTitle = converter.getTitle(); String sTitle = converter.getTitle();
GreenstoneTags.StartDocument(hnode, sTitle,greenstoneTagsType); GreenstoneTags.StartDocument(hnode, sTitle,greenstoneTagsType, pageNum);
//Print header //Print header
addHeader(hnode); addHeader(hnode);