From f6da7bb8d41355147030152c46bc03fefc4812f3 Mon Sep 17 00:00:00 2001 From: Philipp Zumstein Date: Thu, 23 Jun 2016 00:38:48 +0200 Subject: [PATCH 01/14] Change const to var in utilities In order to make these mappings also available when the script is used with `loadSubScript` from outside we have to use `var` instead of `const`, `let`. See https://github.com/aurimasv/z2csl/issues/6 --- chrome/content/zotero/xpcom/utilities.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index 18fae8927..565f5e9bc 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -31,7 +31,7 @@ * Note that this is the reverse of the text variable map, since all mappings should be one to one * and it makes the code cleaner */ -const CSL_NAMES_MAPPINGS = { +var CSL_NAMES_MAPPINGS = { "author":"author", "editor":"editor", "bookAuthor":"container-author", @@ -47,7 +47,7 @@ const CSL_NAMES_MAPPINGS = { /* * Mappings for text variables */ -const CSL_TEXT_MAPPINGS = { +var CSL_TEXT_MAPPINGS = { "title":["title"], "container-title":["publicationTitle", "reporter", "code"], /* reporter and code should move to SQL mapping tables */ "collection-title":["seriesTitle", "series"], @@ -91,7 +91,7 @@ const CSL_TEXT_MAPPINGS = { /* * Mappings for dates */ -const CSL_DATE_MAPPINGS = { +var CSL_DATE_MAPPINGS = { "issued":"date", "accessed":"accessDate", "submitted":"filingDate" @@ -101,7 +101,7 @@ const CSL_DATE_MAPPINGS = { * Mappings for types * Also see itemFromCSLJSON */ -const CSL_TYPE_MAPPINGS = { +var CSL_TYPE_MAPPINGS = { 'book':"book", 'bookSection':'chapter', 'journalArticle':"article-journal", From bd6dec352c6d769442b025146a9683464a5d58df Mon Sep 17 00:00:00 2001 From: retorquere Date: Mon, 27 Jun 2016 15:54:50 +0200 Subject: [PATCH 02/14] Sort items for translator In response to https://forums.zotero.org/discussion/60375?page=1#Item_6 --- chrome/content/zotero/xpcom/translation/translate_item.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js index 5eed86e2e..94caa8a3b 100644 --- a/chrome/content/zotero/xpcom/translation/translate_item.js +++ b/chrome/content/zotero/xpcom/translation/translate_item.js @@ -754,6 +754,7 @@ Zotero.Translate.ItemGetter = function() { Zotero.Translate.ItemGetter.prototype = { "setItems":function(items) { this._itemsLeft = items; + this._itemsLeft.sort(function(a, b) { return a.id - b.id; }); this.numItems = this._itemsLeft.length; }, @@ -784,6 +785,7 @@ Zotero.Translate.ItemGetter.prototype = { } } + this._itemsLeft.sort(function(a, b) { return a.id - b.id; }); this.numItems = this._itemsLeft.length; }, @@ -794,6 +796,7 @@ Zotero.Translate.ItemGetter.prototype = { this._collectionsLeft = Zotero.getCollections(null, true, libraryID); } + this._itemsLeft.sort(function(a, b) { return a.id - b.id; }); this.numItems = this._itemsLeft.length; }, @@ -999,4 +1002,4 @@ Zotero.Translate.ItemGetter.prototype = { return obj; } } -Zotero.Translate.ItemGetter.prototype.__defineGetter__("numItemsRemaining", function() { return this._itemsLeft.length }); \ No newline at end of file +Zotero.Translate.ItemGetter.prototype.__defineGetter__("numItemsRemaining", function() { return this._itemsLeft.length }); From 6a7e3d02597cc2be00c86e2a47d92e963c617af3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 16 Jul 2016 17:15:17 -0400 Subject: [PATCH 03/14] Add "is (less|greater) than" to num pages/volumes search conditions https://forums.zotero.org/discussion/60897/ --- chrome/content/zotero/xpcom/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/search.js b/chrome/content/zotero/xpcom/search.js index 7eb233364..2255a32e9 100644 --- a/chrome/content/zotero/xpcom/search.js +++ b/chrome/content/zotero/xpcom/search.js @@ -2209,7 +2209,7 @@ Zotero.SearchConditions = new function(){ }, table: 'itemData', field: 'value', - aliases: ['pages', 'section', 'seriesNumber','issue'], + aliases: ['pages', 'numPages', 'numberOfVolumes', 'section', 'seriesNumber','issue'], template: true // mark for special handling }, From 01aec4134c9bcfc669616b62372da84987b4b10e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 22 Jul 2016 00:18:02 -0400 Subject: [PATCH 04/14] Update submodules --- resource/schema/repotime.txt | 2 +- styles | 2 +- translators | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index bab190bf1..e40d8c2c3 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2016-05-29 23:00:00 +2016-06-22 00:00:00 diff --git a/styles b/styles index b354fbecb..9f54d7c5b 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit b354fbecbd9dc17fe56989bcd6a376f9fb826772 +Subproject commit 9f54d7c5bf2e75cd0e4be4554c83bde1f8193fce diff --git a/translators b/translators index 7ea3b45ac..971861c01 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit 7ea3b45ac1765b6c784d95e864b4795fe194896a +Subproject commit 971861c01a33d2af8e0910c4a9230078c64922f1 From 254da12e1289aeb5170ed6e2effa10969d8f0640 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 23 Jul 2016 16:21:43 -0400 Subject: [PATCH 05/14] Hide unsigned add-on warning in Standalone There's no need for Zotero Standalone add-ons to be signed by Mozilla. Currently only hides when the Extensions pane is first loaded, so if the user switches to Appearance or Plugins and switches back, the warning reappears --- .../content/zotero/standalone/standalone.js | 50 +++++++++++++++++-- .../content/zotero/standalone/standalone.xul | 2 +- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js index 0b1c6b5e6..05eb51b45 100644 --- a/chrome/content/zotero/standalone/standalone.js +++ b/chrome/content/zotero/standalone/standalone.js @@ -106,18 +106,62 @@ const ZoteroStandalone = new function() { } /** - * Opens a URL in the basic viewer + * Opens a URL in the basic viewer, and optionally run a callback on load + * + * @param {String} uri + * @param {Function} [onLoad] - Function to run once URI is loaded; passed the loaded document */ - this.openInViewer = function(uri) { + this.openInViewer = function(uri, onLoad) { var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("zotero:basicViewer"); if(win) { win.loadURI(uri); } else { - window.openDialog("chrome://zotero/content/standalone/basicViewer.xul", + win = window.openDialog("chrome://zotero/content/standalone/basicViewer.xul", "basicViewer", "chrome,resizable,centerscreen,menubar,scrollbars", uri); } + if (onLoad) { + let browser + let func = function () { + win.removeEventListener("load", func); + browser = win.document.documentElement.getElementsByTagName('browser')[0]; + browser.addEventListener("pageshow", innerFunc); + }; + let innerFunc = function () { + browser.removeEventListener("pageshow", innerFunc); + onLoad(browser.contentDocument); + }; + win.addEventListener("load", func); + + } + } + + this.updateAddonsPane = function (doc) { + // Hide unsigned add-on verification warnings + // + // This only works for the initial load of the window. If the user switches to Appearance + // or Plugins and then back to Extensions, the warnings will appear again. A better way to + // disable this might be discoverable by studying + // https://dxr.mozilla.org/mozilla-central/source/toolkit/mozapps/extensions/content/extensions.js + var addonList = doc.getElementById('addon-list'); + setTimeout(function () { + for (let i = 0; i < addonList.itemCount; i++) { + let richListItem = addonList.getItemAtIndex(i); + let container = doc.getAnonymousElementByAttribute( + richListItem, 'anonid', 'warning-container' + ); + if (container) { + let link = doc.getAnonymousElementByAttribute( + richListItem, 'anonid', 'warning-link' + ); + if (link && link.href.indexOf('unsigned-addons') != -1) { + richListItem.removeAttribute('notification'); + container.hidden = true; + } + } + } + }); } /** diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul index 15c7db22b..7d17a281d 100644 --- a/chrome/content/zotero/standalone/standalone.xul +++ b/chrome/content/zotero/standalone/standalone.xul @@ -168,7 +168,7 @@ command="cmd_zotero_rtfScan"/> + oncommand="ZoteroStandalone.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/> From ed9e6558710ae2bb81bbb24573b805166e18d6d9 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 23 Jul 2016 16:27:44 -0400 Subject: [PATCH 06/14] Pass correct event name to removeEventListener in support function --- test/content/support.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/content/support.js b/test/content/support.js index 2f3ebf714..8d7deb078 100644 --- a/test/content/support.js +++ b/test/content/support.js @@ -12,7 +12,7 @@ var zoteroObjectKeyRe = /^[23456789ABCDEFGHIJKMNPQRSTUVWXZ]{8}$/; // based on Zo function waitForDOMEvent(target, event, capture) { var deferred = Q.defer(); var func = function(ev) { - target.removeEventListener("event", func, capture); + target.removeEventListener(event, func, capture); deferred.resolve(ev); } target.addEventListener(event, func, capture); From 3dfb73fabaf4791f0f74cf17c5facdf2a3907367 Mon Sep 17 00:00:00 2001 From: Philipp Zumstein Date: Sun, 31 Jul 2016 20:46:03 +0200 Subject: [PATCH 07/14] Allow ZU.doGet to have requestHeaders (#1062) This is mainly for translators which have to work with content negotiation, e.g. ORCID API or API calls of ISBN agencies. --- chrome/content/zotero/xpcom/http.js | 12 ++++++++++-- chrome/content/zotero/xpcom/utilities_translate.js | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js index 7c1e21253..4dfc05fbf 100644 --- a/chrome/content/zotero/xpcom/http.js +++ b/chrome/content/zotero/xpcom/http.js @@ -201,11 +201,12 @@ Zotero.HTTP = new function() { * @param {Function} onDone Callback to be executed upon request completion * @param {String} responseCharset Character set to force on the response * @param {Zotero.CookieSandbox} [cookieSandbox] Cookie sandbox object + * @param {Object} requestHeaders HTTP headers to include with request * @return {XMLHttpRequest} The XMLHttpRequest object if the request was sent, or * false if the browser is offline * @deprecated Use {@link Zotero.HTTP.promise} */ - this.doGet = function(url, onDone, responseCharset, cookieSandbox) { + this.doGet = function(url, onDone, responseCharset, cookieSandbox, requestHeaders) { if (url instanceof Components.interfaces.nsIURI) { // Don't display password in console var disp = this.getDisplayURI(url); @@ -235,6 +236,13 @@ Zotero.HTTP = new function() { if (responseCharset) { channel.contentCharset = responseCharset; } + + // Set request headers + if (requestHeaders) { + for (var header in requestHeaders) { + xmlhttp.setRequestHeader(header, requestHeaders[header]); + } + } // Don't cache GET requests xmlhttp.channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE; @@ -997,4 +1005,4 @@ Zotero.HTTP = new function() { "defaultView":new Zotero.HTTP.Window(url) }); } -} \ No newline at end of file +} diff --git a/chrome/content/zotero/xpcom/utilities_translate.js b/chrome/content/zotero/xpcom/utilities_translate.js index 626cfcb8e..86f03f6e1 100644 --- a/chrome/content/zotero/xpcom/utilities_translate.js +++ b/chrome/content/zotero/xpcom/utilities_translate.js @@ -298,9 +298,10 @@ Zotero.Utilities.Translate.prototype.processDocuments = function(urls, processor * @param {Function} processor Callback to be executed for each document loaded * @param {Function} done Callback to be executed after all documents have been loaded * @param {String} responseCharset Character set to force on the response +* @param {Object} requestHeaders HTTP headers to include with request * @return {Boolean} True if the request was sent, or false if the browser is offline */ -Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, responseCharset) { +Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, responseCharset, requestHeaders) { var callAgain = false, me = this, translate = this._translate; @@ -332,7 +333,7 @@ Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, res } catch(e) { translate.complete(false, e); } - }, responseCharset, this._translate.cookieSandbox); + }, responseCharset, this._translate.cookieSandbox, requestHeaders); } /** From 19a4c649034d3c115495473e72875d390a799249 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 02:03:29 -0400 Subject: [PATCH 08/14] Update citeproc-js to 1.1.113 --- chrome/content/zotero/xpcom/citeproc.js | 438 +++++++++++++++--------- 1 file changed, 276 insertions(+), 162 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index a3b0f2e67..953939168 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -22,19 +22,8 @@ * this program. If not, see or * respectively. */ -if (!Array.indexOf) { - Array.prototype.indexOf = function (obj) { - var i, len; - for (i = 0, len = this.length; i < len; i += 1) { - if (this[i] === obj) { - return i; - } - } - return -1; - }; -} var CSL = { - PROCESSOR_VERSION: "1.1.101", + PROCESSOR_VERSION: "1.1.113", CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_BOTTOM: 2, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, @@ -206,6 +195,38 @@ var CSL = { this["container-phrase"] = {}; this["title-phrase"] = {}; }, + parseLocator: function(item) { + if (this.opt.development_extensions.locator_date_and_revision) { + if (item.locator) { + item.locator = "" + item.locator; + var idx = item.locator.indexOf("|"); + if (idx > -1) { + var raw_locator = item.locator; + item.locator = raw_locator.slice(0, idx); + raw_locator = raw_locator.slice(idx + 1); + m = raw_locator.match(/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*/); + if (m) { + item["locator-date"] = this.fun.dateparser.parseDateToObject(m[1]); + raw_locator = raw_locator.slice(m[1].length); + } + item["locator-extra"] = raw_locator.replace(/^\s+/, "").replace(/\s+$/, ""); + } + } + } + if (item.locator) { + item.locator = ("" + item.locator).replace(/\s+$/, ''); + } + return item; + }, + normalizeLocaleStr: function(str) { + if (!str) return; + var lst = str.split('-'); + lst[0] = lst[0].toLowerCase(); + if (lst[1]) { + lst[1] = lst[1].toUpperCase(); + } + return lst.join("-"); + }, parseNoteFieldHacks: function(Item, validFieldsForType) { if ("string" !== typeof Item.note) return; var elems = []; @@ -372,8 +393,7 @@ var CSL = { "number-of-pages", "number-of-volumes", "volume", - "citation-number", - "year-suffix" + "citation-number" ], DATE_VARIABLES: [ "locator-date", @@ -398,11 +418,11 @@ var CSL = { }; var stack = []; str = str.replace(/()/g, "$1 $2$3"); - var m1match = str.match(/((?: \"| \'|\" |\'[-.,;\?:]|\[|\]|\(|\)||<\/span>|<\/?(?:i|sc|b)>))/g); + var m1match = str.match(/((?: \"| \'|\" |\'[-.,;\?:]|\[|\]|\(|\)||<\/span>|<\/?(?:i|sc|b|sub|sup)>))/g); if (!m1match) { return [str]; } - var m1split = str.split(/(?: \"| \'|\" |\'[-.,;\?:]|\[|\]|\(|\)||<\/span>|<\/?(?:i|sc|b)>)/g); + var m1split = str.split(/(?: \"| \'|\" |\'[-.,;\?:]|\[|\]|\(|\)||<\/span>|<\/?(?:i|sc|b|sub|sup)>)/g); outer: for (var i=0,ilen=m1match.length; i -1) { + this.opt.sort_sep = "@"; + } else { + this.opt.sort_sep = "|"; + } this.localeConfigure(langspec); function makeRegExp(lst) { var lst = lst.slice(); @@ -3133,6 +3162,25 @@ CSL.Engine.prototype.getCitationLabel = function (Item) { break; } } + if (!label) { + if (Item.title) { + var skipWords = this.locale[this.opt.lang].opts["skip-words"]; + var lst = Item.title.split(/\s+/); + for (var i = lst.length - 1; i > -1; i--) { + if (skipWords.indexOf(lst[i]) > -1) { + lst = lst.slice(0, i).concat(lst.slice(i + 1)); + } + } + var str = lst.join(''); + str = str.slice(0, params[0].authors[0]); + if (str.length > 1) { + str = str.slice(0, 1).toUpperCase() + str.slice(1).toLowerCase(); + } else if (str.length === 1) { + str = str.toUpperCase(); + } + label = str; + } + } var year = "0000"; if (Item.issued) { if (Item.issued.year) { @@ -4616,27 +4664,10 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, if (Item.id) { this.transform.loadAbbreviation("default", "hereinafter", Item.id); } - if (this.opt.development_extensions.locator_date_and_revision) { - if (item.locator) { - item.locator = "" + item.locator; - var idx = item.locator.indexOf("|"); - if (idx > -1) { - var raw_locator = item.locator; - item.locator = raw_locator.slice(0, idx); - raw_locator = raw_locator.slice(idx + 1); - m = raw_locator.match(/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*/); - if (m) { - item["locator-date"] = this.fun.dateparser.parseDateToObject(m[1]); - raw_locator = raw_locator.slice(m[1].length); - } - item["locator-extra"] = raw_locator.replace(/^\s+/, "").replace(/\s+$/, ""); - } - } + item = CSL.parseLocator.call(this, item); + if (this.opt.development_extensions.static_statute_locator) { + this.remapSectionVariable([[Item,item]]); } - if (item.locator) { - item.locator = ("" + item.locator).replace(/\s+$/, ''); - } - this.remapSectionVariable([[Item,item]]); if (this.opt.development_extensions.locator_label_parse) { if (item.locator && ["bill","gazette","legislation","regulation","treaty"].indexOf(Item.type) === -1 && (!item.label || item.label === 'page')) { m = CSL.LOCATOR_LABELS_REGEXP.exec(item.locator); @@ -5006,6 +5037,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, obj = []; obj.push(mycitation.properties.index); obj.push(this.process_CitationCluster.call(this, mycitation.sortedItems, mycitation.citationID)); + obj.push(mycitation.citationID); ret.push(obj); } this.tmp.taintedItemIDs = {}; @@ -5016,6 +5048,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, obj = []; obj.push(citationsPre.length); obj.push(this.process_CitationCluster.call(this, sortedItems, citation.citationID)); + obj.push(citation.citationID); ret.push(obj); ret.sort(function (a, b) { if (a[0] > b[0]) { @@ -5064,7 +5097,9 @@ CSL.Engine.prototype.makeCitationCluster = function (rawList) { newitem = [Item, item]; inputList.push(newitem); } - this.remapSectionVariable(inputList); + if (this.opt.development_extensions.static_statute_locator) { + this.remapSectionVariable(inputList); + } if (inputList && inputList.length > 1 && this.citation_sort.tokens.length > 0) { len = inputList.length; for (pos = 0; pos < len; pos += 1) { @@ -5225,6 +5260,7 @@ CSL.getCitationCluster = function (inputList, citationID) { for (pos = 0; pos < len; pos += 1) { Item = inputList[pos][0]; item = inputList[pos][1]; + item = CSL.parseLocator.call(this, item); last_collapsed = this.tmp.have_collapsed; params = {}; this.tmp.shadow_numbers = {}; @@ -5995,11 +6031,6 @@ CSL.localeResolve = function (langstr, defaultLocale) { }; CSL.Engine.prototype.localeConfigure = function (langspec, beShy) { var localexml; - if (this.opt.development_extensions.normalize_lang_keys_to_lowercase) { - langspec.best = langspec.best.toLowerCase(); - langspec.bare = langspec.bare.toLowerCase(); - langspec.base = langspec.base.toLowerCase(); - } if (beShy && this.locale[langspec.best]) { return; } @@ -6535,7 +6566,7 @@ CSL.Node["date-part"] = { myform = "numeric"; } } - value = CSL.Util.Dates[this.strings.name][myform](state, value, gender, ("accessed" === date_variable)); + value = CSL.Util.Dates[this.strings.name][myform](state, value, gender, this.default_locale); if ("month" === this.strings.name) { if (state.tmp.strip_periods) { value = value.replace(/\./g, ""); @@ -7246,7 +7277,7 @@ CSL.Node.key = { if (state.sys.normalizeUnicode) { keystring = state.sys.normalizeUnicode(keystring); } - keystring = keystring.split(" ").join("A"); + keystring = keystring ? (keystring.split(" ").join(state.opt.sort_sep) + state.opt.sort_sep) : ""; if ("" === keystring) { keystring = undefined; } @@ -8619,34 +8650,57 @@ CSL.NameOutput.prototype._renderInstitutionName = function (v, name, slot, j) { tertiary = this.fixupInstitution(tertiary, v, j); } } + var n = { + l: { + pri: false, + sec: false, + ter: false + }, + s: { + pri: false, + sec: false, + ter: false + } + }; + if (primary) { + n.l.pri = primary["long"]; + n.s.pri = primary["short"].length ? primary["short"] : primary["long"]; + } + if (secondary) { + n.l.sec = secondary["long"]; + n.s.sec = secondary["short"].length ? secondary["short"] : secondary["long"]; + } + if (tertiary) { + n.l.ter = tertiary["long"]; + n.s.ter = tertiary["short"].length ? tertiary["short"] : tertiary["long"]; + } switch (this.institution.strings["institution-parts"]) { case "short": if (primary["short"].length) { short_style = this._getShortStyle(); - institution = [this._renderOneInstitutionPart(primary["short"], short_style)]; + institution = [this._composeOneInstitutionPart([n.s.pri, n.s.sec, n.s.ter], slot, short_style)]; } else { long_style = this._getLongStyle(primary, v, j); - institution_long = this._composeOneInstitutionPart([primary, secondary, tertiary], slot, long_style); - institution = [institution_long]; + institution = [this._composeOneInstitutionPart([n.l.pri, n.l.sec, n.l.ter], slot, long_style)]; } break; case "short-long": long_style = this._getLongStyle(primary, v, j); short_style = this._getShortStyle(); institution_short = this._renderOneInstitutionPart(primary["short"], short_style); - institution_long = this._composeOneInstitutionPart([primary, secondary, tertiary], slot, long_style); + institution_long = this._composeOneInstitutionPart([n.l.pri, n.l.sec, n.l.ter], slot, long_style); institution = [institution_short, institution_long]; break; case "long-short": long_style = this._getLongStyle(primary, v, j); short_style = this._getShortStyle(); institution_short = this._renderOneInstitutionPart(primary["short"], short_style); - institution_long = this._composeOneInstitutionPart([primary, secondary, tertiary], slot, long_style, true); + institution_long = this._composeOneInstitutionPart([n.l.pri, n.l.sec, n.l.ter], slot, long_style, true); institution = [institution_long, institution_short]; break; default: long_style = this._getLongStyle(primary, v, j); - institution = [this._composeOneInstitutionPart([primary, secondary, tertiary], slot, long_style)]; + institution = [this._composeOneInstitutionPart([n.l.pri, n.l.sec, n.l.ter], slot, long_style)]; break; } return this._join(institution, " "); @@ -8654,13 +8708,13 @@ CSL.NameOutput.prototype._renderInstitutionName = function (v, name, slot, j) { CSL.NameOutput.prototype._composeOneInstitutionPart = function (names, slot, style) { var primary = false, secondary = false, tertiary = false; if (names[0]) { - primary = this._renderOneInstitutionPart(names[0]["long"], style); + primary = this._renderOneInstitutionPart(names[0], style); } if (names[1]) { - secondary = this._renderOneInstitutionPart(names[1]["long"], style); + secondary = this._renderOneInstitutionPart(names[1], style); } if (names[2]) { - tertiary = this._renderOneInstitutionPart(names[2]["long"], style); + tertiary = this._renderOneInstitutionPart(names[2], style); } var institutionblob; if (secondary || tertiary) { @@ -8674,7 +8728,12 @@ CSL.NameOutput.prototype._composeOneInstitutionPart = function (names, slot, sty secondary_tok.strings.prefix = " "; } } + var secondary_outer = new CSL.Token(); + secondary_outer.decorations.push(["@font-style", "normal"]); + secondary_outer.decorations.push(["@font-weight", "normal"]); + this.state.output.openLevel(secondary_outer); this.state.output.append(secondary, secondary_tok); + this.state.output.closeLevel(); tertiary_tok = CSL.Util.cloneToken(style); if (slot.tertiary) { tertiary_tok.strings.prefix = this.state.opt.citeAffixes.institutions[slot.tertiary].prefix; @@ -8683,8 +8742,13 @@ CSL.NameOutput.prototype._composeOneInstitutionPart = function (names, slot, sty tertiary_tok.strings.prefix = " "; } } + var tertiary_outer = new CSL.Token(); + tertiary_outer.decorations.push(["@font-style", "normal"]); + tertiary_outer.decorations.push(["@font-weight", "normal"]); + this.state.output.openLevel(tertiary_outer); this.state.output.append(tertiary, tertiary_tok); this.state.output.closeLevel(); + this.state.output.closeLevel(); institutionblob = this.state.output.pop(); } else { institutionblob = primary; @@ -8866,11 +8930,11 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i, j) { } else if (this.state.tmp.sort_key_flag) { if (this.state.opt["demote-non-dropping-particle"] === "never") { first = this._join([non_dropping_particle, family, dropping_particle], " "); - merged = this._join([first, given], "0"); + merged = this._join([first, given], this.state.opt.sort_sep); blob = this._join([merged, suffix], " "); } else { second = this._join([given, dropping_particle, non_dropping_particle], " "); - merged = this._join([family, second], "0"); + merged = this._join([family, second], this.state.opt.sort_sep); blob = this._join([merged, suffix], " "); } } else if (this.name.strings["name-as-sort-order"] === "all" || (this.name.strings["name-as-sort-order"] === "first" && i === 0 && (j === 0 || "undefined" === typeof j))) { @@ -8920,7 +8984,7 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i, j) { var space = " "; if (this.name.strings["initialize-with"] && this.name.strings["initialize-with"].match(/[\u00a0\ufeff]/) - && ["fr", "ru"].indexOf(this.state.opt["default-locale"][0].slice(0, 2)) > -1) { + && ["fr", "ru", "cs"].indexOf(this.state.opt["default-locale"][0].slice(0, 2)) > -1) { space = "\u00a0" } if (has_hyphenated_non_dropping_particle) { @@ -9511,7 +9575,7 @@ CSL.castLabel = function (state, node, term, plural, mode) { if (state.tmp.group_context.tip.label_form && label_form !== "static") { label_form = state.tmp.group_context.tip.label_form; } - var ret = state.getTerm(term, label_form, plural, false, mode); + var ret = state.getTerm(term, label_form, plural, false, mode, node.default_locale); if (state.tmp.strip_periods) { ret = ret.replace(/\./g, ""); } else { @@ -9949,7 +10013,7 @@ CSL.Node.text = { if (this.strings.plural) { plural = this.strings.plural; } - if ("citation-number" === this.variables_real[0] || "citation-label" === this.variables_real[0]) { + if ("citation-number" === this.variables_real[0] || "year-suffix" === this.variables_real[0] || "citation-label" === this.variables_real[0]) { if (this.variables_real[0] === "citation-number") { if (state.build.root === "citation") { state.opt.update_mode = CSL.NUMERIC; @@ -9994,9 +10058,43 @@ CSL.Node.text = { } }; this.execs.push(func); - } else if (this.variables_real[0] === "citation-label") { + } else if (this.variables_real[0] === "year-suffix") { + state.opt.has_year_suffix = true; + if (state[state.tmp.area].opt.collapse === "year-suffix-ranged") { + this.range_prefix = state.getTerm("citation-range-delimiter"); + } + this.successor_prefix = state[state.build.area].opt.layout_delimiter; + if (state[state.tmp.area].opt["year-suffix-delimiter"]) { + this.successor_prefix = state[state.build.area].opt["year-suffix-delimiter"]; + } + func = function (state, Item) { + if (state.registry.registry[Item.id] && state.registry.registry[Item.id].disambig.year_suffix !== false && !state.tmp.just_looking) { + num = parseInt(state.registry.registry[Item.id].disambig.year_suffix, 10); + if (state[state.tmp.area].opt.cite_group_delimiter) { + this.successor_prefix = state[state.tmp.area].opt.cite_group_delimiter; + } + number = new CSL.NumericBlob(false, num, this, Item.id); + formatter = new CSL.Util.Suffixator(CSL.SUFFIX_CHARS); + number.setFormatter(formatter); + state.output.append(number, "literal"); + firstoutput = false; + for (var i=0,ilen=state.tmp.group_context.mystack.length; i -1) { - if (this.variables_real[0] === "year-suffix") { - state.opt.has_year_suffix = true; - if (state[state.tmp.area].opt.collapse === "year-suffix-ranged") { - this.range_prefix = state.getTerm("citation-range-delimiter"); - } - this.successor_prefix = state[state.build.area].opt.layout_delimiter; - if (state[state.tmp.area].opt["year-suffix-delimiter"]) { - this.successor_prefix = state[state.build.area].opt["year-suffix-delimiter"]; - } - } + } else if (["page", "page-first", "chapter-number", "collection-number", "edition", "issue", "number", "number-of-pages", "number-of-volumes", "volume"].indexOf(this.variables_real[0]) > -1) { func = function(state, Item) { state.processNumber(this, Item, this.variables[0], Item.type); CSL.Util.outputNumericField(state, this.variables[0], Item.id); @@ -10382,21 +10470,39 @@ CSL.Attributes["@variable"] = function (state, arg) { if (["authority", "committee"].indexOf(variable) > -1 && "string" === typeof Item[variable] && "names" === this.name) { - var creatorParent = { - literal:Item[variable], - multi:{ - _key:{} - } - }; - if (Item.multi && Item.multi._keys && Item.multi._keys[variable]) { + var creatorParents = []; + var isValid = true; + var rawNames = Item[variable].split(/\s*;\s*/); + var rawMultiNames = {}; + if (Item.multi && Item.multi._keys[variable]) { for (var langTag in Item.multi._keys[variable]) { + rawMultiNames[langTag] = Item.multi._keys[variable][langTag].split(/\s*;\s*/); + if (rawMultiNames[langTag].length !== rawNames.length) { + isValid = false; + break; + } + } + } + if (!isValid) { + rawNames = [Item[variable]]; + rawMultiNames = Item.multi._keys[variable]; + } + for (var j = 0, jlen = rawNames.length; j < jlen; j++) { + var creatorParent = { + literal:rawNames[j], + multi:{ + _key:{} + } + }; + for (var langTag in rawMultiNames) { var creatorChild = { - literal:Item.multi._keys[variable][langTag] + literal:rawMultiNames[langTag][j] } creatorParent.multi._key[langTag] = creatorChild; } + rawNames[j] = creatorParent; } - Item[variable] = [creatorParent]; + Item[variable] = rawNames; } if (this.strings.form === "short" && !Item[variable]) { if (variable === "title") { @@ -11140,28 +11246,32 @@ CSL.Attributes["@year-range-format"] = function (state, arg) { state.opt["year-range-format"] = arg; }; CSL.Attributes["@default-locale"] = function (state, arg) { - var lst, len, pos, m, ret; - m = arg.match(/-x-(sort|translit|translat)-/g); - if (m) { - for (pos = 0, len = m.length; pos < len; pos += 1) { - m[pos] = m[pos].replace(/^-x-/, "").replace(/-$/, ""); + if (this.name === 'style') { + var lst, len, pos, m, ret; + m = arg.match(/-x-(sort|translit|translat)-/g); + if (m) { + for (pos = 0, len = m.length; pos < len; pos += 1) { + m[pos] = m[pos].replace(/^-x-/, "").replace(/-$/, ""); + } } - } - lst = arg.split(/-x-(?:sort|translit|translat)-/); - ret = [lst[0]]; - for (pos = 1, len = lst.length; pos < len; pos += 1) { - ret.push(m[pos - 1]); - ret.push(lst[pos]); - } - lst = ret.slice(); - len = lst.length; - for (pos = 1; pos < len; pos += 2) { - state.opt[("locale-" + lst[pos])].push(lst[(pos + 1)].replace(/^\s*/g, "").replace(/\s*$/g, "")); - } - if (lst.length) { - state.opt["default-locale"] = lst.slice(0, 1); - } else { - state.opt["default-locale"] = ["en"]; + lst = arg.split(/-x-(?:sort|translit|translat)-/); + ret = [lst[0]]; + for (pos = 1, len = lst.length; pos < len; pos += 1) { + ret.push(m[pos - 1]); + ret.push(lst[pos]); + } + lst = ret.slice(); + len = lst.length; + for (pos = 1; pos < len; pos += 2) { + state.opt[("locale-" + lst[pos])].push(lst[(pos + 1)].replace(/^\s*/g, "").replace(/\s*$/g, "")); + } + if (lst.length) { + state.opt["default-locale"] = lst.slice(0, 1); + } else { + state.opt["default-locale"] = ["en"]; + } + } else if (arg === "true") { + this.default_locale = true; } }; CSL.Attributes["@default-locale-sort"] = function (state, arg) { @@ -12081,14 +12191,19 @@ CSL.Transform = function (state) { secondary_tok.strings.prefix = " "; } for (var i = secondary_tok.decorations.length - 1; i > -1; i += -1) { - if (['@quotes/true','@font-style/italic','@font-style/oblique','@font-weight/bold'].indexOf(secondary_tok.decorations[i].join('/')) > -1) { + if (['@quotes/true', '@font-style/italic', '@font-style/oblique', '@font-weight/bold'].indexOf(secondary_tok.decorations[i].join('/')) > -1) { secondary_tok.decorations = secondary_tok.decorations.slice(0, i).concat(secondary_tok.decorations.slice(i + 1)) } } if (secondary_locale !== "en" && secondary_tok.strings["text-case"] === "title") { secondary_tok.strings["text-case"] = "passthrough"; } + var secondary_outer = new CSL.Token(); + secondary_outer.decorations.push(["@font-style", "normal"]); + secondary_outer.decorations.push(["@font-weight", "normal"]); + state.output.openLevel(secondary_outer); state.output.append(secondary, secondary_tok); + state.output.closeLevel(); var blob_obj = state.output.current.value(); var blobs_pos = state.output.current.value().blobs.length - 1; if (state.parallel.use_parallels) { @@ -12104,14 +12219,19 @@ CSL.Transform = function (state) { tertiary_tok.strings.prefix = " "; } for (var i = tertiary_tok.decorations.length - 1; i > -1; i += -1) { - if (['@quotes/true','@font-style/italic','@font-style/oblique','@font-weight/bold'].indexOf(tertiary_tok.decorations[i].join('/')) > -1) { + if (['@quotes/true', '@font-style/italic', '@font-style/oblique', '@font-weight/bold'].indexOf(tertiary_tok.decorations[i].join('/')) > -1) { tertiary_tok.decorations = tertiary_tok.decorations.slice(0, i).concat(tertiary_tok.decorations.slice(i + 1)) } } if (tertiary_locale !== "en" && tertiary_tok.strings["text-case"] === "title") { tertiary_tok.strings["text-case"] = "passthrough"; } + var tertiary_outer = new CSL.Token(); + tertiary_outer.decorations.push(["@font-style", "normal"]); + tertiary_outer.decorations.push(["@font-weight", "normal"]); + state.output.openLevel(tertiary_outer); state.output.append(tertiary, tertiary_tok); + state.output.closeLevel(); var blob_obj = state.output.current.value(); var blobs_pos = state.output.current.value().blobs.length - 1; if (state.parallel.use_parallels) { @@ -12319,15 +12439,17 @@ CSL.NumericBlob.prototype.checkLast = function (last) { }; CSL.Util.fixDateNode = function (parent, pos, node) { var form, variable, datexml, subnode, partname, attr, val, prefix, suffix, children, key, subchildren, kkey, display, cslid; + var lingo = this.cslXml.getAttributeValue(node, "lingo"); + var default_locale = this.cslXml.getAttributeValue(node, "default-locale"); this.build.date_key = true; form = this.cslXml.getAttributeValue(node, "form"); var lingo; - if ("accessed" === this.cslXml.getAttributeValue(node, "variable")) { + if (default_locale) { lingo = this.opt["default-locale"][0]; } else { lingo = this.cslXml.getAttributeValue(node, "lingo"); } - if (!this.getDate(form)) { + if (!this.getDate(form, default_locale)) { return parent; } var dateparts = this.cslXml.getAttributeValue(node, "date-parts"); @@ -12336,12 +12458,13 @@ CSL.Util.fixDateNode = function (parent, pos, node) { suffix = this.cslXml.getAttributeValue(node, "suffix"); display = this.cslXml.getAttributeValue(node, "display"); cslid = this.cslXml.getAttributeValue(node, "cslid"); - datexml = this.cslXml.nodeCopy(this.getDate(form, ("accessed" === variable))); + datexml = this.cslXml.nodeCopy(this.getDate(form, default_locale)); this.cslXml.setAttribute(datexml, 'lingo', this.opt.lang); this.cslXml.setAttribute(datexml, 'form', form); this.cslXml.setAttribute(datexml, 'date-parts', dateparts); this.cslXml.setAttribute(datexml, "cslid", cslid); this.cslXml.setAttribute(datexml, 'variable', variable); + this.cslXml.setAttribute(datexml, 'default-locale', default_locale); if (prefix) { this.cslXml.setAttribute(datexml, "prefix", prefix); } @@ -12351,27 +12474,35 @@ CSL.Util.fixDateNode = function (parent, pos, node) { if (display) { this.cslXml.setAttribute(datexml, "display", display); } + children = this.cslXml.children(datexml); + for (key in children) { + subnode = children[key]; + if ("date-part" === this.cslXml.nodename(subnode)) { + partname = this.cslXml.getAttributeValue(subnode, "name"); + if (default_locale) { + this.cslXml.setAttributeOnNodeIdentifiedByNameAttribute(datexml, "date-part", partname, "@default-locale", "true"); + } + } + } children = this.cslXml.children(node); for (key in children) { - subnode = children[key]; - if ("date-part" === this.cslXml.nodename(subnode)) { - partname = this.cslXml.getAttributeValue(subnode, "name"); - subchildren = this.cslXml.attributes(subnode); - for (attr in subchildren) { - if (subchildren.hasOwnProperty(attr)) { - if ("@name" === attr) { - continue; - } - if (lingo && lingo !== this.opt.lang) { - if (["@suffix", "@prefix", "@form"].indexOf(attr) > -1) { - continue; - } - } - val = subchildren[attr]; - this.cslXml.setAttributeOnNodeIdentifiedByNameAttribute(datexml, "date-part", partname, attr, val); + subnode = children[key]; + if ("date-part" === this.cslXml.nodename(subnode)) { + partname = this.cslXml.getAttributeValue(subnode, "name"); + subchildren = this.cslXml.attributes(subnode); + for (attr in subchildren) { + if ("@name" === attr) { + continue; + } + if (lingo && lingo !== this.opt.lang) { + if (["@suffix", "@prefix", "@form"].indexOf(attr) > -1) { + continue; } } + val = subchildren[attr]; + this.cslXml.setAttributeOnNodeIdentifiedByNameAttribute(datexml, "date-part", partname, attr, val); } + } } if ("year" === this.cslXml.getAttributeValue(node, "date-parts")) { this.cslXml.deleteNodeByNameAttribute(datexml, 'month'); @@ -13431,8 +13562,6 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type) function setStyling(values) { var masterNode = CSL.Util.cloneToken(node); var masterStyling = new CSL.Token(); - masterStyling.range_prefix = node.range_prefix; - masterStyling.successor_prefix = node.successor_prefix; if (!me.tmp.just_looking) { for (var j=masterNode.decorations.length-1;j>-1;j--) { if (masterNode.decorations[j][0] === "@quotes") { @@ -13475,9 +13604,10 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type) } function fixupRangeDelimiter(variable, val, rangeDelimiter, isNumeric) { var isPage = checkPage(variable, val); - if (rangeDelimiter === "-") { + var hasTerm = checkTerm(variable, val); + if (hasTerm && rangeDelimiter === "-") { if (isNumeric) { - if (isPage || (variable === "locator" && val.label === "art.") || ["issue", "volume", "edition", "number"].indexOf(variable) > -1) { + if (isPage || ["locator", "issue", "volume", "edition", "number"].indexOf(variable) > -1) { rangeDelimiter = me.getTerm("page-range-delimiter") if (!rangeDelimiter) { rangeDelimiter = "\u2013"; @@ -13495,7 +13625,14 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type) } function checkPage(variable, val) { return variable === "page" - || (variable === "locator" && (["p.", "para.", "ch."].indexOf(val.label) > -1)); + || (variable === "locator" && (["p."].indexOf(val.label) > -1)); + } + function checkTerm(variable, val) { + var ret = true; + if (variable === "locator") { + ret = !!me.getTerm(CSL.STATUTE_SUBDIV_STRINGS[val.label]); + } + return ret; } function manglePageNumbers(values, i, currentInfo) { if (i<1) return; @@ -13597,12 +13734,6 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type) var localeType = this.opt["cite-lang-prefs"][languageRole][0]; val = this.transform.getTextSubField(ItemObject, variable, "locale-"+localeType, true); val = val.name; - } else if (variable === "year-suffix" && this.registry.registry[ItemObject.id]) { - this.opt.has_year_suffix = true; - val = parseInt(this.registry.registry[ItemObject.id].disambig.year_suffix, 10); - if (!val && val !== 0) { - val = ""; - } } else { val = ItemObject[variable]; } @@ -13638,7 +13769,6 @@ CSL.Util.outputNumericField = function(state, varname, itemID) { state.output.openLevel(state.tmp.shadow_numbers[varname].masterStyling); var nums = state.tmp.shadow_numbers[varname].values; var masterLabel = nums.length ? nums[0].label : null; - var masterStyling = state.tmp.shadow_numbers[varname].masterStyling; var labelForm = state.tmp.shadow_numbers[varname].labelForm; var embeddedLabelForm; if (labelForm) { @@ -13682,23 +13812,7 @@ CSL.Util.outputNumericField = function(state, varname, itemID) { } } if (num.collapsible) { - if (varname === "year-suffix") { - numStyling.range_prefix = masterStyling.range_prefix; - numStyling.successor_prefix = masterStyling.successor_prefix; - } var blob = new CSL.NumericBlob(num.particle, parseInt(num.value, 10), numStyling, itemID); - if (varname === "year-suffix") { - state.tmp.has_done_year_suffix = true; - var formatter = new CSL.Util.Suffixator(CSL.SUFFIX_CHARS); - blob.setFormatter(formatter); - if (state[state.tmp.area].opt.cite_group_delimiter) { - blob.successor_prefix = state[state.tmp.area].opt.cite_group_delimiter; - } else if (state[state.tmp.area].opt["year-suffix-delimiter"]) { - blob.successor_prefix = state[state.tmp.area].opt["year-suffix-delimiter"]; - } else { - blob.successor_prefix = state[state.tmp.area].opt.layout_delimiter; - } - } if ("undefined" === typeof blob.gender) { blob.gender = state.locale[state.opt.lang]["noun-genders"][varname]; } @@ -14289,12 +14403,12 @@ CSL.Output.Formatters.title = function (state, string) { return word; } function splitme (str, rex) { - var res, seps = str.match(rex); - if (seps) { + var m = str.match(rex); + if (m) { var splits = str.split(rex); res = [splits[0]]; - for (var i=0; i Date: Tue, 26 Jul 2016 17:56:37 -0400 Subject: [PATCH 09/14] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index df96ce18e..b36326d73 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.10.SOURCE + 4.0.29.11.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index f63007e6b..efddafa54 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.10.SOURCE' + VERSION: '4.0.29.11.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index 958ab0b91..07f157913 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.10.SOURCE + 4.0.29.11.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From 7daafd4ceb91bf8eae006d73c450f3aeaadca0af Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 02:22:22 -0400 Subject: [PATCH 10/14] Update submodules --- resource/schema/renamed-styles.json | 2 -- resource/schema/repotime.txt | 2 +- translators | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resource/schema/renamed-styles.json b/resource/schema/renamed-styles.json index 3bc614f82..a67c9bcbe 100644 --- a/resource/schema/renamed-styles.json +++ b/resource/schema/renamed-styles.json @@ -281,7 +281,6 @@ "harvard3": "harvard-swinburne-university-of-technology", "head-and-neck-oncology": "biomed-central", "healthcare-the-journal-of-delivery-science-and-innovation": "healthcare", - "heart-and-lung-the-journal-of-critical-care": "heart-and-lung-the-journal-of-acute-and-critical-care", "hwr-berlin": "hochschule-fur-wirtschaft-und-recht-berlin", "ices-jms": "ices-journal-of-marine-science", "ieee-w-url": "ieee-with-url", @@ -443,7 +442,6 @@ "taylor-and-francis-reference-style-f": "taylor-and-francis-chicago-f", "technology-operation-management": "springer-humanities-author-date", "the-academy-of-management-review": "academy-of-management-review", - "the-american-journal-of-emergency-medicine": "american-journal-of-emergency-medicine", "tort-law-review": "the-tort-law-review", "transition-studies-review": "springer-basic-author-date", "trends-journal": "trends-journals", diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index e40d8c2c3..e611d5090 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2016-06-22 00:00:00 +2016-07-29 23:30:00 diff --git a/translators b/translators index 971861c01..4f435f5fc 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit 971861c01a33d2af8e0910c4a9230078c64922f1 +Subproject commit 4f435f5fc59b82f3b607c9d97292dceea8f063d0 From 85523e61a780cb2c54f4bdabbfaa60cb14244f6b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 02:48:22 -0400 Subject: [PATCH 11/14] Use unbranded builds for 'release' and 'beta' on Travis --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68d991213..61b9205c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ language: cpp compiler: - gcc env: - - FX_CHANNEL="" - - FX_CHANNEL="-esr" - - FX_CHANNEL="-beta" + - FX_CHANNEL="release" + - FX_CHANNEL="beta" + - FX_CHANNEL="esr" matrix: fast_finish: true allow_failures: @@ -13,7 +13,14 @@ matrix: notifications: email: false install: - - wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US" + # Use unbranded builds for 'release' and 'beta' + - test $FX_CHANNEL != "esr" \ + && TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`" \ + && FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`" \ + && wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/$FN" + # Use official build for 'esr' + - test $FX_CHANNEL == "esr" + && wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US" - tar xf tarball before_script: - export DISPLAY=:99.0 From d4f3f1a194787f612088ae7d3f0c6f637adda136 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 02:52:39 -0400 Subject: [PATCH 12/14] Travis debugging --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61b9205c8..7aca12840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ notifications: email: false install: # Use unbranded builds for 'release' and 'beta' - - test $FX_CHANNEL != "esr" \ - && TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`" \ - && FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`" \ + - test $FX_CHANNEL != "esr" + && TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`" + && FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`" && wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/$FN" # Use official build for 'esr' - test $FX_CHANNEL == "esr" From 1db721031c1d8e712d651e2c4f4044bcbbde0758 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 02:57:45 -0400 Subject: [PATCH 13/14] Travis debugging --- .travis.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7aca12840..81520a45c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,15 @@ notifications: email: false install: # Use unbranded builds for 'release' and 'beta' - - test $FX_CHANNEL != "esr" - && TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`" - && FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`" - && wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/$FN" + - if [ $FX_CHANNEL != "esr" ]; then + TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`"; + FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`"; + wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/$FN"; + fi # Use official build for 'esr' - - test $FX_CHANNEL == "esr" - && wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US" + - if [ $FX_CHANNEL == "esr" ]; then + wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US"; + fi - tar xf tarball before_script: - export DISPLAY=:99.0 From a0571a9a17a00625fda5a74dde1d0acdb599a64a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 Aug 2016 03:01:22 -0400 Subject: [PATCH 14/14] Fix ESR build on Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 81520a45c..b576791c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: fi # Use official build for 'esr' - if [ $FX_CHANNEL == "esr" ]; then - wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US"; + wget -O tarball "https://download.mozilla.org/?product=firefox-${FX_CHANNEL}-latest&os=linux64&lang=en-US"; fi - tar xf tarball before_script: