[sword-cvs] sword/src/modules/filters osisrtf.cpp,1.10,1.11

sword@www.crosswire.org sword@www.crosswire.org
Sat, 28 Jun 2003 14:31:22 -0700


Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv737/src/modules/filters

Modified Files:
	osisrtf.cpp 
Log Message:
no message

Index: osisrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** osisrtf.cpp	27 Jun 2003 21:51:50 -0000	1.10
--- osisrtf.cpp	28 Jun 2003 21:31:20 -0000	1.11
***************
*** 19,22 ****
--- 19,23 ----
  #include <utilxml.h>
  #include <versekey.h>
+ #include <swmodule.h>
  
  SWORD_NAMESPACE_START
***************
*** 44,47 ****
--- 45,51 ----
  	if (!substituteToken(buf, token)) {
  		XMLTag tag(token);
+ 		bool osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+ 
+ 		
  		
  		// <w> tag
***************
*** 231,235 ****
  
  				//alternate " and '
! 				buf += (level % 2) ? '\'' : '\"';
  				
  				if (who == "Jesus")
--- 235,240 ----
  
  				//alternate " and '
! 				if (osisQToTick)
! 					buf += (level % 2) ? '\"' : '\'';
  				
  				if (who == "Jesus")
***************
*** 238,247 ****
  			else if (tag.isEndTag()) {
  				//alternate " and '
! 				buf += (level % 2) ? '\'' : '\"';
  				buf += "}";
  			}
  			else {	// empty quote marker
  				//alternate " and '
! 				buf += (level % 2) ? '\'' : '\"';
  			}
  		}
--- 243,254 ----
  			else if (tag.isEndTag()) {
  				//alternate " and '
! 				if (osisQToTick)
! 					buf += (level % 2) ? '\"' : '\'';
  				buf += "}";
  			}
  			else {	// empty quote marker
  				//alternate " and '
! 				if (osisQToTick)
! 					buf += (level % 2) ? '\"' : '\'';
  			}
  		}