[sword-cvs] sword/src/modules/filters gbfhtmlhref.cpp,1.23,1.24 osishtmlhref.cpp,1.18,1.19 osisrtf.cpp,1.26,1.27 osiswebif.cpp,1.6,1.7 thmlheadings.cpp,1.12,1.13 thmlhtmlhref.cpp,1.45,1.46 thmlrtf.cpp,1.41,1.42
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 15 Jan 2004 20:42:47 -0700
Update of /cvs/core/sword/src/modules/filters
In directory www:/tmp/cvs-serv22315/src/modules/filters
Modified Files:
gbfhtmlhref.cpp osishtmlhref.cpp osisrtf.cpp osiswebif.cpp
thmlheadings.cpp thmlhtmlhref.cpp thmlrtf.cpp
Log Message:
WINCE fixes
Index: gbfhtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/gbfhtmlhref.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gbfhtmlhref.cpp 22 Dec 2003 20:06:35 -0000 1.23
+++ gbfhtmlhref.cpp 16 Jan 2004 03:42:42 -0000 1.24
@@ -170,10 +170,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
//char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
Index: osishtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osishtmlhref.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- osishtmlhref.cpp 24 Oct 2003 02:43:46 -0000 1.18
+++ osishtmlhref.cpp 16 Jan 2004 03:42:42 -0000 1.19
@@ -143,10 +143,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
Index: osisrtf.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- osisrtf.cpp 24 Dec 2003 20:51:36 -0000 1.26
+++ osisrtf.cpp 16 Jan 2004 03:42:42 -0000 1.27
@@ -148,10 +148,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n';
buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str());
Index: osiswebif.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osiswebif.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- osiswebif.cpp 24 Nov 2003 09:16:40 -0000 1.6
+++ osiswebif.cpp 16 Jan 2004 03:42:42 -0000 1.7
@@ -123,10 +123,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
// buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
Index: thmlheadings.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlheadings.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- thmlheadings.cpp 7 Jul 2003 01:16:15 -0000 1.12
+++ thmlheadings.cpp 16 Jan 2004 03:42:42 -0000 1.13
@@ -9,8 +9,9 @@
#include <thmlheadings.h>
#include <utilxml.h>
+#ifndef _WIN32_WCE
#include <iostream>
-
+#endif
#ifndef __GNUC__
#else
#include <unixstr.h>
Index: thmlhtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlhtmlhref.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- thmlhtmlhref.cpp 22 Dec 2003 21:33:32 -0000 1.45
+++ thmlhtmlhref.cpp 16 Jan 2004 03:42:42 -0000 1.46
@@ -92,10 +92,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
@@ -137,10 +137,10 @@
SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) {}
+ SWCATCH ( ... ) {}
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str());
Index: thmlrtf.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlrtf.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- thmlrtf.cpp 22 Dec 2003 21:33:32 -0000 1.41
+++ thmlrtf.cpp 16 Jan 2004 03:42:42 -0000 1.42
@@ -217,10 +217,10 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) { }
+ SWCATCH ( ... ) { }
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
@@ -256,10 +256,10 @@
SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
VerseKey *vkey;
// see if we have a VerseKey * or descendant
- try {
+ SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
}
- catch ( ... ) {}
+ SWCATCH ( ... ) {}
if (vkey) {
// leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt.
buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->Verse(), footnoteNumber.c_str());