commit e0f6f023d8f51b39086d5e5310059fe3a3ef5e64
parent dd0c537ce15b94c9b24cfa9ee3b8ab623303b826
Author: Simon Kornblith <simon@simonster.com>
Date: Tue, 5 Sep 2006 01:09:04 +0000
various fixes to citation formatting (mostly Chicago Manual of Style)
Diffstat:
3 files changed, 56 insertions(+), 34 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/xpcom/cite.js b/chrome/chromeFiles/content/scholar/xpcom/cite.js
@@ -1014,6 +1014,8 @@ CSL.prototype._formatDate = function(element, date, format) {
} else {
string = date.day.toString();
}
+ } else if(child.name == "text") {
+ string = this._getTerm(child["term-name"], false, child["form"]);
}
if(string) {
@@ -1318,9 +1320,11 @@ CSL.prototype._getFieldValue = function(name, element, item, format, bibCitEleme
data = this._formatLocator(name, element, field, format);
}
} else if(name == "pages") {
- var field = item.getField("pages");
- if(field) {
- data = this._formatLocator("page", element, field, format);
+ if(typeName != "book") {
+ var field = item.getField("pages");
+ if(field) {
+ data = this._formatLocator("page", element, field, format);
+ }
}
} else if(name == "edition") {
data = item.getField("edition");
diff --git a/chrome/chromeFiles/locale/en-US/scholar/locales.xml b/chrome/chromeFiles/locale/en-US/scholar/locales.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<terms>
+<terms xmlns="http://purl.org/net/xbiblio/csl">
<locale xml:lang="en">
<term name="in">in</term>
<term name="ibid">ibid</term>
<term name="accessed">accessed</term>
<term name="forthcoming">forthcoming</term>
<term name="references">References</term>
+ <term name="no date">nd</term>
<term name="and">and</term>
<term name="et-al">et al.</term>
@@ -19,7 +20,7 @@
<multiple>paragraph</multiple>
</term>
<term name="volume">volume</term>
- <term name="issue">issue</term>
+ <term name="issue">number</term>
<!-- SHORT LOCATOR FORMS -->
<term name="page" form="short">
@@ -31,7 +32,7 @@
<multiple>ΒΆΒΆ</multiple>
</term>
<term name="volume" form="short">vol</term>
- <term name="issue" form="short">iss</term>
+ <term name="issue" form="short">no</term>
<!-- LONG ROLE FORMS -->
<term name="editor">
diff --git a/scrapers.sql b/scrapers.sql
@@ -1,4 +1,4 @@
--- 77
+-- 78
-- Set the following timestamp to the most recent scraper update date
REPLACE INTO "version" VALUES ('repository', STRFTIME('%s', '2006-08-31 22:44:00'));
@@ -5982,9 +5982,9 @@ function doImport() {
}
}');
-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2006-08-29 23:05:00', 'American Psychological Association',
+REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2006-09-04 20:14:00', 'American Psychological Association',
'<?xml version="1.0" encoding="UTF-8"?>
-<?oxygen RNGSchema="file:/Users/darcusb/xbiblio/csl/schema/trunk/csl-alt.rnc" type="compact"?>
+<?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
<info>
<title>American Psychological Association</title>
@@ -6002,7 +6002,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '200
<name>Johan Kool</name>
<email>johankool@users.sourceforge.net</email>
</contributor>
- <updated>2006-08-29T23:05:00+05:00</updated>
+ <updated>2006-09-04T20:14:00+05:00</updated>
</info>
<defaults>
<contributor name-as-sort-order="no">
@@ -6047,7 +6047,6 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '200
</date>
<text term-name="from"/>
<url/>
- <date prefix=", "/>
</access>
</defaults>
<citation prefix="(" suffix=")" delimiter="; ">
@@ -6144,7 +6143,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '200
</bibliography>
</style>');
-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.csl', '2006-08-30 17:40:00', 'Chicago Manual of Style (Note)',
+REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.csl', '2006-09-04 20:27:00', 'Chicago Manual of Style (Note)',
'<?xml version="1.0" encoding="UTF-8"?>
<?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
@@ -6163,7 +6162,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
<name>Johan Kool</name>
<email>johankool@users.sourceforge.net</email>
</contributor>
- <updated>2006-08-24T16:30:00+01:00</updated>
+ <updated>2006-09-04T20:27:00+05:00</updated>
<summary>The note-without-bibliography variant of the Chicago style.</summary>
</info>
<defaults>
@@ -6188,6 +6187,8 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
<title/>
</titles>
<date>
+ <month suffix=" " text-transform="capitalize"/>
+ <day suffix=", "/>
<year/>
</date>
<publisher>
@@ -6196,10 +6197,15 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
</publisher>
<access>
<url/>
- <date prefix=" "/>
+ <date prefix=" (" suffix=")">
+ <text term-name="accessed" suffix=" "/>
+ <month suffix=" " text-transform="capitalize"/>
+ <day suffix=", "/>
+ <year/>
+ </date>
</access>
</defaults>
- <citation suffix=".">
+ <citation suffix="." delimiter="; ">
<et-al min-authors="4" use-first="1"/>
<layout>
<item>
@@ -6209,11 +6215,15 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
<titles font-style="italic"/>
<editor prefix=", "/>
<translator prefix=", "/>
+ <titles relation="container" prefix=" "/>
<group prefix=" (" suffix=")" delimiter=", ">
<publisher/>
- <date/>
+ <date>
+ <year/>
+ </date>
</group>
<pages prefix=", "/>
+ <access prefix=", "/>
</type>
<type name="chapter">
<author suffix=", "/>
@@ -6223,30 +6233,37 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
<titles relation="container" prefix=" " font-style="italic"/>
<editor prefix=", "/>
<translator prefix=", "/>
- <pages prefix=", "/>
<group prefix=" (" suffix=")" delimiter=", ">
<publisher/>
- <date/>
+ <date>
+ <year/>
+ </date>
</group>
+ <pages prefix=", "/>
+ <access prefix=", "/>
</group>
</type>
- <type name="journal-article">
+ <type name="article">
<author suffix=", "/>
<titles prefix="“" suffix=",” "/>
- <titles relation="container" font-style="italic"/>
- <volume prefix=" "/>
- <issue prefix=" (" suffix=")"/>
- <pages prefix=": "/>
+ <titles relation="container" font-style="italic" suffix=", "/>
+ <group delimiter=", ">
+ <date/>
+ <access/>
+ </group>
</type>
- <type name="article">
+ <type name="article-journal">
<author suffix=", "/>
<titles prefix="“" suffix=",” "/>
- <titles relation="container" font-style="italic" suffix=", "/>
- <date>
- <day suffix=" "/>
- <month suffix=" " text-transform="capitalize"/>
- <year/>
- </date>
+ <titles relation="container" font-style="italic"/>
+ <volume prefix=" "/>
+ <issue prefix=", ">
+ <label form="short" text-transform="lowercase" suffix=". "/>
+ <number/>
+ </issue>
+ <date prefix=" (" suffix=")"/>
+ <pages prefix=": "/>
+ <access prefix=", "/>
</type>
</choose>
</item>
@@ -6258,7 +6275,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
</citation>
</style>');
-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2006-08-29 23:05:00', 'Modern Language Association',
+REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2006-09-04 20:28:00', 'Modern Language Association',
'<?xml version="1.0" encoding="UTF-8"?>
<?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="author" xml:lang="en">
@@ -6278,11 +6295,11 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '200
<name>Simon Kornblith</name>
<email>simon@simonster.com</email>
</contributor>
- <updated>2006-08-29T23:05:00+05:00</updated>
+ <updated>2006-09-04T20:28:00+05:00</updated>
</info>
<defaults>
<contributor name-as-sort-order="first">
- <name and="text" sort-separator=", " delimiter=", "/>
+ <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" suffix="."/>
</contributor>
<author>
@@ -6312,7 +6329,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '200
<month suffix=" "/>
<year/>
</date>
- <url prefix=" <" suffix=">"/>
+ <url prefix=" <" suffix=">"/>
</access>
</defaults>
<citation prefix="(" suffix=")" delimiter="; ">
