Skip to content

Commit

Permalink
Synchronised with upstream.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlj
mlj committed Feb 5, 2015
1 parent bb68c25 commit faf83c0
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 34 deletions.
23 changes: 23 additions & 0 deletions cic-att.conll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43732,3 +43732,26 @@
4 die dies N Nb NUMBs|GENDm|CASEb 0 adv(6)pred _ _
5 septingentesimosexagesimoquinto septingentesimussexagesimusquintus M Mo NUMBs|GENDm|CASEb 4 atr _ _

1 sed sed C C- INFLn 3 aux _ _
2 te tu P Pp PERS2|NUMBs|GENDm|CASEa 3 obj _ _
3 amavi amo V V- PERS1|NUMBs|TENSr|MOODi|VOICa 6 pred _ _
4 tamen tamen D Df INFLn 3 aux _ _
5 admiratus admiror V V- NUMBs|TENSr|MOODp|VOICp|GENDm|CASEn 6 pred _ _
6 que que C C- INFLn 0 pred _ _
7 sum sum V V- PERS1|NUMBs|TENSp|MOODi|VOICa 5 aux _ _
8 quod quod G G- INFLn 5 adv _ _
9 nihilominus nihilominus D Df INFLn 14 adv _ _
10 ad ad R R- INFLn 14 obl _ _
11 me ego P Pp PERS1|NUMBs|GENDm|CASEa 10 obl _ _
12 tua tuus P Ps PERS2|NUMBs|GENDf|CASEb 13 atr _ _
13 manu manus N Nb NUMBs|GENDf|CASEb 14 adv _ _
14 scripsisses scribo V V- PERS2|NUMBs|TENSl|MOODs|VOICa 8 pred _ _

1 a ab R R- INFLn 4 obl _ _
2 Turranio Turranius N Ne NUMBs|GENDm|CASEb 1 obl _ _
3 te tu P Pp PERS2|NUMBs|GENDm|CASEa 4 sub _ _
4 accepisse accipio V V- TENSr|MOODn|VOICa 7 comp _ _
5 meas meus P Ps PERS1|NUMBp|GENDf|CASEa 6 atr _ _
6 litteras littera N Nb NUMBp|GENDf|CASEa 4 obj _ _
7 gaudeo gaudeo V V- PERS1|NUMBs|TENSp|MOODi|VOICa 0 pred _ _

