[sword-cvs] sword/include gbfwebif.h,NONE,1.1 thmlwebif.h,NONE,1.1 utilweb.h,NONE,1.1 Makefile.am,1.19,1.20 defs.h,1.9,1.10 swmodule.h,1.63,1.64 utilfuns.h,1.1.1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Sun, 1 Jun 2003 07:32:16 -0700
Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv1646/include
Modified Files:
Makefile.am defs.h swmodule.h utilfuns.h
Added Files:
gbfwebif.h thmlwebif.h utilweb.h
Log Message:
added webif stuff, updated makefile.am files
--- NEW FILE: gbfwebif.h ---
/******************************************************************************
*
* $Id: gbfwebif.h,v 1.1 2003/06/01 14:32:09 joachim 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 GBFWEBIF_H
#define GBFWEBIF_H
#include <gbfhtmlhref.h>
#include <string>
SWORD_NAMESPACE_START
/** this filter converts GBF text to HTML text with hrefs
*/
class SWDLLEXPORT GBFWEBIF : public GBFHTMLHREF {
const std::string baseURL;
const std::string passageStudyURL;
protected:
virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
GBFWEBIF();
};
SWORD_NAMESPACE_END
#endif
--- NEW FILE: thmlwebif.h ---
/******************************************************************************
*
* $Id: thmlwebif.h,v 1.1 2003/06/01 14:32:09 joachim 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 _ThMLWEBIF_H
#define _ThMLWEBIF_H
#include <thmlhtmlhref.h>
#include <string>
SWORD_NAMESPACE_START
/** this filter converts ThML text to HTML text with hrefs
*/
class SWDLLEXPORT ThMLWEBIF : public ThMLHTMLHREF {
const std::string baseURL;
const std::string passageStudyURL;
protected:
virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
public:
ThMLWEBIF();
};
SWORD_NAMESPACE_END
#endif /* _ThMLWEBIF_H */
--- NEW FILE: utilweb.h ---
/******************************************************************************
* utilxml.h - definition of class that deal with xml constructs
*
* $Id: utilweb.h,v 1.1 2003/06/01 14:32:09 joachim 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 UTILWEB_H
#define UTILWEB_H
#include <defs.h>
#include <string>
SWORD_NAMESPACE_START
/** Encodes and URL
* Encodes a string into a valid URL, e.g. changes http://www.crosswire.org/test.jsp?force=1&help=1 into
* http://www.crosswire.org/test.jsp?force=1&help=1
* This function works on the data of the buf parameter.
*/
const std::string encodeURL( const std::string& buf );
SWORD_NAMESPACE_END
#endif
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/include/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.am 30 May 2003 19:22:32 -0000 1.19
--- Makefile.am 1 Jun 2003 14:32:09 -0000 1.20
***************
*** 12,19 ****
--- 12,21 ----
pkginclude_HEADERS += $(swincludedir)/filemgr.h
pkginclude_HEADERS += $(swincludedir)/flatapi.h
+
pkginclude_HEADERS += $(swincludedir)/gbffootnotes.h
pkginclude_HEADERS += $(swincludedir)/gbfheadings.h
pkginclude_HEADERS += $(swincludedir)/gbfhtml.h
pkginclude_HEADERS += $(swincludedir)/gbfhtmlhref.h
+ pkginclude_HEADERS += $(swincludedir)/gbfwebif.h
pkginclude_HEADERS += $(swincludedir)/gbfmorph.h
pkginclude_HEADERS += $(swincludedir)/gbfosis.h
***************
*** 24,27 ****
--- 26,30 ----
pkginclude_HEADERS += $(swincludedir)/gbfthml.h
pkginclude_HEADERS += $(swincludedir)/greeklexattribs.h
+
pkginclude_HEADERS += $(swincludedir)/hebrewmcim.h
pkginclude_HEADERS += $(swincludedir)/hrefcom.h
***************
*** 86,89 ****
--- 89,93 ----
pkginclude_HEADERS += $(swincludedir)/sysdata.h
pkginclude_HEADERS += $(swincludedir)/tbdisp.h
+
pkginclude_HEADERS += $(swincludedir)/thmlfootnotes.h
pkginclude_HEADERS += $(swincludedir)/thmlgbf.h
***************
*** 91,94 ****
--- 95,99 ----
pkginclude_HEADERS += $(swincludedir)/thmlhtml.h
pkginclude_HEADERS += $(swincludedir)/thmlhtmlhref.h
+ pkginclude_HEADERS += $(swincludedir)/thmlwebif.h
pkginclude_HEADERS += $(swincludedir)/thmllemma.h
pkginclude_HEADERS += $(swincludedir)/thmlmorph.h
***************
*** 100,103 ****
--- 105,109 ----
pkginclude_HEADERS += $(swincludedir)/thmlstrongs.h
pkginclude_HEADERS += $(swincludedir)/thmlvariants.h
+
pkginclude_HEADERS += $(swincludedir)/treekey.h
pkginclude_HEADERS += $(swincludedir)/treekeyidx.h
***************
*** 120,123 ****
--- 126,132 ----
pkginclude_HEADERS += $(swincludedir)/utilfuns.h
pkginclude_HEADERS += $(swincludedir)/utilstr.h
+ pkginclude_HEADERS += $(swincludedir)/utilxml.h
+ pkginclude_HEADERS += $(swincludedir)/utilweb.h
+
pkginclude_HEADERS += $(swincludedir)/versekey.h
pkginclude_HEADERS += $(swincludedir)/zcom.h
***************
*** 129,133 ****
pkginclude_HEADERS += $(swincludedir)/ztext.h
pkginclude_HEADERS += $(swincludedir)/zverse.h
- pkginclude_HEADERS += $(swincludedir)/utilxml.h
pkginclude_HEADERS += $(swincludedir)/installmgr.h
pkginclude_HEADERS += $(swincludedir)/ftpparse.h
--- 138,141 ----
Index: defs.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/defs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** defs.h 20 Feb 2003 07:25:19 -0000 1.9
--- defs.h 1 Jun 2003 14:32:09 -0000 1.10
***************
*** 6,11 ****
#ifdef NO_SWORD_NAMESPACE
! #define SWORD_NAMESPACE_START
! #define SWORD_NAMESPACE_END
#else
#define SWORD_NAMESPACE_START namespace sword {
--- 6,11 ----
#ifdef NO_SWORD_NAMESPACE
! #define SWORD_NAMESPACE_START namespace sword {
! #define SWORD_NAMESPACE_END }; using namespace sword;
#else
#define SWORD_NAMESPACE_START namespace sword {
Index: swmodule.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** swmodule.h 6 May 2003 03:27:56 -0000 1.63
--- swmodule.h 1 Jun 2003 14:32:09 -0000 1.64
***************
*** 63,67 ****
enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI};
! enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS};
enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML};
--- 63,67 ----
enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI};
! enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF};
enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML};
Index: utilfuns.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utilfuns.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** utilfuns.h 4 May 1999 22:03:36 -0000 1.1.1.1
--- utilfuns.h 1 Jun 2003 14:32:09 -0000 1.2
***************
*** 25,29 ****
#include <utilstr.h>
#include <utilconf.h>
!
#endif
--- 25,29 ----
#include <utilstr.h>
#include <utilconf.h>
! #include <utilweb.h>
#endif