Skip to content

Commit bc4dc2d

Browse files
honnibalhonnibal
committed
Merge branch 'develop' of https://github.com/explosion/spaCy into develop
2 parents 717e812 + 51ce346 commit bc4dc2d

File tree

16 files changed

+408
-315
lines changed

16 files changed

+408
-315
lines changed

‎website/_includes/_mixins.jade

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,23 @@ mixin section(id)
1111
block
1212

1313

14+
//- Accordion (collapsible sections)
15+
title - [string] Section title.
16+
id - [string] Optional section ID for permalinks.
17+
level - [integer] Headline level for section title.
18+
19+
mixin accordion(title, id, level)
20+
section.o-accordion.o-block
21+
+h(level || 4).o-no-block(id=id)
22+
button.o-accordion__button.o-grid.o-grid--vcenter.o-grid--space.js-accordion(aria-expanded="false")=title
23+
svg.o-accordion__icon(width="20" height="20" viewBox="0 0 10 10" aria-hidden="true" focusable="false")
24+
rect.o-accordion__hide(height="8" width="2" y="1" x="4")
25+
rect(height="2" width="8" y="4" x="1")
26+
27+
.o-accordion__content(hidden="")
28+
block
29+
30+
1431
//- Headlines Helper Mixin
1532
level - [integer] 1, 2, 3, 4, or 5
1633

‎website/_includes/_page_models.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ for id in CURRENT_MODELS
5050
+cell
5151
span(data-tpl=id data-tpl-key=field) #[em n/a]
5252

53-
+row(data-tpl=id data-tpl-key="compat-wrapper" style="display: none")
53+
+row(data-tpl=id data-tpl-key="compat-wrapper" hidden="")
5454
+cell
5555
+label Compat #[+help("Latest compatible model version for your spaCy installation").u-color-subtle]
5656
+cell
5757
.o-field.u-float-left
5858
select.o-field__select.u-text-small(data-tpl=id data-tpl-key="compat")
5959
div(data-tpl=id data-tpl-key="compat-versions")  
6060

61-
section(data-tpl=id data-tpl-key="benchmarks" style="display: none")
61+
section(data-tpl=id data-tpl-key="benchmarks" hidden="")
6262
+grid.o-block-small
6363
for keys, label in MODEL_BENCHMARKS
64-
.u-flex-full.u-padding-small(data-tpl=id data-tpl-key=label.toLowerCase() style="display: none")
64+
.u-flex-full.u-padding-small(data-tpl=id data-tpl-key=label.toLowerCase() hidden="")
6565
+table.o-block-small
6666
+row("head")
6767
+head-cell(colspan="2")=(MODEL_META["benchmark_" + label] || label)
6868
for label, field in keys
69-
+row(style="display: none")
69+
+row(hidden="")
7070
+cell.u-nowrap
7171
+label=label
7272
if MODEL_META[field]

‎website/_includes/_scripts.jade

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if IS_PAGE
4141
https://medium.com/dev-channel/es6-modules-in-chrome-canary-m60-ba588dfb8ab7
4242
4343
- ProgressBar = "new ProgressBar('.js-progress');"
44+
- Accordion = "new Accordion('.js-accordion');"
4445
- Changelog = "new Changelog('" + SOCIAL.github + "', 'spacy');"
4546
- NavHighlighter = "new NavHighlighter('data-section', 'data-nav');"
4647
- GitHubEmbed = "new GitHubEmbed('" + SOCIAL.github + "', 'data-gh-embed');"
@@ -57,6 +58,7 @@ if environment == "deploy"
5758
if IS_PAGE
5859
!=NavHighlighter
5960
!=GitHubEmbed
61+
!=Accordion
6062
if HAS_MODELS
6163
!=ModelLoader
6264
if compare_models
@@ -74,6 +76,8 @@ else
7476
!=NavHighlighter
7577
| import GitHubEmbed from '/assets/js/github-embed.js';
7678
!=GitHubEmbed
79+
| import Accordion from '/assets/js/accordion.js';
80+
!=Accordion
7781
if HAS_MODELS
7882
| import { ModelLoader } from '/assets/js/models.js';
7983
!=ModelLoader

‎website/api/_annotation/_dep-labels.jade

Lines changed: 105 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,112 @@
11
//- 💫 DOCS > API > ANNOTATION > DEPENDENCY LABELS
22
3-
+h(3, "dependency-parsing-english") English dependency labels
4-
53
p
6-
| The English dependency labels use the #[+a("http://www.clearnlp.com") ClearNLP]
7-
| #[+a("http://www.mathcs.emory.edu/~choi/doc/clear-dependency-2012.pdf") CLEAR Style].
4+
| This section lists the syntactic dependency labels assigned by
5+
| spaCy's #[+a("/models") models]. The individual labels are
6+
| language-specific and depend on the training corpus.
87

