Ticket #1278: 06-joins.patch

chrome/content/zotero/xpcom/csl.js

@@ -269 +269 @@
                         if(Zotero.CSL._textCharRegexp.test(prefix[prefix.length-1])) prefix += " ";
                         
                         citationString.append(prefix);
+                        citationString.has_prefix = true;
                 }
                 
                 this._processElements(citationItem.item, context.layout, citationString,
                         context, citationItem, ignore);
                 
                 // add suffix
+                var hasSuffixPunctuation;
                 if(citationItem.suffix) {
                         var suffix = citationItem.suffix;
+                        var sfx = suffix.replace(/^\s*/g, "").replace(/\s*$/g, "");
+                        var pnct = Zotero.CSL.FormattedString._punctuation;
+                        if (pnct.indexOf(sfx[sfx.length-1]) != -1) {
+                            hasSuffixPunctuation = true;
+                        } else {
+                            hasSuffixPunctuation = false;
+                        }
                         
                         // add space to suffix if last char is alphanumeric
                         if(Zotero.CSL._textCharRegexp.test(suffix[0])) suffix = " "+suffix;
@@ -285 +294 @@
                 }
                 
                 string.concat(citationString);
+                string.hasSuffixPunctuation = hasSuffixPunctuation;
         }
         
         var returnString = string.clone();