Ticket #439: 25-alternative-font-markup.patch

chrome/content/zotero/xpcom/csl.js

@@ -2 +2 @@
     ***** BEGIN LICENSE BLOCK *****
     
     Copyright (c) 2006  Center for History and New Media
-                        George Mason University, Fairfax, Virginia, USA
+                       George Mason University, Fairfax, Virginia, USA
                         http://chnm.gmu.edu
     
     Licensed under the Educational Community License, Version 1.0 (the "License");
@@ -814 +814 @@
                                                 success = true;
                                         }
                                 }
-                                
                                 if(success) {
-                                        formattedString.concat(newString, child);
+                                        // see comment to Zotero.CSL.FormattedString.prototype.concat, below
+                                        formattedString.concat(newString, child, true);
                                         dataAppended = true;
                                 }
                         } else if(child.@macro.length()) {
@@ -2673 +2673 @@
 }
 
 Zotero.CSL.FormattedString._punctuation = "!.,?:";
+Zotero.CSL.FormattedString._faces = ['normal','italic'];
 
 /*
  * attaches another formatted string to the end of the current one
+ * 
+ * parameter textTagFlag limits alternative font markup parsing to strings
+ * as passed immediately from a <text variable="XX"/> tag.  Strings
+ * passed by <text macro=XX"/> are not parsed.
  */
-Zotero.CSL.FormattedString.prototype.concat = function(formattedString, element) {
+Zotero.CSL.FormattedString.prototype.concat = function(formattedString, element, textTagFlag) {
         default xml namespace = "http://purl.org/net/xbiblio/csl"; with({});
         
         if(!formattedString || !formattedString.string) {
@@ -2699 +2704 @@
                         suffix = element.@suffix.toString();
                         element.@suffix = [];
                 }
-                haveAppended = this.append(formattedString.string, element, false, true);
+                // apply alternative typeface, rm->it, it->rm according
+                // to paired asterisks.  double asterisk is escape.
+                //
+                var string = formattedString.string.replace(/\*\*/g, "[[ASTERISK]]");
+                // save the effort in most cases
+                if ( textTagFlag && string.match(/.*\*[^*]+\*.*/)) {
+                        var start = 0;
+                        if ( element && element['@font-style'] == 'italic' ) {
+                                var start = 1;
+                        }
+                        if (string.indexOf("*") == 0 ) {
+                                var start = ( start + 1 ) % 2;
+                        }
+                        var split = string.split(/\*([^*]+)\*/);
+                        for (i=0; i<split.length; i++) {
+                                pos = ( start + i ) % 2;
+                                element['@font-style'] = Zotero.CSL.FormattedString._faces[pos];
+                                this.append(split[i].replace(/\[\[ASTERISK\]\]/g, "*"), element, false, true);
+                                if (i == 0) {
+                                        element.@prefix = [];
+                                }
+                        }
+                        haveAppended = true;
+                } else {
+                        haveAppended = this.append(formattedString.string, element, false, true);
+                }
         }
         
         // if there's close punctuation to append, that also counts
@@ -2731 +2761 @@
         if(typeof(string) != "string") {
                 string = string.toString();
         }
-        
+
         // get prefix
         var prefix = "";
         if(element && element.@prefix.length()) {