[sword-cvs] sword/include swoptfilter.h,NONE,1.1 gbffootnotes.h,1.12,1.13 gbfheadings.h,1.5,1.6 gbfmorph.h,1.5,1.6 gbfosis.h,1.9,1.10 gbfredletterwords.h,1.3,1.4 gbfstrongs.h,1.11,1.12 localemgr.h,1.15,1.16 osisfootnotes.h,1.1,1.2 osisheadings.h,1.1,1.2 osislemma.h,1.1,1.2 osismorph.h,1.2,1.3 osisredletterwords.h,1.1,1.2 osisscripref.h,1.1,1.2 osisstrongs.h,1.2,1.3 plainfootnotes.h,1.6,1.7 swfilter.h,1.16,1.17 swmgr.h,1.54,1.55 swmodule.h,1.66,1.67 thmlfootnotes.h,1.4,1.5 thmlheadings.h,1.4,1.5 thmllemma.h,1.4,1.5 thmlmorph.h,1.4,1.5 thmlscripref.h,1.4,1.5 thmlstrongs.h,1.4,1.5 thmlvariants.h,1.4,1.5 utf8cantillation.h,1.4,1.5 utf8greekaccents.h,1.4,1.5 utf8hebrewpoints.h,1.4,1.5 utilxml.h,1.5,1.6

sword@www.crosswire.org sword@www.crosswire.org
Fri, 4 Jul 2003 21:58:45 -0700


Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv7690/include

Modified Files:
	gbffootnotes.h gbfheadings.h gbfmorph.h gbfosis.h 
	gbfredletterwords.h gbfstrongs.h localemgr.h osisfootnotes.h 
	osisheadings.h osislemma.h osismorph.h osisredletterwords.h 
	osisscripref.h osisstrongs.h plainfootnotes.h swfilter.h 
	swmgr.h swmodule.h thmlfootnotes.h thmlheadings.h thmllemma.h 
	thmlmorph.h thmlscripref.h thmlstrongs.h thmlvariants.h 
	utf8cantillation.h utf8greekaccents.h utf8hebrewpoints.h 
	utilxml.h 
Added Files:
	swoptfilter.h 
Log Message:
Added SWOptionFilter


--- NEW FILE: swoptfilter.h ---
/***************************************************************************
 *
 * $Id: swoptfilter.h,v 1.1 2003/07/05 04:58:42 scribe Exp $
 *
 * 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 SWOPTFILTER_H
#define SWOPTFILTER_H

#include <swfilter.h>

SWORD_NAMESPACE_START

  /** This Filter shows/hides strong's numbers in a OSIS text
  */
class SWDLLEXPORT SWOptionFilter : public SWFilter {
protected:
	SWBuf optionValue;
	const char *optName;
	const char *optTip;
	const StringList *optValues;
	bool option;
public:
	SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues);
	virtual ~SWOptionFilter();
	virtual const char *getOptionName() { return optName; }
	virtual const char *getOptionTip() { return optTip; }
	virtual void setOptionValue(const char *ival);
	virtual const char *getOptionValue();
	virtual StringList getOptionValues() { return *optValues; }
};

SWORD_NAMESPACE_END
#endif

Index: gbffootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbffootnotes.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gbffootnotes.h	28 Feb 2003 13:31:37 -0000	1.12
--- gbffootnotes.h	5 Jul 2003 04:58:42 -0000	1.13
***************
*** 22,26 ****
  #define GBFFOOTNOTES_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define GBFFOOTNOTES_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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 *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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides footnotes in a GBF text
    */
