Merge changes I5eda5705,I1d2008b1
* changes:
Update version number
Add lwc to annotation helper
diff --git a/Changes b/Changes
index f1e0353..1018287 100755
--- a/Changes
+++ b/Changes
@@ -6,6 +6,7 @@
- Improve VC creation tool by supporting "blurring".
- Make tutorial queries localizable for different default corpora.
- Update dependencies.
+ - Add lwc annotations.
0.24 2017-11-22
- Added support for relation visualization.
diff --git a/dev/js/src/hint/foundries/corenlp.js b/dev/js/src/hint/foundries/corenlp.js
index b3c931c..d4279b7 100644
--- a/dev/js/src/hint/foundries/corenlp.js
+++ b/dev/js/src/hint/foundries/corenlp.js
@@ -1,4 +1,5 @@
-define(["hint/foundries","hint/foundries/stts"], function (ah, sttsArray) {
+define(["hint/foundries","hint/foundries/stts","hint/foundries/negranodes","hint/foundries/negraedges"],
+ function (ah, sttsArray, negraNodesArray, negraEdgesArray) {
var namedEntities = [
["I-LOC", "I-LOC ", "Location"],
["I-MISC", "I-MISC ", "Miscellaneous"],
@@ -6,86 +7,6 @@
["I-PER", "I-PER ", "Person"]
];
- // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/negra-corpus.html
- // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/knoten.html
- var negraNodes = [
- ["AA", "AA", "superlative phrase with 'am'"],
- ["AP","AP", "adjektive phrase"],
- ["AVP","AVP", "adverbial phrase"],
- ["CAP","CAP", "coordinated adjektive phrase"],
- ["CAVP","CAVP", "coordinated adverbial phrase"],
- ["CAC","CAC", "coordinated adposition"],
- ["CCP","CCP", "coordinated complementiser"],
- ["CH","CH", "chunk"],
- ["CNP","CNP", "coordinated noun phrase"],
- ["CO","CO", "coordination"],
- ["CPP","CPP", "coordinated adpositional phrase"],
- ["CS","CS", "coordinated sentence"],
- ["CVP","CVP", "coordinated verb phrase (non-finite)"],
- ["CVZ","CVZ", "coordinated zu-marked infinitive"],
- ["DL","DL", "discourse level constituent"],
- ["ISU","ISU", "idiosyncratis unit"],
- ["MPN","MPN", "multi-word proper noun"],
- ["MTA","MTA", "multi-token adjective"],
- ["NM","NM", "multi-token number"],
- ["NP","NP", "noun phrase"],
- ["PP","PP", "adpositional phrase"],
- ["QL","QL", "quasi-languag"],
- ["ROOT","ROOT", "root node"],
- ["S","S", "sentence"],
- ["VP","VP", "verb phrase (non-finite)"],
- ["VZ","VZ", "zu-marked infinitive"]
- ];
-
- // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/kanten.html
- var negraEdges = [
- ["AC","AC","adpositional case marker"],
- ["ADC","ADC","adjective component"],
- ["AMS","AMS","measure argument of adj"],
- ["APP","APP","apposition"],
- ["AVC","AVC","adverbial phrase component"],
- ["CC","CC","comparative complement"],
- ["CD","CD","coordinating conjunction"],
- ["CJ","CJ","conjunct"],
- ["CM","CM","comparative concjunction"],
- ["CP","CP","complementizer"],
- ["DA","DA","dative"],
- ["DH","DH","discourse-level head"],
- ["DM","DM","discourse marker"],
- ["GL","GL","prenominal genitive"],
- ["GR","GR","postnominal genitive"],
- ["HD","HD","head"],
- ["JU","JU","junctor"],
- ["MC","MC","comitative"],
- ["MI","MI","instrumental"],
- ["ML","ML","locative"],
- ["MNR","MNR","postnominal modifier"],
- ["MO","MO","modifier"],
- ["MR","MR","rhetorical modifier"],
- ["MW","MW","way (directional modifier)"],
- ["NG","NG","negation"],
- ["NK","NK","noun kernel modifier"],
- ["NMC","NMC","numerical component"],
- ["OA","OA","accusative object"],
- ["OA2","OA2","second accusative object"],
- ["OC","OC","clausal object"],
- ["OG","OG","genitive object"],
- ["PD","PD","predicate"],
- ["PG","PG","pseudo-genitive"],
- ["PH","PH","placeholder"],
- ["PM","PM","morphological particle"],
- ["PNC","PNC","proper noun component"],
- ["RC","RC","relative clause"],
- ["RE","RE","repeated element"],
- ["RS","RS","reported speech"],
- ["SB","SB","subject"],
- ["SBP","SBP","passivised subject (PP)"],
- ["SP","SP","subject or predicate"],
- ["SVP","SVP","separable verb prefix"],
- ["UC","UC","(idiosyncratic) unit component"],
- ["VO","VO","vocative"]
- ];
-
ah["-"].push(
["CoreNLP", "corenlp/", "Constituency, Named Entities, Part-of-Speech"]
);
@@ -102,9 +23,9 @@
ah["corenlp/ne_dewac_175m_600="] = namedEntities;
ah["corenlp/ne_hgc_175m_600="] = namedEntities;
ah["corenlp/p="] = sttsArray;
- ah["corenlp/c="] = negraNodes;
+ ah["corenlp/c="] = negraNodesArray;
- for (var i in negraNodes) {
- ah["corenlp/c=" + negraNodes[i][0] + '-'] = negraEdges;
+ for (var i in negraNodesArray) {
+ ah["corenlp/c=" + negraNodesArray[i][0] + '-'] = negraEdgesArray;
};
});
diff --git a/dev/js/src/hint/foundries/lwc.js b/dev/js/src/hint/foundries/lwc.js
new file mode 100644
index 0000000..3457ef7
--- /dev/null
+++ b/dev/js/src/hint/foundries/lwc.js
@@ -0,0 +1,11 @@
+define(["hint/foundries","hint/foundries/negraedges"], function (ah, negraEdgesArray) {
+ ah["-"].push(
+ ["LWC", "lwc/", "Dependency"]
+ );
+
+ ah["lwc/"] = [
+ ["Dependency", "d="]
+ ];
+
+ ah["lwc/d="] = negraEdgesArray;
+});
diff --git a/dev/js/src/hint/foundries/negraedges.js b/dev/js/src/hint/foundries/negraedges.js
new file mode 100644
index 0000000..7450ad0
--- /dev/null
+++ b/dev/js/src/hint/foundries/negraedges.js
@@ -0,0 +1,51 @@
+define(function () {
+ // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/negra-corpus.html
+ // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/kanten.html
+ return [
+ ["AC","AC","adpositional case marker"],
+ ["ADC","ADC","adjective component"],
+ ["AMS","AMS","measure argument of adj"],
+ ["APP","APP","apposition"],
+ ["AVC","AVC","adverbial phrase component"],
+ ["CC","CC","comparative complement"],
+ ["CD","CD","coordinating conjunction"],
+ ["CJ","CJ","conjunct"],
+ ["CM","CM","comparative concjunction"],
+ ["CP","CP","complementizer"],
+ ["DA","DA","dative"],
+ ["DH","DH","discourse-level head"],
+ ["DM","DM","discourse marker"],
+ ["GL","GL","prenominal genitive"],
+ ["GR","GR","postnominal genitive"],
+ ["HD","HD","head"],
+ ["JU","JU","junctor"],
+ ["MC","MC","comitative"],
+ ["MI","MI","instrumental"],
+ ["ML","ML","locative"],
+ ["MNR","MNR","postnominal modifier"],
+ ["MO","MO","modifier"],
+ ["MR","MR","rhetorical modifier"],
+ ["MW","MW","way (directional modifier)"],
+ ["NG","NG","negation"],
+ ["NK","NK","noun kernel modifier"],
+ ["NMC","NMC","numerical component"],
+ ["OA","OA","accusative object"],
+ ["OA2","OA2","second accusative object"],
+ ["OC","OC","clausal object"],
+ ["OG","OG","genitive object"],
+ ["PD","PD","predicate"],
+ ["PG","PG","pseudo-genitive"],
+ ["PH","PH","placeholder"],
+ ["PM","PM","morphological particle"],
+ ["PNC","PNC","proper noun component"],
+ ["RC","RC","relative clause"],
+ ["RE","RE","repeated element"],
+ ["RS","RS","reported speech"],
+ ["SB","SB","subject"],
+ ["SBP","SBP","passivised subject (PP)"],
+ ["SP","SP","subject or predicate"],
+ ["SVP","SVP","separable verb prefix"],
+ ["UC","UC","(idiosyncratic) unit component"],
+ ["VO","VO","vocative"]
+ ];
+});
diff --git a/dev/js/src/hint/foundries/negranodes.js b/dev/js/src/hint/foundries/negranodes.js
new file mode 100644
index 0000000..b6be581
--- /dev/null
+++ b/dev/js/src/hint/foundries/negranodes.js
@@ -0,0 +1,32 @@
+define(function () {
+ // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/negra-corpus.html
+ // http://www.coli.uni-saarland.de/projects/sfb378/negra-corpus/knoten.html
+ return [
+ ["AA", "AA", "superlative phrase with 'am'"],
+ ["AP","AP", "adjektive phrase"],
+ ["AVP","AVP", "adverbial phrase"],
+ ["CAP","CAP", "coordinated adjektive phrase"],
+ ["CAVP","CAVP", "coordinated adverbial phrase"],
+ ["CAC","CAC", "coordinated adposition"],
+ ["CCP","CCP", "coordinated complementiser"],
+ ["CH","CH", "chunk"],
+ ["CNP","CNP", "coordinated noun phrase"],
+ ["CO","CO", "coordination"],
+ ["CPP","CPP", "coordinated adpositional phrase"],
+ ["CS","CS", "coordinated sentence"],
+ ["CVP","CVP", "coordinated verb phrase (non-finite)"],
+ ["CVZ","CVZ", "coordinated zu-marked infinitive"],
+ ["DL","DL", "discourse level constituent"],
+ ["ISU","ISU", "idiosyncratis unit"],
+ ["MPN","MPN", "multi-word proper noun"],
+ ["MTA","MTA", "multi-token adjective"],
+ ["NM","NM", "multi-token number"],
+ ["NP","NP", "noun phrase"],
+ ["PP","PP", "adpositional phrase"],
+ ["QL","QL", "quasi-languag"],
+ ["ROOT","ROOT", "root node"],
+ ["S","S", "sentence"],
+ ["VP","VP", "verb phrase (non-finite)"],
+ ["VZ","VZ", "zu-marked infinitive"]
+ ]
+});
diff --git a/package.json b/package.json
index db70bb7..e32b541 100755
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "Kalamar",
"description": "Mojolicious-based Frontend for KorAP",
"license" : "BSD-2-Clause",
- "version": "0.25.1",
+ "version": "0.25.2",
"repository" : {
"type": "git",
"url": "https://github.com/KorAP/Kalamar.git"