[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS mainfrm.cpp,1.117,1.118 paraldisp.cpp,1.1,1.2

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv28971/apps/windoze/CBuilder5/BibleCS

Modified Files:
	mainfrm.cpp paraldisp.cpp 
Log Message:
no message

Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** mainfrm.cpp	12 Jun 2003 02:03:34 -0000	1.117
--- mainfrm.cpp	13 Jun 2003 12:18:21 -0000	1.118
***************
*** 2752,2756 ****
  	}
  	value[k] = 0;
! 	int bno = atoi((menuchoice->Parent->Caption.c_str()+menuchoice->Parent->Caption.Length()-2));
  	parallelDisp->mod[bno] = value;
  	parallelDisp->Display();
--- 2752,2756 ----
  	}
  	value[k] = 0;
! 	int bno = atoi((menuchoice->Parent->Caption.c_str()+menuchoice->Parent->Caption.Length()-2))-1;
  	parallelDisp->mod[bno] = value;
  	parallelDisp->Display();

Index: paraldisp.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/paraldisp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** paraldisp.cpp	12 Jun 2003 02:03:34 -0000	1.1
--- paraldisp.cpp	13 Jun 2003 12:18:21 -0000	1.2
***************
*** 82,87 ****
  
  
! 	
  	string lastEntry = "something the first entry will never be";
  	while ((key->Book() == book) && (key->Chapter() == chap) && (mods[0]->Error() == 0)) {
  		if (lastEntry == (string)mods[0]->getRawEntry()) {
--- 82,115 ----
  
  
! /*
! 	// Dunno if this first line does anything 
! 	newtext += "{\\stylesheet{\\s1{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ltrch\\dbch\\af2\\afs24\\langfe255\\loch\\f0\\fs24\\lang1033\\snext1 Default;}";
! 	newtext += "{\\s2\\sa120{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ltrch\\dbch\\af2\\afs24\\langfe255\\loch\\f0\\fs24\\lang1033\\sbasedon1\\snext2 Text body;}";
! 	newtext += "{\\s3\\sa120{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ltrch\\dbch\\af2\\afs24\\langfe255\\loch\\f0\\fs24\\lang1033\\sbasedon2\\snext3 Table Contents;}";
! 	newtext += "{\\s4\\sa120\\qc{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ai\\ab\\ltrch\\dbch\\af2\\afs24\\langfe255\\ai\\ab\\loch\\f0\\fs24\\lang1033\\i\\b\\sbasedon3\\snext4 Table Heading;}";
! 	newtext += "}";
! 	newtext += "{\\info{\\comment StarWriter}{\\vern6410}}";
! 
! 	newtext += "\\deftab1250";
! 	newtext += "{\\*\\pgdsctbl";
! 	newtext += "{\\pgdsc0\\pgdscuse195\\pgwsxn12240\\pghsxn15840\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\pgdscnxt0 Default;}}";
! 
! 	newtext += "\\paperh15840\\paperw12240\\margl1800\\margr1800\\margt1440\\margb1440\\sectd\\sbknone\\pgwsxn12240\\pghsxn15840\\marglsxn1800\\margrsxn1800\\margtsxn1440\\margbsxn1440\\ftnbj\\ftnstart1\\ftnrstcont\\ftnnar\\aenddoc\\aftnrstcont\\aftnstart1\\aftnnrlc";
! 
! 	newtext += "\\trowd\\trql\\trleft778\\clbrdrt\\brdrs\\brdrw1\\brdrcf1\\brsp0\\clbrdrl\\brdrs\\brdrw1\\brdrcf1\\brsp0\\clbrdrb\\brdrs\\brdrw1\\brdrcf1\\brsp0\\cellx4278\\clbrdrt\\brdrs\\brdrw1\\brdrcf1\\brsp0\\clbrdrl\\brdrs\\brdrw1\\brdrcf1\\brsp0\\clbrdrb\\brdrs\\brdrw1\\brdrcf1\\brsp0\\clbrdrr\\brdrs\\brdrw1\\brdrcf1\\brsp0\\cellx7772";
! 	newtext += "\\pard\\intbl\\pard\\plain \\intbl\\s4\\sa120\\qc{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ai\\ab\\ltrch\\dbch\\af2\\afs24\\langfe255\\ai\\ab\\loch\\f0\\fs24\\lang1033\\i\\b {\\ltrch\\loch\\f0 ";
! 
! 	newtext += "HEADING COL 1";
! 
! 	newtext += "}";
! 	newtext += "\\cell\\pard\\plain \\intbl\\s4\\sa120\\qc{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}\\rtlch\\afs24\\lang255\\ai\\ab\\ltrch\\dbch\\af2\\afs24\\langfe255\\ai\\ab\\loch\\f0\\fs24\\lang1033\\i\\b {\\ltrch\\loch\\f0 ";
! 
! 	newtext += "HEADING COL 2";
! 
! 	newtext += "}";
! 	newtext += "\\cell\\row\\pard ";
! */
  	string lastEntry = "something the first entry will never be";
+ //	bool firstRow = true;
  	while ((key->Book() == book) && (key->Chapter() == chap) && (mods[0]->Error() == 0)) {
  		if (lastEntry == (string)mods[0]->getRawEntry()) {
***************
*** 89,105 ****
  			continue;
  		}
  
  		for (int z = 0; z < realModCount; z++) {
- 			newtext = newtext + "{\\par\\pard ";
  
! 		if (mods[z]->Direction() == DIRECTION_RTL) {
! 			newtext = newtext + "\\qr ";
! 		}
! 		if (mods[z]->Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_NT	 && (!strnicmp(mods[0]->Lang(), "he", 2) || !strnicmp(mods[0]->Lang(), "ar", 2)))) {
! 		   newtext = newtext + "\\rtlpar ";
! 		}
  
! 			
! 			tmptext = "";
  			lastEntry = mods[z]->getRawEntry();
  			for (const char *loop = (const char *)(*mods[z]); *loop; loop++) {
--- 117,167 ----
  			continue;
  		}
+ /*
+ 		// First Row data, notice the additional \\clbrdrt lines which aren't in following rows
+ 		newtext += "\\trowd\\trql\\trleft778";
+ //		if (firstRow)
+ //			newtext += "\\clbrdrt\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\clbrdrl\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\clbrdrb\\brdrs\\brdrw1\\brdrcf1\\brsp0";
  
+ 		// This line should change the background color but doesn't seem to work
+ 		//newtext += "\\clcbpat2";
+ 
+ //		if (firstRow)
+ //			newtext += "\\clbrdrt\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\cellx4278";			
+ 		newtext += "\\clbrdrl\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\clbrdrb\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\clbrdrr\\brdrs\\brdrw1\\brdrcf1\\brsp0";
+ 		newtext += "\\cellx7772";
+ 		newtext += "\\pard\\intbl\\pard\\plain ";
+ */
+ 		bool firstRow = true;
  		for (int z = 0; z < realModCount; z++) {
  
! //		if (!firstRow)
! //			newtext += "\\par__________________\\par";
! 		firstRow = false;
  
! /*		
! 			// Cell
! 			newtext += "\\intbl\\s3\\sa120";
! 			newtext += "{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}";
! 			newtext += "\\rtlch\\afs24\\lang255\\ltrch\\dbch\\af2\\afs24\\langfe255\\loch\\f0\\fs24\\lang1033 ";
! 
! 			newtext += "{\\ltrch\\loch\\f0 ";
! */
! /*			
! 			if (mods[z]->Direction() == DIRECTION_RTL) {
! 				newtext = newtext + "\\qr ";
! 			}
! 			if (mods[z]->Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_NT	 && (!strnicmp(mods[0]->Lang(), "he", 2) || !strnicmp(mods[0]->Lang(), "ar", 2)))) {
! 			   newtext = newtext + "\\rtlpar ";
! 			}
! 
! */			
! 			tmptext = "{\\b ";
! 			tmptext += mods[z]->Name();
! 			tmptext += ": }	";
  			lastEntry = mods[z]->getRawEntry();
  			for (const char *loop = (const char *)(*mods[z]); *loop; loop++) {
***************
*** 146,154 ****
  				versepos =  GetTextLen() - 3;
  			}
! 			newtext = newtext + "}";
  		}
  		
  		(*mods[0])++;
  	}
  	newtext = newtext + RTFTrailer;
  
--- 208,231 ----
  				versepos =  GetTextLen() - 3;
  			}
! //			newtext = newtext + "}";
! 
! 			if (z < (realModCount-1))
! 				newtext += "\\par__________\\par ";
! 			else	newtext += "\\par\\par ";
! 			
! //			if (z < (realModCount-1))
! //				newtext += "\\cell\\pard\\plain ";
! //			else	newtext += "\\cell\\row\\pard ";
! 
  		}
  		
  		(*mods[0])++;
  	}
+ 
+ 	// ending stuff
+ //	newtext += "\\pard\\plain \\s1";
+ //	newtext += "{\\*\\hyphen2\\hyphlead2\\hyphtrail2\\hyphmax0}";
+ //	newtext += "\\rtlch\\afs24\\lang255\\ltrch\\dbch\\af2\\afs24\\langfe255\\loch\\f0\\fs24\\lang1033 "; 
+ 
  	newtext = newtext + RTFTrailer;