Skip to content

Commit

Permalink
Merge pull request #298 from neelsmith/dev
Browse files Browse the repository at this point in the history
Support updated packages
  • Loading branch information
neelsmith authored Jun 10, 2023
2 parents 1a5dfb8 + 54b47a3 commit 1b1a5b1
Show file tree
Hide file tree
Showing 27 changed files with 26,129 additions and 24,171 deletions.
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Kanones"
uuid = "107500f9-53d4-4696-8485-0747242ad8bc"
authors = ["nsmith"]
version = "0.16.6"
version = "0.16.7"

[deps]
AtticGreek = "330c8319-f7ed-461a-8c52-cee5da4c0892"
Expand Down Expand Up @@ -35,9 +35,9 @@ BenchmarkTools = "1.3"
CSV = "0.9, 0.10"
CitableBase = "10"
CitableCorpus = "0.13"
CitableObject = "0.15"
CitableObject = "0.16"
CitableParserBuilder = "0.24"
CitableText = "0.15"
CitableText = "0.16"
Compat = "4"
DataFrames = "1"
DocStringExtensions = "0.9"
Expand Down
28 changes: 28 additions & 0 deletions datasets/ionic/rules-tables/finiteverbs/ew_uncontracted_impft.cex
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Rule|StemClass|Ending|Person|Number|Tense|Mood|Voice

verbinfl.ewionicimpft1|ew_contract|εον|first|singular|imperfect|indicative|active
verbinfl.ewionicimpft2|ew_contract|εόμην|first|singular|imperfect|indicative|middle
verbinfl.ewionicimpft3|ew_contract|εόμην|first|singular|imperfect|indicative|passive

verbinfl.ewionicimpft4|ew_contract|εες|second|singular|imperfect|indicative|active
verbinfl.ewionicimpft5|ew_contract|εο|second|singular|imperfect|indicative|middle
verbinfl.ewionicimpft6|ew_contract|εο|second|singular|imperfect|indicative|passive

verbinfl.ewionicimpft7|ew_contract|εε|third|singular|imperfect|indicative|active
verbinfl.ewionicimpft8|ew_contract|έετο|third|singular|imperfect|indicative|middle
verbinfl.ewιονιξthird9|ew_contract|έετο|third|singular|imperfect|indicative|passive


verbinfl.ewionicimpft10|ew_contract|έομεν|first|plural|imperfect|indicative|active
verbinfl.ewionicimpft11|ew_contract|εόμεθα|first|plural|imperfect|indicative|middle
verbinfl.ewionicimpft12|ew_contract|εόμεθα|first|plural|imperfect|indicative|passive


verbinfl.ewionicimpft13|ew_contract|έετε|second|plural|imperfect|indicative|active
verbinfl.ewionicimpft14|ew_contract|έεσθε|second|plural|imperfect|indicative|middle
verbinfl.ewionicimpft15|ew_contract|έεσθε|second|plural|imperfect|indicative|passive


verbinfl.ewionicimpft16|ew_contract|εον|third|plural|imperfect|indicative|active
verbinfl.ewionicimpft17|ew_contract|έοντο|third|plural|imperfect|indicative|middle
verbinfl.ewionicimpft18|ew_contract|έοντο|third|plural|imperfect|indicative|passive
33 changes: 33 additions & 0 deletions datasets/ionic/rules-tables/finiteverbs/ew_uncontracted_pres.cex
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
Rule|StemClass|Ending|Person|Number|Tense|Mood|Voice

verbinfl.ewionicpresindic1|ew_contract|έω|first|singular|present|indicative|active
verbinfl.ewionicpresindic2|ew_contract|έομαι|first|singular|present|indicative|middle
verbinfl.ewionicpresindic3|ew_contract|έομαι|first|singular|present|indicative|passive


verbinfl.ewionicpresindic4|ew_contract|εες|second|singular|present|indicative|active
verbinfl.ewionicpresindic5|ew_contract|εσαι|second|singular|present|indicative|middle
verbinfl.ewionicpresindic6a|ew_contract|εσαι|second|singular|present|indicative|passive


verbinfl.ewionicpresindic7|ew_contract|εε|third|singular|present|indicative|active
verbinfl.ewionicpresindic8|ew_contract|εεται|third|singular|present|indicative|middle
verbinfl.ewionicpresindic9|ew_contract|εεται|third|singular|present|indicative|passive




