www

commit 52462481593a6ca868f44f0f58884c006b956272
parent 7448e2ac6a11d5a1aec10367f27e4feaf3f384ea
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 12 Feb 2011 04:36:37 +0000

generate a citation list when using "Create Bibliography" context menu options if the selected style does not define a bibliographny


Diffstat:
M
chrome/content/zotero/fileInterface.js
 | 
12
+++++-------
M
chrome/content/zotero/xpcom/cite.js
 | 
60
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
chrome/content/zotero/xpcom/translation/browser_firefox.js
 | 
3
+++

3 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -397,11 +397,10 @@ var Zotero_File_Interface = new function() {
 						   createInstance(Components.interfaces.nsITransferable);
 		var clipboardService = Components.classes["@mozilla.org/widget/clipboard;1"].
 							   getService(Components.interfaces.nsIClipboard);
-		var style = Zotero.Styles.get(style).csl;
-		style.updateItems([item.id for each(item in items)]);
+		var style = Zotero.Styles.get(style);
 		
 		// add HTML
-		var bibliography = Zotero.Cite.makeFormattedBibliography(style, "html");
+		var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "html");
 		var str = Components.classes["@mozilla.org/supports-string;1"].
 				  createInstance(Components.interfaces.nsISupportsString);
 		str.data = bibliography;
@@ -410,7 +409,7 @@ var Zotero_File_Interface = new function() {
 		
 		// add text (or HTML source)
 		if(!asHTML) {
-			var bibliography = Zotero.Cite.makeFormattedBibliography(style, "text");
+			var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, "text");
 		}
 		var str = Components.classes["@mozilla.org/supports-string;1"].
 				  createInstance(Components.interfaces.nsISupportsString);
@@ -496,9 +495,8 @@ var Zotero_File_Interface = new function() {
 				return;
 			}
 			else {
-				var style = Zotero.Styles.get(io.style).csl;
-				style.updateItems([item.id for each(item in items)]);
-				var bibliography = Zotero.Cite.makeFormattedBibliography(style, format);
+				var style = Zotero.Styles.get(io.style);
+				var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(style, items, format);
 			}
 		} catch(e) {
 			window.alert(Zotero.getString("fileInterface.bibliographyGenerationError"));
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
@@ -257,9 +257,69 @@ Zotero.Cite.getBibliographyFormatParameters = function(bib) {
 	return bibStyle;
 }
 
+/**
+ * Makes a formatted bibliography, if the style defines one; otherwise makes a formatted list of
+ * items
+ * @param {Zotero.Style} style The style to use
+ * @param {Zotero.Item[]} items An array of items
+ * @param {String} format The format of the output
+ */
+Zotero.Cite.makeFormattedBibliographyOrCitationList = function(style, items, format) {
+	var cslEngine = style.csl;
+	cslEngine.setOutputFormat(format);
+	cslEngine.updateItems([item.id for each(item in items)]);
+	
+	var bibliography = Zotero.Cite.makeFormattedBibliography(cslEngine, format);
+	if(bibliography) return bibliography;
+	
+	var styleClass = style.class;
+	var citations = [cslEngine.appendCitationCluster({"citationItems":[{"id":item.id}], "properties":{}}, true)[0][1]
+		for each(item in items)];
+	
+	if(styleClass == "note") {
+		if(format == "html") {
+			return "<ol>\n\t<li>"+citations.join("</li>\n\t<li>")+"</li>\n</ol>";
+		} else if(format == "text") {
+			var output = [];
+			for(var i=0; i<citations.length; i++) {
+				output.push((i+1)+". "+citations[i]+"\r\n");
+			}
+			return output.join("");
+		} else if(format == "rtf") {
+			var output = ["{\\rtf \n{\\*\\listtable{\\list\\listtemplateid1\\listhybrid{\\listlevel"+
+				"\\levelnfc0\\levelnfcn0\\leveljc0\\leveljcn0\\levelfollow0\\levelstartat1"+
+				"\\levelspace360\\levelindent0{\\*\\levelmarker \\{decimal\\}.}{\\leveltext"+
+				"\\leveltemplateid1\\'02\\'00.;}{\\levelnumbers\\'01;}\\fi-360\\li720\\lin720 }"+
+				"{\\listname ;}\\listid1}}\n{\\*\\listoverridetable{\\listoverride\\listid1"+
+				"\\listoverridecount0\\ls1}}\n\\tx720\\li720\\fi-480\\ls1\\ilvl0\n"];
+			for(var i=0; i<citations.length; i++) {
+				output.push("{\\listtext "+(i+1)+".	}"+citations[i]+"\\\n");
+			}
+			output.push("}");
+			return output.join("");
+		} else {
+			throw "Unimplemented bibliography format "+format;
+		}
+	} else {
+		if(format == "html") {
+			return citations.join("<br />");
+		} else if(format == "text") {
+			return citations.join("\r\n");
+		} else if(format == "rtf") {
+			return "<\\rtf \n"+citations.join("\\\n")+"\n}";
+		}
+	}
+}
+
+/**
+ * Makes a formatted bibliography
+ * @param {Zotero.Style} style The style
+ * @param {Zotero.Item[]} items An array of items
+ */
 Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
 	cslEngine.setOutputFormat(format);
 	var bib = cslEngine.makeBibliography();
+	if(!bib) return false;
 	
 	if(format == "html") {
 		var html = bib[0].bibstart+bib[1].join("")+bib[0].bibend;
diff --git a/chrome/content/zotero/xpcom/translation/browser_firefox.js b/chrome/content/zotero/xpcom/translation/browser_firefox.js
@@ -324,6 +324,9 @@ Zotero.Translate.IO.Read.prototype = {
 	},
 	
 	"_initRDF":function() {
+		// call Zotero.wait() to do UI repaints
+		Zotero.wait();
+		
 		// get URI
 		var IOService = Components.classes['@mozilla.org/network/io-service;1']
 						.getService(Components.interfaces.nsIIOService);