40 changes: 36 additions & 4 deletions cic-att.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<proiel export-time="2014-12-19T12:44:28+01:00" schema-version="2.0">
<proiel export-time="2015-02-05T16:19:16+01:00" schema-version="2.0">
<annotation>
<relations>
<value tag="adnom" summary="adnominal" primary="true" secondary="true"/>
Expand Down Expand Up @@ -161,13 +161,13 @@
<funder>Department of Classics, History of Arts and Ideas</funder>
<distributor>Department of Classics, History of Arts and Ideas</distributor>
<distributor-address>PO Box 1020 Blindern, N-0315 Oslo</distributor-address>
<date>19 December 2014</date>
<date>05 February 2015</date>
<license>CC BY-NC-SA 3.0</license>
<license-url>http://creativecommons.org/licenses/by-nc-sa/3.0/us/</license-url>
<reference-system>book, letter, section</reference-system>
<editor>Dag Trygve Truslew Haug</editor>
<annotator>Øyvind Strand (3673 sentences), Þorsteinn Vilhjálmsson (269 sentences), Per Erik Solberg (38 sentences), and Dag Haug (12 sentences)</annotator>
<reviewer>Þorsteinn Vilhjálmsson (3516 sentences), Dag Haug (68 sentences), and Øyvind Strand (10 sentences)</reviewer>
<annotator>Øyvind Strand (3673 sentences), Þorsteinn Vilhjálmsson (269 sentences), Per Erik Solberg (38 sentences), Dag Haug (14 sentences), and Giovanna Albonico (2 sentences)</annotator>
<reviewer>Þorsteinn Vilhjálmsson (3516 sentences), Dag Haug (70 sentences), and Øyvind Strand (10 sentences)</reviewer>
<electronic-text-editor>Gregory Crane</electronic-text-editor>
<electronic-text-title>Letters to Atticus</electronic-text-title>
<electronic-text-publisher>Perseus Digital Library</electronic-text-publisher>
Expand Down Expand Up @@ -55122,5 +55122,37 @@
<token id="1196335" empty-token-sort="V" relation="pred"/>
</sentence>
</div>
<div>
<title>Book 6, letter 9</title>
<sentence id="79027" status="reviewed">
<token id="1124862" form="sed" citation-part="6.9.1" lemma="sed" part-of-speech="C-" morphology="---------n" head-id="1124864" relation="aux" presentation-after=" "/>
<token id="1124863" form="te" citation-part="6.9.1" lemma="tu" part-of-speech="Pp" morphology="2s---ma--i" head-id="1124864" relation="obj" presentation-after=" "/>
<token id="1124864" form="amavi" citation-part="6.9.1" lemma="amo" part-of-speech="V-" morphology="1sria----i" head-id="2021766" relation="pred" presentation-after=" ">
<slash target-id="1124868" relation="adv"/>
</token>
<token id="1124865" form="tamen" citation-part="6.9.1" lemma="tamen" part-of-speech="Df" morphology="---------n" head-id="1124864" relation="aux" presentation-after=" "/>
<token id="1124866" form="admiratus" citation-part="6.9.1" lemma="admiror" part-of-speech="V-" morphology="-srppmn--i" head-id="2021766" relation="pred">
<slash target-id="1124863" relation="obj"/>
</token>
<token id="2021766" form="que" citation-part="6.9.1" lemma="que" part-of-speech="C-" morphology="---------n" relation="pred" presentation-after=" "/>
<token id="1124867" form="sum" citation-part="6.9.1" lemma="sum" part-of-speech="V-" morphology="1spia----i" head-id="1124866" relation="aux" presentation-after=" "/>
<token id="1124868" form="quod" citation-part="6.9.1" lemma="quod" part-of-speech="G-" morphology="---------n" head-id="1124866" relation="adv" presentation-after=" "/>
<token id="1124869" form="nihilo minus" citation-part="6.9.1" lemma="nihilominus" part-of-speech="Df" morphology="---------n" head-id="1124875" relation="adv" presentation-after=" "/>
<token id="1124871" form="ad" citation-part="6.9.1" lemma="ad" part-of-speech="R-" morphology="---------n" head-id="1124875" relation="obl" presentation-after=" "/>
<token id="1124872" form="me" citation-part="6.9.1" lemma="ego" part-of-speech="Pp" morphology="1s---ma--i" head-id="1124871" relation="obl" presentation-after=" "/>
<token id="1124873" form="tua" citation-part="6.9.1" lemma="tuus" part-of-speech="Ps" morphology="2s---fb--i" head-id="1124874" relation="atr" presentation-after=" "/>
<token id="1124874" form="manu" citation-part="6.9.1" lemma="manus" part-of-speech="Nb" morphology="-s---fb--i" head-id="1124875" relation="adv" presentation-after=" "/>
<token id="1124875" form="scripsisses" citation-part="6.9.1" lemma="scribo" part-of-speech="V-" morphology="2slsa----i" head-id="1124868" relation="pred" presentation-after=". "/>
</sentence>
<sentence id="79030" status="reviewed">
<token id="1124901" form="a" citation-part="6.9.2" lemma="ab" part-of-speech="R-" morphology="---------n" head-id="1124904" relation="obl" presentation-after=" "/>
<token id="1124902" form="Turranio" citation-part="6.9.2" lemma="Turranius" part-of-speech="Ne" morphology="-s---mb--i" head-id="1124901" relation="obl" presentation-after=" "/>
<token id="1124903" form="te" citation-part="6.9.2" lemma="tu" part-of-speech="Pp" morphology="2s---ma--i" head-id="1124904" relation="sub" presentation-after=" "/>
<token id="1124904" form="accepisse" citation-part="6.9.2" lemma="accipio" part-of-speech="V-" morphology="--rna----i" head-id="1124907" relation="comp" presentation-after=" "/>
<token id="1124905" form="meas" citation-part="6.9.2" lemma="meus" part-of-speech="Ps" morphology="1p---fa--i" head-id="1124906" relation="atr" presentation-after=" "/>
<token id="1124906" form="litteras" citation-part="6.9.2" lemma="littera" part-of-speech="Nb" morphology="-p---fa--i" head-id="1124904" relation="obj" presentation-after=" "/>
<token id="1124907" form="gaudeo" citation-part="6.9.2" lemma="gaudeo" part-of-speech="V-" morphology="1spia----i" relation="pred" presentation-after=". "/>
</sentence>
</div>
</source>
</proiel>
12 changes: 8 additions & 4 deletions gothic-nt.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<proiel export-time="2014-04-23T21:04:44+02:00" schema-version="2.0">
<proiel export-time="2015-02-05T16:02:07+01:00" schema-version="2.0">
<annotation>
<relations>
<value tag="adnom" summary="adnominal" primary="true" secondary="true"/>
Expand Down Expand Up @@ -160,18 +160,22 @@
<funder>Research Council of Norway</funder>
<distributor>Department of Philosophy, Classics, History of Arts and Ideas</distributor>
<distributor-address>PO Box 1020 Blindern, N-0315 Oslo</distributor-address>
<date>23 April 2014</date>
<date>05 February 2015</date>
<license>CC BY-NC-SA 3.0</license>
<license-url>http://creativecommons.org/licenses/by-nc-sa/3.0/us/</license-url>
<reference-system>Standard Bible reference system</reference-system>
<editor>Dag Trygve Truslew Haug</editor>
<annotator>Michael Frotscher (2238 sentences), Corinna Scheungraber (2018 sentences), Marek Majer (895 sentences), Ingrid Andersen (258 sentences), Dag Haug (44 sentences), and Eirik Welo (4 sentences)</annotator>
<reviewer>Marek Majer (4760 sentences), Dag Haug (693 sentences), and Eirik Welo (4 sentences)</reviewer>
<electronic-text-editor>Tom de Herdt</electronic-text-editor>
<electronic-text-title>An electronic edition of the Gothic Bible and minor fragments, based on Wilhelm Streitberg's edition</electronic-text-title>
<electronic-text-version>March 2004</electronic-text-version>
<electronic-text-publisher>Wulfila Project</electronic-text-publisher>
<electronic-text-place>Antwerp</electronic-text-place>
<electronic-text-original-url>www.wulfila.be</electronic-text-original-url>
<electronic-text-license>free</electronic-text-license>
<electronic-text-date>March 2004</electronic-text-date>
<electronic-text-original-url>http://www.wulfila.be</electronic-text-original-url>
<electronic-text-license>Freely available for academic and non-commercial use</electronic-text-license>
<electronic-text-license-url>http://www.wulfila.be/gothic/text/header/</electronic-text-license-url>
<printed-text-editor>Wilhelm Streitberg</printed-text-editor>
<printed-text-title>Die gotische Bibel</printed-text-title>
<printed-text-edition>Zweite, verbesserte Auflage</printed-text-edition>
Expand Down
2 changes: 1 addition & 1 deletion greek-nt.conll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11481,7 +11481,7 @@
19 ἐν ἐν R R- INFLn 16 atr _ _
20 οὐρανοῖς οὐρανός N Nb NUMBp|GENDm|CASEd 19 obl _ _

