suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #466, Miscellaneous Chicago Manual of Style formatting problems

Browse Source
This commit is contained in:
Simon Kornblith 2006-12-21 22:09:45 +00:00
parent bd7d95a576
commit d2e4063b20
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
chrome/content/zotero/xpcom/cite.js
View File

@ -422,14 +422,8 @@ Zotero.CSL.prototype.createCitation = function(citation, format) {
var string = this._getTerm("ibid");
string = string[0].toUpperCase()+string.substr(1);
} else {
var string = "";
var lasti = citation.itemIDs.length-1;
for(var i in citation.itemIDs) {
if(this._cit.format && this._cit.format.delimiter && string) {
// add delimiter if one exists, and this isn't the first element
// with content
string += this._cit.format.delimiter;
}
var locatorType = false;
var locator = false;
if(citation.locators) {
@ -444,9 +438,14 @@ Zotero.CSL.prototype.createCitation = function(citation, format) {
locator = citation.locators[i];
}
string += this._getCitation(Zotero.Items.get(citation.itemIDs[i]),
string = this._getCitation(Zotero.Items.get(citation.itemIDs[i]),
(citation.citationType[i] == 1 ? "first" : "subsequent"),
locatorType, locator, format, this._cit);
if(this._cit.format && this._cit.format.delimiter && i != lasti) {
// add delimiter if one exists, and this isn't the last element
string += this._cit.format.delimiter;
}
}
}
@ -454,14 +453,14 @@ Zotero.CSL.prototype.createCitation = function(citation, format) {
if(this._cit.format) {
// add citation prefix or suffix
if(this._cit.format.prefix) {
string = this._cit.format.prefix + string ;
string.string = string.string + this._cit.format.prefix;
}
if(this._cit.format.suffix) {
string += this._cit.format.suffix;
string.append(this._cit.format.suffix);
}
}
return string;
return string.get();
}
/*
@ -490,7 +489,7 @@ Zotero.CSL.prototype.createBibliography = function(items, format) {
for(var i in items) {
var item = items[i];
var string = this._getCitation(item, "first", false, false, format, this._bib);
var string = this._getCitation(item, "first", false, false, format, this._bib).get();
if(!string) {
continue;
}
@ -1115,7 +1114,7 @@ Zotero.CSL.prototype._getCitation = function(item, position, locatorType, locato
typeName);
}
return formattedString.get();
return formattedString;
}
/*
@ -1404,8 +1403,24 @@ Zotero.CSL.FormattedString.prototype.concat = function(formattedString, element)
}
if(formattedString.string) {
return this.append(formattedString.get(), element, false, true);
// first, append the actual string
var haveAppended = this.append(formattedString.string, element, false, true);
// if there's close punctuation to append, that also counts
if(formattedString.closePunctuation) {
haveAppended = true;
if(this.closePunctuation) {
// if there's existing close punctuation and punctuation to
// append, we need to append that
this.string += this.closePunctuation;
}
// add the new close punctuation
this.closePunctuation = formattedString.closePunctuation;
}
return haveAppended;
}
return false;
}
/*
@ -1430,9 +1445,10 @@ Zotero.CSL.FormattedString.prototype.append = function(string, element, dontDeli
// close quotes, etc. using punctuation
if(this.closePunctuation) {
if(Zotero.CSL.FormattedString._punctuation.indexOf(string[0]) != -1) {
this.string += string[0]+this.closePunctuation;
this.string += string[0];
string = string.substr(1);
}
this.string += this.closePunctuation;
this.closePunctuation = false;
}

6
scrapers.sql
View File

@ -1,4 +1,4 @@
-- 154
-- 155
-- ***** BEGIN LICENSE BLOCK *****
--
@ -10056,13 +10056,13 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
<titles quotes="true"/>
</group>
<group class="container">
<text term-name="in" text-transform="lowercase"/>
<text prefix=" " term-name="in" text-transform="lowercase"/>
<group delimiter=", ">
<titles relation="container" prefix=" " font-style="italic"/>
<editor/>
<translator/>
</group>
<group prefix="(" suffix=")" delimiter=", ">
<group prefix=" (" suffix=")" delimiter=", ">
<publisher/>
<date>
<year/>