← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sword/lucid

« back to all changes in this revision

Viewing changes to src/modules/filters/osisrtf.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs, Jonathan Marsden, Dmitrijs Ledkovs
  • Date: 2010-01-21 00:10:17 UTC
  • mfrom: (1.1.4 upstream) (5.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100121001017-5ea19163rgisywbl
Tags: 1.6.1+dfsg-1
[ Jonathan Marsden ]
* debian/libsword8.examples: Add missing tcl eggdrop bot script.

[ Dmitrijs Ledkovs ]
* Drop shipping .la file in favour of pkg-config (Debian release goal)
  - More info http://lists.debian.org/debian-devel/2009/08/msg00783.html
* Drop backported patches, refreshed libver & compiler warnings.
* Compiling with -Werror enabled. 
* Bumped standards version to 3.8.3, no changes needed.
* Added debian/README.source documentation quilt usage
* Added configure option --without-internalregex

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/filters/osisrtf.cpp
87
87
        addEscapeStringSubstitute("lt", "<");
88
88
        addEscapeStringSubstitute("gt", ">");
89
89
        addEscapeStringSubstitute("quot", "\"");
90
 
        addTokenSubstitute("lg", "{\\par}");
91
 
        addTokenSubstitute("/lg", "{\\par}");
 
90
        //      addTokenSubstitute("lg", "{\\par}");
 
91
        //      addTokenSubstitute("/lg", "{\\par}");
92
92
 
93
93
        setTokenCaseSensitive(true);
94
94
}
239
239
                                if (!tag.isEmpty()) {
240
240
                                        SWBuf type = tag.getAttribute("type");
241
241
 
242
 
                                        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
243
 
                                                        && (type != "strongsMarkup")            // deprecated
 
242
                                        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
 
243
                                                        && (type != "strongsMarkup")    // deprecated
244
244
                                                        ) {
245
245
                                                SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
246
246
                                                VerseKey *vkey = NULL;
265
265
                        }
266
266
                }
267
267
 
268
 
                // <p> paragraph tag
269
 
                else if (!strcmp(tag.getName(), "p")) {
 
268
                // <p> paragraph and <lg> linegroup tags
 
269
                else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
270
270
                        if ((!tag.isEndTag()) && (!tag.isEmpty())) {    // non-empty start tag
271
271
                                outText("{\\fi200\\par}", buf, u);
272
272
                        }
275
275
                                userData->supressAdjacentWhitespace = true;
276
276
                        }
277
277
                        else {                                  // empty paragraph break marker
278
 
                                outText("{\\pard\\par\\par}", buf, u);
 
278
                                outText("{\\pard\\par}", buf, u);
279
279
                                userData->supressAdjacentWhitespace = true;
280
280
                        }
281
281
                }
373
373
                else if (!strcmp(tag.getName(), "hi")) {
374
374
                        SWBuf type = tag.getAttribute("type");
375
375
                        if ((!tag.isEndTag()) && (!tag.isEmpty())) {
376
 
                                if (type == "b" || type == "x-b")
 
376
                                if (type == "bold" || type == "b" || type == "x-b")
377
377
                                        outText("{\\b1 ", buf, u);
378
378
                                else    // all other types
379
379
                                        outText("{\\i1 ", buf, u);