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

Removed option greenstone_tags, added options headingTags and pageTags instead

Browse source
This commit is contained in:
Georgy Litvinov 2016-09-21 14:39:58 +03:00 • committed by Georgy Litvinov
parent f482e1a054
commit d04fb61ae3
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,11 +17,15 @@ public class GreenstoneTags {
private static LinkedList<Integer> headerStack = new LinkedList<Integer>();
private static boolean pageSection = false;
private static String tagsType = "none";
//headings none
private static String headingTags = "headings";
//sections div none
private static String pageTags = "sections";
protected static void processHeading(Node currentNode, Node hnode, int pageNum) {
if (tagsType.equals("none") || tagsType.equals("pages")){
//if (tags.equals("none") || tags.equals("pages")){
if (headingTags.equals("none") || pageTags.equals("section")){
return;
}
@ -51,7 +55,7 @@ public class GreenstoneTags {
&& Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(nextNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
)
&& tagsType.equals("headings-pages")
&& headingTags.equals("headings-pages")
) {
//Open page section
openSection(hnode, pageNum);
@ -63,7 +67,7 @@ public class GreenstoneTags {
}
protected static void processPageBreak(Node currentNode, Node hnode, Integer pageNum){
if (tagsType.equals("none") || tagsType.equals("headings")){
if (headingTags.equals("none") || headingTags.equals("headings")){
return;
}
@ -73,7 +77,7 @@ public class GreenstoneTags {
&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
)
&& !headerStack.isEmpty()
|| tagsType.equals("pages")
|| pageTags.equals("sections")
) {
if (pageSection) {
closeSection(hnode);
@ -87,14 +91,15 @@ public class GreenstoneTags {
}
}
//Method to open main document tag
protected static void StartDocument(Node hnode, String title, String type, int pageNum){
tagsType = type;
if (tagsType.equals("none")){
protected static void StartDocument(Node hnode, String title, String heading, String pages, int pageNum){
headingTags = heading;
pageTags = pages;
if (headingTags.equals("none")){
return;
}
//Create main document section
openSection(hnode, title);
if (tagsType.equals("pages")){
if (pageTags.equals("sections")){
//Open page section
openSection(hnode, pageNum);
}
@ -103,7 +108,7 @@ public class GreenstoneTags {
}
//Method to close open tags at the end of the document
protected static void endDocument(Node hnode){
if (tagsType.equals("none")){
if (headingTags.equals("none")){
return;
}
if (pageSection){

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

@ -103,7 +103,8 @@ public class TextConverter extends ConverterHelper {
//Current master page name
private String nextMasterPage = null;
private String greenstoneTagsType = config.greenstoneTags();
private String headingTags = config.getHeadingTags();
private String pageTags = config.getPageTags();
public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter);
@ -1582,7 +1583,7 @@ public class TextConverter extends ConverterHelper {
//Start tagging
String sTitle = converter.getTitle();
GreenstoneTags.StartDocument(hnode, sTitle,greenstoneTagsType, pageNum);
GreenstoneTags.StartDocument(hnode, sTitle,headingTags,pageTags, pageNum);
//Print header
addHeader(hnode);

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

@ -40,7 +40,7 @@ import writer2latex.util.Misc;
public class XhtmlConfig extends writer2latex.base.ConfigBase {
// Implement configuration methods
protected int getOptionCount() { return 60; }
protected int getOptionCount() { return 61; }
protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
// Override setOption: To be backwards compatible, we must accept options
@ -158,7 +158,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
private static final int UPLINK = 56;
private static final int DIRECTORY_ICON = 57;
private static final int DOCUMENT_ICON = 58;
private static final int GREENSTONE_TAGS = 59;
private static final int HEADING_TAGS = 59;
private static final int PAGE_TAGS = 60;
protected ComplexOption xheading = addComplexOption("heading-map");
protected ComplexOption xpar = addComplexOption("paragraph-map");
@ -292,7 +293,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
options[UPLINK] = new Option("uplink","");
options[DIRECTORY_ICON] = new Option("directory_icon","");
options[DOCUMENT_ICON] = new Option("document_icon","");
options[GREENSTONE_TAGS] = new Option("greenstone_tags","headings-pages");
options[HEADING_TAGS] = new Option("heading_tags","sections");
options[PAGE_TAGS] = new Option("page_tags","sections");
}
protected void readInner(Element elm) {
@ -435,7 +437,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
public String getXhtmlUplink() { return options[UPLINK].getString(); }
public String getXhtmlDirectoryIcon() { return options[DIRECTORY_ICON].getString(); }
public String getXhtmlDocumentIcon() { return options[DOCUMENT_ICON].getString(); }
public String greenstoneTags() { return options[GREENSTONE_TAGS].getString(); }
public String getHeadingTags() { return options[HEADING_TAGS].getString(); }
public String getPageTags() { return options[PAGE_TAGS].getString(); }
public XhtmlStyleMap getXParStyleMap() { return getStyleMap(xpar); }
public XhtmlStyleMap getXHeadingStyleMap() { return getStyleMap(xheading); }