diff options
Diffstat (limited to 'src/modules/filters/osisrtf.cpp')
| -rw-r--r-- | src/modules/filters/osisrtf.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/filters/osisrtf.cpp b/src/modules/filters/osisrtf.cpp index 84801e3..b8cf30c 100644 --- a/src/modules/filters/osisrtf.cpp +++ b/src/modules/filters/osisrtf.cpp @@ -87,8 +87,8 @@ OSISRTF::OSISRTF() { addEscapeStringSubstitute("lt", "<"); addEscapeStringSubstitute("gt", ">"); addEscapeStringSubstitute("quot", "\""); - addTokenSubstitute("lg", "{\\par}"); - addTokenSubstitute("/lg", "{\\par}"); + // addTokenSubstitute("lg", "{\\par}"); + // addTokenSubstitute("/lg", "{\\par}"); setTokenCaseSensitive(true); } @@ -239,8 +239,8 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us if (!tag.isEmpty()) { SWBuf type = tag.getAttribute("type"); - if ( (type != "x-strongsMarkup") // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off - && (type != "strongsMarkup") // deprecated + if ((type != "x-strongsMarkup") // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off + && (type != "strongsMarkup") // deprecated ) { SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); VerseKey *vkey = NULL; @@ -265,8 +265,8 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us } } - // <p> paragraph tag - else if (!strcmp(tag.getName(), "p")) { + // <p> paragraph and <lg> linegroup tags + else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag outText("{\\fi200\\par}", buf, u); } @@ -275,7 +275,7 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us userData->supressAdjacentWhitespace = true; } else { // empty paragraph break marker - outText("{\\pard\\par\\par}", buf, u); + outText("{\\pard\\par}", buf, u); userData->supressAdjacentWhitespace = true; } } @@ -373,7 +373,7 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us else if (!strcmp(tag.getName(), "hi")) { SWBuf type = tag.getAttribute("type"); if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (type == "b" || type == "x-b") + if (type == "bold" || type == "b" || type == "x-b") outText("{\\b1 ", buf, u); else // all other types outText("{\\i1 ", buf, u); |