verbinfl.ewionicpresindic10|ew_contract|έομεν|first|plural|present|indicative|active
verbinfl.ewionicpresindic11|ew_contract|εόμεθα|first|plural|present|indicative|middle
verbinfl.ewionicpresindic12|ew_contract|εόμεθα|first|plural|present|indicative|passive


verbinfl.ewionicpresindic13|ew_contract|έετε|second|plural|present|indicative|active
verbinfl.ewionicpresindic14|ew_contract|έεσθε|second|plural|present|indicative|middle
verbinfl.ewionicpresindic15|ew_contract|έεσθε|second|plural|present|indicative|passive


verbinfl.ewionicpresindic16|ew_contract|έουσι|third|plural|present|indicative|active
verbinfl.ewionicpresindic16a|ew_contract|έουσιν|third|plural|present|indicative|active
verbinfl.ewionicpresindic17|ew_contract|έονται|third|plural|present|indicative|middle
verbinfl.ewionicpresindic18|ew_contract|έονται|third|plural|present|indicative|passive
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Rule|StemClass|Ending|Person|Number|Tense|Mood|Voice

verbinfl.aor2imp1|aor2|ε|second|singular|aorist|imperative|active
verbinfl.aor2imp1|aor2||second|singular|aorist|imperative|active
verbinfl.aor2imp2|aor2|έτω|third|singular|aorist|imperative|active

verbinfl.aor2imp3|aor2|ετε|second|plural|aorist|imperative|active
verbinfl.aor2imp3|aor2|έτε|second|plural|aorist|imperative|active
verbinfl.aor2imp4|aor2|όντων|third|plural|aorist|imperative|active


verbinfl.aor2imp5|aor2|οῦ|second|singular|aorist|imperative|middle
verbinfl.aor2imp6|aor2|έσθω|third|singular|aorist|imperative|middle

verbinfl.aor2imp7|aor2|εσθε|second|plural|aorist|imperative|middle
verbinfl.aor2imp7|aor2|έσθε|second|plural|aorist|imperative|middle
verbinfl.aor2imp8|aor2|έσθων|third|plural|aorist|imperative|middle


Expand All @@ -21,6 +21,6 @@ verbinfl.aor2imp8|aor2|έσθων|third|plural|aorist|imperative|middle
verbinfl.aor2depimp5|aor2_dep|οῦ|second|singular|aorist|imperative|middle
verbinfl.aor2depimp6|aor2_dep|έσθω|third|singular|aorist|imperative|middle

verbinfl.aor2depimp7|aor2_dep|εσθε|second|plural|aorist|imperative|middle
verbinfl.aor2depimp7|aor2_dep|έσθε|second|plural|aorist|imperative|middle
verbinfl.aor2depimp8|aor2_dep|έσθων|third|plural|aorist|imperative|middle

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Rule|StemClass|Ending|Person|Number|Tense|Mood|Voice

verbinfl.pp3aorindic1|pp3|α|first|singular|aorist|indicative|active
verbinfl.pp3aorindic2|pp3|άμην|first|singular|aorist|indicative|middle


verbinfl.pp3aorindic4|pp3|ας|second|singular|aorist|indicative|active
verbinfl.pp3aorindic5|pp3|ω|second|singular|aorist|indicative|middle


verbinfl.pp3aorindic7|pp3|ε|third|singular|aorist|indicative|active
verbinfl.pp3aorindic8|pp3|ατο|third|singular|aorist|indicative|middle


verbinfl.pp3aorindic10|pp3|αμεν|first|plural|aorist|indicative|active
verbinfl.pp3aorindic11|pp3|άμεθα|first|plural|aorist|indicative|middle


verbinfl.pp3aorindic13|pp3|ατε|second|plural|aorist|indicative|active
verbinfl.pp3aorindic14|pp3|ασθε|second|plural|aorist|indicative|middle


verbinfl.pp3aorindic16|pp3|αν|third|plural|aorist|indicative|active
verbinfl.pp3aorindic17|pp3|αντο|third|plural|aorist|indicative|middle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Rule|StemClass|Ending|Person|Number|Tense|Mood|Voice