! class SWDLLEXPORT GBFFootnotes : public SWOptionFilter {
  public:
  	GBFFootnotes();
  	virtual ~GBFFootnotes();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: gbfheadings.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfheadings.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gbfheadings.h	28 Feb 2003 13:31:37 -0000	1.5
--- gbfheadings.h	5 Jul 2003 04:58:42 -0000	1.6
***************
*** 22,26 ****
  #define GBFHEADINGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define GBFHEADINGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
    /** 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 *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; }
  };
  
--- 28,36 ----
    /** This Filter shows/hides headings in a GBF text
    */
! class SWDLLEXPORT GBFHeadings : public SWOptionFilter {
  public:
  	GBFHeadings();
  	virtual ~GBFHeadings();
  	virtual char processText (SWBuf &text, const SWKey * key = 0, const SWModule *module = 0);
  };
  

Index: gbfmorph.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfmorph.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gbfmorph.h	28 Feb 2003 13:31:37 -0000	1.5
--- gbfmorph.h	5 Jul 2003 04:58:42 -0000	1.6
***************
*** 22,26 ****
  #define GBFMORPH_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define GBFMORPH_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
    /** 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 *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; }
  };
  
--- 28,36 ----
    /** This Filter shows/hides morph tags in a GBF text
    */
! class SWDLLEXPORT GBFMorph : public SWOptionFilter {
  public:
  	GBFMorph();
  	virtual ~GBFMorph();
  	virtual char processText(SWBuf &text, const SWKey * key = 0, const SWModule *module = 0);
  };
  

Index: gbfosis.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfosis.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gbfosis.h	27 Jun 2003 01:41:06 -0000	1.9
--- gbfosis.h	5 Jul 2003 04:58:42 -0000	1.10
***************
*** 27,30 ****
--- 27,31 ----
  SWORD_NAMESPACE_START
  
+ 
  class QuoteStack {
  private:
***************
*** 44,48 ****
  	};
  
! 	std::stack<QuoteInstance> quotes;
  public:
  	QuoteStack();
--- 45,50 ----
  	};
  
! 	typedef std::stack<QuoteInstance> QuoteInstanceStack;
! 	QuoteInstanceStack quotes;
  public:
  	QuoteStack();

Index: gbfredletterwords.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfredletterwords.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gbfredletterwords.h	20 Feb 2003 07:25:19 -0000	1.3
--- gbfredletterwords.h	5 Jul 2003 04:58:42 -0000	1.4
***************
*** 22,26 ****
  #define GBFREDLETTERWORDS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define GBFREDLETTERWORDS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 30,49 ****
   * 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; }
  };
  
--- 30,38 ----
   * to have this kind of markup in the text.
   */
