www

commit dc4a448780fab2b9f76fae6026333465c1812448
parent 018f8e3e4ed310ba37d69bac0b9990d33973d389
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun, 12 Feb 2012 18:10:19 -0500

Merge branch '3.0'

Diffstat:
M
chrome/content/zotero/itemPane.xul
 | 
2
+-
M
chrome/content/zotero/xpcom/citeproc.js
 | 
13
++++++++++++-
M
chrome/content/zotero/xpcom/integration.js
 | 
2
+-

3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
@@ -109,7 +109,7 @@
 				<groupbox id="zotero-duplicates-merge-version-select">
 					<description>Choose the version of the item to use as the master item:</description>
 					<hbox>
-						<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)"/>
+						<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
 					</hbox>
 				</groupbox>
 				
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
@@ -2133,7 +2133,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.278";
+    this.processor_version = "1.0.279";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -7506,6 +7506,8 @@ CSL.Node.text = {
                                         if (parseInt(m[1]) >= parseInt(m[2])) {
                                             locator = m[1] + "-" + m[2];
                                         }
+                                    } else {
+                                        locator = locator.replace(/\u2013/g,"-");
                                     }
                                     state.output.append(locator, this, false, false, true);
                                 }
@@ -7527,6 +7529,15 @@ CSL.Node.text = {
                             func = function (state, Item) {
                                 var value = state.getVariable(Item, "page", form);
                                 if (value) {
+                                    value = value.replace(/--*/g,"\u2013");
+                                    var m = value.match(/^([0-9]+)\s*\u2013\s*([0-9]+)$/)
+                                    if (m) {
+                                        if (parseInt(m[1]) >= parseInt(m[2])) {
+                                            value = m[1] + "-" + m[2];
+                                        }
+                                    } else {
+                                        value = value.replace(/\u2013/g,"-");
+                                    }
                                     value = state.fun.page_mangler(value);
                                     state.output.append(value, this, false, false, true);
                                 }
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -1620,7 +1620,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = function(field, callback) 
 				try {
 					session.lookupItems(citation);
 				} catch(e) {
-					if(e instanceof MissingItemException) {
+					if(e instanceof Zotero.Integration.MissingItemException) {
 						citation.citationItems = [];
 					} else {
 						throw e;