mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged r1792-1793 to trunk

Browse source
This commit is contained in:
Dan Stillman 2007-10-26 14:44:43 +00:00
parent 3ce9d82b00
commit cc497c2718
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/xpcom/cite.js
View file

@ -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") {

2
chrome/content/zotero/xpcom/cite_compat.js
View file

@ -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