[sword-cvs] sword/apps/console/diatheke diatheke.dsp,1.5,1.6 diatheke.cpp,1.26,1.27 corediatheke.h,1.18,1.19 corediatheke.cpp,1.27,1.28
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 4 Apr 2003 21:13:26 -0700
Update of /usr/local/cvsroot/sword/apps/console/diatheke
In directory www:/tmp/cvs-serv18179
Modified Files:
diatheke.dsp diatheke.cpp corediatheke.h corediatheke.cpp
Log Message:
added Words of Christ in Red toggle support
Index: diatheke.dsp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/console/diatheke/diatheke.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** diatheke.dsp 27 Jan 2003 07:02:46 -0000 1.5
--- diatheke.dsp 5 Apr 2003 04:13:23 -0000 1.6
***************
*** 45,49 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 45,49 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MT /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 69,73 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 69,73 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 94,98 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /GZ /c
! # ADD CPP /nologo /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /I "../../../../icu-sword/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_ICU_" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 94,98 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /GZ /c
! # ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src/utilfuns/win32" /I "../../../../icu-sword/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_ICU_" /D "_ICUSWORD_" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 119,123 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /c
! # ADD CPP /nologo /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /I "../../../../icu-sword/include" /D "NDEBUG" /D "_ICU_" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 119,123 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /c
! # ADD CPP /nologo /MT /w /W0 /GX /O2 /I "../../../include" /I "../../../src/utilfuns/win32" /I "../../../../icu-sword/include" /D "NDEBUG" /D "_ICU_" /D "_ICUSWORD_" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
Index: diatheke.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/console/diatheke/diatheke.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** diatheke.cpp 10 Oct 2002 22:50:17 -0000 1.26
--- diatheke.cpp 5 Apr 2003 04:13:23 -0000 1.27
***************
*** 36,40 ****
fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents),\n");
fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping,\n");
! fprintf (stderr, " b (Bi-Directional Reordering)\n");
fprintf (stderr, "Maximum verses may be any integer value\n");
--- 36,40 ----
fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents),\n");
fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping,\n");
! fprintf (stderr, " b (Bi-Directional Reordering), x (Red Words of Christ)\n");
fprintf (stderr, "Maximum verses may be any integer value\n");
***************
*** 124,127 ****
--- 124,129 ----
if (strchr(argv[i+1], 'b'))
optionfilters |= OP_BIDI;
+ if (strchr(argv[i+1], 'x'))
+ optionfilters |= OP_RED;
i++;
}
Index: corediatheke.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/console/diatheke/corediatheke.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** corediatheke.h 13 Oct 2002 18:22:43 -0000 1.18
--- corediatheke.h 5 Apr 2003 04:13:23 -0000 1.19
***************
*** 30,33 ****
--- 30,34 ----
#define OP_BIDI 2048
#define OP_VARIANTS 4096
+ #define OP_RED 8192
#define ST_NONE 0
Index: corediatheke.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/console/diatheke/corediatheke.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** corediatheke.cpp 16 Feb 2003 02:43:27 -0000 1.27
--- corediatheke.cpp 5 Apr 2003 04:13:23 -0000 1.28
***************
*** 193,197 ****
else
manager.setGlobalOption("Scripture Cross-References","Off");
!
if (optionfilters & OP_VARIANTS && variants) {
if (variants == -1)
--- 193,200 ----
else
manager.setGlobalOption("Scripture Cross-References","Off");
! if (optionfilters & OP_RED)
! manager.setGlobalOption("Words of Christ in Red","On");
! else
! manager.setGlobalOption("Words of Christ in Red","Off");
if (optionfilters & OP_VARIANTS && variants) {
if (variants == -1)