verbinfl.pp3aorindicdep2|pp3_dep|άμην|first|singular|aorist|indicative|middle

verbinfl.pp3aorindicdep5|pp3_dep|ω|second|singular|aorist|indicative|middle


verbinfl.pp3aorindicdep8|pp3_dep|ατο|third|singular|aorist|indicative|middle


verbinfl.pp3aorindicdep11|pp3_dep|άμεθα|first|plural|aorist|indicative|middle


verbinfl.pp3aorindicdep14|pp3_dep|ασθε|second|plural|aorist|indicative|middle


verbinfl.pp3aorindicdep17|pp3_dep|αντο|third|plural|aorist|indicative|middle

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Rule|StemClass|Ending|Gender|Case|Number|

nouninfl.a_as_short1|a_as_short|α^|feminine|nominative|singular|
nouninfl.a_as_short2|a_as_short|ας|feminine|genitive|singular|
nouninfl.a_as_short3|a_as_short|ᾳ|feminine|dative|singular|
nouninfl.a_as_short4|a_as_short|α^ν|feminine|accusative|singular|
nouninfl.a_as_short5|a_as_short|α^|feminine|vocative|singular|

nouninfl.a_as_short6|a_as_short|αι|feminine|nominative|plural|
nouninfl.a_as_short7|a_as_short|ῶν|feminine|genitive|plural|
nouninfl.a_as_short8|a_as_short|αις|feminine|dative|plural|
nouninfl.a_as_short9|a_as_short|α_ς|feminine|accusative|plural|
nouninfl.a_as_short10|a_as_short|αι|feminine|vocative|plural|
32 changes: 32 additions & 0 deletions datasets/literarygreek-rules/rules-tables/nouns/decl3/s_dos.cex
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Rule|StemClass|Ending|Gender|Case|Number|


nouninfl.s_dos11|s_dos|ς|masculine|nominative|singular|
nouninfl.s_dos12|s_dos|δος|masculine|genitive|singular|
nouninfl.s_dos13|s_dos|δι|masculine|dative|singular|
nouninfl.s_dos14|s_dos|δα|masculine|accusative|singular|
nouninfl.s_dos15|s_dos||masculine|vocative|singular|

nouninfl.s_dos16|s_dos|δες|masculine|nominative|plural|
nouninfl.s_dos17|s_dos|δων|masculine|genitive|plural|
nouninfl.s_dos18|s_dos|σι|masculine|dative|plural|
nouninfl.s_dos18a|s_dos|σιν|masculine|dative|plural|
nouninfl.s_dos19|s_dos|δες|masculine|accusative|plural|
nouninfl.s_dos20|s_dos|δες|masculine|vocative|plural|





nouninfl.s_dos11|s_dos|ς|feminine|nominative|singular|
nouninfl.s_dos12|s_dos|δος|feminine|genitive|singular|
nouninfl.s_dos13|s_dos|δι|feminine|dative|singular|
nouninfl.s_dos14|s_dos|δα|feminine|accusative|singular|
nouninfl.s_dos15|s_dos||feminine|vocative|singular|

nouninfl.s_dos16|s_dos|δες|feminine|nominative|plural|
nouninfl.s_dos17|s_dos|δων|feminine|genitive|plural|
nouninfl.s_dos18|s_dos|σι|feminine|dative|plural|
nouninfl.s_dos18a|s_dos|σιν|feminine|dative|plural|
nouninfl.s_dos19|s_dos|δες|feminine|accusative|plural|
nouninfl.s_dos20|s_dos|δες|feminine|vocative|plural|
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Rule|StemClass|Ending|Tense|Voice|Gender|Case|Number|

ptcplinfl.aor2act1|aor2|ών|present|active|masculine|nominative|singular|
ptcplinfl.aor2act2|aor2|όντος|present|active|masculine|genitive|singular|
ptcplinfl.aor2act3|aor2|όντι|present|active|masculine|dative|singular|
ptcplinfl.aor2act4|aor2|όντα|present|active|masculine|accusative|singular|

ptcplinfl.aor2act6|aor2|όντες|present|active|masculine|nominative|plural|
ptcplinfl.aor2act7|aor2|όντων|present|active|masculine|genitive|plural|
ptcplinfl.aor2act8|aor2|όντοις|present|active|masculine|dative|plural|
ptcplinfl.aor2act9|aor2|όντας|present|active|masculine|accusative|plural|