1 Τί τὶς P Px NUMBs|GENDn|CASEn 3 sub _ _
1 Τί τίς P Pi NUMBs|GENDn|CASEn 3 sub _ _
2 ὑμῖν ὑμεῖς P Pp PERS2|NUMBp|GENDp|CASEd 3 obl _ _
3 δοκεῖ δοκέω V V- PERS3|NUMBs|TENSp|MOODi|VOICa 0 pred _ _

Expand Down
8 changes: 4 additions & 4 deletions greek-nt.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<proiel export-time="2014-10-01T00:04:17+02:00" schema-version="2.0">
<proiel export-time="2015-02-05T15:40:42+01:00" schema-version="2.0">
<annotation>
<relations>
<value tag="adnom" summary="adnominal" primary="true" secondary="true"/>
Expand Down Expand Up @@ -160,12 +160,12 @@
<funder>Research Council of Norway</funder>
<distributor>Department of Philosophy, Classics, History of Arts and Ideas</distributor>
<distributor-address>PO Box 1020 Blindern, N-0315 Oslo</distributor-address>
<date>03 October 2014</date>
<date>05 February 2015</date>
<license>CC BY-NC-SA 3.0</license>
<license-url>http://creativecommons.org/licenses/by-nc-sa/3.0/us/</license-url>
<reference-system>Standard biblical reference system</reference-system>
<editor>Dag Haug</editor>
<annotator>Dagmar Wodtko (7570 sentences), Marek Majer (760 sentences), Pål Rykkja Gilbert (643 sentences), Bergthora Aegisdottir (531 sentences), Michael Frotscher (365 sentences), Dag Haug (346 sentences), Eirik Welo (342 sentences), Per Kristen Teigen (301 sentences), David Sobey (217 sentences), Hanne Eckhoff (182 sentences), Þorsteinn Vilhjálmsson (153 sentences), Corinna Scheungraber (120 sentences), Angelika Müth (96 sentences), Jana Beck (41 sentences), Sergej Munkvold (4 sentences), and Dag Haug (1 sentence)</annotator>
<annotator>Dagmar Wodtko (7570 sentences), Marek Majer (760 sentences), Bergthora Aegisdottir (698 sentences), Pål Rykkja Gilbert (643 sentences), Michael Frotscher (365 sentences), Dag Haug (346 sentences), Eirik Welo (342 sentences), Per Kristen Teigen (301 sentences), David Sobey (217 sentences), Hanne Eckhoff (182 sentences), Þorsteinn Vilhjálmsson (153 sentences), Corinna Scheungraber (120 sentences), Angelika Müth (96 sentences), Jana Beck (41 sentences), Sergej Munkvold (4 sentences), and Dag Haug (1 sentence)</annotator>
<reviewer>Dag Haug (4935 sentences), Marek Majer (4145 sentences), Þorsteinn Vilhjálmsson (1095 sentences), Eirik Welo (941 sentences), and Hanne Eckhoff (144 sentences)</reviewer>
<electronic-text-editor>Ulrik Sandborg-Petersen</electronic-text-editor>
<electronic-text-title>Tischendorf 8th GNT with morphology and lemmatization</electronic-text-title>
Expand Down Expand Up @@ -15427,7 +15427,7 @@
<token id="861129" empty-token-sort="P" citation-part="MATT 18.10" head-id="278637" relation="sub" antecedent-id="278506" information-status="old"/>
</sentence>
<sentence id="15514" status="reviewed" presentation-after=" ">
<token id="278658" form="Τί" citation-part="MATT 18.12" lemma="τὶς" part-of-speech="Px" morphology="-s---nn--i" head-id="278660" relation="sub" information-status="non_spec" presentation-after=" "/>
<token id="278658" form="Τί" citation-part="MATT 18.12" lemma="τίς" part-of-speech="Pi" morphology="-s---nn--i" head-id="278660" relation="sub" information-status="non_spec" presentation-after=" "/>
<token id="278659" form="ὑμῖν" citation-part="MATT 18.12" lemma="ὑμεῖς" part-of-speech="Pp" morphology="2p---pd--i" head-id="278660" relation="obl" antecedent-id="278639" information-status="old" presentation-after=" "/>
<token id="278660" form="δοκεῖ" citation-part="MATT 18.12" lemma="δοκέω" part-of-speech="V-" morphology="3spia----i" relation="pred" presentation-after=";"/>
</sentence>
Expand Down
2 changes: 1 addition & 1 deletion hdt.conll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4438,7 +4438,7 @@
8 ἐχαρίζετο χαρίζομαι V V- PERS3|NUMBs|TENSi|MOODi|VOICm 9 pred _ _
9 οὔτε οὔτε C C- INFLn 0 pred _ _
10 λόγου λόγος N Nb NUMBs|GENDm|CASEg 12 obl _ _
11 μιν μιν P Pp PERS3|NUMBs|GENDm|CASEa 14 obj _ _
11 μιν μιν P Pp PERS3|NUMBs|GENDm|CASEa 12 obj _ _
12 ποιησάμενος ποιέω V V- NUMBs|TENSa|MOODp|VOICm|GENDm|CASEn 14 xadv _ _
13 οὐδενὸς οὐδείς P Px NUMBs|GENDm|CASEg 10 atr _ _
14 ἀποπέμπεται ἀποπέμπω V V- PERS3|NUMBs|TENSp|MOODi|VOICm 9 pred _ _
Expand Down
10 changes: 6 additions & 4 deletions hdt.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<proiel export-time="2014-12-19T12:38:45+01:00" schema-version="2.0">
<proiel export-time="2015-02-05T16:12:50+01:00" schema-version="2.0">
<annotation>
<relations>
<value tag="adnom" summary="adnominal" primary="true" secondary="true"/>
Expand Down Expand Up @@ -161,7 +161,7 @@
<funder>Department of Classics, History of Arts and Ideas</funder>
<distributor>Department of Classics, History of Arts and Ideas</distributor>
<distributor-address>PO Box 1020 Blindern, N-0315 Oslo</distributor-address>
<date>19 December 2014</date>
<date>05 February 2015</date>
<license>CC BY-NC-SA 3.0</license>
<license-url>http://creativecommons.org/licenses/by-nc-sa/3.0/us/</license-url>
<reference-system>book, chapter, section</reference-system>
Expand Down Expand Up @@ -5894,12 +5894,14 @@
<token id="871438" form="ἐχαρίζετο" citation-part="1.33.1" lemma="χαρίζομαι" part-of-speech="V-" morphology="3siim----i" head-id="871439" relation="pred" presentation-after=", "/>
<token id="871439" form="οὔτε" citation-part="1.33.1" lemma="οὔτε" part-of-speech="C-" morphology="---------n" relation="pred" presentation-after=" "/>
<token id="871440" form="λόγου" citation-part="1.33.1" lemma="λόγος" part-of-speech="Nb" morphology="-s---mg--i" head-id="871442" relation="obl" presentation-after=" "/>
<token id="871441" form="μιν" citation-part="1.33.1" lemma="μιν" part-of-speech="Pp" morphology="3s---ma--i" head-id="871444" relation="obj" presentation-after=" "/>
<token id="871441" form="μιν" citation-part="1.33.1" lemma="μιν" part-of-speech="Pp" morphology="3s---ma--i" head-id="871442" relation="obj" presentation-after=" "/>
<token id="871442" form="ποιησάμενος" citation-part="1.33.1" lemma="ποιέω" part-of-speech="V-" morphology="-sapmmn--i" head-id="871444" relation="xadv" presentation-after=" ">
<slash target-id="871444" relation="xsub"/>
</token>
<token id="871443" form="οὐδενὸς" citation-part="1.33.1" lemma="οὐδείς" part-of-speech="Px" morphology="-s---mg--i" head-id="871440" relation="atr" presentation-after=" "/>
<token id="871444" form="ἀποπέμπεται" citation-part="1.33.1" lemma="ἀποπέμπω" part-of-speech="V-" morphology="3spim----i" head-id="871439" relation="pred" presentation-after=", "/>
<token id="871444" form="ἀποπέμπεται" citation-part="1.33.1" lemma="ἀποπέμπω" part-of-speech="V-" morphology="3spim----i" head-id="871439" relation="pred" presentation-after=", ">
<slash target-id="871441" relation="obj"/>
</token>
<token id="871445" form="κάρτα" citation-part="1.33.1" lemma="κάρτα" part-of-speech="Df" morphology="---------n" head-id="871447" relation="adv" presentation-after=" "/>
<token id="871446" form="δόξας" citation-part="1.33.1" lemma="δοκέω" part-of-speech="V-" morphology="-sapamn--i" head-id="871444" relation="xadv" presentation-after=" ">
<slash target-id="871444" relation="xsub"/>
Expand Down
Loading

0 comments on commit faf83c0

Please sign in to comment.