← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/modules/filters/plainhtml.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/plainhtml.cpp
 
1
/***************************************************************************
 
2
 *                         plainhtml.cpp  -  description
 
3
 *                            -------------------
 
4
 *   begin                : Thu Jun 24 1999
 
5
 *   copyright            : (C) 1999 by Torsten Uhlmann
 
6
 *   email                : TUhlmann@gmx.de
 
7
 *
 
8
 * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
 
9
 *      CrossWire Bible Society
 
10
 *      P. O. Box 2528
 
11
 *      Tempe, AZ  85280-2528
 
12
 *
 
13
 * This program is free software; you can redistribute it and/or modify it
 
14
 * under the terms of the GNU General Public License as published by the
 
15
 * Free Software Foundation version 2.
 
16
 *
 
17
 * This program is distributed in the hope that it will be useful, but
 
18
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 
19
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 
20
 * General Public License for more details.
 
21
 *
 
22
 */
 
23
 
 
24
#include <plainhtml.h>
 
25
#include <swbuf.h>
 
26
 
 
27
SWORD_NAMESPACE_START
 
28
 
 
29
PLAINHTML::PLAINHTML()
 
30
{
 
31
}
 
32
 
 
33
 
 
34
char PLAINHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
 
35
{
 
36
        int count = 0;
 
37
 
 
38
        SWBuf orig = text;
 
39
        const char *from = orig.c_str();
 
40
        for (text = ""; *from; from++) 
 
41
        {
 
42
                if ((*from == '\n') && (from[1] == '\n')) // two newlinea are a paragraph
 
43
                {
 
44
                        text += "<P>";
 
45
                        from++;
 
46
                        continue;
 
47
                } else {
 
48
                        if ((*from == '\n')) // && (from[1] != '\n')) // only one new line
 
49
                        {
 
50
                                text += "<BR>";
 
51
                                continue;
 
52
                        }
 
53
                }
 
54
                
 
55
                if (*from == '{') { //footnote start
 
56
                        text += "<FONT COLOR=\"#80000\"><SMALL> (";
 
57
                        continue;
 
58
                }
 
59
                else if (*from == '}') //footnote end
 
60
                {
 
61
                        text += ") </SMALL></FONT>";
 
62
                        continue;
 
63
                }
 
64
                else if (*from == '<') {
 
65
                        text += "&lt;";
 
66
                        continue;
 
67
                }
 
68
                else if (*from == '>') {
 
69
                        text += "&gt;";
 
70
                        continue;
 
71
                }
 
72
                else if (*from == '&') {
 
73
                        text += "&amp;";
 
74
                        continue;
 
75
                }
 
76
                else if ((*from == ' ') && (count > 5000))
 
77
                {
 
78
                        text += "<WBR>";
 
79
                        count = 0;
 
80
                        continue;
 
81
                }
 
82
 
 
83
                text += *from;
 
84
                count++;
 
85
        }
 
86
        return 0;
 
87
}
 
88
 
 
89
SWORD_NAMESPACE_END