! class SWDLLEXPORT GBFRedLetterWords : public SWOptionFilter {
  public:
  	GBFRedLetterWords();
  	virtual ~GBFRedLetterWords();
  	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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gbfstrongs.h	28 Feb 2003 13:31:37 -0000	1.11
--- gbfstrongs.h	5 Jul 2003 04:58:42 -0000	1.12
***************
*** 22,26 ****
  #define GBFSTRONGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define GBFSTRONGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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 *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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides strong's numbers in a GBF text
   */
! class SWDLLEXPORT GBFStrongs : public SWOptionFilter {
  public:
  	GBFStrongs();
  	virtual ~GBFStrongs();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: localemgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/localemgr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** localemgr.h	27 Jun 2003 01:41:06 -0000	1.15
--- localemgr.h	5 Jul 2003 04:58:42 -0000	1.16
***************
*** 33,38 ****
  SWORD_NAMESPACE_START
  
! typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > >LocaleMap;
! 
  /**
  * The LocaleMgr class handles all the different locales of Sword.
--- 33,39 ----
  SWORD_NAMESPACE_START
  
!  
! typedef std::list<SWBuf> StringList;
! typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > > LocaleMap;
  /**
  * The LocaleMgr class handles all the different locales of Sword.
***************
*** 46,114 ****
  * To get a list of availble locales use @see getAvailableLocales
  */
! class SWDLLEXPORT LocaleMgr
! {
  private:
!   void deleteLocales ();
!   char *defaultLocaleName;
!   LocaleMgr(const LocaleMgr &);
  
  protected:
!   LocaleMap locales;
  
  public:
!   /** Default constructor of  LocaleMgr
!   * You do normally not need this constructor, use LocaleMgr::systemLocaleMgr instead.
!   */
!   LocaleMgr (const char *iConfigPath = 0);
  
!   /**
!   * Default destructor of LocaleMgr
!   */
!   virtual ~ LocaleMgr ();
  
!   /** Get the locale connected with the name "name".
!   *
!   * @param name The name of the locale you want to have. For example use getLocale("de") to get the locale for the German language.
!   * @return Returns the locale object if the locale with the name given as parameter was found. If it wasn't found return NULL.
!   */
!   virtual SWLocale *getLocale (const char *name);
  
!   /** Get the list of available locales.
!   *
!   * @return Returns a list of strings, which contains the names of the available locales.
!   */
!   virtual std::list < SWBuf > getAvailableLocales ();
!   
!   /** Returns translated text.
!   * This function uses both parameters to return the translated version of the given text.
!   *
!   * @param text The text to translate into the language given by the first parameter.
!   * @param localeName The name of the locale Sword should use
!   * @return Returns the translated text.
!   */
!   virtual const char *translate (const char *text, const char *localeName = 0);
  
!   /** Get the default locale name. To set it use @see setDefaultLocaleName
!   *
!   * @return Returns the default locale name
!   */
!   virtual const char *getDefaultLocaleName ();
  
!   /** Set the new standard locale of Sword.
!   *
!   * @param name The name of the new default locale  
!   */
!   virtual void setDefaultLocaleName (const char *name);
  
!   /** The LocaleMgr object used globally in the Sword world.
!   * Do not create your own LocaleMgr, use this static object instead.
!   */
!   static LocaleMgr systemLocaleMgr;
  
-   
-   /** Augment this localmgr with all locale.conf files in a directory
-   */
-   virtual void loadConfigDir(const char *ipath);
-   
  };
  
--- 47,114 ----
  * To get a list of availble locales use @see getAvailableLocales
  */
! class SWDLLEXPORT LocaleMgr {
  private:
! 	void deleteLocales();
! 	char *defaultLocaleName;
! 	LocaleMgr(const LocaleMgr &);
  
  protected:
! 	LocaleMap *locales;
  
  public:
! 	/** Default constructor of  LocaleMgr
! 	* You do normally not need this constructor, use LocaleMgr::systemLocaleMgr instead.
! 	*/
! 	LocaleMgr(const char *iConfigPath = 0);
  
! 	/**
! 	* Default destructor of LocaleMgr
! 	*/
! 	virtual ~LocaleMgr();
  
! 	/** Get the locale connected with the name "name".
! 	*
! 	* @param name The name of the locale you want to have. For example use getLocale("de") to get the locale for the German language.
! 	* @return Returns the locale object if the locale with the name given as parameter was found. If it wasn't found return NULL.
! 	*/
! 	virtual SWLocale *getLocale(const char *name);
  
! 	/** Get the list of available locales.
! 	*
! 	* @return Returns a list of strings, which contains the names of the available locales.
! 	*/
! 	virtual StringList getAvailableLocales();
  
! 	/** Returns translated text.
! 	* This function uses both parameters to return the translated version of the given text.
! 	*
! 	* @param text The text to translate into the language given by the first parameter.
! 	* @param localeName The name of the locale Sword should use
! 	* @return Returns the translated text.
! 	*/
! 	virtual const char *translate(const char *text, const char *localeName = 0);
  
! 	/** Get the default locale name. To set it use @see setDefaultLocaleName
! 	*
! 	* @return Returns the default locale name
! 	*/
! 	virtual const char *getDefaultLocaleName();
  
! 	/** Set the new standard locale of Sword.
! 	*
! 	* @param name The name of the new default locale  
! 	*/
! 	virtual void setDefaultLocaleName(const char *name);
! 
! 	/** The LocaleMgr object used globally in the Sword world.
! 	* Do not create your own LocaleMgr, use this static object instead.
! 	*/
! 	static LocaleMgr systemLocaleMgr;
! 
! 
! 	/** Augment this localmgr with all locale.conf files in a directory
! 	*/
! 	virtual void loadConfigDir(const char *ipath);
  
  };
  

Index: osisfootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisfootnotes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisfootnotes.h	17 Jun 2003 22:14:18 -0000	1.1
--- osisfootnotes.h	5 Jul 2003 04:58:42 -0000	1.2
***************
*** 22,26 ****
  #define OSISFOOTNOTES_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISFOOTNOTES_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,48 ****
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISFootnotes : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
! 
  public:
  	OSISFootnotes();
  	virtual ~OSISFootnotes();
  	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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISFootnotes : public SWOptionFilter {
  public:
  	OSISFootnotes();
  	virtual ~OSISFootnotes();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: osisheadings.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisheadings.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisheadings.h	30 Apr 2003 08:20:03 -0000	1.1
--- osisheadings.h	5 Jul 2003 04:58:42 -0000	1.2
***************
*** 22,26 ****
  #define OSISHEADINGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISHEADINGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISHeadings : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
  public:
  	OSISHeadings();
  	virtual ~OSISHeadings();
  	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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISHeadings : public SWOptionFilter {
  public:
  	OSISHeadings();
  	virtual ~OSISHeadings();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: osislemma.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osislemma.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osislemma.h	27 Jun 2003 06:18:44 -0000	1.1
--- osislemma.h	5 Jul 2003 04:58:42 -0000	1.2
***************
*** 22,26 ****
  #define OSISLEMMA_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISLEMMA_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISLemma : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
  public:
  	OSISLemma();
  	virtual ~OSISLemma();
  	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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISLemma : public SWOptionFilter {
  public:
  	OSISLemma();
  	virtual ~OSISLemma();
  	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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osismorph.h	20 Feb 2003 07:25:19 -0000	1.2
--- osismorph.h	5 Jul 2003 04:58:42 -0000	1.3
***************
*** 22,26 ****
  #define OSISMORPH_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISMORPH_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** This Filter shows/hides morph tags in a OSIS text
   */
! class SWDLLEXPORT OSISMorph : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
  public:
  	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; }
- 	virtual void setOptionValue (const char *ival);
- 	virtual const char *getOptionValue ();
- 	virtual OptionsList getOptionValues () { return options; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides morph tags in a OSIS text
   */
! class SWDLLEXPORT OSISMorph : public SWOptionFilter {
  public:
  	OSISMorph();
  	virtual ~OSISMorph();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: osisredletterwords.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisredletterwords.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisredletterwords.h	27 Jun 2003 06:18:44 -0000	1.1
--- osisredletterwords.h	5 Jul 2003 04:58:42 -0000	1.2
***************
*** 22,26 ****
  #define OSISREDLETTERWORDS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISREDLETTERWORDS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISRedLetterWords : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
  public:
  	OSISRedLetterWords();
  	virtual ~OSISRedLetterWords();
  	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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISRedLetterWords : public SWOptionFilter {
  public:
  	OSISRedLetterWords();
  	virtual ~OSISRedLetterWords();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: osisscripref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisscripref.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osisscripref.h	27 Jun 2003 06:18:44 -0000	1.1
--- osisscripref.h	5 Jul 2003 04:58:42 -0000	1.2
***************
*** 22,26 ****
  #define OSISSCRIPREF_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISSCRIPREF_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISScripref : public SWFilter {
! 	bool option;
! 	static const char on[];
! 	static const char off[];
! 	static const char optName[];
! 	static const char optTip[];
! 	OptionsList options;
  public:
  	OSISScripref();
  	virtual ~OSISScripref();
  	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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a OSIS text
   */
! class SWDLLEXPORT OSISScripref : public SWOptionFilter {
  public:
  	OSISScripref();
  	virtual ~OSISScripref();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: osisstrongs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisstrongs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osisstrongs.h	20 Feb 2003 07:25:19 -0000	1.2
--- osisstrongs.h	5 Jul 2003 04:58:42 -0000	1.3
***************
*** 22,26 ****
  #define OSISSTRONGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define OSISSTRONGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
    /** 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; }
  };
  
--- 28,36 ----
    /** This Filter shows/hides strong's numbers in a OSIS text
    */
! class SWDLLEXPORT OSISStrongs : public SWOptionFilter {
  public:
  	OSISStrongs();
  	virtual ~OSISStrongs();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: plainfootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/plainfootnotes.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** plainfootnotes.h	20 Feb 2003 07:25:19 -0000	1.6
--- plainfootnotes.h	5 Jul 2003 04:58:42 -0000	1.7
***************
*** 22,26 ****
  #define PLAINFOOTNOTES_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define PLAINFOOTNOTES_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 31,51 ****
   *@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; }
  };
  
--- 31,39 ----
   *@author The team of BibleTime
   */
! class SWDLLEXPORT PLAINFootnotes : public SWOptionFilter {
  public:
  	PLAINFootnotes();
  	virtual ~PLAINFootnotes();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: swfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swfilter.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** swfilter.h	28 Feb 2003 13:31:37 -0000	1.16
--- swfilter.h	5 Jul 2003 04:58:42 -0000	1.17
***************
*** 34,38 ****
  * The type definitoin for option types
  */
! typedef std::list < SWBuf > OptionsList;
  
  class SWModule;
--- 34,38 ----
  * The type definitoin for option types
  */
! typedef std::list < SWBuf > StringList;
  
  class SWModule;
***************
*** 61,66 ****
  	 * @return list of option values
  	 */
! 	virtual OptionsList getOptionValues () {
! 		OptionsList options;
  		return options;
  	}
--- 61,66 ----
  	 * @return list of option values
  	 */
! 	virtual StringList getOptionValues () {
! 		StringList options;
  		return options;
  	}

Index: swmgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmgr.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** swmgr.h	27 Jun 2003 01:41:06 -0000	1.54
--- swmgr.h	5 Jul 2003 04:58:42 -0000	1.55
***************
*** 54,57 ****
--- 54,58 ----
  typedef std::map < SWBuf, SWModule *, std::less < SWBuf > >ModMap;
  typedef std::map < SWBuf, SWFilter * >FilterMap;
+ typedef std::list < SWBuf >StringList;
  
  /** SWMgr is the main class of the Sword library.
***************
*** 86,90 ****
  	SWFilter *transliterator;
  	FilterList cleanupFilters;
! 	OptionsList options;
  	virtual void init(); // use to initialize before loading modules
  	virtual char AddModToConfig(int conffd, const char *fname);
--- 87,91 ----
  	SWFilter *transliterator;
  	FilterList cleanupFilters;
! 	StringList options;
  	virtual void init(); // use to initialize before loading modules
  	virtual char AddModToConfig(int conffd, const char *fname);
***************
*** 96,100 ****
  	ConfigEntMap::iterator start,
  	ConfigEntMap::iterator end);
! 	std::list<SWBuf> augPaths;
  
  	/**
--- 97,101 ----
  	ConfigEntMap::iterator start,
  	ConfigEntMap::iterator end);
! 	StringList augPaths;
  
  	/**
***************
*** 137,141 ****
  	*
  	*/
! 	static void findConfig(char *configType, char **prefixPath, char **configPath, std::list<SWBuf> *augPaths = 0);
  	/** The global config object.
  	* This is the global config object. It contains all items of all modules,
--- 138,142 ----
  	*
  	*/
! 	static void findConfig(char *configType, char **prefixPath, char **configPath, StringList *augPaths = 0);
  	/** The global config object.
  	* This is the global config object. It contains all items of all modules,
***************
*** 245,253 ****
  	* @return This function returns a list of global options.
  	*/
! 	virtual OptionsList getGlobalOptions();
  	/**
  	*
  	*/
! 	virtual OptionsList getGlobalOptionValues(const char *option);
  	/**
  	* Sets the cipher key for the given module. This function updates the key
--- 246,254 ----
  	* @return This function returns a list of global options.
  	*/
! 	virtual StringList getGlobalOptions();
  	/**
  	*
  	*/
! 	virtual StringList getGlobalOptionValues(const char *option);
  	/**
  	* Sets the cipher key for the given module. This function updates the key

Index: swmodule.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** swmodule.h	27 Jun 2003 01:41:07 -0000	1.66
--- swmodule.h	5 Jul 2003 04:58:42 -0000	1.67
***************
*** 53,57 ****
  
  typedef std::list < SWFilter * >FilterList;
- 
  typedef std::map < SWBuf, SWBuf, std::less < SWBuf > > AttributeValue;
  typedef std::map < SWBuf, AttributeValue, std::less < SWBuf > > AttributeList;
--- 53,56 ----

Index: thmlfootnotes.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlfootnotes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlfootnotes.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlfootnotes.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLFOOTNOTES_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLFOOTNOTES_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides footnotes in a ThML text
   */
! class SWDLLEXPORT ThMLFootnotes : public SWOptionFilter {
  public:
  	ThMLFootnotes();
  	virtual ~ThMLFootnotes();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmlheadings.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlheadings.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlheadings.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlheadings.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLHEADINGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLHEADINGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides headings in a ThML text
   */
! class SWDLLEXPORT ThMLHeadings : public SWOptionFilter {
  public:
  	ThMLHeadings();
  	virtual ~ThMLHeadings();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmllemma.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmllemma.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmllemma.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmllemma.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLLEMMA_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLLEMMA_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides lemmas in a ThML text
   */
! class SWDLLEXPORT ThMLLemma : public SWOptionFilter {
  public:
  	ThMLLemma();
  	virtual ~ThMLLemma();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmlmorph.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlmorph.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlmorph.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlmorph.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLMORPH_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLMORPH_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides morph tags in a ThML text
   */
! class SWDLLEXPORT ThMLMorph : public SWOptionFilter {
  public:
  	ThMLMorph();
  	virtual ~ThMLMorph();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmlscripref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlscripref.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlscripref.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlscripref.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLSCRIPREF_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLSCRIPREF_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides scripture references in a ThML text
   */
! class SWDLLEXPORT ThMLScripref : public SWOptionFilter {
  public:
  	ThMLScripref();
  	virtual ~ThMLScripref();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmlstrongs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlstrongs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlstrongs.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlstrongs.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define THMLSTRONGS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define THMLSTRONGS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides strong's numbers in a ThML text
   */
! class SWDLLEXPORT ThMLStrongs : public SWOptionFilter {
  public:
  	ThMLStrongs();
  	virtual ~ThMLStrongs();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: thmlvariants.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlvariants.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thmlvariants.h	20 Feb 2003 07:25:20 -0000	1.4
--- thmlvariants.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 38,42 ****
  	static const char optName[];
  	static const char optTip[];
! 	OptionsList options;
  
  public:
--- 38,42 ----
  	static const char optName[];
  	static const char optTip[];
! 	StringList options;
  
  public:
***************
*** 48,52 ****
  	virtual void setOptionValue(const char *ival);
  	virtual const char *getOptionValue();
! 	virtual OptionsList getOptionValues() { return options; }
  };
  
--- 48,52 ----
  	virtual void setOptionValue(const char *ival);
  	virtual const char *getOptionValue();
! 	virtual StringList getOptionValues() { return options; }
  };
  

Index: utf8cantillation.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8cantillation.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utf8cantillation.h	20 Feb 2003 07:25:20 -0000	1.4
--- utf8cantillation.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define UTF8CANTILLATION_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define UTF8CANTILLATION_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
    /** 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; }
  };
  
--- 28,36 ----
    /** This Filter shows/hides Hebrew cantillation marks in UTF8 text
    */
! class SWDLLEXPORT UTF8Cantillation : public SWOptionFilter {
  public:
  	UTF8Cantillation();
  	virtual ~UTF8Cantillation();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: utf8greekaccents.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8greekaccents.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utf8greekaccents.h	20 Feb 2003 07:25:20 -0000	1.4
--- utf8greekaccents.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define UTF8GREEKACCENTS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define UTF8GREEKACCENTS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
    /** 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; }
  };
  
--- 28,36 ----
    /** This Filter shows/hides Greek Accents marks in UTF8 text
    */
! class SWDLLEXPORT UTF8GreekAccents : public SWOptionFilter {
  public:
  	UTF8GreekAccents();
  	virtual ~UTF8GreekAccents();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: utf8hebrewpoints.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utf8hebrewpoints.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utf8hebrewpoints.h	20 Feb 2003 07:25:20 -0000	1.4
--- utf8hebrewpoints.h	5 Jul 2003 04:58:42 -0000	1.5
***************
*** 22,26 ****
  #define UTF8HEBREWPOINTS_H
  
! #include <swfilter.h>
  
  SWORD_NAMESPACE_START
--- 22,26 ----
  #define UTF8HEBREWPOINTS_H
  
! #include <swoptfilter.h>
  
  SWORD_NAMESPACE_START
***************
*** 28,47 ****
  /** 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; }
  };
  
--- 28,36 ----
  /** This Filter shows/hides Hebrew vowel points in UTF8 text
   */
! class SWDLLEXPORT UTF8HebrewPoints : public SWOptionFilter {
  public:
  	UTF8HebrewPoints();
  	virtual ~UTF8HebrewPoints();
  	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
  };
  

Index: utilxml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utilxml.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utilxml.h	26 Jun 2003 04:33:31 -0000	1.5
--- utilxml.h	5 Jul 2003 04:58:42 -0000	1.6
***************
*** 30,35 ****
  SWORD_NAMESPACE_START
  
! typedef std::map<SWBuf, SWBuf> MapStringPair;
! typedef std::list<SWBuf> ListString;
  
  /** Simple XML helper class.
--- 30,35 ----
  SWORD_NAMESPACE_START
  
! typedef std::map<SWBuf, SWBuf> StringPairMap;
! typedef std::list<SWBuf> StringList;
  
  /** Simple XML helper class.
***************
*** 42,46 ****
  	mutable bool empty;
  	mutable bool endTag;
! 	mutable MapStringPair attributes;
  	mutable SWBuf junkBuf;
  	
--- 42,46 ----
  	mutable bool empty;
  	mutable bool endTag;
! 	mutable StringPairMap attributes;
  	mutable SWBuf junkBuf;
  	
***************
*** 64,68 ****
  	inline bool isEndTag() const { return endTag; }
  
! 	const ListString getAttributeNames() const;
  	int getAttributePartCount(const char *attribName, char partSplit = '|') const;
  	const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const;
--- 64,68 ----
  	inline bool isEndTag() const { return endTag; }
  
! 	const StringList getAttributeNames() const;
  	int getAttributePartCount(const char *attribName, char partSplit = '|') const;
  	const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const;