Commit 244e7067 authored by di68kap's avatar di68kap

- MLW Tests korrigiert (neue Literaturangabensyntax)

parent fac56062
......@@ -34,7 +34,7 @@ Lemma = [< klassisch | gesichert >] LemmaWort
LemmaWort = LAT_WORT
LemmaVarianten = LemmaVariante { [";" | ","] [ZW] LemmaVariante } [ ABS Zusatz ]
LemmaVarianten = LemmaVariante { [";" | ","] [ZW] LemmaVariante } [ [LZ] Zusatz ]
LemmaVariante = LAT_WORT # Ist eine Lemma immer ein einzelnes Wort?
......
......@@ -93,7 +93,7 @@ class MLWGrammar(Grammar):
LemmaWort = LAT_WORT
LemmaVarianten = LemmaVariante { [";" | ","] [ZW] LemmaVariante } [ ABS Zusatz ]
LemmaVarianten = LemmaVariante { [";" | ","] [ZW] LemmaVariante } [ [LZ] Zusatz ]
LemmaVariante = LAT_WORT # Ist eine Lemma immer ein einzelnes Wort?
......@@ -326,7 +326,7 @@ class MLWGrammar(Grammar):
flexion = Forward()
genus = Forward()
wortart = Forward()
source_hash__ = "006973bb80648bce916ec3ac284ba94f"
source_hash__ = "e14c9e38e16ad15f7e15cca038fdd8b7"
parser_initialization__ = "upon instantiation"
COMMENT__ = r'(?:\/\/.*)|(?:\/\*(?:.|\n)*?\*\/)'
WHITESPACE__ = r'[\t ]*'
......@@ -467,7 +467,7 @@ class MLWGrammar(Grammar):
Grammatik = Series(wortart, ABS, flexion, Option(Series(Option(Token(";")), genus)), mandatory=1)
GrammatikPosition = Series(ZWW, Token("GRAMMATIK"), Option(LZ), Grammatik, ZeroOrMore(Series(ABS, GrammatikVariante)), mandatory=3)
LemmaVariante = Synonym(LAT_WORT)
LemmaVarianten = Series(LemmaVariante, ZeroOrMore(Series(Option(Alternative(Token(";"), Token(","))), Option(ZW), LemmaVariante)), Option(Series(ABS, Zusatz)))
LemmaVarianten = Series(LemmaVariante, ZeroOrMore(Series(Option(Alternative(Token(";"), Token(","))), Option(ZW), LemmaVariante)), Option(Series(Option(LZ), Zusatz)))
LemmaWort.set(Synonym(LAT_WORT))
gesichert = Token("$")
klassisch = Token("*")
......
......@@ -30,5 +30,5 @@
1: """vizreg-: {=> v. ibi 1}"""
2: """festregel(a): {=> v. ibi 2}"""
3: """fezdregl(a): {=> v. ibi 3}"""
4: """em-: Chron.: Fred.; 2,35sqq. capit. p. 43.; 2,36 p. 60,10."""
5: """ym-: Chart.: Sangall.; A 194."""
\ No newline at end of file
4: """em-: Chron. Fred.; 2,35sqq. capit. p. 43.; 2,36 p. 60,10."""
5: """ym-: Chart. Sangall.; A 194."""
......@@ -7,20 +7,20 @@ M1: """
[match:Bedeutung]
M1: """LAT capital, rica -- DEU Kopftuch:
* Transl.: Libor. I; 32 "raptis feminarum -is (fa[s]citergiis var. l.)."
* Transl.: Libor. II; 20 "nuditatem membrorum illius (puellae) tegere festinarunt fideles
* Transl. Libor. I; 32 "raptis feminarum -is (fa[s]citergiis var. l.)."
* Transl. Libor. II; 20 "nuditatem membrorum illius (puellae) tegere festinarunt fideles
clerici et laici inprimis cum eorum -cula, dein vestibus solitis.""""
M2: """in univ.:
* Leg.: Burgund. Rom.; 38,1 si quis ... nullo metu aut imperio ad pacta venire conpellitur, sed libera voluntate pactum inisse cognuscitur eqs.
* Ionas: Bob. Columb.; 1,17 p. 185,9 quae (sc. ferae) ad imperium eius statim veniebant.
* Lex: Baiuv.; 1,10 hoc (sc. lex) per inperium regis vel iudicis fiat.
* Arbeo: Emm.; 16 p. 49,17 ex imperio principis ... in ospiti sui scuriam ... deductus est episcopus. persaepe. v. et p. 1407, 57."""
* Leg. Burgund. Rom.; 38,1 si quis ... nullo metu aut imperio ad pacta venire conpellitur, sed libera voluntate pactum inisse cognuscitur eqs.
* Ionas Bob. Columb.; 1,17 p. 185,9 quae (sc. ferae) ad imperium eius statim veniebant.
* Lex Baiuv.; 1,10 hoc (sc. lex) per inperium regis vel iudicis fiat.
* Arbeo Emm.; 16 p. 49,17 ex imperio principis ... in ospiti sui scuriam ... deductus est episcopus. persaepe. v. et p. 1407, 57."""
[fail:Bedeutung]
F1: """capital, rica -- Kopftuch:
* Transl.: Libor. I; 32 "raptis feminarum -is (fa[s]citergiis var. l.)."
* Transl.: Libor. II; 20 "nuditatem membrorum illius (puellae) tegere festinarunt fideles
* Transl. Libor. I; 32 "raptis feminarum -is (fa[s]citergiis var. l.)."
* Transl. Libor. II; 20 "nuditatem membrorum illius (puellae) tegere festinarunt fideles
clerici et laici inprimis cum eorum -cula, dein vestibus solitis." """
[match:Bedeutungskategorie]
......
[match:BelegPosition]
M1: """
* Catal.: thes. Germ.; 28,11 (post 851) "-um III"
* Form.: Sangall.; 39 p. 421,16 "munuscula ... direximus, hoc est palliolum ... ,
* Catal. thes. Germ.; 28,11 (post 851) "-um III"
* Form. Sangall.; 39 p. 421,16 "munuscula ... direximus, hoc est palliolum ... ,
-as duas."
* Catal.: thes. Germ.; 18,7 "-eterculi viginti quatuor"
* Libri: confrat. I; app. A 6 p. 137,30 "pulpitum ... -a cocco imaginata
* Catal. thes. Germ.; 18,7 "-eterculi viginti quatuor"
* Libri confrat. I; app. A 6 p. 137,30 "pulpitum ... -a cocco imaginata
circumdari iussit pontifex."
* Catal.: thes. Germ.; 76,15 "-rulae II."; 40,5 VI "vizregule."; 129a,5 "-sterculas
* Catal. thes. Germ.; 76,15 "-rulae II."; 40,5 VI "vizregule."; 129a,5 "-sterculas
II."; 24,8 "-itella X."; 114,8 VIII "fezdreglę."; 6,24 "fasciutercule
VII."; 92,6 "fascerculę tres."; 21,20 IIII "festregelę"
{saepe}"""
[match:Belege]
M1: """{=> v. ibi.} * Annal.: Plac.; a. 1266 p. 516,21."""
M1: """{=> v. ibi.} * Annal. Plac.; a. 1266 p. 516,21."""
[match:Beleg]
M1: """Catal.: thes. Germ.; 28,11 (post 851) "-um III.""""
M2: """Form.: Sangall.; 39 p. 421,16 "munuscula ... direximus, hoc est palliolum ... ,
M1: """Catal. thes. Germ.; 28,11 (post 851) "-um III.""""
M2: """Form. Sangall.; 39 p. 421,16 "munuscula ... direximus, hoc est palliolum ... ,
-as duas.""""
M3: """Catal.: thes. Germ.; 18,7 "-eterculi viginti quatuor" """
M4: """Libri: confrat. I; app. A 6 p. 137,30 "pulpitum ... -a cocco imaginata
M3: """Catal. thes. Germ.; 18,7 "-eterculi viginti quatuor" """
M4: """Libri confrat. I; app. A 6 p. 137,30 "pulpitum ... -a cocco imaginata
circumdari iussit pontifex.""""
M5: """Catal.: thes. Germ.; 18,7 "-eterculi viginti quatuor" """
M6: """Catal.: thes. Germ.; 76,15 "-rulae II"; 40,5 VI "vizregule"; 129a,5 "-sterculas
M5: """Catal. thes. Germ.; 18,7 "-eterculi viginti quatuor" """
M6: """Catal. thes. Germ.; 76,15 "-rulae II"; 40,5 VI "vizregule"; 129a,5 "-sterculas
II."; 24,8 "-itella X"; 114,8 VIII "fezdreglę"; 6,24 "fasciutercule VII";
92,6 "fascerculę tres"; 21,20 IIII "festregelę"
{saepe}"""
M7: """Ionas: Bob. Columb.; 1,17 p. 185,9 quae (sc. ferae) ad imperium eius statim veniebant."""
M8: """Chron.: Fred.; 2,35sqq. capit. p. 43. 2,36 p. 60,10."""
M9: """Arbeo: Emm.; 16 p. 49,17 "ex imperio principis ... in ospiti sui scuriam ... deductus est"
M7: """Ionas Bob. Columb.; 1,17 p. 185,9 quae (sc. ferae) ad imperium eius statim veniebant."""
M8: """Chron. Fred.; 2,35sqq. capit. p. 43. 2,36 p. 60,10."""
M9: """Arbeo Emm.; 16 p. 49,17 "ex imperio principis ... in ospiti sui scuriam ... deductus est"
{episcopus} {persaepe} {v. et {=> p. 1407, 57|ziel}}"""
M10:"""Arbeo: Emm.; 16 p. 49,17 "ex imperio principis ... in ospiti sui scuriam ... deductus est"
M10:"""Arbeo Emm.; 16 p. 49,17 "ex imperio principis ... in ospiti sui scuriam ... deductus est"
{episcopus;; persaepe;; v. et {=> p. 1407, 57|ziel}}"""
M11:"""Otto Frising.: gest.;
M11:"""Otto Frising. gest.;
1,24 p. 37,12
"Romanorum principem adeunt apocrisiarii imperatoris Constantinopolitani tam
confederationis vinculum ... inter duo imperia, Hesperiae videlicet et orientis,
......
......@@ -2,9 +2,9 @@
M1: """
STELLENVERZEICHNIS fascitergula
* Form.: Sangall.; 39 p. 421,16 {=> URL_1}
* Libri: confrat. I; app. A 6 p. 137,30 {-} // {-} bedeutet: keine URL vorhanden
* Catal.: thes. Germ.;
* Form. Sangall.; 39 p. 421,16 {=> URL_1}
* Libri confrat. I; app. A 6 p. 137,30 {-} // {-} bedeutet: keine URL vorhanden
* Catal. thes. Germ.;
18,7 {=> URL_3}
28,11 (post 851) {=> URL_4}
76,15 {=> URL_5}
......
......@@ -83,13 +83,16 @@ Match-test "3"
)
)
(LemmaVariante
(LAT_WORT
(:RegExp
"facietergula"
)
(Zusatz
"sim."
(:Whitespace
" "
)
)
(Zusatz
"sim."
)
)
Match-test "4"
......@@ -107,13 +110,16 @@ Match-test "4"
"facietergula"
)
(LemmaVariante
(LAT_WORT
(:RegExp
"fascistergula"
)
(Zusatz
"sim."
(:Whitespace
" "
)
)
(Zusatz
"sim."
)
)
Fail-test "99"
......@@ -159,13 +165,16 @@ Match-test "1"
"facistergula"
)
(LemmaVariante
(LAT_WORT
(:RegExp
"fascitercula"
)
(Zusatz
"sim."
(:Whitespace
" "
)
)
(Zusatz
"sim."
)
)
(GrammatikPosition
(Grammatik
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment