From 4cfb146b1a54819105ef989f8a238e5422b8a8d4 Mon Sep 17 00:00:00 2001 From: Tobie Langel Date: Tue, 15 Mar 2016 09:39:43 +0100 Subject: [PATCH 1/3] Expand W3C dom refs. --- refs/biblio.json | 42 +++++ refs/w3c.json | 450 ++++++++++++++++++++++++++--------------------- 2 files changed, 294 insertions(+), 198 deletions(-) diff --git a/refs/biblio.json b/refs/biblio.json index aaf7f027c..bb8de402c 100644 --- a/refs/biblio.json +++ b/refs/biblio.json @@ -543,6 +543,48 @@ "DOM4": { "aliasOf": "dom" }, + "DOM4-20101007": { + "aliasOf": "dom-20101007" + }, + "DOM4-20110531": { + "aliasOf": "dom-20110531" + }, + "DOM4-20110915": { + "aliasOf": "dom-20110915" + }, + "DOM4-20120105": { + "aliasOf": "dom-20120105" + }, + "DOM4-20120405": { + "aliasOf": "dom-20120405" + }, + "DOM4-20121206": { + "aliasOf": "dom-20121206" + }, + "DOM4-20131107": { + "aliasOf": "dom-20131107" + }, + "DOM4-20140204": { + "aliasOf": "dom-20140204" + }, + "DOM4-20140508": { + "aliasOf": "dom-20140508" + }, + "DOM4-20140710": { + "aliasOf": "dom-20140710" + }, + "DOM4-20150428": { + "aliasOf": "dom-20150428" + }, + "DOM4-20150618": { + "aliasOf": "dom-20150618" + }, + "DOM4-20151006": { + "aliasOf": "dom-20151006" + }, + "DOM4-20151119": { + "aliasOf": "dom-20151119" + }, "DOMEvents": { "aliasOf": "DOM-Level-3-Events" }, diff --git a/refs/w3c.json b/refs/w3c.json index 536f3ae98..fcb9b6325 100644 --- a/refs/w3c.json +++ b/refs/w3c.json @@ -20400,7 +20400,95 @@ }, "edDraft": "http://dvcs.w3.org/hg/dap/raw-file/tip/discovery-api/Overview.html" }, - "dom": { + "dom-20101007": { + "authors": [ + "Anne van Kesteren" + ], + "title": "Web DOM Core", + "status": "WD", + "publisher": "W3C", + "rawDate": "2010-10-07", + "href": "http://www.w3.org/TR/2010/WD-domcore-20101007/", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20110531": { + "authors": [ + "Anne van Kesteren", + "Ms2ger" + ], + "title": "DOM Core", + "status": "WD", + "publisher": "W3C", + "rawDate": "2011-05-31", + "href": "http://www.w3.org/TR/2011/WD-domcore-20110531/", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20110915": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger" + ], + "title": "DOM4", + "status": "WD", + "publisher": "W3C", + "rawDate": "2011-09-15", + "href": "http://www.w3.org/TR/2011/WD-dom-20110915/", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20120105": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger" + ], + "title": "DOM4", + "status": "WD", + "publisher": "W3C", + "rawDate": "2012-01-05", + "href": "http://www.w3.org/TR/2012/WD-dom-20120105/", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20120405": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger" + ], + "title": "DOM4", + "status": "WD", + "publisher": "W3C", + "rawDate": "2012-04-05", + "href": "http://www.w3.org/TR/2012/WD-dom-20120405/", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20121206": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Lachlan Hunt", + "Ms2ger" + ], + "href": "http://www.w3.org/TR/2012/WD-dom-20121206/", + "title": "DOM4", + "rawDate": "2012-12-06", + "status": "WD", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/2008/webapps/" + ] + }, + "dom-20131107": { "authors": [ "Anne van Kesteren", "Aryeh Gregor", @@ -20408,209 +20496,133 @@ "Alex Russell", "Robin Berjon" ], - "href": "http://www.w3.org/TR/dom/", + "href": "http://www.w3.org/TR/2013/WD-dom-20131107/", "title": "W3C DOM4", - "status": "REC", + "rawDate": "2013-11-07", + "status": "WD", "publisher": "W3C", "deliveredBy": [ "http://www.w3.org/html/wg/" + ] + }, + "dom-20140204": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" ], - "versions": { - "20101007": { - "status": "WD", - "rawDate": "2010-10-07", - "href": "http://www.w3.org/TR/2010/WD-domcore-20101007/", - "source": "./data/w3c-specs.txt" - }, - "20110531": { - "status": "WD", - "rawDate": "2011-05-31", - "href": "http://www.w3.org/TR/2011/WD-domcore-20110531/", - "source": "./data/w3c-specs.txt" - }, - "20110915": { - "status": "WD", - "rawDate": "2011-09-15", - "href": "http://www.w3.org/TR/2011/WD-dom-20110915/", - "source": "./data/w3c-specs.txt" - }, - "20120105": { - "status": "WD", - "rawDate": "2012-01-05", - "href": "http://www.w3.org/TR/2012/WD-dom-20120105/", - "source": "./data/w3c-specs.txt" - }, - "20120405": { - "status": "WD", - "rawDate": "2012-04-05", - "href": "http://www.w3.org/TR/2012/WD-dom-20120405/", - "source": "./data/w3c-specs.txt" - }, - "20121206": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Lachlan Hunt", - "Ms2ger" - ], - "href": "http://www.w3.org/TR/2012/WD-dom-20121206/", - "title": "DOM4", - "rawDate": "2012-12-06", - "status": "WD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/2008/webapps/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20131107": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2013/WD-dom-20131107/", - "title": "W3C DOM4", - "rawDate": "2013-11-07", - "status": "WD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20140204": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2014/WD-dom-20140204/", - "title": "W3C DOM4", - "rawDate": "2014-02-04", - "status": "LCWD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20140508": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2014/CR-dom-20140508/", - "title": "W3C DOM4", - "rawDate": "2014-05-08", - "status": "CR", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20140710": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2014/WD-dom-20140710/", - "title": "W3C DOM4", - "rawDate": "2014-07-10", - "status": "LCWD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20150428": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2015/WD-dom-20150428/", - "title": "W3C DOM4", - "rawDate": "2015-04-28", - "status": "LCWD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20150618": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2015/WD-dom-20150618/", - "title": "W3C DOM4", - "rawDate": "2015-06-18", - "status": "LCWD", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20151006": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2015/PR-dom-20151006/", - "title": "W3C DOM4", - "rawDate": "2015-10-06", - "status": "PR", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - }, - "20151119": { - "authors": [ - "Anne van Kesteren", - "Aryeh Gregor", - "Ms2ger", - "Alex Russell", - "Robin Berjon" - ], - "href": "http://www.w3.org/TR/2015/REC-dom-20151119/", - "title": "W3C DOM4", - "rawDate": "2015-11-19", - "status": "REC", - "publisher": "W3C", - "deliveredBy": [ - "http://www.w3.org/html/wg/" - ], - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf" - } - }, + "href": "http://www.w3.org/TR/2014/WD-dom-20140204/", + "title": "W3C DOM4", + "rawDate": "2014-02-04", + "status": "LCWD", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20140508": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2014/CR-dom-20140508/", + "title": "W3C DOM4", + "rawDate": "2014-05-08", + "status": "CR", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20140710": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2014/WD-dom-20140710/", + "title": "W3C DOM4", + "rawDate": "2014-07-10", + "status": "LCWD", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20150428": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2015/WD-dom-20150428/", + "title": "W3C DOM4", + "rawDate": "2015-04-28", + "status": "LCWD", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20150618": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2015/WD-dom-20150618/", + "title": "W3C DOM4", + "rawDate": "2015-06-18", + "status": "LCWD", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20151006": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2015/PR-dom-20151006/", + "title": "W3C DOM4", + "rawDate": "2015-10-06", + "status": "PR", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] + }, + "dom-20151119": { + "authors": [ + "Anne van Kesteren", + "Aryeh Gregor", + "Ms2ger", + "Alex Russell", + "Robin Berjon" + ], + "href": "http://www.w3.org/TR/2015/REC-dom-20151119/", + "title": "W3C DOM4", "rawDate": "2015-11-19", - "source": "http://www.w3.org/2002/01/tr-automation/tr.rdf", - "edDraft": "https://w3c.github.io/dom/" + "status": "REC", + "publisher": "W3C", + "deliveredBy": [ + "http://www.w3.org/html/wg/" + ] }, "dom-iop": { "aliasOf": "scxml-dom-iop" @@ -20618,6 +20630,48 @@ "domcore": { "aliasOf": "dom" }, + "domcore-20101007": { + "aliasOf": "dom-20101007" + }, + "domcore-20110531": { + "aliasOf": "dom-20110531" + }, + "domcore-20110915": { + "aliasOf": "dom-20110915" + }, + "domcore-20120105": { + "aliasOf": "dom-20120105" + }, + "domcore-20120405": { + "aliasOf": "dom-20120405" + }, + "domcore-20121206": { + "aliasOf": "dom-20121206" + }, + "domcore-20131107": { + "aliasOf": "dom-20131107" + }, + "domcore-20140204": { + "aliasOf": "dom-20140204" + }, + "domcore-20140508": { + "aliasOf": "dom-20140508" + }, + "domcore-20140710": { + "aliasOf": "dom-20140710" + }, + "domcore-20150428": { + "aliasOf": "dom-20150428" + }, + "domcore-20150618": { + "aliasOf": "dom-20150618" + }, + "domcore-20151006": { + "aliasOf": "dom-20151006" + }, + "domcore-20151119": { + "aliasOf": "dom-20151119" + }, "dpub-aam-1.0": { "authors": [ "Richard Schwerdtfeger" From b636dda93122312f44dad7ecbdeba40dd11d0b82 Mon Sep 17 00:00:00 2001 From: Tobie Langel Date: Tue, 15 Mar 2016 10:05:58 +0100 Subject: [PATCH 2/3] Fix W3C script to: 1) avoid overwriting existing specs, 2) handle aliasing to other files. --- scripts/rdf.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/rdf.js b/scripts/rdf.js index c76172d57..5218e2dd2 100755 --- a/scripts/rdf.js +++ b/scripts/rdf.js @@ -166,7 +166,7 @@ request({ delete curr.date; delete curr.trURL; delete curr.shortName; - } else { + } else if (!bibref.get(k)[k]) { var clone = _cloneJSON(ref); clone.href = clone.trURL; delete clone.trURL; @@ -175,6 +175,10 @@ request({ } }); + output = output.filter(function(ref) { + return current[ref.shortName]; + }); + // Fill in missing previous versions output.forEach(function(ref) { var cur = current[ref.shortName]; @@ -204,7 +208,10 @@ request({ Object.keys(aliases).forEach(function(k) { var aliasShortname = aliases[k]; var alias = current[aliasShortname]; - if (!alias) throw new Error("Missing data for spec " + aliasShortname); + if (!alias) { + if (bibref.get(aliasShortname)[aliasShortname]) return; + else throw new Error("Missing data for spec " + aliasShortname); + } var obj = { aliasOf: aliasShortname }; while (alias.aliasOf) { aliasShortname = alias.aliasOf; From d2c850ad074990de8e48f7d08820ebd21f416219 Mon Sep 17 00:00:00 2001 From: Tobie Langel Date: Tue, 15 Mar 2016 10:07:24 +0100 Subject: [PATCH 3/3] Make DOM point to the WHATWG version. --- refs/whatwg.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/refs/whatwg.json b/refs/whatwg.json index 4a149c3d2..17666cf16 100644 --- a/refs/whatwg.json +++ b/refs/whatwg.json @@ -40,6 +40,16 @@ "status": "Living Standard", "source": "https://resources.whatwg.org/biblio.json" }, + "DOM": { + "authors": [ + "Anne van Kesteren" + ], + "href": "https://dom.spec.whatwg.org/", + "title": "DOM Standard", + "publisher": "WHATWG", + "status": "Living Standard", + "source": "https://resources.whatwg.org/biblio.json" + }, "DOMPARSING": { "authors": [ "Ms2ger" @@ -163,14 +173,7 @@ "aliasOf": "DIFFERENCES" }, "WHATWG-DOM": { - "authors": [ - "Anne van Kesteren" - ], - "href": "https://dom.spec.whatwg.org/", - "title": "DOM Standard", - "publisher": "WHATWG", - "status": "Living Standard", - "source": "https://resources.whatwg.org/biblio.json" + "aliasOf": "DOM" }, "WHATWG-DOMPARSING": { "aliasOf": "DOMPARSING"