9-
+table(["Label", "Description"])
10-
+dep-row("acomp", "adjectival complement")
11-
+dep-row("advcl", "adverbial clause modifier")
12-
+dep-row("advmod", "adverbial modifier")
13-
+dep-row("agent", "agent")
14-
+dep-row("amod", "adjectival modifier")
15-
+dep-row("appos", "appositional modifier")
16-
+dep-row("attr", "attribute")
17-
+dep-row("aux", "auxiliary")
18-
+dep-row("auxpass", "auxiliary (passive)")
19-
+dep-row("cc", "coordinating conjunction")
20-
+dep-row("ccomp", "clausal complement")
21-
+dep-row("complm", "complementizer")
22-
+dep-row("conj", "conjunct")
23-
+dep-row("cop", "copula")
24-
+dep-row("csubj", "clausal subject")
25-
+dep-row("csubjpass", "clausal subject (passive)")
26-
+dep-row("dep", "unclassified dependent")
27-
+dep-row("det", "determiner")
28-
+dep-row("dobj", "direct object")
29-
+dep-row("expl", "expletive")
30-
+dep-row("hmod", "modifier in hyphenation")
31-
+dep-row("hyph", "hyphen")
32-
+dep-row("infmod", "infinitival modifier")
33-
+dep-row("intj", "interjection")
34-
+dep-row("iobj", "indirect object")
35-
+dep-row("mark", "marker")
36-
+dep-row("meta", "meta modifier")
37-
+dep-row("neg", "negation modifier")
38-
+dep-row("nmod", "modifier of nominal")
39-
+dep-row("nn", "noun compound modifier")
40-
+dep-row("npadvmod", "noun phrase as adverbial modifier")
41-
+dep-row("nsubj", "nominal subject")
42-
+dep-row("nsubjpass", "nominal subject (passive)")
43-
+dep-row("num", "number modifier")
44-
+dep-row("number", "number compound modifier")
45-
+dep-row("oprd", "object predicate")
46-
+dep-row("obj", "object")
47-
+dep-row("obl", "oblique nominal")
48-
+dep-row("parataxis", "parataxis")
49-
+dep-row("partmod", "participal modifier")
50-
+dep-row("pcomp", "complement of preposition")
51-
+dep-row("pobj", "object of preposition")
52-
+dep-row("poss", "possession modifier")
53-
+dep-row("possessive", "possessive modifier")
54-
+dep-row("preconj", "pre-correlative conjunction")
55-
+dep-row("prep", "prepositional modifier")
56-
+dep-row("prt", "particle")
57-
+dep-row("punct", "punctuation")
58-
+dep-row("quantmod", "modifier of quantifier")
59-
+dep-row("rcmod", "relative clause modifier")
60-
+dep-row("root", "root")
61-
+dep-row("xcomp", "open clausal complement")
8+
+accordion("English", "dependency-parsing-english")
9+
p
10+
| The English dependency labels use the
11+
| #[+a("http://www.mathcs.emory.edu/~choi/doc/clear-dependency-2012.pdf") CLEAR Style]
12+
| by #[+a("http://www.clearnlp.com") ClearNLP].
6213

63-
+h(3, "dependency-parsing-german") German dependency labels
14+
+table(["Label", "Description"])
15+
+dep-row("acomp", "adjectival complement")
16+
+dep-row("advcl", "adverbial clause modifier")
17+
+dep-row("advmod", "adverbial modifier")
18+
+dep-row("agent", "agent")
19+
+dep-row("amod", "adjectival modifier")
20+
+dep-row("appos", "appositional modifier")
21+
+dep-row("attr", "attribute")
22+
+dep-row("aux", "auxiliary")
23+
+dep-row("auxpass", "auxiliary (passive)")
24+
+dep-row("cc", "coordinating conjunction")
25+
+dep-row("ccomp", "clausal complement")
26+
+dep-row("complm", "complementizer")
27+
+dep-row("conj", "conjunct")
28+
+dep-row("cop", "copula")
29+
+dep-row("csubj", "clausal subject")
30+
+dep-row("csubjpass", "clausal subject (passive)")
31+
+dep-row("dep", "unclassified dependent")
32+
+dep-row("det", "determiner")
33+
+dep-row("dobj", "direct object")
34+
+dep-row("expl", "expletive")
35+
+dep-row("hmod", "modifier in hyphenation")
36+
+dep-row("hyph", "hyphen")
37+
+dep-row("infmod", "infinitival modifier")
38+
+dep-row("intj", "interjection")
39+
+dep-row("iobj", "indirect object")
40+
+dep-row("mark", "marker")
41+
+dep-row("meta", "meta modifier")
42+
+dep-row("neg", "negation modifier")
43+
+dep-row("nmod", "modifier of nominal")
44+
+dep-row("nn", "noun compound modifier")
45+
+dep-row("npadvmod", "noun phrase as adverbial modifier")
46+
+dep-row("nsubj", "nominal subject")
47+
+dep-row("nsubjpass", "nominal subject (passive)")
48+
+dep-row("num", "number modifier")
49+
+dep-row("number", "number compound modifier")
50+
+dep-row("oprd", "object predicate")
51+
+dep-row("obj", "object")
52+
+dep-row("obl", "oblique nominal")
53+
+dep-row("parataxis", "parataxis")
54+
+dep-row("partmod", "participal modifier")
55+
+dep-row("pcomp", "complement of preposition")
56+
+dep-row("pobj", "object of preposition")
57+
+dep-row("poss", "possession modifier")
58+
+dep-row("possessive", "possessive modifier")
59+
+dep-row("preconj", "pre-correlative conjunction")
60+
+dep-row("prep", "prepositional modifier")
61+
+dep-row("prt", "particle")
62+
+dep-row("punct", "punctuation")
63+
+dep-row("quantmod", "modifier of quantifier")
64+
+dep-row("rcmod", "relative clause modifier")
65+
+dep-row("root", "root")
66+
+dep-row("xcomp", "open clausal complement")
6467

