www

commit cc497c271853881c6a4a87a1999898430159a742
parent 3ce9d82b0095ea746dbfe4e855b6e8e323d68750
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 26 Oct 2007 14:44:43 +0000

Merged r1792-1793 to trunk


Diffstat:
M
chrome/content/zotero/xpcom/cite.js
 | 
4
++--
M
chrome/content/zotero/xpcom/cite_compat.js
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
@@ -2297,8 +2297,8 @@ Zotero.CSL.FormattedString.prototype.append = function(string, element, dontDeli
 			               .replace(/(\r\n|\r|\n)/g, "<br />")
 			               .replace(/[\x00-\x1F]/g, "");
 		} else if(this.format == "RTF") {
-			string = string.replace(/[\x7F-\uFFFF]/g, Zotero.CSL.FormattedString._rtfEscapeFunction)
-			               .replace("\\", "\\\\", "g")
+			string = string.replace("\\", "\\\\", "g")
+			               .replace(/[\x7F-\uFFFF]/g, Zotero.CSL.FormattedString._rtfEscapeFunction)
 			               .replace("\t", "\\tab ", "g")
 			               .replace(/(\r\n|\r|\n)/g, "\\line ");
 		} else if(this.format == "Integration") {
diff --git a/chrome/content/zotero/xpcom/cite_compat.js b/chrome/content/zotero/xpcom/cite_compat.js
@@ -1134,7 +1134,7 @@ Zotero.CSL.Compat.prototype._processCreators = function(type, element, creators,
 			var firstName, lastName;
 			for(var i=0; i<maxCreators; i++) {
 				var firstName = "";
-				if(element["form"] && element["form"] != "short") {
+				if(!element["form"] || element["form"] != "short") {
 					if(child["initialize-with"] != undefined) {
 						// even if initialize-with is simply an empty string, use
 						// initials