[sword-cvs] sword/include cipherfil.h,1.9,1.10 defs.h,1.8,1.9 gbffootnotes.h,1.10,1.11 gbfheadings.h,1.3,1.4 gbfhtml.h,1.10,1.11 gbfhtmlhref.h,1.3,1.4 gbfmorph.h,1.3,1.4 gbfosis.h,1.5,1.6 gbfplain.h,1.10,1.11 gbfredletterwords.h,1.2,1.3 gbfrtf.h,1.8,1.9 gbfstrongs.h,1.9,1.10 gbfthml.h,1.5,1.6 greeklexattribs.h,1.2,1.3 hrefcom.h,1.7,1.8 latin1utf16.h,1.4,1.5 latin1utf8.h,1.3,1.4 osismorph.h,1.1,1.2 osisplain.h,1.1,1.2 osisrtf.h,1.1,1.2 osisstrongs.h,1.1,1.2 plainfootnotes.h,1.5,1.6 plainhtml.h,1.8,1.9 rawcom.h,1.17,1.18 rawfiles.h,1.16,1.17 rawgenbook.h,1.5,1.6 rawld.h,1.17,1.18 rawld4.h,1.11,1.12 rawtext.h,1.26,1.27 rtfhtml.h,1.6,1.7 rwphtml.h,1.8,1.9 rwprtf.h,1.8,1.9 scsuutf8.h,1.3,1.4 swbasicfilter.h,1.12,1.13 swbuf.h,1.1,1.2 swfilter.h,1.14,1.15 swmgr.h,1.51,1.52 swmodule.h,1.57,1.58 thmlfootnotes.h,1.3,1.4 thmlgbf.h,1.5,1.6 thmlheadings.h,1.3,1.4 thmlhtml.h,1.8,1.9 thmlhtmlhref.h,1.3,1.4 thmllemma.h,1.3,1.4 thmlmorph.h,1.3,1.4 thmlolb.h,1.2,1.3 thmlosis.h,1.5,1.6 thmlplain.h,1.5,1.6 thmlrtf.h,1.6,1.7 thmlscripref.h,1.3,1.4 thmlstrongs.h,1.3,1.4 thmlvariants.h,1.3,1.4 unicodertf.h,1.4,1.5 utf16utf8.h,1.4,1.5 utf8arshaping.h,1.5,1.6 utf8bidireorder.h,1.6,1.7 utf8cantillation.h,1.3,1.4 utf8greekaccents.h,1.3,1.4 utf8hebrewpoints.h,1.3,1.4 utf8html.h,1.3,1.4 utf8latin1.h,1.3,1.4 utf8nfc.h,1.5,1.6 utf8nfkd.h,1.5,1.6 utf8transliterator.h,1.17,1.18 utf8utf16.h,1.4,1.5 zcom.h,1.18,1.19 zld.h,1.7,1.8 ztext.h,1.27,1.28
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 20 Feb 2003 00:25:24 -0700
Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv18313/include
Modified Files:
cipherfil.h defs.h gbffootnotes.h gbfheadings.h gbfhtml.h
gbfhtmlhref.h gbfmorph.h gbfosis.h gbfplain.h
gbfredletterwords.h gbfrtf.h gbfstrongs.h gbfthml.h
greeklexattribs.h hrefcom.h latin1utf16.h latin1utf8.h
osismorph.h osisplain.h osisrtf.h osisstrongs.h
plainfootnotes.h plainhtml.h rawcom.h rawfiles.h rawgenbook.h
rawld.h rawld4.h rawtext.h rtfhtml.h rwphtml.h rwprtf.h
scsuutf8.h swbasicfilter.h swbuf.h swfilter.h swmgr.h
swmodule.h thmlfootnotes.h thmlgbf.h thmlheadings.h thmlhtml.h
thmlhtmlhref.h thmllemma.h thmlmorph.h thmlolb.h thmlosis.h
thmlplain.h thmlrtf.h thmlscripref.h thmlstrongs.h
thmlvariants.h unicodertf.h utf16utf8.h utf8arshaping.h
utf8bidireorder.h utf8cantillation.h utf8greekaccents.h
utf8hebrewpoints.h utf8html.h utf8latin1.h utf8nfc.h
utf8nfkd.h utf8transliterator.h utf8utf16.h zcom.h zld.h
ztext.h
Log Message:
Started HUGE task of moving all char **buf over to SWBuf &buf
NEED YOUR HELP
Index: cipherfil.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/cipherfil.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cipherfil.h 1 Oct 2002 19:52:40 -0000 1.9
--- cipherfil.h 20 Feb 2003 07:25:19 -0000 1.10
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 25,30 ****
#include <swcipher.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
--- 25,28 ----
***************
*** 34,38 ****
CipherFilter(const char *key);
virtual ~CipherFilter();
! virtual char ProcessText(char *text, int maxlen, const SWKey *key, const SWModule * = 0);
virtual SWCipher *getCipher();
};
--- 32,36 ----
CipherFilter(const char *key);
virtual ~CipherFilter();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
virtual SWCipher *getCipher();
};
Index: defs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/defs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** defs.h 22 Nov 2002 04:46:03 -0000 1.8
--- defs.h 20 Feb 2003 07:25:19 -0000 1.9
***************
*** 16,21 ****
SWORD_NAMESPACE_START
- #define FILTERPAD 32
-
// _declspec works in BC++ 5 and later, as well as VC++
#if defined(_MSC_VER)
--- 16,19 ----
Index: gbffootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbffootnotes.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gbffootnotes.h 1 Oct 2002 19:52:40 -0000 1.10
--- gbffootnotes.h 20 Feb 2003 07:25:19 -0000 1.11
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides footnotes in a GBF text
*/
! class SWDLLEXPORT GBFFootnotes:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFFootnotes ();
! virtual ~ GBFFootnotes ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides footnotes in a GBF text
*/
! class SWDLLEXPORT GBFFootnotes:public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFFootnotes();
! virtual ~GBFFootnotes();
! virtual char processText(SWBuf &text, const SWKey * key = 0, const SWModule * = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: gbfheadings.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfheadings.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gbfheadings.h 1 Oct 2002 19:52:40 -0000 1.3
--- gbfheadings.h 20 Feb 2003 07:25:19 -0000 1.4
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides headings in a GBF text
*/
! class SWDLLEXPORT GBFHeadings:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFHeadings ();
! virtual ~ GBFHeadings ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides headings in a GBF text
*/
! class SWDLLEXPORT GBFHeadings : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFHeadings();
! virtual ~GBFHeadings();
! virtual char processText (SWBuf &text, const SWKey * key = 0, const SWModule * = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: gbfhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtml.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gbfhtml.h 10 Jan 2003 20:43:15 -0000 1.10
--- gbfhtml.h 20 Feb 2003 07:25:19 -0000 1.11
***************
*** 1,17 ****
! /*-*************************************************************************
! gbfhtml.h - description
! -------------------
! begin : 2001-09-03
! copyright : 2001 by CrossWire Bible Society
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef GBFHTML_H
--- 1,21 ----
! /******************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef GBFHTML_H
***************
*** 20,25 ****
#include <swbasicfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 28,36 ****
class SWDLLEXPORT GBFHTML : public SWBasicFilter {
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
! GBFHTML ();
};
-
SWORD_NAMESPACE_END
--- 30,37 ----
class SWDLLEXPORT GBFHTML : public SWBasicFilter {
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
! GBFHTML();
};
SWORD_NAMESPACE_END
Index: gbfhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfhtmlhref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gbfhtmlhref.h 1 Oct 2002 19:52:40 -0000 1.3
--- gbfhtmlhref.h 20 Feb 2003 07:25:19 -0000 1.4
***************
*** 1,17 ****
! /*-*************************************************************************
! gbfhtmlhref.h - description
! -------------------
! begin : 2001-09-03
! copyright : 2001 by CrossWire Bible Society
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef GBFHTMLHREF_H
--- 1,21 ----
! /******************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef GBFHTMLHREF_H
***************
*** 20,25 ****
#include <swbasicfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 28,36 ****
class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
! GBFHTMLHREF ();
};
-
SWORD_NAMESPACE_END
--- 30,37 ----
class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
! GBFHTMLHREF();
};
SWORD_NAMESPACE_END
Index: gbfmorph.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfmorph.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gbfmorph.h 1 Oct 2002 19:52:40 -0000 1.3
--- gbfmorph.h 20 Feb 2003 07:25:19 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /***************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,58 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides morph tags in a GBF text
*/
! class SWDLLEXPORT GBFMorph:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFMorph ();
! virtual ~ GBFMorph ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides morph tags in a GBF text
*/
! class SWDLLEXPORT GBFMorph : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFMorph();
! virtual ~GBFMorph();
! virtual char processText(SWBuf &text, const SWKey * key = 0, const SWModule * = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: gbfosis.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfosis.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gbfosis.h 13 Feb 2003 20:16:35 -0000 1.5
--- gbfosis.h 20 Feb 2003 07:25:19 -0000 1.6
***************
*** 1,22 ****
/***************************************************************************
! gbfosis.h - description
! -------------------
! begin : 2001-09-03
! copyright : 2001 by CrossWire Bible Society
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef GBFOSIS_H
#define GBFOSIS_H
- #include <defs.h>
#include <swfilter.h>
#include <string>
--- 1,25 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef GBFOSIS_H
#define GBFOSIS_H
#include <swfilter.h>
#include <string>
***************
*** 62,67 ****
GBFOSIS();
virtual ~GBFOSIS();
! char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0);
! static void pushString(char **buf, const char *format, ...);
};
--- 65,69 ----
GBFOSIS();
virtual ~GBFOSIS();
! char processText(SWBuf &text, const SWKey * = 0, const SWModule * = 0);
};
Index: gbfplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfplain.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gbfplain.h 13 Feb 2003 20:16:35 -0000 1.10
--- gbfplain.h 20 Feb 2003 07:25:19 -0000 1.11
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,38 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This filter converts GBF text to plain text
*/
! class SWDLLEXPORT GBFPlain:public SWFilter
! {
public:
! GBFPlain ();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This filter converts GBF text to plain text
*/
! class SWDLLEXPORT GBFPlain : public SWFilter {
public:
! GBFPlain();
! virtual char processText (SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
};
Index: gbfredletterwords.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfredletterwords.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gbfredletterwords.h 13 Feb 2003 20:16:35 -0000 1.2
--- gbfredletterwords.h 20 Feb 2003 07:25:19 -0000 1.3
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,61 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides "red letter tags" (marking the
! * words of Jesus) in a GBF text. Turn this off if you don't want
! * to have this kind of markup in the text.
! */
! class SWDLLEXPORT GBFRedLetterWords : public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFRedLetterWords ();
! virtual ~ GBFRedLetterWords ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides "red letter tags" (marking the
! * words of Jesus) in a GBF text. Turn this off if you don't want
! * to have this kind of markup in the text.
! */
! class SWDLLEXPORT GBFRedLetterWords : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFRedLetterWords();
! virtual ~GBFRedLetterWords();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: gbfrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfrtf.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gbfrtf.h 1 Oct 2002 19:52:40 -0000 1.8
--- gbfrtf.h 20 Feb 2003 07:25:19 -0000 1.9
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,38 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts GBF text into RTF text
! */
! class SWDLLEXPORT GBFRTF:public SWFilter
! {
public:
! GBFRTF ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts GBF text into RTF text
! */
! class SWDLLEXPORT GBFRTF : public SWFilter {
public:
! GBFRTF();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
};
Index: gbfstrongs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfstrongs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gbfstrongs.h 1 Oct 2002 19:52:40 -0000 1.9
--- gbfstrongs.h 20 Feb 2003 07:25:19 -0000 1.10
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides strong's numbers in a GBF text
! */
! class SWDLLEXPORT GBFStrongs:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFStrongs ();
! virtual ~ GBFStrongs ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides strong's numbers in a GBF text
! */
! class SWDLLEXPORT GBFStrongs : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! GBFStrongs();
! virtual ~GBFStrongs();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: gbfthml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfthml.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gbfthml.h 1 Oct 2002 19:52:40 -0000 1.5
--- gbfthml.h 20 Feb 2003 07:25:19 -0000 1.6
***************
*** 1,18 ****
/***************************************************************************
! gbfthml.h - description
! -------------------
! begin : 1999-10-28
! copyright : 1999 by Chris Little
! email : chrislit@chiasma.org
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef GBFTHML_H
--- 1,21 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef GBFTHML_H
***************
*** 21,35 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts GBF text into ThML text
! */
! class SWDLLEXPORT GBFThML:public SWFilter
! {
public:
! GBFThML ();
! virtual char ProcessText (char *text, int maxlen = -1);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts GBF text into ThML text
! */
! class SWDLLEXPORT GBFThML : public SWFilter {
public:
! GBFThML();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: greeklexattribs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/greeklexattribs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** greeklexattribs.h 1 Oct 2002 19:52:40 -0000 1.2
--- greeklexattribs.h 20 Feb 2003 07:25:19 -0000 1.3
***************
*** 1,5 ****
! /*
*
! * thmlplain.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /***************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,37 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts ThML text to plain text
! */
! class SWDLLEXPORT GreekLexAttribs:public SWFilter {
public:
GreekLexAttribs();
! virtual char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts ThML text to plain text
! */
! class SWDLLEXPORT GreekLexAttribs : public SWFilter {
public:
GreekLexAttribs();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: hrefcom.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/hrefcom.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hrefcom.h 1 Oct 2002 19:52:40 -0000 1.7
--- hrefcom.h 20 Feb 2003 07:25:19 -0000 1.8
***************
*** 41,45 ****
const char *idesc = 0, SWDisplay * idisp = 0);
virtual ~HREFCom();
! virtual char *getRawEntry();
// OPERATORS -----------------------------------------------------------------
--- 41,45 ----
const char *idesc = 0, SWDisplay * idisp = 0);
virtual ~HREFCom();
! virtual SWBuf &getRawEntryBuf();
// OPERATORS -----------------------------------------------------------------
Index: latin1utf16.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/latin1utf16.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** latin1utf16.h 13 Feb 2003 20:16:35 -0000 1.4
--- latin1utf16.h 20 Feb 2003 07:25:19 -0000 1.5
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /***************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,36 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts Latin-1 encoded text to UTF-16
! */
! class SWDLLEXPORT Latin1UTF16:public SWFilter {
public:
! Latin1UTF16();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts Latin-1 encoded text to UTF-16
! */
! class SWDLLEXPORT Latin1UTF16 : public SWFilter {
public:
! Latin1UTF16();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: latin1utf8.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/latin1utf8.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** latin1utf8.h 1 Oct 2002 19:52:40 -0000 1.3
--- latin1utf8.h 20 Feb 2003 07:25:19 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /***************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,36 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts Latin-1 encoded text to UTF-8
! */
! class SWDLLEXPORT Latin1UTF8:public SWFilter {
public:
! Latin1UTF8();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts Latin-1 encoded text to UTF-8
! */
! class SWDLLEXPORT Latin1UTF8 : public SWFilter {
public:
! Latin1UTF8();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: osismorph.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osismorph.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osismorph.h 8 Jan 2003 09:39:57 -0000 1.1
--- osismorph.h 20 Feb 2003 07:25:19 -0000 1.2
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /***************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,33 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides morph tags in a OSIS text
! */
! class SWDLLEXPORT OSISMorph:public SWFilter {
bool option;
static const char on[];
--- 24,32 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides morph tags in a OSIS text
! */
! class SWDLLEXPORT OSISMorph : public SWFilter {
bool option;
static const char on[];
***************
*** 39,43 ****
OSISMorph();
virtual ~OSISMorph();
! virtual char ProcessText(char *text, int maxlen, const SWKey * key, const SWModule * = 0);
virtual const char *getOptionName() { return optName; }
virtual const char *getOptionTip () { return optTip; }
--- 38,42 ----
OSISMorph();
virtual ~OSISMorph();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
virtual const char *getOptionName() { return optName; }
virtual const char *getOptionTip () { return optTip; }
Index: osisplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisplain.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisplain.h 16 Feb 2003 06:53:56 -0000 1.1
--- osisplain.h 20 Feb 2003 07:25:19 -0000 1.2
***************
*** 1,5 ****
! /*
*
! * osisplain.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,28 ****
#include <swbasicfilter.h>
- #include <defs.h>
#include <string>
--- 24,27 ----
***************
*** 31,47 ****
SWORD_NAMESPACE_START
! /** this filter converts OSIS text to plain text
! */
! class SWDLLEXPORT OSISPlain:public SWBasicFilter
! {
public:
! string tagData;
! string::size_type pos1;
! string::size_type pos2;
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
! OSISPlain ();
};
--- 30,45 ----
SWORD_NAMESPACE_START
! /** this filter converts OSIS text to plain text
! */
! class SWDLLEXPORT OSISPlain : public SWBasicFilter {
public:
! string tagData;
! string::size_type pos1;
! string::size_type pos2;
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
! OSISPlain();
};
Index: osisrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisrtf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisrtf.h 16 Feb 2003 06:53:56 -0000 1.1
--- osisrtf.h 20 Feb 2003 07:25:19 -0000 1.2
***************
*** 1,5 ****
! /*
*
! * osisrtf.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,28 ****
#include <swbasicfilter.h>
- #include <defs.h>
#include <string>
--- 24,27 ----
***************
*** 31,47 ****
SWORD_NAMESPACE_START
! /** this filter converts OSIS text to RTF text
! */
! class SWDLLEXPORT OSISRTF:public SWBasicFilter
! {
private:
! string tagData;
! string::size_type pos1;
! string::size_type pos2;
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
! OSISRTF ();
};
--- 30,45 ----
SWORD_NAMESPACE_START
! /** this filter converts OSIS text to RTF text
! */
! class SWDLLEXPORT OSISRTF : public SWBasicFilter {
private:
! string tagData;
! string::size_type pos1;
! string::size_type pos2;
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
! OSISRTF();
};
Index: osisstrongs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisstrongs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisstrongs.h 8 Jan 2003 09:39:57 -0000 1.1
--- osisstrongs.h 20 Feb 2003 07:25:19 -0000 1.2
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /***************************************************************************
*
* $Id$
***************
*** 24,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides strong's numbers in a OSIS text
*/
! class SWDLLEXPORT OSISStrongs:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! OSISStrongs ();
! virtual ~ OSISStrongs ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides strong's numbers in a OSIS text
*/
! class SWDLLEXPORT OSISStrongs : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! OSISStrongs();
! virtual ~OSISStrongs();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: plainfootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/plainfootnotes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** plainfootnotes.h 1 Oct 2002 19:52:40 -0000 1.5
--- plainfootnotes.h 20 Feb 2003 07:25:19 -0000 1.6
***************
*** 1,27 ****
/***************************************************************************
! plainfootnotes.h - description
! -------------------
! begin : Wed Oct 13 1999
! copyright : (C) 1999 by The team of BibleTime
! email : info@bibletime.de
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
!
! /* $Header$ */
! /* $Revision$ */
#ifndef PLAINFOOTNOTES_H
#define PLAINFOOTNOTES_H
- #include <defs.h>
-
#include <swfilter.h>
--- 1,25 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef PLAINFOOTNOTES_H
#define PLAINFOOTNOTES_H
#include <swfilter.h>
***************
*** 31,63 ****
/**Shows or hides footnotes in plain text.
! *@author The team of BibleTime
! */
! class SWDLLEXPORT PLAINFootnotes:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! PLAINFootnotes ();
! virtual ~ PLAINFootnotes ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 29,51 ----
/**Shows or hides footnotes in plain text.
! *@author The team of BibleTime
! */
! class SWDLLEXPORT PLAINFootnotes : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! PLAINFootnotes();
! virtual ~PLAINFootnotes();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: plainhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/plainhtml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** plainhtml.h 1 Oct 2002 19:52:40 -0000 1.8
--- plainhtml.h 20 Feb 2003 07:25:19 -0000 1.9
***************
*** 1,22 ****
/***************************************************************************
! rwphtml.h - description
! -------------------
! begin : Tue Jun 15 15:34:26 CEST 1999
!
! copyright : (C) 1999 by Torsten Uhlmann
! email : TUhlmann@gmx.de
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
!
! /* $Header$ */
! /* $Revision$ */
#ifndef PLAINHTML_H
--- 1,21 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef PLAINHTML_H
***************
*** 25,39 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts plain text to HTML text
! */
! class SWDLLEXPORT PLAINHTML:public SWFilter
! {
public:
! PLAINHTML ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 24,36 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts plain text to HTML text
! * @author Torsten Uhlmann, begin : Tue Jun 15 15:34:26 CEST 1999
! */
! class SWDLLEXPORT PLAINHTML : public SWFilter {
public:
! PLAINHTML();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: rawcom.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawcom.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rawcom.h 21 Oct 2002 00:30:37 -0000 1.17
--- rawcom.h 20 Feb 2003 07:25:19 -0000 1.18
***************
*** 42,50 ****
SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
const char* ilang = 0);
! virtual ~RawCom();
! virtual char *getRawEntry();
! virtual void increment(int steps);
! virtual void decrement(int steps) { increment(-steps); }
// write interface ----------------------------
--- 42,51 ----
SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
const char* ilang = 0);
! virtual ~RawCom();
! virtual SWBuf &getRawEntryBuf();
!
! virtual void increment(int steps);
! virtual void decrement(int steps) { increment(-steps); }
// write interface ----------------------------
Index: rawfiles.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawfiles.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rawfiles.h 1 Oct 2002 19:52:40 -0000 1.16
--- rawfiles.h 20 Feb 2003 07:25:19 -0000 1.17
***************
*** 44,48 ****
const char *ilang = 0);
virtual ~RawFiles();
! virtual char *getRawEntry();
// write interface ----------------------------
--- 44,48 ----
const char *ilang = 0);
virtual ~RawFiles();
! virtual SWBuf &getRawEntryBuf();
// write interface ----------------------------
Index: rawgenbook.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawgenbook.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rawgenbook.h 1 Oct 2002 19:52:40 -0000 1.5
--- rawgenbook.h 20 Feb 2003 07:25:19 -0000 1.6
***************
*** 44,48 ****
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~RawGenBook();
! virtual char *getRawEntry();
// write interface ----------------------------
virtual bool isWritable() {
--- 44,48 ----
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~RawGenBook();
! virtual SWBuf &getRawEntryBuf();
// write interface ----------------------------
virtual bool isWritable() {
Index: rawld.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawld.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rawld.h 1 Oct 2002 19:52:40 -0000 1.17
--- rawld.h 20 Feb 2003 07:25:19 -0000 1.18
***************
*** 44,48 ****
virtual ~RawLD();
! virtual char *getRawEntry();
virtual void increment(int steps = 1);
--- 44,48 ----
virtual ~RawLD();
! virtual SWBuf &getRawEntryBuf();
virtual void increment(int steps = 1);
Index: rawld4.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawld4.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rawld4.h 1 Oct 2002 19:52:40 -0000 1.11
--- rawld4.h 20 Feb 2003 07:25:19 -0000 1.12
***************
*** 44,48 ****
virtual ~RawLD4();
! virtual char *getRawEntry();
virtual void increment(int steps = 1);
--- 44,48 ----
virtual ~RawLD4();
! virtual SWBuf &getRawEntryBuf();
virtual void increment(int steps = 1);
Index: rawtext.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawtext.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rawtext.h 21 Oct 2002 00:30:37 -0000 1.26
--- rawtext.h 20 Feb 2003 07:25:19 -0000 1.27
***************
*** 43,47 ****
const char* ilang = 0);
virtual ~RawText();
! virtual char *getRawEntry();
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
--- 43,47 ----
const char* ilang = 0);
virtual ~RawText();
! virtual SWBuf &getRawEntryBuf();
virtual void increment(int steps = 1);
virtual void decrement(int steps = 1) { increment(-steps); }
Index: rtfhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rtfhtml.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rtfhtml.h 1 Oct 2002 19:52:40 -0000 1.6
--- rtfhtml.h 20 Feb 2003 07:25:19 -0000 1.7
***************
*** 1,21 ****
/***************************************************************************
! rtfhtml.h - description
! -------------------
! begin : Wed Oct 13 1999
! copyright : (C) 1999 by The team of BibleTime
! email : info@bibletime.de
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
!
! /* $Header$ */
! /* $Revision$ */
#ifndef RTFHTML_H
--- 1,21 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef RTFHTML_H
***************
*** 24,38 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts RTF text into HTML text
! */
! class SWDLLEXPORT RTFHTML:public SWFilter
! {
public:
! RTFHTML ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts RTF text into HTML text
! */
! class SWDLLEXPORT RTFHTML : public SWFilter {
public:
! RTFHTML();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: rwphtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rwphtml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rwphtml.h 1 Oct 2002 19:52:40 -0000 1.8
--- rwphtml.h 20 Feb 2003 07:25:19 -0000 1.9
***************
*** 1,22 ****
/***************************************************************************
! rwphtml.h - description
! -------------------
! begin : Tue Jun 15 15:34:26 CEST 1999
!
! copyright : (C) 1999 by Torsten Uhlmann
! email : TUhlmann@gmx.de
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
!
! /* $Header$ */
! /* $Revision$ */
#ifndef RWPHTML_H
--- 1,21 ----
/***************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef RWPHTML_H
***************
*** 25,39 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts RWP text to HTML text
! */
! class SWDLLEXPORT RWPHTML:public SWFilter
! {
public:
! RWPHTML ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 24,36 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts RWP text to HTML text
! * @author Torsten Uhlmann, begin : Tue Jun 15 15:34:26 CEST 1999
! */
! class SWDLLEXPORT RWPHTML : public SWFilter {
public:
! RWPHTML();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: rwprtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rwprtf.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rwprtf.h 1 Oct 2002 19:52:40 -0000 1.8
--- rwprtf.h 20 Feb 2003 07:25:20 -0000 1.9
***************
*** 27,41 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts RWP text to RTF text
! */
! class SWDLLEXPORT RWPRTF:public SWFilter
! {
public:
! RWPRTF ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 27,38 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts RWP text to RTF text
! */
! class SWDLLEXPORT RWPRTF : public SWFilter {
public:
! RWPRTF();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: scsuutf8.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/scsuutf8.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scsuutf8.h 1 Oct 2002 19:52:40 -0000 1.3
--- scsuutf8.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,42 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts SCSU compressed (encoded) text to UTF-8
! */
! class SWDLLEXPORT SCSUUTF8:public SWFilter {
! private:
! unsigned char* UTF8Output(unsigned long, unsigned char* text);
!
unsigned long c, d;
!
! public:
! SCSUUTF8();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,38 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts SCSU compressed (encoded) text to UTF-8
! */
! class SWDLLEXPORT SCSUUTF8 : public SWFilter {
unsigned long c, d;
+ unsigned char* UTF8Output(unsigned long, unsigned char* text);
! public:
! SCSUUTF8();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: swbasicfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbasicfilter.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** swbasicfilter.h 1 Oct 2002 22:04:58 -0000 1.12
--- swbasicfilter.h 20 Feb 2003 07:25:20 -0000 1.13
***************
*** 27,47 ****
#include <swfilter.h>
-
- #include <defs.h>
#include <map>
SWORD_NAMESPACE_START
/** A filter providing commonly used functionality.
! * This filter has facilities for handling SGML/HTML/XML like tokens and
! * escape strings (like SGML entities). It has the facility for just
! * substituting the given tokens and escape strings to other strings and for
! * "manual" custom token handling.
! *
! * In this class the functions with arguments looking as <code>char
! * **buf</code> write a character sequnce at address specified by
! * <code>*buf</code> address and change <code>*buf</code> to point past
! * the last char of the written sequence.
! */
class SWDLLEXPORT SWBasicFilter : public SWFilter {
--- 27,46 ----
#include <swfilter.h>
#include <map>
+ #include <string>
SWORD_NAMESPACE_START
/** A filter providing commonly used functionality.
! * This filter has facilities for handling SGML/HTML/XML like tokens and
! * escape strings (like SGML entities). It has the facility for just
! * substituting the given tokens and escape strings to other strings and for
! * "manual" custom token handling.
! *
! * In this class the functions with arguments looking as <code>char
! * **buf</code> write a character sequnce at address specified by
! * <code>*buf</code> address and change <code>*buf</code> to point past
! * the last char of the written sequence.
! */
class SWDLLEXPORT SWBasicFilter : public SWFilter {
***************
*** 57,61 ****
public:
SWBasicFilter();
! virtual char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0);
virtual ~SWBasicFilter();
--- 56,60 ----
public:
SWBasicFilter();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
virtual ~SWBasicFilter();
***************
*** 63,67 ****
const SWModule *module;
const SWKey *key;
- char *resultBuffer;
typedef std::map<std::string, std::string> DualStringMap;
DualStringMap tokenSubMap;
--- 62,65 ----
***************
*** 93,101 ****
void addTokenSubstitute(const char *findString, const char *replaceString);
void addEscapeStringSubstitute(const char *findString, const char *replaceString);
! bool substituteToken(char **buf, const char *token);
! bool substituteEscapeString(char **buf, const char *escString);
!
! /** Like sprintf*/
! void pushString(char **buf, const char *format, ...);
/** This function is called for every token encountered in the input text.
--- 91,96 ----
void addTokenSubstitute(const char *findString, const char *replaceString);
void addEscapeStringSubstitute(const char *findString, const char *replaceString);
! bool substituteToken(SWBuf &buf, const char *token);
! bool substituteEscapeString(SWBuf &buf, const char *escString);
/** This function is called for every token encountered in the input text.
***************
*** 105,109 ****
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
/** This function is called for every escape sequence encountered in the input text.
--- 100,104 ----
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
/** This function is called for every escape sequence encountered in the input text.
***************
*** 113,117 ****
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
! virtual bool handleEscapeString(char **buf, const char *escString, DualStringMap &userData);
};
--- 108,112 ----
* @return <code>false</code> if was not handled and should be handled in
* the default way (by just substituting).*/
! virtual bool handleEscapeString(SWBuf &buf, const char *escString, DualStringMap &userData);
};
Index: swbuf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** swbuf.h 20 Feb 2003 03:12:37 -0000 1.1
--- swbuf.h 20 Feb 2003 07:25:20 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
+ #define JUNKBUFSIZE 8191
class SWDLLEXPORT SWBuf {
***************
*** 34,37 ****
--- 35,39 ----
unsigned int allocSize;
static char *nullStr;
+ static char junkBuf[JUNKBUFSIZE];
void assureSize(unsigned int size);
***************
*** 54,57 ****
--- 56,60 ----
void append(const SWBuf &str);
void append(char ch);
+ void appendFormatted(const char *format, ...);
operator const char *() const { return c_str(); }
Index: swfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swfilter.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** swfilter.h 1 Oct 2002 19:52:40 -0000 1.14
--- swfilter.h 20 Feb 2003 07:25:20 -0000 1.15
***************
*** 23,31 ****
#ifndef SWFILTER_H
#define SWFILTER_H
- #include <string>
- #include <list>
- #include <swkey.h>
#include <defs.h>
SWORD_NAMESPACE_START
--- 23,31 ----
#ifndef SWFILTER_H
#define SWFILTER_H
#include <defs.h>
+ #include <swbuf.h>
+ #include <list>
+ #include <swkey.h>
SWORD_NAMESPACE_START
***************
*** 34,38 ****
* The type definitoin for option types
*/
! typedef std::list < std::string > OptionsList;
--- 34,38 ----
* The type definitoin for option types
*/
! typedef std::list < SWBuf > OptionsList;
***************
*** 45,111 ****
class SWDLLEXPORT SWFilter {
public:
! virtual ~SWFilter() {}
! /** the type definition for option lists,
! * see @ref getOptionValues
! */
! // typedef std::list < std::string > OptionsList;
! /** gets the name of the option of this filter
! * @return option name
! */
! virtual const char * getOptionName ()
! {
! return 0;
! }
! /** gets a short explanation of the option of this filter;
! * it could be presented to the user in frontend programs
! * @return option tip/explanation
! */
! virtual const char * getOptionTip ()
! {
! return 0;
! }
! /** returns a list of the possible option values
! * might be
! * @return list of option values
! */
! virtual OptionsList getOptionValues ()
! {
! OptionsList options;
! return options;
! }
! /** sets the value of the option of this filter,
! * e.g maybe a strong's filter mioght be set to "on" / "off" -
! * that would mean to show or not to show the strongs in the text,
! * see also @ref getOptionValues
! * @param ival the new option valus
! */
! virtual void setOptionValue (const char *)
! {
! }
! virtual const char * getOptionValue ()
! {
! return 0;
! }
! /** This is the main filter function
! * @param text the text to be filtered/converted
! * @param maxlen maximal length of text to be processed
! * @param key sorry I don't know
! * @return 0
! */
! virtual char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0)
! {
! return ProcessText(text, maxlen);
! }
! /** This is the main filter function without the 3rd parameter
! * @param text the text to be filtered/converted
! * @param maxlen maximal length of text to be processed
! * @return 0
! */
! virtual char ProcessText(char *text, int maxlen = -1)
! {
! return ProcessText(text, maxlen, 0);
! }
};
! SWORD_NAMESPACE_END
#endif
--- 45,88 ----
class SWDLLEXPORT SWFilter {
public:
! virtual ~SWFilter() {}
!
! /** gets the name of the option of this filter
! * @return option name
! */
! virtual const char *getOptionName () { return 0; }
!
! /** gets a short explanation of the option of this filter;
! * it could be presented to the user in frontend programs
! * @return option tip/explanation
! */
! virtual const char *getOptionTip () { return 0; }
!
! /** returns a list of the possible option values
! * might be
! * @return list of option values
! */
! virtual OptionsList getOptionValues () {
! OptionsList options;
! return options;
! }
!
! /** sets the value of the option of this filter,
! * e.g maybe a strong's filter mioght be set to "on" / "off" -
! * that would mean to show or not to show the strongs in the text,
! * see also @ref getOptionValues
! * @param ival the new option valus
! */
! virtual void setOptionValue (const char *) { }
! virtual const char *getOptionValue () { return 0; }
!
! /** This is the main filter function
! * @param text the text to be filtered/converted
! * @param maxlen maximal length of text to be processed
! * @param key sorry I don't know
! * @return 0
! */
! virtual char processText(SWBuf &text, const SWKey * = 0, const SWModule * = 0) = 0;
};
! SWORD_NAMESPACE_END
#endif
Index: swmgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmgr.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** swmgr.h 16 Feb 2003 06:53:56 -0000 1.51
--- swmgr.h 20 Feb 2003 07:25:20 -0000 1.52
***************
*** 54,58 ****
typedef std::map < std::string, SWModule *, std::less < std::string > >ModMap;
- typedef std::list < std::string > OptionsList;
typedef std::map < std::string, SWFilter * >FilterMap;
--- 54,57 ----
Index: swmodule.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** swmodule.h 14 Dec 2002 21:20:15 -0000 1.57
--- swmodule.h 20 Feb 2003 07:25:20 -0000 1.58
***************
*** 32,35 ****
--- 32,36 ----
#include <swcacher.h>
#include <list>
+ #include <swbuf.h>
#include <defs.h>
***************
*** 347,356 ****
*/
#ifndef SWIG
! virtual char *getRawEntry() = 0;
#else
! virtual char *getRawEntry() {};
#endif
-
// write interface ----------------------------
/** Is the module writable? :)
--- 348,356 ----
*/
#ifndef SWIG
! virtual SWBuf &getRawEntryBuf() = 0;
#else
! virtual SWBuf &getRawEntryBuf() {};
#endif
// write interface ----------------------------
/** Is the module writable? :)
***************
*** 432,437 ****
* @return *this
*/
! virtual void renderFilter(char *buf, long size, SWKey *key) {
! filterBuffer(renderFilters, buf, size, key);
}
/** Adds an EncodingFilter to this module's @see encodingfilters queue
--- 432,437 ----
* @return *this
*/
! virtual void renderFilter(SWBuf &buf, SWKey *key) {
! filterBuffer(renderFilters, buf, key);
}
/** Adds an EncodingFilter to this module's @see encodingfilters queue
***************
*** 470,475 ****
* @return *this
*/
! virtual void encodingFilter(char *buf, long size, SWKey *key) {
! filterBuffer(encodingFilters, buf, size, key);
}
/** Adds a StripFilter to this module's @ref stripfilters queue
--- 470,475 ----
* @return *this
*/
! virtual void encodingFilter(SWBuf &buf, SWKey *key) {
! filterBuffer(encodingFilters, buf, key);
}
/** Adds a StripFilter to this module's @ref stripfilters queue
***************
*** 487,492 ****
* @return *this
*/
! virtual void stripFilter(char *buf, long size, SWKey *key) {
! filterBuffer(stripFilters, buf, size, key);
}
/** Adds a RawFilter to this module's @ref rawfilters queue
--- 487,492 ----
* @return *this
*/
! virtual void stripFilter(SWBuf &buf, SWKey *key) {
! filterBuffer(stripFilters, buf, key);
}
/** Adds a RawFilter to this module's @ref rawfilters queue
***************
*** 505,512 ****
* @return *this
*/
! virtual void filterBuffer(FilterList *filters, char *buf, long size, SWKey *key) {
FilterList::iterator it;
for (it = filters->begin(); it != filters->end(); it++) {
! (*it)->ProcessText(buf, size, key, this);
}
}
--- 505,512 ----
* @return *this
*/
! virtual void filterBuffer(FilterList *filters, SWBuf &buf, SWKey *key) {
FilterList::iterator it;
for (it = filters->begin(); it != filters->end(); it++) {
! (*it)->processText(buf, key, this);
}
}
***************
*** 517,522 ****
* @return *this
*/
! virtual void rawFilter(char *buf, long size, SWKey *key) {
! filterBuffer(rawFilters, buf, size, key);
}
/** Adds an OptionFilter to this module's @ref optionfilters queue
--- 517,522 ----
* @return *this
*/
! virtual void rawFilter(SWBuf &buf, SWKey *key) {
! filterBuffer(rawFilters, buf, key);
}
/** Adds an OptionFilter to this module's @ref optionfilters queue
***************
*** 534,539 ****
* @return *this
*/
! virtual void optionFilter(char *buf, long size, SWKey *key) {
! filterBuffer(optionFilters, buf, size, key);
}
/** calls all StripFilters on buffer or current text
--- 534,539 ----
* @return *this
*/
! virtual void optionFilter(SWBuf &buf, SWKey *key) {
! filterBuffer(optionFilters, buf, key);
}
/** calls all StripFilters on buffer or current text
Index: thmlfootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlfootnotes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlfootnotes.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlfootnotes.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,5 ****
! /*
*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,60 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides footnotes in a ThML text
! */
! class SWDLLEXPORT ThMLFootnotes:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLFootnotes ();
! virtual ~ ThMLFootnotes ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
SWORD_NAMESPACE_END
#endif
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides footnotes in a ThML text
! */
! class SWDLLEXPORT ThMLFootnotes : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLFootnotes();
! virtual ~ThMLFootnotes();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlgbf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlgbf.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** thmlgbf.h 1 Oct 2002 19:52:40 -0000 1.5
--- thmlgbf.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,5 ****
! /*
*
! * thmlgbf.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,39 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts ThML text to GBF text
! */
! class SWDLLEXPORT ThMLGBF:public SWFilter
! {
public:
! ThMLGBF ();
! virtual char ProcessText (char *text, int maxlen = -1);
};
SWORD_NAMESPACE_END
#endif
--- 24,37 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts ThML text to GBF text
! */
! class SWDLLEXPORT ThMLGBF : public SWFilter {
public:
! ThMLGBF();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlheadings.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlheadings.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlheadings.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlheadings.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,5 ****
! /*
*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,60 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides headings in a ThML text
! */
! class SWDLLEXPORT ThMLHeadings:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLHeadings ();
! virtual ~ ThMLHeadings ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
SWORD_NAMESPACE_END
#endif
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides headings in a ThML text
! */
! class SWDLLEXPORT ThMLHeadings : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLHeadings();
! virtual ~ThMLHeadings();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlhtml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** thmlhtml.h 1 Oct 2002 19:52:40 -0000 1.8
--- thmlhtml.h 20 Feb 2003 07:25:20 -0000 1.9
***************
*** 1,19 ****
! /***************************************************************************
! thmlhtml.h - description
! -------------------
! begin : 1999-10-28
!
! copyright : 1999 by Chris Little
! email : chrislit@chiasma.org
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef THMLHTML_H
--- 1,21 ----
! /******************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef THMLHTML_H
***************
*** 22,27 ****
#include <swbasicfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 30,37 ****
class SWDLLEXPORT ThMLHTML : public SWBasicFilter {
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
ThMLHTML();
};
SWORD_NAMESPACE_END
#endif
--- 30,38 ----
class SWDLLEXPORT ThMLHTML : public SWBasicFilter {
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
ThMLHTML();
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlhtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlhtmlhref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlhtmlhref.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlhtmlhref.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,17 ****
! /***************************************************************************
! thmlhtmlhref.h - description
! -------------------
! begin : 2001-09-03
! copyright : 2001 by CrossWire Bible Society
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef _THMLHTMLHREF_H
--- 1,21 ----
! /******************************************************************************
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef _THMLHTMLHREF_H
***************
*** 20,25 ****
#include <swbasicfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 28,32 ****
class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter {
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
ThMLHTMLHREF();
--- 30,34 ----
class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter {
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
ThMLHTMLHREF();
Index: thmllemma.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmllemma.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmllemma.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmllemma.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,5 ****
! /*
*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,60 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides lemmas in a ThML text
! */
! class SWDLLEXPORT ThMLLemma:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLLemma ();
! virtual ~ ThMLLemma ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
SWORD_NAMESPACE_END
#endif
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides lemmas in a ThML text
! */
! class SWDLLEXPORT ThMLLemma : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLLemma();
! virtual ~ThMLLemma();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlmorph.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlmorph.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlmorph.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlmorph.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides morph tags in a ThML text
! */
! class SWDLLEXPORT ThMLMorph:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLMorph ();
! virtual ~ ThMLMorph ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
SWORD_NAMESPACE_END
#endif
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides morph tags in a ThML text
! */
! class SWDLLEXPORT ThMLMorph : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLMorph();
! virtual ~ThMLMorph();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlolb.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlolb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** thmlolb.h 1 Oct 2002 19:52:40 -0000 1.2
--- thmlolb.h 20 Feb 2003 07:25:20 -0000 1.3
***************
*** 1,5 ****
! /*
*
! * thmlolb.h
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,39 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts ThML text to OLB text
! */
! class SWDLLEXPORT ThMLOLB:public SWFilter
! {
public:
! ThMLOLB ();
! virtual char ProcessText (char *text, int maxlen = -1);
};
SWORD_NAMESPACE_END
#endif
--- 24,37 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts ThML text to OLB text
! */
! class SWDLLEXPORT ThMLOLB : public SWFilter {
public:
! ThMLOLB();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
+
SWORD_NAMESPACE_END
#endif
Index: thmlosis.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlosis.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** thmlosis.h 13 Feb 2003 20:16:35 -0000 1.5
--- thmlosis.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,22 ****
! /***************************************************************************
! thmlosis.h - description
! -------------------
! begin : 2001-09-03
! copyright : 2001 by CrossWire Bible Society
! ***************************************************************************/
!
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef THMLOSIS_H
#define THMLOSIS_H
- #include <defs.h>
#include <swfilter.h>
--- 1,25 ----
! /******************************************************************************
! *
! * $Id$
! *
! * Copyright 2003 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef THMLOSIS_H
#define THMLOSIS_H
#include <swfilter.h>
***************
*** 28,37 ****
protected:
virtual const char *convertToOSIS(const char *, const SWKey *key);
- void pushString(char **buf, const char *format, ...);
public:
ThMLOSIS();
virtual ~ThMLOSIS();
! char ProcessText(char *text, int maxlen, const SWKey *, const SWModule * = 0);
};
SWORD_NAMESPACE_END
#endif /* THMLOSIS_H */
--- 31,40 ----
protected:
virtual const char *convertToOSIS(const char *, const SWKey *key);
public:
ThMLOSIS();
virtual ~ThMLOSIS();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
+
SWORD_NAMESPACE_END
#endif /* THMLOSIS_H */
Index: thmlplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlplain.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** thmlplain.h 1 Oct 2002 19:52:40 -0000 1.5
--- thmlplain.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,5 ****
! /*
*
! * thmlplain.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,38 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts ThML text to plain text
! */
! class SWDLLEXPORT ThMLPlain:public SWFilter
! {
public:
! ThMLPlain ();
! virtual char ProcessText (char *text, int maxlen = -1);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts ThML text to plain text
! */
! class SWDLLEXPORT ThMLPlain : public SWFilter {
public:
! ThMLPlain();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: thmlrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlrtf.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** thmlrtf.h 1 Oct 2002 19:52:40 -0000 1.6
--- thmlrtf.h 20 Feb 2003 07:25:20 -0000 1.7
***************
*** 1,5 ****
! /*
*
! * thmlrtf.h
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,39 ****
#include <swbasicfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** this filter converts ThML text to RTF text
! */
! class SWDLLEXPORT ThMLRTF:public SWBasicFilter
! {
protected:
! virtual bool handleToken(char **buf, const char *token, DualStringMap &userData);
public:
! ThMLRTF ();
};
--- 24,36 ----
#include <swbasicfilter.h>
SWORD_NAMESPACE_START
! /** this filter converts ThML text to RTF text
! */
! class SWDLLEXPORT ThMLRTF : public SWBasicFilter {
protected:
! virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
! ThMLRTF();
};
Index: thmlscripref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlscripref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlscripref.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlscripref.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,5 ****
! /*
*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,62 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides scripture references in a ThML text
! */
! class SWDLLEXPORT ThMLScripref:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLScripref ();
! virtual ~ ThMLScripref ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
SWORD_NAMESPACE_END
-
#endif
--- 24,49 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides scripture references in a ThML text
! */
! class SWDLLEXPORT ThMLScripref : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLScripref();
! virtual ~ThMLScripref();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
SWORD_NAMESPACE_END
#endif
Index: thmlstrongs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlstrongs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlstrongs.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlstrongs.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,5 ****
! /*
*
! * $Id:
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
! * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 24,59 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides strong's numbers in a ThML text
! */
! class SWDLLEXPORT ThMLStrongs:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLStrongs ();
! virtual ~ ThMLStrongs ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides strong's numbers in a ThML text
! */
! class SWDLLEXPORT ThMLStrongs : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! ThMLStrongs();
! virtual ~ThMLStrongs();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: thmlvariants.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlvariants.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** thmlvariants.h 1 Oct 2002 19:52:40 -0000 1.3
--- thmlvariants.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,62 ****
#include <swmodule.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides textual variants
! */
! class SWDLLEXPORT ThMLVariants : public SWFilter
! {
! char option;
! static const char primary[];
! static const char secondary[];
! static const char all[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
! public:
! ThMLVariants ();
! virtual ~ ThMLVariants ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 25,52 ----
#include <swmodule.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides textual variants
! */
! class SWDLLEXPORT ThMLVariants : public SWFilter {
! char option;
! static const char primary[];
! static const char secondary[];
! static const char all[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
! public:
! ThMLVariants();
! virtual ~ThMLVariants();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: unicodertf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/unicodertf.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** unicodertf.h 1 Oct 2002 19:52:40 -0000 1.4
--- unicodertf.h 20 Feb 2003 07:25:20 -0000 1.5
***************
*** 1,3 ****
! /*
*
* $Id$
--- 1,3 ----
! /******************************************************************************
*
* $Id$
***************
*** 24,37 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 text into RTF Unicode tags
! */
! class SWDLLEXPORT UnicodeRTF:public SWFilter {
public:
! UnicodeRTF();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 text into RTF Unicode tags
! */
! class SWDLLEXPORT UnicodeRTF : public SWFilter {
public:
! UnicodeRTF();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf16utf8.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf16utf8.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utf16utf8.h 1 Oct 2002 19:52:40 -0000 1.4
--- utf16utf8.h 20 Feb 2003 07:25:20 -0000 1.5
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,36 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts UTF-16 encoded text to UTF-8
! */
! class SWDLLEXPORT UTF16UTF8:public SWFilter {
public:
! UTF16UTF8();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts UTF-16 encoded text to UTF-8
! */
! class SWDLLEXPORT UTF16UTF8 : public SWFilter {
public:
! UTF16UTF8();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8arshaping.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8arshaping.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utf8arshaping.h 13 Feb 2003 20:16:35 -0000 1.5
--- utf8arshaping.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 27,47 ****
#include <unicode/ushape.h>
- #include <defs.h>
SWORD_NAMESPACE_START
! /** This Filter controls the arabic shaping of UTF-8 text
! * FIXME: is that correct? how to control it?
! */
! class SWDLLEXPORT UTF8arShaping : public SWFilter
! {
! private:
! UConverter* conv;
! UErrorCode err;
! public:
! UTF8arShaping();
! ~UTF8arShaping();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
-
SWORD_NAMESPACE_END
--- 29,46 ----
#include <unicode/ushape.h>
SWORD_NAMESPACE_START
! /** This Filter controls the arabic shaping of UTF-8 text
! * FIXME: is that correct? how to control it?
! */
! class SWDLLEXPORT UTF8arShaping : public SWFilter {
! private:
! UConverter* conv;
! UErrorCode err;
! public:
! UTF8arShaping();
! ~UTF8arShaping();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
SWORD_NAMESPACE_END
Index: utf8bidireorder.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8bidireorder.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** utf8bidireorder.h 13 Feb 2003 20:16:35 -0000 1.6
--- utf8bidireorder.h 20 Feb 2003 07:25:20 -0000 1.7
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 27,44 ****
#include <unicode/ubidi.h>
- #include <defs.h>
SWORD_NAMESPACE_START
! /** This Filter reorders UTF-8 text according to Unicode BiDi
! */
! class SWDLLEXPORT UTF8BiDiReorder : public SWFilter
! {
! private:
! UConverter* conv;
! UErrorCode err;
! public:
! UTF8BiDiReorder();
! ~UTF8BiDiReorder();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 29,44 ----
#include <unicode/ubidi.h>
SWORD_NAMESPACE_START
! /** This Filter reorders UTF-8 text according to Unicode BiDi
! */
! class SWDLLEXPORT UTF8BiDiReorder : public SWFilter {
! private:
! UConverter* conv;
! UErrorCode err;
! public:
! UTF8BiDiReorder();
! ~UTF8BiDiReorder();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8cantillation.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8cantillation.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8cantillation.h 1 Oct 2002 19:52:40 -0000 1.3
--- utf8cantillation.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,58 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides Hebrew cantillation marks in UTF8 text
*/
! class SWDLLEXPORT UTF8Cantillation:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8Cantillation ();
! virtual ~ UTF8Cantillation ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides Hebrew cantillation marks in UTF8 text
*/
! class SWDLLEXPORT UTF8Cantillation : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8Cantillation();
! virtual ~UTF8Cantillation();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: utf8greekaccents.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8greekaccents.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8greekaccents.h 1 Oct 2002 19:52:40 -0000 1.3
--- utf8greekaccents.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,58 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
/** This Filter shows/hides Greek Accents marks in UTF8 text
*/
! class SWDLLEXPORT UTF8GreekAccents:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8GreekAccents ();
! virtual ~ UTF8GreekAccents ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
/** This Filter shows/hides Greek Accents marks in UTF8 text
*/
! class SWDLLEXPORT UTF8GreekAccents : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8GreekAccents();
! virtual ~UTF8GreekAccents();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: utf8hebrewpoints.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8hebrewpoints.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8hebrewpoints.h 1 Oct 2002 19:52:40 -0000 1.3
--- utf8hebrewpoints.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,58 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This Filter shows/hides Hebrew vowel points in UTF8 text
! */
! class SWDLLEXPORT UTF8HebrewPoints:public SWFilter
! {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8HebrewPoints ();
! virtual ~ UTF8HebrewPoints ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 24,47 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This Filter shows/hides Hebrew vowel points in UTF8 text
! */
! class SWDLLEXPORT UTF8HebrewPoints : public SWFilter {
! bool option;
! static const char on[];
! static const char off[];
! static const char optName[];
! static const char optTip[];
! OptionsList options;
public:
! UTF8HebrewPoints();
! virtual ~UTF8HebrewPoints();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: utf8html.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8html.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8html.h 1 Oct 2002 19:52:40 -0000 1.3
--- utf8html.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,36 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 text into HTML escape sequences
! */
! class SWDLLEXPORT UTF8HTML:public SWFilter {
public:
! UTF8HTML();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 text into HTML escape sequences
! */
! class SWDLLEXPORT UTF8HTML : public SWFilter {
public:
! UTF8HTML();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8latin1.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8latin1.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utf8latin1.h 1 Oct 2002 19:52:40 -0000 1.3
--- utf8latin1.h 20 Feb 2003 07:25:20 -0000 1.4
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,37 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 encoded text to Latin-1
! */
! class SWDLLEXPORT UTF8Latin1:public SWFilter {
! char replacementChar;
public:
! UTF8Latin1(char rchar = '?');
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,36 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 encoded text to Latin-1
! */
! class SWDLLEXPORT UTF8Latin1 : public SWFilter {
! char replacementChar;
public:
! UTF8Latin1(char rchar = '?');
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8nfc.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8nfc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utf8nfc.h 1 Oct 2002 19:52:40 -0000 1.5
--- utf8nfc.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 27,43 ****
#include <unicode/unorm.h>
- #include <defs.h>
SWORD_NAMESPACE_START
! class SWDLLEXPORT UTF8NFC : public SWFilter
! {
! private:
! UConverter* conv;
! UChar *source, *target;
! UErrorCode err;
! public:
! UTF8NFC();
! ~UTF8NFC();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 29,43 ----
#include <unicode/unorm.h>
SWORD_NAMESPACE_START
! class SWDLLEXPORT UTF8NFC : public SWFilter {
! private:
! UConverter* conv;
! UChar *source, *target;
! UErrorCode err;
! public:
! UTF8NFC();
! ~UTF8NFC();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8nfkd.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8nfkd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utf8nfkd.h 1 Oct 2002 19:52:40 -0000 1.5
--- utf8nfkd.h 20 Feb 2003 07:25:20 -0000 1.6
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 27,43 ****
#include <unicode/unorm.h>
- #include <defs.h>
SWORD_NAMESPACE_START
! class SWDLLEXPORT UTF8NFKD : public SWFilter
! {
! private:
! UConverter* conv;
! UChar *source, *target;
! UErrorCode err;
! public:
! UTF8NFKD();
! ~UTF8NFKD();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
};
--- 29,43 ----
#include <unicode/unorm.h>
SWORD_NAMESPACE_START
! class SWDLLEXPORT UTF8NFKD : public SWFilter {
! private:
! UConverter* conv;
! UChar *source, *target;
! UErrorCode err;
! public:
! UTF8NFKD();
! ~UTF8NFKD();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: utf8transliterator.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8transliterator.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** utf8transliterator.h 4 Feb 2003 04:41:10 -0000 1.17
--- utf8transliterator.h 20 Feb 2003 07:25:20 -0000 1.18
***************
*** 1,3 ****
! /*
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
! *
! * $Id$
*
* Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 57,101 ****
/** This Filter uses ICU for transliteration
*/
! class SWDLLEXPORT UTF8Transliterator : public SWFilter
! {
private:
! char option;
! static const char optionstring[NUMTARGETSCRIPTS][16];
! static const char optName[];
! static const char optTip[];
! static const char SW_RB_RULE_BASED_IDS[];
! static const char SW_RB_RULE[];
! static const char SW_RESDATA[];
! OptionsList options;
! static SWTransMap transMap;
! UErrorCode utf8status;
!
! void Load(UErrorCode &status);
! void registerTrans(const UnicodeString& ID, const UnicodeString& resource,
! UTransDirection dir, UErrorCode &status );
! bool checkTrans(const UnicodeString& ID, UErrorCode &status );
! Transliterator * createTrans(const UnicodeString& preID, const UnicodeString& ID,
! const UnicodeString& postID, UTransDirection dir, UErrorCode &status );
!
! public:
! UTF8Transliterator ();
! virtual char ProcessText (char *text, int maxlen, const SWKey * key, const SWModule * = 0);
! virtual const char *getOptionName ()
! {
! return optName;
! }
! virtual const char *getOptionTip ()
! {
! return optTip;
! }
! virtual void setOptionValue (const char *ival);
! virtual const char *getOptionValue ();
! virtual OptionsList getOptionValues ()
! {
! return options;
! }
};
--- 59,91 ----
/** This Filter uses ICU for transliteration
*/
! class SWDLLEXPORT UTF8Transliterator : public SWFilter {
private:
! char option;
! static const char optionstring[NUMTARGETSCRIPTS][16];
! static const char optName[];
! static const char optTip[];
! static const char SW_RB_RULE_BASED_IDS[];
! static const char SW_RB_RULE[];
! static const char SW_RESDATA[];
! OptionsList options;
! static SWTransMap transMap;
! UErrorCode utf8status;
!
! void Load(UErrorCode &status);
! void registerTrans(const UnicodeString& ID, const UnicodeString& resource, UTransDirection dir, UErrorCode &status);
! bool checkTrans(const UnicodeString& ID, UErrorCode &status);
! Transliterator *createTrans(const UnicodeString& preID, const UnicodeString& ID, const UnicodeString& postID, UTransDirection dir, UErrorCode &status);
!
! public:
! UTF8Transliterator();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
! virtual const char *getOptionName() { return optName; }
! virtual const char *getOptionTip() { return optTip; }
! virtual void setOptionValue(const char *ival);
! virtual const char *getOptionValue();
! virtual OptionsList getOptionValues() { return options; }
};
Index: utf8utf16.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8utf16.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utf8utf16.h 1 Oct 2002 19:52:40 -0000 1.4
--- utf8utf16.h 20 Feb 2003 07:25:20 -0000 1.5
***************
*** 1,4 ****
! /*
*
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
--- 1,5 ----
! /******************************************************************************
*
+ * $Id$
*
* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
***************
*** 23,36 ****
#include <swfilter.h>
- #include <defs.h>
-
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 encoded text to UTF-16
! */
! class SWDLLEXPORT UTF8UTF16:public SWFilter {
public:
! UTF8UTF16();
! virtual char ProcessText (char *text, int maxlen, const SWKey *key, const SWModule * = 0);
};
--- 24,35 ----
#include <swfilter.h>
SWORD_NAMESPACE_START
! /** This filter converts UTF-8 encoded text to UTF-16
! */
! class SWDLLEXPORT UTF8UTF16 : public SWFilter {
public:
! UTF8UTF16();
! virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
};
Index: zcom.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/zcom.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** zcom.h 21 Oct 2002 00:30:37 -0000 1.18
--- zcom.h 20 Feb 2003 07:25:20 -0000 1.19
***************
*** 48,54 ****
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~zCom();
! virtual char *getRawEntry();
! virtual void increment(int steps = 1);
! virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
--- 48,54 ----
SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
virtual ~zCom();
! virtual SWBuf &getRawEntryBuf();
! virtual void increment(int steps = 1);
! virtual void decrement(int steps = 1) { increment(-steps); }
// write interface ----------------------------
***************
*** 64,68 ****
// end write interface ------------------------
! virtual void rawZFilter(char *buf, long size, char direction = 0) { rawFilter(buf, size, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
--- 64,68 ----
// end write interface ------------------------
! virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
Index: zld.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/zld.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** zld.h 1 Oct 2002 19:52:40 -0000 1.7
--- zld.h 20 Feb 2003 07:25:20 -0000 1.8
***************
*** 42,46 ****
const char* ilang = 0);
virtual ~zLD();
! virtual char *getRawEntry();
virtual void increment(int steps = 1);
--- 42,46 ----
const char* ilang = 0);
virtual ~zLD();
! virtual SWBuf &getRawEntryBuf();
virtual void increment(int steps = 1);
***************
*** 60,64 ****
// end write interface ------------------------
! virtual void rawZFilter(char *buf, long size, char direction = 0) { rawFilter(buf, size, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
--- 60,64 ----
// end write interface ------------------------
! virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
Index: ztext.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/ztext.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ztext.h 21 Oct 2002 00:30:37 -0000 1.27
--- ztext.h 20 Feb 2003 07:25:20 -0000 1.28
***************
*** 53,57 ****
virtual ~zText();
! virtual char *getRawEntry();
virtual void increment(int steps = 1);
--- 53,57 ----
virtual ~zText();
! virtual SWBuf &getRawEntryBuf();
virtual void increment(int steps = 1);
***************
*** 69,73 ****
// end write interface ------------------------
! virtual void rawZFilter(char *buf, long size, char direction = 0) { rawFilter(buf, size, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------
--- 69,73 ----
// end write interface ------------------------
! virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
// swcacher interface ----------------------