ptcplinfl.aor2act1n|aor2|όν|present|active|neuter|nominative|singular|
ptcplinfl.aor2act2n|aor2|όντος|present|active|neuter|genitive|singular|
ptcplinfl.aor2act3n|aor2|όντι|present|active|neuter|dative|singular|
ptcplinfl.aor2act4n|aor2|όν|present|active|neuter|accusative|singular|

ptcplinfl.aor2act6n|aor2|όντα|present|active|neuter|nominative|plural|
ptcplinfl.aor2act7n|aor2|όντων|present|active|neuter|genitive|plural|
ptcplinfl.aor2act8n|aor2|όντοις|present|active|neuter|dative|plural|
ptcplinfl.aor2act9n|aor2|όντα|present|active|neuter|accusative|plural|



ptcplinfl.aor2act1f|aor2|οῦσα|present|active|feminine|nominative|singular|
ptcplinfl.aor2act2f|aor2|ούσης|present|active|feminine|genitive|singular|
ptcplinfl.aor2act3f|aor2|ούσῃ|present|active|feminine|dative|singular|
ptcplinfl.aor2act4f|aor2|οῦσαν|present|active|feminine|accusative|singular|

ptcplinfl.aor2act6f|aor2|οῦσαι|present|active|feminine|nominative|plural|
ptcplinfl.aor2act7f|aor2|ούσων|present|active|feminine|genitive|plural|
ptcplinfl.aor2act8f|aor2|ούσαις|present|active|feminine|dative|plural|
ptcplinfl.aor2act9f|aor2|ούσας|present|active|feminine|accusative|plural|
9 changes: 7 additions & 2 deletions datasets/literarygreek-rules/stems-tables/nouns/decl3.cex
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ nounstems.n33903|lsj.n33903|ἐλπ|feminine|is_idos|inflectionaccented

nounstems.n42887|lsj.n42887|ἐσθ|feminine|hs_htos|inflectionaccented

nounstems.n44071|lsj.n44071|εὐθυντηρ|masculine|0_os|inflectionaccented
nounstems.n44071|lsj.n44071|εὐθυντηρ|masculine|0_os|stemaccented

nounstems.n84494|lsj.n84494|πολ|feminine|is_ews|recessive|
nounstems.n84494|lsj.n84494|πολ|feminine|is_ews|recessive|

nounstems.n76703m|lsj.n76703|παι|masculine|s_dos|inflectionaccented
nounstems.n76703f|lsj.n76703|παι|feminine|s_dos|inflectionaccented

nounstems.n71314|lsj.n71314|νύξ|feminine|xx|inflectionaccented
48 changes: 24 additions & 24 deletions datasets/literarygreek-rules/stems-tables/pronouns/ekeinos.cex
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
StemUrn|LexicalEntity|String|Gender|Case|Number|PronounClass

pronoun.n31951a|lsj.n31951|ἐκεῖνος|masculine|nominative|singular|article
pronoun.n31951b|lsj.n31951|ἐκείνου|masculine|genitive|singular|article
pronoun.n31951c|lsj.n31951|ἐκείνῳ|masculine|dative|singular|article
pronoun.n31951d|lsj.n31951|ἐκεῖνον|masculine|accusative|singular|article
pronoun.n31951a|lsj.n31951|ἐκεῖνος|masculine|nominative|singular|demonstrative
pronoun.n31951b|lsj.n31951|ἐκείνου|masculine|genitive|singular|demonstrative
pronoun.n31951c|lsj.n31951|ἐκείνῳ|masculine|dative|singular|demonstrative
pronoun.n31951d|lsj.n31951|ἐκεῖνον|masculine|accusative|singular|demonstrative

pronoun.n31951e|lsj.n31951|ἐκεῖνοι|masculine|nominative|plural|article
pronoun.n31951f|lsj.n31951|ἐκείνων|masculine|genitive|plural|article
pronoun.n31951g|lsj.n31951|ἐκείνοις|masculine|dative|plural|article
pronoun.n31951h|lsj.n31951|ἐκείνους|masculine|accusative|plural|article
pronoun.n31951e|lsj.n31951|ἐκεῖνοι|masculine|nominative|plural|demonstrative
pronoun.n31951f|lsj.n31951|ἐκείνων|masculine|genitive|plural|demonstrative
pronoun.n31951g|lsj.n31951|ἐκείνοις|masculine|dative|plural|demonstrative
pronoun.n31951h|lsj.n31951|ἐκείνους|masculine|accusative|plural|demonstrative


