← Back to branch summary

~ubuntu-branches/debian/squeeze/sword/squeeze

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Marsden, Jonathan Marsden, Dmitrijs Ledkovs, Closed Bugs
  • Date: 2009-05-30 11:55:55 UTC
  • mfrom: (1.3.1 upstream) (6.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090530115555-r427zsn3amivdpfu
Tags: 1.6.0+dfsg-1
http://bugs.debian.org/507960
https://launchpad.net/bugs/320558
http://bugs.debian.org/513448
https://launchpad.net/bugs/322638
https://launchpad.net/bugs/305172
[ Jonathan Marsden ]
* New upstream release. (Closes: #507960) (LP: #320558)
* debian/patches/02_libver.diff:
  - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
* debian/patches/series:
  - Remove 10_diatheke.diff -- included in upstream source.
* debian/patches/:
  - Remove several old unused .diff files.
  - Add 11_regex_only_when_needed.diff to conditionally include regex lib.
  - Add 12_fix_compiler_warnings.diff to remove all compiler warnings.
  - Add 13_fix_osis2mod_compression_default.diff from upstream svn.
  - Add 14_closing_section_not_chapter.diff from upstream svn.
* debian/libsword7.*: 
  - Rename to libsword8.*
  - Change libsword7 to libsword8 within files.
* debian/rules: 
  - SONAME bump to 8.
  - Set library version check to >= 1.6
* debian/control:
  - Change libsword7 to libsword8.
  - Add libsword7 to Conflicts.
  - Fix case of sword to SWORD in package descriptions.
  - Bump Standards-Version to 3.8.1 (no changes needed).
  - Fix section for libsword-dbg to avoid lintian warning.
* debian/rules:
  - Add DFSG get-orig-source target.
* debian/copyright:
  - Fix various mistakes in initial attempt to document copyrights.

[ Dmitrijs Ledkovs ]
* debian/rules: Added utils.mk to use missing-files target and call it on
  each build.
* debian/libsword-dev.install: Added libsword.la, previously missing.
* debian/libsword7.install: Added missing libicu translit files.
* debian/control:
  - Updated all uses of SWORD version to 1.6
  - Added libsword-dbg package
* debian/watch: Fixed a small mistake which was resulting in extra "."
  in final version name.
* debian/rules: simplified manpage processing.
* debian/libsword8.lintian-overrides: added override for module
  installation directory.
* debian/copyright: Updated with information about everyfile.
  Closes: #513448 LP: #322638
* debian/diatheke.examples: moved examples here from the diatheke.install
* debian/rules:
  - enabled shell script based testsuite
  - added commented out cppunit testsuite
* debian/patches/40_missing_includes.diff: 
  - added several missing stdio.h includes to prevent FTBFS of testsuite.

[ Closed Bugs ]
* FTBFS on intrepid (LP: #305172)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/filters/gbfheadings.cpp
 
1
/******************************************************************************
 
2
 *
 
3
 * gbfheadings -        SWFilter descendant to hide or show headings
 
4
 *                      in a GBF module.
 
5
 *
 
6
 * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
 
7
 *      CrossWire Bible Society
 
8
 *      P. O. Box 2528
 
9
 *      Tempe, AZ  85280-2528
 
10
 *
 
11
 * This program is free software; you can redistribute it and/or modify it
 
12
 * under the terms of the GNU General Public License as published by the
 
13
 * Free Software Foundation version 2.
 
14
 *
 
15
 * This program is distributed in the hope that it will be useful, but
 
16
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 
18
 * General Public License for more details.
 
19
 *
 
20
 */
 
21
 
 
22
#include <stdlib.h>
 
23
#include <gbfheadings.h>
 
24
 
 
25
SWORD_NAMESPACE_START
 
26
 
 
27
 
 
28
const char oName[] = "Headings";
 
29
const char oTip[] = "Toggles Headings On and Off if they exist";
 
30
 
 
31
const SWBuf choices[3] = {"Off", "On", ""};
 
32
const StringList oValues(&choices[0], &choices[2]);
 
33
 
 
34
GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) {
 
35
        setOptionValue("Off");
 
36
}
 
37
 
 
38
 
 
39
GBFHeadings::~GBFHeadings() {
 
40
}
 
41
 
 
42
 
 
43
char GBFHeadings::processText (SWBuf &text, const SWKey *key, const SWModule *module) {
 
44
        if (!option) {  // if we don't want headings
 
45
                char token[2048]; // cheese.  Fix.
 
46
                int tokpos = 0;
 
47
                bool intoken = false;
 
48
                bool hide = false;
 
49
 
 
50
        const char *from;
 
51
        SWBuf orig = text;
 
52
        from = orig.c_str();
 
53
        for (text = ""; *from; from++) {
 
54
                        if (*from == '<') {
 
55
                                intoken = true;
 
56
                                tokpos = 0;
 
57
//                              memset(token, 0, 2048);
 
58
                                token[0] = 0;
 
59
                                token[1] = 0;
 
60
                                token[2] = 0;
 
61
                                continue;
 
62
                        }
 
63
                        if (*from == '>') {     // process tokens
 
64
                                intoken = false;
 
65
                                switch (*token) {
 
66
                                case 'T':                               // Reference
 
67
                                        switch(token[1]) {
 
68
                                        case 'S':               // Begin heading
 
69
                                                hide = true;
 
70
                                                break;
 
71
                                        case 's':               // end heading
 
72
                                                hide = false;
 
73
                                                break;
 
74
                                        }
 
75
                                        continue;       // skip token
 
76
                                }
 
77
                                // if not a heading token, keep token in text
 
78
                                if (!hide) {
 
79
                                        text += '<';
 
80
                                        for (char *tok = token; *tok; tok++)
 
81
                                                text += *tok;
 
82
                                        text += '>';
 
83
                                }
 
84
                                continue;
 
85
                        }
 
86
                        if (intoken) {
 
87
                                if (tokpos < 2045)
 
88
                                        token[tokpos++] = *from;
 
89
                                        token[tokpos+2] = 0;
 
90
                        }
 
91
                        else    {
 
92
                                if (!hide) {
 
93
                                        text += *from;
 
94
                                }
 
95
                        }
 
96
                }
 
97
        }
 
98
        return 0;
 
99
}
 
100
 
 
101
SWORD_NAMESPACE_END