65-
p
66-
| The German dependency labels use the
67-
| #[+a("http://www.ims.uni-stuttgart.de/forschung/ressourcen/korpora/TIGERCorpus/annotation/index.html") TIGER Treebank]
68-
| annotation scheme.
68+
+accordion("German", "dependency-parsing-german")
69+
p
70+
| The German dependency labels use the
71+
| #[+a("http://www.ims.uni-stuttgart.de/forschung/ressourcen/korpora/TIGERCorpus/annotation/index.html") TIGER Treebank]
72+
| annotation scheme.
6973

70-
+table(["Label", "Description"])
71-
+dep-row("ac", "adpositional case marker")
72-
+dep-row("adc", "adjective component")
73-
+dep-row("ag", "genitive attribute")
74-
+dep-row("ams", "measure argument of adjective")
75-
+dep-row("app", "apposition")
76-
+dep-row("avc", "adverbial phrase component")
77-
+dep-row("cc", "comparative complement")
78-
+dep-row("cd", "coordinating conjunction")
79-
+dep-row("cj", "conjunct")
80-
+dep-row("cm", "comparative conjunction")
81-
+dep-row("cp", "complementizer")
82-
+dep-row("cvc", "collocational verb construction")
83-
+dep-row("da", "dative")
84-
+dep-row("dh", "discourse-level head")
85-
+dep-row("dm", "discourse marker")
86-
+dep-row("ep", "expletive es")
87-
+dep-row("hd", "head")
88-
+dep-row("ju", "junctor")
89-
+dep-row("mnr", "postnominal modifier")
90-
+dep-row("mo", "modifier")
91-
+dep-row("ng", "negation")
92-
+dep-row("nk", "noun kernel element")
93-
+dep-row("nmc", "numerical component")
94-
+dep-row("oa", "accusative object")
95-
+dep-row("oa", "second accusative object")
96-
+dep-row("oc", "clausal object")
97-
+dep-row("og", "genitive object")
98-
+dep-row("op", "prepositional object")
99-
+dep-row("par", "parenthetical element")
100-
+dep-row("pd", "predicate")
101-
+dep-row("pg", "phrasal genitive")
102-
+dep-row("ph", "placeholder")
103-
+dep-row("pm", "morphological particle")
104-
+dep-row("pnc", "proper noun component")
105-
+dep-row("rc", "relative clause")
106-
+dep-row("re", "repeated element")
107-
+dep-row("rs", "reported speech")
108-
+dep-row("sb", "subject")
74+
+table(["Label", "Description"])
75+
+dep-row("ac", "adpositional case marker")
76+
+dep-row("adc", "adjective component")
77+
+dep-row("ag", "genitive attribute")
78+
+dep-row("ams", "measure argument of adjective")
79+
+dep-row("app", "apposition")
80+
+dep-row("avc", "adverbial phrase component")
81+
+dep-row("cc", "comparative complement")
82+
+dep-row("cd", "coordinating conjunction")
83+
+dep-row("cj", "conjunct")
84+
+dep-row("cm", "comparative conjunction")
85+
+dep-row("cp", "complementizer")
86+
+dep-row("cvc", "collocational verb construction")
87+
+dep-row("da", "dative")
88+
+dep-row("dh", "discourse-level head")
89+
+dep-row("dm", "discourse marker")
90+
+dep-row("ep", "expletive es")
91+
+dep-row("hd", "head")
92+
+dep-row("ju", "junctor")
93+
+dep-row("mnr", "postnominal modifier")
94+
+dep-row("mo", "modifier")
95+
+dep-row("ng", "negation")
96+
+dep-row("nk", "noun kernel element")
97+
+dep-row("nmc", "numerical component")
98+
+dep-row("oa", "accusative object")
99+
+dep-row("oa", "second accusative object")
100+
+dep-row("oc", "clausal object")
101+
+dep-row("og", "genitive object")
102+
+dep-row("op", "prepositional object")
103+
+dep-row("par", "parenthetical element")
104+
+dep-row("pd", "predicate")
105+
+dep-row("pg", "phrasal genitive")
106+
+dep-row("ph", "placeholder")
107+
+dep-row("pm", "morphological particle")
108+
+dep-row("pnc", "proper noun component")
109+
+dep-row("rc", "relative clause")
110+
+dep-row("re", "repeated element")
111+
+dep-row("rs", "reported speech")
112+
+dep-row("sb", "subject")

0 commit comments

Comments
 (0)