[sword-svn] r460 - trunk

[chrislit at www.crosswire.org]

Author: chrislit
Date: 2007-09-09 17:09:29 -0700 (Sun, 09 Sep 2007)
New Revision: 460

Modified:
   trunk/RxRichEditX.cpp
   trunk/biblecsmgr.cpp
   trunk/paraldisp.cpp
   trunk/swdisprtfchap.cpp
Log:
Farsi fixes

Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp	2007-09-09 22:55:10 UTC (rev 459)
+++ trunk/RxRichEditX.cpp	2007-09-10 00:09:29 UTC (rev 460)
@@ -100,7 +100,7 @@
 		rtfText += "\\qr ";
 	}else
 		rtfText += "\\ql ";
-	if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "ar", 2)))) {
+	if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "fa", 2) || !strnicmp(module->Lang(), "ar", 2)))) {
 		rtfText = rtfText + "\\rtlpar ";
 	}
 
@@ -307,7 +307,7 @@
     if (module->Direction() == DIRECTION_RTL) {
 		newtext += "\\qr ";
     }
-    if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "ar", 2)))) {
+    if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "fa", 2) || !strnicmp(module->Lang(), "ar", 2)))) {
 		newtext += "\\rtlpar ";
     }
 
@@ -434,7 +434,7 @@
 		}
 
 		if (tmptext.Length() > 3) {	// make sure we have an entry
-			if (module->Direction() == DIRECTION_RTL && (SWDispRTFChap::platformID == WIN9X || (module->Lang() && strnicmp(module->Lang(), "he", 2) && strnicmp(module->Lang(), "ar", 2)))) {
+			if (module->Direction() == DIRECTION_RTL && (SWDispRTFChap::platformID == WIN9X || (module->Lang() && strnicmp(module->Lang(), "he", 2) && strnicmp(module->Lang(), "fa", 2) && strnicmp(module->Lang(), "ar", 2)))) {
 				newtext = newtext + RTFVersePre + tmptext + RTFVersePost;
 				if (verseNum)
 					newtext = newtext + RTFVerseMarkPre + IntToStr(VerseKey(module->KeyText()).Verse()) + RTFVerseMarkPost;

Modified: trunk/biblecsmgr.cpp
===================================================================
--- trunk/biblecsmgr.cpp	2007-09-09 22:55:10 UTC (rev 459)
+++ trunk/biblecsmgr.cpp	2007-09-10 00:09:29 UTC (rev 460)
@@ -58,7 +58,7 @@
 //                if (!strnicmp(lang.c_str(), "ar", 2)) {
 //                        module->AddRenderFilter(arshaping);
 //                }
-			 if (platformID == WIN9X || (strnicmp(lang.c_str(), "he", 2) && strnicmp(lang.c_str(), "ar", 2))) {
+			 if (platformID == WIN9X || (strnicmp(lang.c_str(), "he", 2) && strnicmp(lang.c_str(), "fa", 2) && strnicmp(lang.c_str(), "ar", 2))) {
 				    module->AddRenderFilter(bidireorder);
 
 			 }

Modified: trunk/paraldisp.cpp
===================================================================
--- trunk/paraldisp.cpp	2007-09-09 22:55:10 UTC (rev 459)
+++ trunk/paraldisp.cpp	2007-09-10 00:09:29 UTC (rev 460)
@@ -184,7 +184,7 @@
 			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)))) {
+			if (mods[z]->Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_NT	 && (!strnicmp(mods[0]->Lang(), "he", 2) || !strnicmp(mods[0]->Lang(), "fa", 2) || !strnicmp(mods[0]->Lang(), "ar", 2)))) {
 			   newtext = newtext + "\\rtlpar ";
 			}
 
@@ -210,7 +210,7 @@
 					}
 					else break;
 				} while (true);
-				if (mods[z]->Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_WINDOWS	 || (mods[z]->Lang() && strnicmp(mods[z]->Lang(), "he", 2) && strnicmp(mods[z]->Lang(), "ar", 2)))) {
+				if (mods[z]->Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_WINDOWS	 || (mods[z]->Lang() && strnicmp(mods[z]->Lang(), "he", 2) && strnicmp(mods[z]->Lang(), "fa", 2) && strnicmp(mods[z]->Lang(), "ar", 2)))) {
 					newtext = newtext + RTFVersePre;
 					if ((key->Verse() == verse) && (dispAttribs.markCurrentVerse)) {
 						newtext = newtext + "\\cf2 "; // \cf2 = second color in color table
@@ -299,4 +299,4 @@
 		RegisterComponents("SWORD", classes, 0);
 	}
 }
-//---------------------------------------------------------------------------
\ No newline at end of file
+//---------------------------------------------------------------------------

Modified: trunk/swdisprtfchap.cpp
===================================================================
--- trunk/swdisprtfchap.cpp	2007-09-09 22:55:10 UTC (rev 459)
+++ trunk/swdisprtfchap.cpp	2007-09-10 00:09:29 UTC (rev 460)
@@ -86,7 +86,7 @@
 	if (Module.Direction() == DIRECTION_RTL) {
 		newtext = newtext + "\\qr ";
 	}
-	if (Module.Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_NT	 && (!strnicmp(Module.Lang(), "he", 2) || !strnicmp(Module.Lang(), "ar", 2)))) {
+	if (Module.Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_NT	 && (!strnicmp(Module.Lang(), "he", 2) || (!strnicmp(Module.Lang(), "fa", 2) || !strnicmp(Module.Lang(), "ar", 2)))) {
 	   newtext = newtext + "\\rtlpar ";
 	}
 
@@ -123,7 +123,7 @@
 				}
 				else break;
 			} while (true);
-			if (Module.Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_WINDOWS	 || (Module.Lang() && strnicmp(Module.Lang(), "he", 2) && strnicmp(Module.Lang(), "ar", 2)))) {
+			if (Module.Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_WINDOWS	 || (Module.Lang() && strnicmp(Module.Lang(), "he", 2) && strnicmp(Module.Lang(), "ar", 2) && strnicmp(Module.Lang(), "fa", 2)))) {
 				newtext = newtext + RTFVersePre;
 				if ((key->Verse() == verse) && (dispAttribs.markCurrentVerse)) {
 					newtext = newtext + "\\cf2 "; // \cf2 = second color in color table