pronoun.n31951i|lsj.n31951|ἐκείνη|feminine|nominative|singular|article
pronoun.n31951j|lsj.n31951|ἐκείνης|feminine|genitive|singular|article
pronoun.n31951k|lsj.n31951|ἐκείνῃ|feminine|dative|singular|article
pronoun.n31951l|lsj.n31951|ἐκείνην|feminine|accusative|singular|article
pronoun.n31951i|lsj.n31951|ἐκείνη|feminine|nominative|singular|demonstrative
pronoun.n31951j|lsj.n31951|ἐκείνης|feminine|genitive|singular|demonstrative
pronoun.n31951k|lsj.n31951|ἐκείνῃ|feminine|dative|singular|demonstrative
pronoun.n31951l|lsj.n31951|ἐκείνην|feminine|accusative|singular|demonstrative

pronoun.n31951m|lsj.n31951|ἐκεῖναι|feminine|nominative|plural|article
pronoun.n31951n|lsj.n31951|ἐκείνων|feminine|genitive|plural|article
pronoun.n31951o|lsj.n31951|ἐκείναις|feminine|dative|plural|article
pronoun.n31951p|lsj.n31951|ἐκείνας|feminine|accusative|plural|article
pronoun.n31951m|lsj.n31951|ἐκεῖναι|feminine|nominative|plural|demonstrative
pronoun.n31951n|lsj.n31951|ἐκείνων|feminine|genitive|plural|demonstrative
pronoun.n31951o|lsj.n31951|ἐκείναις|feminine|dative|plural|demonstrative
pronoun.n31951p|lsj.n31951|ἐκείνας|feminine|accusative|plural|demonstrative


pronoun.n31951q|lsj.n31951|ἐκεῖνο|neuter|nominative|singular|article
pronoun.n31951r|lsj.n31951|ἐκείνου|neuter|genitive|singular|article
pronoun.n31951s|lsj.n31951|ἐκείνῳ|neuter|dative|singular|article
pronoun.n31951t|lsj.n31951|ἐκεῖνο|neuter|accusative|singular|article
pronoun.n31951q|lsj.n31951|ἐκεῖνο|neuter|nominative|singular|demonstrative
pronoun.n31951r|lsj.n31951|ἐκείνου|neuter|genitive|singular|demonstrative
pronoun.n31951s|lsj.n31951|ἐκείνῳ|neuter|dative|singular|demonstrative
pronoun.n31951t|lsj.n31951|ἐκεῖνο|neuter|accusative|singular|demonstrative

pronoun.n31951u|lsj.n31951|ἐκεῖνα|neuter|nominative|plural|article
pronoun.n31951v|lsj.n31951|ἐκείνων|neuter|genitive|plural|article
pronoun.n31951w|lsj.n31951|ἐκείνοις|neuter|dative|plural|article
pronoun.n31951x|lsj.n31951|ἐκεῖνο|neuter|accusative|plural|article
pronoun.n31951u|lsj.n31951|ἐκεῖνα|neuter|nominative|plural|demonstrative
pronoun.n31951v|lsj.n31951|ἐκείνων|neuter|genitive|plural|demonstrative
pronoun.n31951w|lsj.n31951|ἐκείνοις|neuter|dative|plural|demonstrative
pronoun.n31951x|lsj.n31951|ἐκεῖνο|neuter|accusative|plural|demonstrative
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ verbstems.n105829d|lsj.n105829|τετυχηκ|pp4|



verbstems.n105829a|lsj.n45996|ἐχ|w_pres|
verbstems.n105829a|lsj.n45996|ἐχ|w_pp1|
verbstems.n105829a2|lsj.n45996|εἰχ|w_impft_aug|
verbstems.n105829b|lsj.n45996|σχησ|pp2|
verbstems.n105829b2|lsj.n45996|ἑξ|pp2|
Expand Down
Loading

0 comments on commit 1b1a5b1

Please sign in to comment.