From f35f7f43353c6a5cdaf027a958fa744804910235 Mon Sep 17 00:00:00 2001
From: sergiusz <sergiusz.warga@gmail.com>
Date: Tue, 8 Dec 2020 00:16:45 +0100
Subject: [PATCH] Updated text2pensum parser to include comas in span and added
 Pensa up to 10th

---
 app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html   | 2 +-
 app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html   | 4 ++--
 app/templates/Pensa/02_Familia_Romana_Pensum_A.html     | 2 +-
 app/templates/Pensa/03_Puer_Improbus_Pensum_A.html      | 4 ++--
 app/templates/Pensa/03_Puer_Improbus_Pensum_B.html      | 2 +-
 app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html   | 2 +-
 app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html   | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html    | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html    | 2 +-
 app/templates/Pensa/06_Via_Latina_Pensum_A.html         | 6 +++---
 app/templates/Pensa/06_Via_Latina_Pensum_B.html         | 2 +-
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A          | 2 ++
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html     | 2 ++
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B          | 3 +++
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html     | 3 +++
 app/templates/Pensa/08_Taberna_Romana_Pensum_A          | 3 +++
 app/templates/Pensa/08_Taberna_Romana_Pensum_A.html     | 3 +++
 app/templates/Pensa/08_Taberna_Romana_Pensum_B          | 1 +
 app/templates/Pensa/08_Taberna_Romana_Pensum_B.html     | 1 +
 app/templates/Pensa/09_Pastor_et_Oves_Pensum_A          | 2 ++
 app/templates/Pensa/09_Pastor_et_Oves_Pensum_A.html     | 2 ++
 app/templates/Pensa/09_Pastor_et_Oves_Pensum_B          | 2 ++
 app/templates/Pensa/09_Pastor_et_Oves_Pensum_B.html     | 2 ++
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A      | 2 ++
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html | 2 ++
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B      | 2 ++
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B.html | 2 ++
 text2pensum.py                                          | 2 +-
 28 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A
 create mode 100644 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html
 create mode 100644 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B
 create mode 100644 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html
 create mode 100644 app/templates/Pensa/08_Taberna_Romana_Pensum_A
 create mode 100644 app/templates/Pensa/08_Taberna_Romana_Pensum_A.html
 create mode 100644 app/templates/Pensa/08_Taberna_Romana_Pensum_B
 create mode 100644 app/templates/Pensa/08_Taberna_Romana_Pensum_B.html
 create mode 100644 app/templates/Pensa/09_Pastor_et_Oves_Pensum_A
 create mode 100644 app/templates/Pensa/09_Pastor_et_Oves_Pensum_A.html
 create mode 100644 app/templates/Pensa/09_Pastor_et_Oves_Pensum_B
 create mode 100644 app/templates/Pensa/09_Pastor_et_Oves_Pensum_B.html
 create mode 100644 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
 create mode 100644 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html
 create mode 100644 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B
 create mode 100644 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B.html

diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
index c3cfe26..d1f804c 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
@@ -1,4 +1,4 @@
 Nīlus <span>fluvi<input type="text" data-expected="us"/></span> est. Nīlus et Rhēnus <span>fluvi<input type="text" data-expected="ī"/></span> <span><input type="text" data-expected="sunt"/>.</span> Crēta <span>īnsul<input type="text" data-expected="a"/></span> <span><input type="text" data-expected="est"/>.</span> Crēta et Rhodus <span>īnsul<input type="text" data-expected="ae"/></span> sunt. Brundisium <span>oppid<input type="text" data-expected="um"/></span> <span><input type="text" data-expected="est"/>.</span> Brundisium et Tūsculum <span>oppid<input type="text" data-expected="a"/></span> <span><input type="text" data-expected="sunt"/>.</span><br>
-Rhenus <span>fluvi<input type="text" data-expected="us"/></span> <span>magn<input type="text" data-expected="us"/></span> est. Tiberis est <span>fluvi<input type="text" data-expected="us"/></span> <span>parv<input type="text" data-expected="us"/>.</span> Rhenus et Danuvius non <span>fluvi<input type="text" data-expected="i"/></span> <span>parv<input type="text" data-expected="i"/></span>, sed <span>fluvi<input type="text" data-expected="i"/></span> <span>magn<input type="text" data-expected="i"/></span> sunt. Sardinia <span>insul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita <span>insul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia non <span>insul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/></span>, sed <span>insul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium non <span>oppid<input type="text" data-expected="um"/></span> <span>parv<input type="text" data-expected="um"/></span>, sed <span>oppid<input type="text" data-expected="um"/></span> <span>magn<input type="text" data-expected="um"/></span> est. Tusculum et Delphi non <span>oppid<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span>, sed <span>oppid<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> sunt.<br>
+Rhenus <span>fluvi<input type="text" data-expected="us"/></span> <span>magn<input type="text" data-expected="us"/></span> est. Tiberis est <span>fluvi<input type="text" data-expected="us"/></span> <span>parv<input type="text" data-expected="us"/>.</span> Rhenus et Danuvius non <span>fluvi<input type="text" data-expected="i"/></span> <span>parv<input type="text" data-expected="i"/>,</span> sed <span>fluvi<input type="text" data-expected="i"/></span> <span>magn<input type="text" data-expected="i"/></span> sunt. Sardinia <span>insul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita <span>insul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia non <span>insul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/>,</span> sed <span>insul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium non <span>oppid<input type="text" data-expected="um"/></span> <span>parv<input type="text" data-expected="um"/>,</span> sed <span>oppid<input type="text" data-expected="um"/></span> <span>magn<input type="text" data-expected="um"/></span> est. Tusculum et Delphi non <span>oppid<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/>,</span> sed <span>oppid<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> sunt.<br>
 Creta <span>insul<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/></span> est. Lesbos et Chios et Naxus sunt <span>insul<input type="text" data-expected="ae"/></span> <span>Graec<input type="text" data-expected="ae"/>.</span> In Graecia <span>mult<input type="text" data-expected="ae"/></span> <span>insul<input type="text" data-expected="ae"/></span> sunt. In Gallia sunt <span>mult<input type="text" data-expected="i"/></span> <span>fluvi<input type="text" data-expected="i"/>.</span> In Italia <span>mult<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/></span> sunt. In Arabia sunt <span>pauc<input type="text" data-expected="i"/></span> <span>fluvi<input type="text" data-expected="i"/></span> et <span>pauc<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/>.</span><br>
 A et B <span>litter<input type="text" data-expected="ae"/></span> <span>Latin<input type="text" data-expected="ae"/></span> sunt. C quoque <span>litter<input type="text" data-expected="a"/></span> <span>Latin<input type="text" data-expected="a"/></span> est. Multi et pauci <span>vocabul<input type="text" data-expected="a"/></span> <span>Latin<input type="text" data-expected="a"/></span> sunt. Ubi quoque <span>vocabul<input type="text" data-expected="um"/></span> <span>Latin<input type="text" data-expected="um"/></span> est. I et II <span>numer<input type="text" data-expected="i"/></span> <span>Roman<input type="text" data-expected="i"/></span> sunt. III quoque <span>numer<input type="text" data-expected="us"/></span> <span>Roman<input type="text" data-expected="us"/></span> est.
\ No newline at end of file
diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
index 1020c59..a25c001 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
@@ -1,2 +1,2 @@
-Sicilia <span><input type="text" data-expected="insula"/></span> est. Italia insula <span><input type="text" data-expected="non"/></span> est. Rhenus <span><input type="text" data-expected="fluvius"/></span> est. Brundisium <span><input type="text" data-expected="oppidum"/></span> est. Sicilia et Sardinia <span><input type="text" data-expected="insulae"/></span> magnae sunt. Melita insula <span><input type="text" data-expected="parva"/></span> est. Britannia non <span><input type="text" data-expected="insula"/></span> parva, sed <span><input type="text" data-expected="insula"/></span> <span><input type="text" data-expected="magna"/></span> est. Brundisium non <span><input type="text" data-expected="oppidum"/></span> <span><input type="text" data-expected="parvum"/></span>, sed <span><input type="text" data-expected="oppidum"/></span> magnum est. <span>Est<input type="text" data-expected="ne"/></span> Brundisium in Graecia? Brundisium <span><input type="text" data-expected="non"/></span> est in Graecia, <span><input type="text" data-expected="sed"/></span> in Italia. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graecia. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphi <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios <span><input type="text" data-expected="insulae"/></span> Graecae sunt. In Graecia sunt <span><input type="text" data-expected="multae"/></span> insulae.
-Quid est III? III <span><input type="text" data-expected="numerus"/></span> est. Quid est A? A littera est. A, B, C <span><input type="text" data-expected="litterae"/></span> Latinae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latina est? Γ <span><input type="text" data-expected="non"/></span> littera <span><input type="text" data-expected="Latina"/></span>, sed littera <span><input type="text" data-expected="Graeca"/></span> est. Insula <span><input type="text" data-expected="vocabulum"/></span> Latinum est.
\ No newline at end of file
+Sicilia <span><input type="text" data-expected="insula"/></span> est. Italia insula <span><input type="text" data-expected="non"/></span> est. Rhenus <span><input type="text" data-expected="fluvius"/></span> est. Brundisium <span><input type="text" data-expected="oppidum"/></span> est. Sicilia et Sardinia <span><input type="text" data-expected="insulae"/></span> magnae sunt. Melita insula <span><input type="text" data-expected="parva"/></span> est. Britannia non <span><input type="text" data-expected="insula"/></span> parva, sed <span><input type="text" data-expected="insula"/></span> <span><input type="text" data-expected="magna"/></span> est. Brundisium non <span><input type="text" data-expected="oppidum"/></span> <span><input type="text" data-expected="parvum"/>,</span> sed <span><input type="text" data-expected="oppidum"/></span> magnum est. <span>Est<input type="text" data-expected="ne"/></span> Brundisium in Graecia? Brundisium <span><input type="text" data-expected="non"/></span> est in Graecia, <span><input type="text" data-expected="sed"/></span> in Italia. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graecia. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphi <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios <span><input type="text" data-expected="insulae"/></span> Graecae sunt. In Graecia sunt <span><input type="text" data-expected="multae"/></span> insulae.
+Quid est III? III <span><input type="text" data-expected="numerus"/></span> est. Quid est A? A littera est. A, B, C <span><input type="text" data-expected="litterae"/></span> Latinae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latina est? Γ <span><input type="text" data-expected="non"/></span> littera <span><input type="text" data-expected="Latina"/>,</span> sed littera <span><input type="text" data-expected="Graeca"/></span> est. Insula <span><input type="text" data-expected="vocabulum"/></span> Latinum est.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_A.html b/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
index 081b2fb..8ea9c63 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
@@ -1,3 +1,3 @@
-Marcus <span>fili<input type="text" data-expected="us"/></span> Iulii est. Iulia <span>fili<input type="text" data-expected="a"/></span> Iulii est. Iulius est vir <span>Roman<input type="text" data-expected="us"/>.</span> Aemilia <span>femin<input type="text" data-expected="a"/></span> <span>Roman<input type="text" data-expected="a"/></span> est. Iulius <span>domin<input type="text" data-expected="us"/></span>, Aemilia <span>domin<input type="text" data-expected="a"/></span> est. Medus <span>serv<input type="text" data-expected="us"/></span> <span>Graec<input type="text" data-expected="us"/></span> est, Delia est <span>ancill<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/>.</span> Sparta <span>oppid<input type="text" data-expected="um"/></span> <span>Graec<input type="text" data-expected="um"/></span> est.
+Marcus <span>fili<input type="text" data-expected="us"/></span> Iulii est. Iulia <span>fili<input type="text" data-expected="a"/></span> Iulii est. Iulius est vir <span>Roman<input type="text" data-expected="us"/>.</span> Aemilia <span>femin<input type="text" data-expected="a"/></span> <span>Roman<input type="text" data-expected="a"/></span> est. Iulius <span>domin<input type="text" data-expected="us"/>,</span> Aemilia <span>domin<input type="text" data-expected="a"/></span> est. Medus <span>serv<input type="text" data-expected="us"/></span> <span>Graec<input type="text" data-expected="us"/></span> est, Delia est <span>ancill<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/>.</span> Sparta <span>oppid<input type="text" data-expected="um"/></span> <span>Graec<input type="text" data-expected="um"/></span> est.
 Iulius pater <span>Marc<input type="text" data-expected="i"/></span> est. Marcus est filius <span>Iuli<input type="text" data-expected="i"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Medus servus <span>Iuli<input type="text" data-expected="i"/></span> est: Iulius est dominus <span>serv<input type="text" data-expected="i"/>.</span> Iulius dominus <span>Med<input type="text" data-expected="i"/></span> et <span>Dav<input type="text" data-expected="i"/></span> est: Iulius dominus <span>serv<input type="text" data-expected="orum"/></span> est. Numerus <span>serv<input type="text" data-expected="orum"/></span> magnus est. Delia est ancilla <span>Aemili<input type="text" data-expected="ae"/></span>: Aemilia domina <span>ancill<input type="text" data-expected="ae"/></span> est. Aemilia domina <span>Deli<input type="text" data-expected="ae"/></span> et <span>Syr<input type="text" data-expected="ae"/></span> est: Aemilia domina <span>ancill<input type="text" data-expected="arum"/></span> est. In familia <span>Iuli<input type="text" data-expected="i"/></span> est magnus numerus <span>serv<input type="text" data-expected="orum"/></span> et <span>ancill<input type="text" data-expected="arum"/>.</span> Aemilia mater <span>Marc<input type="text" data-expected="i"/></span> et <span>Quint<input type="text" data-expected="i"/></span> et <span>Iuli<input type="text" data-expected="ae"/></span> est. Marcus, Quintus Iuliaque sunt liberi <span>Iuli<input type="text" data-expected="i"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Numerus <span>liber<input type="text" data-expected="orum"/></span> est tres. Numerus <span>serv<input type="text" data-expected="orum"/></span> est centum.
 In pagina prima <span>capitul<input type="text" data-expected="i"/></span> <span>secund<input type="text" data-expected="i"/></span> multa vocabula nova sunt. Numerus <span>capitul<input type="text" data-expected="orum"/></span> non parvus est.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html b/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
index 9eda91e..c75a824 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
@@ -1,2 +1,2 @@
-Cur <span>Marc<input type="text" data-expected="us"/></span> Iuliam pulsat? Marcus <span>Iuli<input type="text" data-expected="am"/></span> pulsat, quia <span>Iuli<input type="text" data-expected="a"/></span> cantat. <span>Iuli<input type="text" data-expected="a"/></span> <span>plor<input type="text" data-expected="at"/></span>, quia Marcus <span>e<input type="text" data-expected="am"/></span> pulsat. Iulia: "Mamma! Marcus <span><input type="text" data-expected="me"/></span> pulsat." Aemilia <span>puell<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="it"/></span> et <span>ven<input type="text" data-expected="it"/>.</span> Mater <span>Quint<input type="text" data-expected="um"/></span> videt et <span>e<input type="text" data-expected="um"/></span> <span>interrog<input type="text" data-expected="at"/></span>: "Quis me <span>voc<input type="text" data-expected="at"/></span>?" <span>Quint<input type="text" data-expected="us"/></span> <span>respond<input type="text" data-expected="et"/></span>: "Iulia <span><input type="text" data-expected="te"/></span> vocat."<br>
-Iulius <span>dorm<input type="text" data-expected="it"/>.</span> Quintus <span>Iuli<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Pater!" Marcus <span>rid<input type="text" data-expected="et"/></span>, quia <span>Iuli<input type="text" data-expected="us"/></span> non venit. Aemilia <span>Marc<input type="text" data-expected="um"/></span> <span>verber<input type="text" data-expected="at"/>.</span> Iulius <span>ven<input type="text" data-expected="it"/></span>, quia <span>Marc<input type="text" data-expected="us"/></span> plorat. Iulius <span>Aemili<input type="text" data-expected="am"/></span> et <span>Marc<input type="text" data-expected="um"/></span> et <span>Quint<input type="text" data-expected="um"/></span> et <span>Iuli<input type="text" data-expected="am"/></span> videt. Iulius: "Puer qui <span>parv<input type="text" data-expected="am"/></span> <span>puell<input type="text" data-expected="am"/></span> pulsat improbus est." Iulius <span>puer<input type="text" data-expected="um"/></span> <span>improb<input type="text" data-expected="um"/></span> verberat. Quem <span>Iuli<input type="text" data-expected="us"/></span> verberat? Puer <span>qu<input type="text" data-expected="em"/></span> Iulius verberat est Marcus. Marcus <span>plor<input type="text" data-expected="at"/>.</span> Puer <span>qu<input type="text" data-expected="i"/></span> plorat <span>laet<input type="text" data-expected="us"/></span> non est. Puella <span>qu<input type="text" data-expected="ae"/></span> cantat <span>laet<input type="text" data-expected="a"/></span> est.
\ No newline at end of file
+Cur <span>Marc<input type="text" data-expected="us"/></span> Iuliam pulsat? Marcus <span>Iuli<input type="text" data-expected="am"/></span> pulsat, quia <span>Iuli<input type="text" data-expected="a"/></span> cantat. <span>Iuli<input type="text" data-expected="a"/></span> <span>plor<input type="text" data-expected="at"/>,</span> quia Marcus <span>e<input type="text" data-expected="am"/></span> pulsat. Iulia: "Mamma! Marcus <span><input type="text" data-expected="me"/></span> pulsat." Aemilia <span>puell<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="it"/></span> et <span>ven<input type="text" data-expected="it"/>.</span> Mater <span>Quint<input type="text" data-expected="um"/></span> videt et <span>e<input type="text" data-expected="um"/></span> <span>interrog<input type="text" data-expected="at"/></span>: "Quis me <span>voc<input type="text" data-expected="at"/></span>?" <span>Quint<input type="text" data-expected="us"/></span> <span>respond<input type="text" data-expected="et"/></span>: "Iulia <span><input type="text" data-expected="te"/></span> vocat."<br>
+Iulius <span>dorm<input type="text" data-expected="it"/>.</span> Quintus <span>Iuli<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Pater!" Marcus <span>rid<input type="text" data-expected="et"/>,</span> quia <span>Iuli<input type="text" data-expected="us"/></span> non venit. Aemilia <span>Marc<input type="text" data-expected="um"/></span> <span>verber<input type="text" data-expected="at"/>.</span> Iulius <span>ven<input type="text" data-expected="it"/>,</span> quia <span>Marc<input type="text" data-expected="us"/></span> plorat. Iulius <span>Aemili<input type="text" data-expected="am"/></span> et <span>Marc<input type="text" data-expected="um"/></span> et <span>Quint<input type="text" data-expected="um"/></span> et <span>Iuli<input type="text" data-expected="am"/></span> videt. Iulius: "Puer qui <span>parv<input type="text" data-expected="am"/></span> <span>puell<input type="text" data-expected="am"/></span> pulsat improbus est." Iulius <span>puer<input type="text" data-expected="um"/></span> <span>improb<input type="text" data-expected="um"/></span> verberat. Quem <span>Iuli<input type="text" data-expected="us"/></span> verberat? Puer <span>qu<input type="text" data-expected="em"/></span> Iulius verberat est Marcus. Marcus <span>plor<input type="text" data-expected="at"/>.</span> Puer <span>qu<input type="text" data-expected="i"/></span> plorat <span>laet<input type="text" data-expected="us"/></span> non est. Puella <span>qu<input type="text" data-expected="ae"/></span> cantat <span>laet<input type="text" data-expected="a"/></span> est.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html b/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
index a1dbafb..824ffd6 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
@@ -1 +1 @@
-Puella <span><input type="text" data-expected="cantat"/></span>: "Lalla." Puella <span><input type="text" data-expected="quae"/></span> cantat est Iulia. Iulia <span><input type="text" data-expected="laeta"/></span> est. Puer improbus puellam <span><input type="text" data-expected="pulsat"/>.</span> Puella <span><input type="text" data-expected="plorat"/></span>: "Uhuhu!" Puer <span><input type="text" data-expected="ridet"/></span>: "Hahahae!" Puer <span><input type="text" data-expected="qui"/></span> ridet est Marcus. Iulia Aemiliam <span><input type="text" data-expected="vocat"/></span>: "Mamma!" Aemilia <span><input type="text" data-expected="venit"/></span>, et Quintum <span><input type="text" data-expected="interrogat"/></span>: "Cur Iulia plorat?" Quintus <span><input type="text" data-expected="respondet"/></span>: "Iulia plorat, <span><input type="text" data-expected="quia"/></span> Marcus eam pulsat." Aemilia: "Marcus puer <span><input type="text" data-expected="probus"/></span> non est, puer <span><input type="text" data-expected="improbus"/></span> est! Ubi est pater?" Aemilia Iulium non <span><input type="text" data-expected="videt"/>.</span> Quintus: "Pater non <span><input type="text" data-expected="hic"/></span> est." Quintus Iulium <span><input type="text" data-expected="vocat"/></span>: "Pater!" Iulius Quintum non <span><input type="text" data-expected="audit"/>.</span> <span><input type="text" data-expected="Cur"/></span> Iulius Quintum non audit? Iulius eum non audit, quia <span><input type="text" data-expected="dormit"/>.</span> Marcus plorat, <span><input type="text" data-expected="quia"/></span> Aemilia eum verberat. Iulius Marcum audit; <span><input type="text" data-expected="iam"/></span> Iulius non dormit. <span><input type="text" data-expected="Quem"/></span> Aemilia verberat? Aemilia Marcum <span><input type="text" data-expected="verberat"/>.</span> Puer <span><input type="text" data-expected="quem"/></span> Aemilia verberat improbus est. Iulia laeta non est <span><input type="text" data-expected="neque"/></span> ridet.
\ No newline at end of file
+Puella <span><input type="text" data-expected="cantat"/></span>: "Lalla." Puella <span><input type="text" data-expected="quae"/></span> cantat est Iulia. Iulia <span><input type="text" data-expected="laeta"/></span> est. Puer improbus puellam <span><input type="text" data-expected="pulsat"/>.</span> Puella <span><input type="text" data-expected="plorat"/></span>: "Uhuhu!" Puer <span><input type="text" data-expected="ridet"/></span>: "Hahahae!" Puer <span><input type="text" data-expected="qui"/></span> ridet est Marcus. Iulia Aemiliam <span><input type="text" data-expected="vocat"/></span>: "Mamma!" Aemilia <span><input type="text" data-expected="venit"/>,</span> et Quintum <span><input type="text" data-expected="interrogat"/></span>: "Cur Iulia plorat?" Quintus <span><input type="text" data-expected="respondet"/></span>: "Iulia plorat, <span><input type="text" data-expected="quia"/></span> Marcus eam pulsat." Aemilia: "Marcus puer <span><input type="text" data-expected="probus"/></span> non est, puer <span><input type="text" data-expected="improbus"/></span> est! Ubi est pater?" Aemilia Iulium non <span><input type="text" data-expected="videt"/>.</span> Quintus: "Pater non <span><input type="text" data-expected="hic"/></span> est." Quintus Iulium <span><input type="text" data-expected="vocat"/></span>: "Pater!" Iulius Quintum non <span><input type="text" data-expected="audit"/>.</span> <span><input type="text" data-expected="Cur"/></span> Iulius Quintum non audit? Iulius eum non audit, quia <span><input type="text" data-expected="dormit"/>.</span> Marcus plorat, <span><input type="text" data-expected="quia"/></span> Aemilia eum verberat. Iulius Marcum audit; <span><input type="text" data-expected="iam"/></span> Iulius non dormit. <span><input type="text" data-expected="Quem"/></span> Aemilia verberat? Aemilia Marcum <span><input type="text" data-expected="verberat"/>.</span> Puer <span><input type="text" data-expected="quem"/></span> Aemilia verberat improbus est. Iulia laeta non est <span><input type="text" data-expected="neque"/></span> ridet.
\ No newline at end of file
diff --git a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
index 2165b25..3c99eb9 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
@@ -1 +1 @@
-Mēdus <span>ad<input type="text" data-expected="est"/>.</span> Dāvus <span>ab<input type="text" data-expected="est"/>.</span> Iūlius <span>imper<input type="text" data-expected="at"/></span>: "<span>Voc<input type="text" data-expected="ā"/></span> Dāvum, <span>Mēd<input type="text" data-expected="e"/></span>!" Mēdus Dāvum <span>voc<input type="text" data-expected="at"/></span>: "<span>Dāv<input type="text" data-expected="e"/></span>! <span>Ven<input type="text" data-expected="ī"/></span>!" Dāvus <span>ven<input type="text" data-expected="it"/></span> neque Iūlium <span>vid<input type="text" data-expected="et"/>.</span> Mēdus: "<span>Salūt<input type="text" data-expected="ā"/></span> dominum!" Dāvus dominum <span>salūt<input type="text" data-expected="at"/></span>: "Salvē, dominē! Quid est?" Dominus: "<span>Tac<input type="text" data-expected="ē"/></span>, <span>serv<input type="text" data-expected="e"/></span>! Nummī meī ubi sunt?" Servus <span>tac<input type="text" data-expected="et"/></span> neque <span>respond<input type="text" data-expected="et"/>.</span> Iūlius: "<span>Respond<input type="text" data-expected="ē"/></span>!" Dāvus: "<span>Interrog<input type="text" data-expected="ā"/></span> Mēdum!" Iūlius Mēdum <span>interrog<input type="text" data-expected="at"/></span>: "Ubi est pecūnia mea, <span>Mēd<input type="text" data-expected="e"/></span>?" Mēdus: "Dāvus pecūniam tuam <span>hab<input type="text" data-expected="et"/>.</span>" Iūlius: "<span>Pōn<input type="text" data-expected="e"/></span> sacculum tuum in mēnsā, <span>Dāv<input type="text" data-expected="e"/></span>!" Dāvus <span>pār<input type="text" data-expected="et"/></span>: sacculum suum in mēnsā <span>pōn<input type="text" data-expected="it"/>.</span> Dāvus: "<span>Vid<input type="text" data-expected="ē"/></span>, <span>domin<input type="text" data-expected="ē"/></span>: sacculus meus vacuus est." Iūlius: "<span>Sūm<input type="text" data-expected="e"/></span> sacculum tuum et <span>discēd<input type="text" data-expected="e"/></span>, <span>bon<input type="text" data-expected="e"/></span> <span>serv<input type="text" data-expected="e"/></span>!" Dāvus sacculum suum <span>sūm<input type="text" data-expected="it"/></span> et <span>discēd<input type="text" data-expected="it"/>.</span>
\ No newline at end of file
+Mēdus <span>ad<input type="text" data-expected="est"/>.</span> Dāvus <span>ab<input type="text" data-expected="est"/>.</span> Iūlius <span>imper<input type="text" data-expected="at"/></span>: "<span>Voc<input type="text" data-expected="ā"/></span> Dāvum, <span>Mēd<input type="text" data-expected="e"/></span>!" Mēdus Dāvum <span>voc<input type="text" data-expected="at"/></span>: "<span>Dāv<input type="text" data-expected="e"/></span>! <span>Ven<input type="text" data-expected="ī"/></span>!" Dāvus <span>ven<input type="text" data-expected="it"/></span> neque Iūlium <span>vid<input type="text" data-expected="et"/>.</span> Mēdus: "<span>Salūt<input type="text" data-expected="ā"/></span> dominum!" Dāvus dominum <span>salūt<input type="text" data-expected="at"/></span>: "Salvē, dominē! Quid est?" Dominus: "<span>Tac<input type="text" data-expected="ē"/>,</span> <span>serv<input type="text" data-expected="e"/></span>! Nummī meī ubi sunt?" Servus <span>tac<input type="text" data-expected="et"/></span> neque <span>respond<input type="text" data-expected="et"/>.</span> Iūlius: "<span>Respond<input type="text" data-expected="ē"/></span>!" Dāvus: "<span>Interrog<input type="text" data-expected="ā"/></span> Mēdum!" Iūlius Mēdum <span>interrog<input type="text" data-expected="at"/></span>: "Ubi est pecūnia mea, <span>Mēd<input type="text" data-expected="e"/></span>?" Mēdus: "Dāvus pecūniam tuam <span>hab<input type="text" data-expected="et"/>.</span>" Iūlius: "<span>Pōn<input type="text" data-expected="e"/></span> sacculum tuum in mēnsā, <span>Dāv<input type="text" data-expected="e"/></span>!" Dāvus <span>pār<input type="text" data-expected="et"/></span>: sacculum suum in mēnsā <span>pōn<input type="text" data-expected="it"/>.</span> Dāvus: "<span>Vid<input type="text" data-expected="ē"/>,</span> <span>domin<input type="text" data-expected="ē"/></span>: sacculus meus vacuus est." Iūlius: "<span>Sūm<input type="text" data-expected="e"/></span> sacculum tuum et <span>discēd<input type="text" data-expected="e"/>,</span> <span>bon<input type="text" data-expected="e"/></span> <span>serv<input type="text" data-expected="e"/></span>!" Dāvus sacculum suum <span>sūm<input type="text" data-expected="it"/></span> et <span>discēd<input type="text" data-expected="it"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
index 2600557..f5d6307 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
@@ -1,4 +1,4 @@
-In sacculō Iūliī <span><input type="text" data-expected="pecūniam"/></span> est. Iūlius pecūniam <span><input type="text" data-expected="numerat"/></span>: "Ūnus, duo, trēs, <span><input type="text" data-expected="quattuor"/></span>, <span><input type="text" data-expected="quīnque"/></span>, sex, <span><input type="text" data-expected="septem"/></span>, <span><input type="text" data-expected="octō"/></span>, <span><input type="text" data-expected="novem"/></span>, <span><input type="text" data-expected="decem"/>.</span>" In <span><input type="text" data-expected="sacculō"/></span> nōn centum, sed <span><input type="text" data-expected="tantum"/></span> decem nummī sunt.<br>
+In sacculō Iūliī <span><input type="text" data-expected="pecūniam"/></span> est. Iūlius pecūniam <span><input type="text" data-expected="numerat"/></span>: "Ūnus, duo, trēs, <span><input type="text" data-expected="quattuor"/>,</span> <span><input type="text" data-expected="quīnque"/>,</span> sex, <span><input type="text" data-expected="septem"/>,</span> <span><input type="text" data-expected="octō"/>,</span> <span><input type="text" data-expected="novem"/>,</span> <span><input type="text" data-expected="decem"/>.</span>" In <span><input type="text" data-expected="sacculō"/></span> nōn centum, sed <span><input type="text" data-expected="tantum"/></span> decem nummī sunt.<br>
 Dāvus dominum <span><input type="text" data-expected="salūtat"/></span>: "Salvē, domine!" Iūlius <span><input type="text" data-expected="respondet"/></span>: "Pōne sacculum tuum in <span><input type="text" data-expected="mēnsā"/></span>!" Dāvus sacculum <span><input type="text" data-expected="suum"/></span> in mēnsā <span><input type="text" data-expected="pōnit"/>.</span> Sacculus Davi <span><input type="text" data-expected="vacuus"/></span> est, in sacculo <span><input type="text" data-expected="eius"/></span> [: Davi] <span><input type="text" data-expected="nulla"/></span> pecunia est. Davus sacculum suum <span><input type="text" data-expected="sumit"/></span> et discedit.
 Iulius: "Mede! Veni!" Medus non venit, quia <span><input type="text" data-expected="is"/></span> [: Medus] pecuniam Iulii <span><input type="text" data-expected="habet"/>.</span> Iulius baculum, <span><input type="text" data-expected="quod"/></span> in mensa est, sumit et <span><input type="text" data-expected="discedit"/>.</span>
 Dominus imperat, bonus servus <span><input type="text" data-expected="paret"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
index 56e891a..bcab091 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
@@ -1,2 +1,2 @@
 Iulius et Aemilia in <span>vill<input type="text" data-expected="a"/></span> <span>habit<input type="text" data-expected="ant"/></span> cum <span>liber<input type="text" data-expected="is"/></span> et <span>serv<input type="text" data-expected="is"/>.</span> Dominus <span>mult<input type="text" data-expected="os"/></span> <span>serv<input type="text" data-expected="os"/></span> et <span>mult<input type="text" data-expected="as"/></span> <span>ancill<input type="text" data-expected="as"/></span> habet.<br>
-Aemilia in <span>peristÿl<input type="text" data-expected="o"/></span> est cum <span>Marc<input type="text" data-expected="o"/></span> et <span>Quint<input type="text" data-expected="o"/></span> et <span>Iuli<input type="text" data-expected="a"/>.</span> Iulia <span>mult<input type="text" data-expected="as"/></span> <span>ros<input type="text" data-expected="as"/></span> in <span>hort<input type="text" data-expected="o"/></span> <span>vid<input type="text" data-expected="et"/></span> et ab <span>Aemili<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Iam Aemilia <span>puell<input type="text" data-expected="am"/></span> non <span>vid<input type="text" data-expected="et"/></span>, neque pueri eam <span>vid<input type="text" data-expected="ent"/>.</span> Aemilia: "Marce et Quinte! <span>Voc<input type="text" data-expected="ate"/></span> Iuliam!" Pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>voc<input type="text" data-expected="ant"/></span>: "Iulia! <span>Ven<input type="text" data-expected="i"/></span>!" et Iulia <span>puer<input type="text" data-expected="os"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Marce et Quinte! <span>Ven<input type="text" data-expected="ite"/></span>!" Iulia pueros non <span>aud<input type="text" data-expected="it"/></span>, sed pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="iunt"/>.</span> Iulia: "Cur pueri non <span>ven<input type="text" data-expected="iunt"/></span>?" Iulia ex <span>hort<input type="text" data-expected="o"/></span> venit cum V <span>ros<input type="text" data-expected="is"/></span> <span>pulchr<input type="text" data-expected="is"/>.</span> Iulia: "<span>Vid<input type="text" data-expected="e"/></span> <span>ros<input type="text" data-expected="as"/></span> meas, mater! <span>Vid<input type="text" data-expected="ete"/></span>, pueri!" Marcus: "Rosae pulchrae sunt, puella sine <span>ros<input type="text" data-expected="is"/></span> pulchra non est!" Iulia cum <span>un<input type="text" data-expected="a"/></span> <span>ros<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Pueri <span>rid<input type="text" data-expected="ent"/>.</span> Aemilia: "<span>Tac<input type="text" data-expected="ete"/></span>, pueri! <span>Sum<input type="text" data-expected="ite"/></span> <span>ros<input type="text" data-expected="as"/></span> et <span>disced<input type="text" data-expected="ite"/></span>!" Pueri <span>ros<input type="text" data-expected="as"/></span> <span>sum<input type="text" data-expected="unt"/></span> et <span>disced<input type="text" data-expected="unt"/></span>; in <span>atri<input type="text" data-expected="o"/></span> <span>aqu<input type="text" data-expected="am"/></span> <span>sum<input type="text" data-expected="unt"/></span> ex <span>impluvi<input type="text" data-expected="o"/></span> et <span>ros<input type="text" data-expected="as"/></span> in <span>aqu<input type="text" data-expected="a"/></span> <span>pon<input type="text" data-expected="unt"/>.</span>
\ No newline at end of file
+Aemilia in <span>peristÿl<input type="text" data-expected="o"/></span> est cum <span>Marc<input type="text" data-expected="o"/></span> et <span>Quint<input type="text" data-expected="o"/></span> et <span>Iuli<input type="text" data-expected="a"/>.</span> Iulia <span>mult<input type="text" data-expected="as"/></span> <span>ros<input type="text" data-expected="as"/></span> in <span>hort<input type="text" data-expected="o"/></span> <span>vid<input type="text" data-expected="et"/></span> et ab <span>Aemili<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Iam Aemilia <span>puell<input type="text" data-expected="am"/></span> non <span>vid<input type="text" data-expected="et"/>,</span> neque pueri eam <span>vid<input type="text" data-expected="ent"/>.</span> Aemilia: "Marce et Quinte! <span>Voc<input type="text" data-expected="ate"/></span> Iuliam!" Pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>voc<input type="text" data-expected="ant"/></span>: "Iulia! <span>Ven<input type="text" data-expected="i"/></span>!" et Iulia <span>puer<input type="text" data-expected="os"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Marce et Quinte! <span>Ven<input type="text" data-expected="ite"/></span>!" Iulia pueros non <span>aud<input type="text" data-expected="it"/>,</span> sed pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="iunt"/>.</span> Iulia: "Cur pueri non <span>ven<input type="text" data-expected="iunt"/></span>?" Iulia ex <span>hort<input type="text" data-expected="o"/></span> venit cum V <span>ros<input type="text" data-expected="is"/></span> <span>pulchr<input type="text" data-expected="is"/>.</span> Iulia: "<span>Vid<input type="text" data-expected="e"/></span> <span>ros<input type="text" data-expected="as"/></span> meas, mater! <span>Vid<input type="text" data-expected="ete"/>,</span> pueri!" Marcus: "Rosae pulchrae sunt, puella sine <span>ros<input type="text" data-expected="is"/></span> pulchra non est!" Iulia cum <span>un<input type="text" data-expected="a"/></span> <span>ros<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Pueri <span>rid<input type="text" data-expected="ent"/>.</span> Aemilia: "<span>Tac<input type="text" data-expected="ete"/>,</span> pueri! <span>Sum<input type="text" data-expected="ite"/></span> <span>ros<input type="text" data-expected="as"/></span> et <span>disced<input type="text" data-expected="ite"/></span>!" Pueri <span>ros<input type="text" data-expected="as"/></span> <span>sum<input type="text" data-expected="unt"/></span> et <span>disced<input type="text" data-expected="unt"/></span>; in <span>atri<input type="text" data-expected="o"/></span> <span>aqu<input type="text" data-expected="am"/></span> <span>sum<input type="text" data-expected="unt"/></span> ex <span>impluvi<input type="text" data-expected="o"/></span> et <span>ros<input type="text" data-expected="as"/></span> in <span>aqu<input type="text" data-expected="a"/></span> <span>pon<input type="text" data-expected="unt"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
index 1513caa..df8e252 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
@@ -1,3 +1,3 @@
-Iulius in magna <span><input type="text" data-expected="villa"/></span> <span><input type="text" data-expected="habitat"/>.</span> Aemilia cum <span><input type="text" data-expected="eo"/></span> [:Iulio] habitat. Iulius Aemiliam <span><input type="text" data-expected="amat"/></span>, quia <span><input type="text" data-expected="ea"/></span> [: Aemilia] bona et <span><input type="text" data-expected="pulchra"/></span> femina est.
+Iulius in magna <span><input type="text" data-expected="villa"/></span> <span><input type="text" data-expected="habitat"/>.</span> Aemilia cum <span><input type="text" data-expected="eo"/></span> [:Iulio] habitat. Iulius Aemiliam <span><input type="text" data-expected="amat"/>,</span> quia <span><input type="text" data-expected="ea"/></span> [: Aemilia] bona et <span><input type="text" data-expected="pulchra"/></span> femina est.
 Aemilia in peristÿlo est <span><input type="text" data-expected="cum"/></span> liberis suis, sed <span><input type="text" data-expected="sine"/></span> viro suo. Iulia <span><input type="text" data-expected="ab"/></span> Aemilia discedit; iam puella in <span><input type="text" data-expected="horto"/></span> est. Iulia rosas <span><input type="text" data-expected="carpit"/></span> et <span><input type="text" data-expected="ex"/></span> horto venit cum V <span><input type="text" data-expected="rosis"/>.</span> Puella laeta est: rosae eam <span><input type="text" data-expected="delectant"/>.</span>
 Ubi est impluvium? <span><input type="text" data-expected="Id"/></span> [: impluvium] est in <span><input type="text" data-expected="atrio"/>.</span> In impluvio <span><input type="text" data-expected="aqua"/></span> est. In atrio nullae <span><input type="text" data-expected="fenestrae"/></span> sunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/06_Via_Latina_Pensum_A.html b/app/templates/Pensa/06_Via_Latina_Pensum_A.html
index e26cc27..918c848 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_A.html
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_A.html
@@ -1,4 +1,4 @@
-Iulius ab <span>oppid<input type="text" data-expected="o"/></span> Tusculo ad <span>vill<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> it. Villa eius prope <span>Tuscul<input type="text" data-expected="um"/></span> est. Iulius in lectica est inter <span>Urs<input type="text" data-expected="um"/></span> et <span>Dav<input type="text" data-expected="um"/>.</span> Dominus a servis <span>port<input type="text" data-expected="atur"/>.</span> Ursus et Davus non saccos <span>port<input type="text" data-expected="ant"/></span>, <span>sacc<input type="text" data-expected="i"/></span> a Syro et Leandro <span>port<input type="text" data-expected="antur"/>.</span> Saccus quem Leander <span>port<input type="text" data-expected="at"/></span> non tam parvus est quam saccus qui a Syro <span>port<input type="text" data-expected="atur"/>.</span>
-Medus non est apud <span>domin<input type="text" data-expected="um"/></span>, nam servus malus dominum <span>tim<input type="text" data-expected="et"/>.</span> Dominus a <span>serv<input type="text" data-expected="o"/></span> <span>mal<input type="text" data-expected="o"/></span> <span>tim<input type="text" data-expected="etur"/>.</span> Dominus <span>serv<input type="text" data-expected="um"/></span> <span>mal<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span> neque ab eo <span>aud<input type="text" data-expected="itur"/>.</span> <span>Serv<input type="text" data-expected="us"/></span> <span>mal<input type="text" data-expected="us"/></span> a <span>domin<input type="text" data-expected="o"/></span> <span>voc<input type="text" data-expected="atur"/></span> neque eum <span>aud<input type="text" data-expected="it"/>.</span>
+Iulius ab <span>oppid<input type="text" data-expected="o"/></span> Tusculo ad <span>vill<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> it. Villa eius prope <span>Tuscul<input type="text" data-expected="um"/></span> est. Iulius in lectica est inter <span>Urs<input type="text" data-expected="um"/></span> et <span>Dav<input type="text" data-expected="um"/>.</span> Dominus a servis <span>port<input type="text" data-expected="atur"/>.</span> Ursus et Davus non saccos <span>port<input type="text" data-expected="ant"/>,</span> <span>sacc<input type="text" data-expected="i"/></span> a Syro et Leandro <span>port<input type="text" data-expected="antur"/>.</span> Saccus quem Leander <span>port<input type="text" data-expected="at"/></span> non tam parvus est quam saccus qui a Syro <span>port<input type="text" data-expected="atur"/>.</span>
+Medus non est apud <span>domin<input type="text" data-expected="um"/>,</span> nam servus malus dominum <span>tim<input type="text" data-expected="et"/>.</span> Dominus a <span>serv<input type="text" data-expected="o"/></span> <span>mal<input type="text" data-expected="o"/></span> <span>tim<input type="text" data-expected="etur"/>.</span> Dominus <span>serv<input type="text" data-expected="um"/></span> <span>mal<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span> neque ab eo <span>aud<input type="text" data-expected="itur"/>.</span> <span>Serv<input type="text" data-expected="us"/></span> <span>mal<input type="text" data-expected="us"/></span> a <span>domin<input type="text" data-expected="o"/></span> <span>voc<input type="text" data-expected="atur"/></span> neque eum <span>aud<input type="text" data-expected="it"/>.</span>
 Quo it Medus? <span>Rom<input type="text" data-expected="am"/></span> it. Unde venit? Medus <span>Tuscul<input type="text" data-expected="o"/></span> venit. Ante <span>Med<input type="text" data-expected="um"/></span> est Roma, Tusculum post <span>e<input type="text" data-expected="um"/></span> est. Cornelius non Tusculo Romam, sed <span>Rom<input type="text" data-expected="a"/></span> <span>Tuscul<input type="text" data-expected="um"/></span> it, nam is <span>Tuscul<input type="text" data-expected="i"/></span> habitat. Cornelius non ambulat, sed <span>equ<input type="text" data-expected="o"/></span> <span>veh<input type="text" data-expected="itur"/>.</span>
-Lÿdia, amica Medi, <span>Rom<input type="text" data-expected="ae"/></span> habitat. Iam Medus <span>Rom<input type="text" data-expected="ae"/></span> apud <span>Lÿdi<input type="text" data-expected="am"/></span> est. Medus <span>amic<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> <span>salut<input type="text" data-expected="at"/></span> et ab <span>amic<input type="text" data-expected="a"/></span> <span>su<input type="text" data-expected="a"/></span> <span>salut<input type="text" data-expected="atur"/></span>, nam Lÿdia <span>Med<input type="text" data-expected="um"/></span> <span>am<input type="text" data-expected="at"/></span> et ab <span>e<input type="text" data-expected="o"/></span> <span>am<input type="text" data-expected="atur"/>.</span>
\ No newline at end of file
+Lÿdia, amica Medi, <span>Rom<input type="text" data-expected="ae"/></span> habitat. Iam Medus <span>Rom<input type="text" data-expected="ae"/></span> apud <span>Lÿdi<input type="text" data-expected="am"/></span> est. Medus <span>amic<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> <span>salut<input type="text" data-expected="at"/></span> et ab <span>amic<input type="text" data-expected="a"/></span> <span>su<input type="text" data-expected="a"/></span> <span>salut<input type="text" data-expected="atur"/>,</span> nam Lÿdia <span>Med<input type="text" data-expected="um"/></span> <span>am<input type="text" data-expected="at"/></span> et ab <span>e<input type="text" data-expected="o"/></span> <span>am<input type="text" data-expected="atur"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/06_Via_Latina_Pensum_B.html b/app/templates/Pensa/06_Via_Latina_Pensum_B.html
index 814a059..be4b7a8 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_B.html
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_B.html
@@ -1,2 +1,2 @@
 Ostia non <span><input type="text" data-expected="procul"/></span> a Roma, sed <span><input type="text" data-expected="prope"/></span> Romam est. <span><input type="text" data-expected="Unde"/></span> venit Iulius? Tusculo venit et <span><input type="text" data-expected="ad"/></span> villam it. Duo servi eum <span><input type="text" data-expected="portant"/>.</span> Syrus et Leander, qui <span><input type="text" data-expected="post"/></span> lecticam ambulant, duos <span><input type="text" data-expected="saccos"/></span> portant. Saccus Syri non <span><input type="text" data-expected="tam"/></span> magnus est <span><input type="text" data-expected="quam"/></span> saccus qui a Leandro portatur, <span><input type="text" data-expected="itaque"/></span> Syrus non tam <span><input type="text" data-expected="fessus"/></span> est quam Leander.
-Medus <span><input type="text" data-expected="apud"/></span> dominum non est, nam Medus dominum iratum <span><input type="text" data-expected="timet"/>.</span> Medus servus <span><input type="text" data-expected="malus"/></span> [= improbus] est; <span><input type="text" data-expected="itaque"/></span> Medus et Iulius non <span><input type="text" data-expected="amici"/></span>, sed inimici sunt. Via Latina, quae est <span><input type="text" data-expected="inter"/></span> Romam et Capuam, non tam <span><input type="text" data-expected="longa"/></span> est quam <span><input type="text" data-expected="via"/></span> Appia. <span><input type="text" data-expected="Quo"/></span> ambulat Medus? Is Romam ambulat, <span><input type="text" data-expected="nam"/></span> amica eius Romae habitat. Cornelius <span><input type="text" data-expected="autem"/></span> [= sed C.] Roma Tusculum <span><input type="text" data-expected="it"/>.</span> Tusculum est <span><input type="text" data-expected="ante"/></span> eum, <span><input type="text" data-expected="post"/></span> eum est Roma. Cornelius equo <span><input type="text" data-expected="vehitur"/></span>, is non <span><input type="text" data-expected="ambulat"/>.</span> Iulius et Cornelius ad villas suas <span><input type="text" data-expected="eunt"/>.</span>
\ No newline at end of file
+Medus <span><input type="text" data-expected="apud"/></span> dominum non est, nam Medus dominum iratum <span><input type="text" data-expected="timet"/>.</span> Medus servus <span><input type="text" data-expected="malus"/></span> [= improbus] est; <span><input type="text" data-expected="itaque"/></span> Medus et Iulius non <span><input type="text" data-expected="amici"/>,</span> sed inimici sunt. Via Latina, quae est <span><input type="text" data-expected="inter"/></span> Romam et Capuam, non tam <span><input type="text" data-expected="longa"/></span> est quam <span><input type="text" data-expected="via"/></span> Appia. <span><input type="text" data-expected="Quo"/></span> ambulat Medus? Is Romam ambulat, <span><input type="text" data-expected="nam"/></span> amica eius Romae habitat. Cornelius <span><input type="text" data-expected="autem"/></span> [= sed C.] Roma Tusculum <span><input type="text" data-expected="it"/>.</span> Tusculum est <span><input type="text" data-expected="ante"/></span> eum, <span><input type="text" data-expected="post"/></span> eum est Roma. Cornelius equo <span><input type="text" data-expected="vehitur"/>,</span> is non <span><input type="text" data-expected="ambulat"/>.</span> Iulius et Cornelius ad villas suas <span><input type="text" data-expected="eunt"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A
new file mode 100644
index 0000000..988a851
--- /dev/null
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A
@@ -0,0 +1,2 @@
+Iulius Marc_o_, fili_o_ su_o_, malum dat. Iulius Marc_o_ et Quint_o_, fili_is_ su_is_, mala dat. Iulius etiam serv_is_ su_is_, Syr_o_ et Leandr_o_, mala dat.<br>
+C_ui_ Aemilia osculum dat? Aemilia vir_o_ su_o_ Iuli_o_ osculum dat. Iulius Aemili_ae_ osculum dat. Iulius Iuli_ae_, fili_ae_ su_ae_, malum dat, neque solum Iuliae, sed etiam Syr_ae_ et Deli_ae_, ancill_is_ su_is_. Iulia mal_o_ su_o_ osculum dat!
\ No newline at end of file
diff --git a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html
new file mode 100644
index 0000000..a2a88fa
--- /dev/null
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html
@@ -0,0 +1,2 @@
+Iulius <span>Marc<input type="text" data-expected="o"/>,</span> <span>fili<input type="text" data-expected="o"/></span> <span>su<input type="text" data-expected="o"/>,</span> malum dat. Iulius <span>Marc<input type="text" data-expected="o"/></span> et <span>Quint<input type="text" data-expected="o"/>,</span> <span>fili<input type="text" data-expected="is"/></span> <span>su<input type="text" data-expected="is"/>,</span> mala dat. Iulius etiam <span>serv<input type="text" data-expected="is"/></span> <span>su<input type="text" data-expected="is"/>,</span> <span>Syr<input type="text" data-expected="o"/></span> et <span>Leandr<input type="text" data-expected="o"/>,</span> mala dat.<br>
+<span>C<input type="text" data-expected="ui"/></span> Aemilia osculum dat? Aemilia <span>vir<input type="text" data-expected="o"/></span> <span>su<input type="text" data-expected="o"/></span> <span>Iuli<input type="text" data-expected="o"/></span> osculum dat. Iulius <span>Aemili<input type="text" data-expected="ae"/></span> osculum dat. Iulius <span>Iuli<input type="text" data-expected="ae"/>,</span> <span>fili<input type="text" data-expected="ae"/></span> <span>su<input type="text" data-expected="ae"/>,</span> malum dat, neque solum Iuliae, sed etiam <span>Syr<input type="text" data-expected="ae"/></span> et <span>Deli<input type="text" data-expected="ae"/>,</span> <span>ancill<input type="text" data-expected="is"/></span> <span>su<input type="text" data-expected="is"/>.</span> Iulia <span>mal<input type="text" data-expected="o"/></span> <span>su<input type="text" data-expected="o"/></span> osculum dat!
\ No newline at end of file
diff --git a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B
new file mode 100644
index 0000000..5453fc8
--- /dev/null
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B
@@ -0,0 +1,3 @@
+Iulius ad villam _advenit_. Ostiarius ostium _aperit_ et post eum _claudit_.<br>
+Sacci non vacui, sed _pleni_ sunt. Iulius: "Videte, pueri: Hic saccus plenus _malorum_ est. Ecce malum tuum, Marce." Iulius Marco malum _dat_. Iulius filiis non _solum_ mala, sed etiam pira dat. Iam pueri _et_ mala _et_ pira habent, sed servi _neque_ mala _neque_ pira habent. Dominus servos ad _se_ vocat et _iis_ quoque mala et _pira_ dat.
+Aemilia ad Iulium _adit_ et ei _osculum_ dat. Iulia abest. Pueri non ambulant, sed _currunt_ in hortum. _Illic_ [: in horto] Iulia non est, ea in cubiculo suo est. Iulia non ridet, sed _lacrimat_: in _oculis_ eius sunt _lacrimae_. Delia: "In atrio pater tuus te _exspectat_, Iulia." Iulia _e_ [= ex] cubiculo _exit_, ad Iulium currit et _ei_ [: Iulio] osculum dat. Iulia rosam ante Iulium _tenet_. Iulia: "Nonne _haec_ rosa _formosa_ [= pulchra] est?"
\ No newline at end of file
diff --git a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html
new file mode 100644
index 0000000..c273cc1
--- /dev/null
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html
@@ -0,0 +1,3 @@
+Iulius ad villam <span><input type="text" data-expected="advenit"/>.</span> Ostiarius ostium <span><input type="text" data-expected="aperit"/></span> et post eum <span><input type="text" data-expected="claudit"/>.</span><br>
+Sacci non vacui, sed <span><input type="text" data-expected="pleni"/></span> sunt. Iulius: "Videte, pueri: Hic saccus plenus <span><input type="text" data-expected="malorum"/></span> est. Ecce malum tuum, Marce." Iulius Marco malum <span><input type="text" data-expected="dat"/>.</span> Iulius filiis non <span><input type="text" data-expected="solum"/></span> mala, sed etiam pira dat. Iam pueri <span><input type="text" data-expected="et"/></span> mala <span><input type="text" data-expected="et"/></span> pira habent, sed servi <span><input type="text" data-expected="neque"/></span> mala <span><input type="text" data-expected="neque"/></span> pira habent. Dominus servos ad <span><input type="text" data-expected="se"/></span> vocat et <span><input type="text" data-expected="iis"/></span> quoque mala et <span><input type="text" data-expected="pira"/></span> dat.
+Aemilia ad Iulium <span><input type="text" data-expected="adit"/></span> et ei <span><input type="text" data-expected="osculum"/></span> dat. Iulia abest. Pueri non ambulant, sed <span><input type="text" data-expected="currunt"/></span> in hortum. <span><input type="text" data-expected="Illic"/></span> [: in horto] Iulia non est, ea in cubiculo suo est. Iulia non ridet, sed <span><input type="text" data-expected="lacrimat"/></span>: in <span><input type="text" data-expected="oculis"/></span> eius sunt <span><input type="text" data-expected="lacrimae"/>.</span> Delia: "In atrio pater tuus te <span><input type="text" data-expected="exspectat"/>,</span> Iulia." Iulia <span><input type="text" data-expected="e"/></span> [= ex] cubiculo <span><input type="text" data-expected="exit"/>,</span> ad Iulium currit et <span><input type="text" data-expected="ei"/></span> [: Iulio] osculum dat. Iulia rosam ante Iulium <span><input type="text" data-expected="tenet"/>.</span> Iulia: "Nonne <span><input type="text" data-expected="haec"/></span> rosa <span><input type="text" data-expected="formosa"/></span> [= pulchra] est?"
\ No newline at end of file
diff --git a/app/templates/Pensa/08_Taberna_Romana_Pensum_A b/app/templates/Pensa/08_Taberna_Romana_Pensum_A
new file mode 100644
index 0000000..60ad149
--- /dev/null
+++ b/app/templates/Pensa/08_Taberna_Romana_Pensum_A
@@ -0,0 +1,3 @@
+Qu_is_ est Albinus? Est tabernarius qu_i_ ornamenta vendit. Qu_ae_ ornamenta? Ornamenta qu_ae_ Albinus vendit sunt gemmae et margaritae. Qu_id_ emit Medus? Ornamentum emit. Qu_od_ ornamentum? Ornamentum qu_od_ Medus emit est anulus c_uius_ pretium est HS C. Digitus in qu_o_ anulus ponitur est digitus quartus.<br>
+H_ic_ servus Medus, ill_e_ Davus est. Lÿdia h_unc_ servum amat, non ill_um_. Lÿdia amica h_uius_ servi est, non ill_ius_. Lÿdia h_uic_ servo osculum dat, non ill_i_. Lÿdia ab h_oc_ servo amatur, non ab ill_o_.
+H_oc_ oppidum est Tusculum, ill_ud_ est Brundisium. Cornelius in h_oc_ oppido habitat, non in ill_o_. Viae h_uius_ oppidi parvae sunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/08_Taberna_Romana_Pensum_A.html b/app/templates/Pensa/08_Taberna_Romana_Pensum_A.html
new file mode 100644
index 0000000..fecab2c
--- /dev/null
+++ b/app/templates/Pensa/08_Taberna_Romana_Pensum_A.html
@@ -0,0 +1,3 @@
+<span>Qu<input type="text" data-expected="is"/></span> est Albinus? Est tabernarius <span>qu<input type="text" data-expected="i"/></span> ornamenta vendit. <span>Qu<input type="text" data-expected="ae"/></span> ornamenta? Ornamenta <span>qu<input type="text" data-expected="ae"/></span> Albinus vendit sunt gemmae et margaritae. <span>Qu<input type="text" data-expected="id"/></span> emit Medus? Ornamentum emit. <span>Qu<input type="text" data-expected="od"/></span> ornamentum? Ornamentum <span>qu<input type="text" data-expected="od"/></span> Medus emit est anulus <span>c<input type="text" data-expected="uius"/></span> pretium est HS C. Digitus in <span>qu<input type="text" data-expected="o"/></span> anulus ponitur est digitus quartus.<br>
+<span>H<input type="text" data-expected="ic"/></span> servus Medus, <span>ill<input type="text" data-expected="e"/></span> Davus est. Lÿdia <span>h<input type="text" data-expected="unc"/></span> servum amat, non <span>ill<input type="text" data-expected="um"/>.</span> Lÿdia amica <span>h<input type="text" data-expected="uius"/></span> servi est, non <span>ill<input type="text" data-expected="ius"/>.</span> Lÿdia <span>h<input type="text" data-expected="uic"/></span> servo osculum dat, non <span>ill<input type="text" data-expected="i"/>.</span> Lÿdia ab <span>h<input type="text" data-expected="oc"/></span> servo amatur, non ab <span>ill<input type="text" data-expected="o"/>.</span>
+<span>H<input type="text" data-expected="oc"/></span> oppidum est Tusculum, <span>ill<input type="text" data-expected="ud"/></span> est Brundisium. Cornelius in <span>h<input type="text" data-expected="oc"/></span> oppido habitat, non in <span>ill<input type="text" data-expected="o"/>.</span> Viae <span>h<input type="text" data-expected="uius"/></span> oppidi parvae sunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/08_Taberna_Romana_Pensum_B b/app/templates/Pensa/08_Taberna_Romana_Pensum_B
new file mode 100644
index 0000000..c06343f
--- /dev/null
+++ b/app/templates/Pensa/08_Taberna_Romana_Pensum_B
@@ -0,0 +1 @@
+Gemmae et margaritae _ornamenta_ pulchra sunt. Aemilia multa ornamenta a Iulio _accipit_. Aemilia _margaritas_ in collo et anulum in _digito_ habet. Multae feminae ante tabernam Albini _consistunt_ et ornamenta eius aspiciunt. Viri ornamenta _emunt_ et feminis dant. _Anulus_ gemmatus centum sestertiis _constat_. _Pretium_ anuli est centum sestertii, sed Medus _nonaginta_ [XC] tantum habet. Albinus: "Nonaginta non _satis_ est!" Medus: "Accipe nonaginta sestertios _aut_ nullos!" Anulus ad digitum medium non _convenit_: digitus medius _nimis_ magnus est. Sed anulus convenit ad digitum _quartum_ [IV], qui non _tantus_ est quantus digitus _medius_. Lÿdia laeta digitum suum _aspicit_ et cum Medo a taberna _abit_. Lÿdia Medo viam _monstrat_.
\ No newline at end of file
diff --git a/app/templates/Pensa/08_Taberna_Romana_Pensum_B.html b/app/templates/Pensa/08_Taberna_Romana_Pensum_B.html
new file mode 100644
index 0000000..5078670
--- /dev/null
+++ b/app/templates/Pensa/08_Taberna_Romana_Pensum_B.html
@@ -0,0 +1 @@
+Gemmae et margaritae <span><input type="text" data-expected="ornamenta"/></span> pulchra sunt. Aemilia multa ornamenta a Iulio <span><input type="text" data-expected="accipit"/>.</span> Aemilia <span><input type="text" data-expected="margaritas"/></span> in collo et anulum in <span><input type="text" data-expected="digito"/></span> habet. Multae feminae ante tabernam Albini <span><input type="text" data-expected="consistunt"/></span> et ornamenta eius aspiciunt. Viri ornamenta <span><input type="text" data-expected="emunt"/></span> et feminis dant. <span><input type="text" data-expected="Anulus"/></span> gemmatus centum sestertiis <span><input type="text" data-expected="constat"/>.</span> <span><input type="text" data-expected="Pretium"/></span> anuli est centum sestertii, sed Medus <span><input type="text" data-expected="nonaginta"/></span> [XC] tantum habet. Albinus: "Nonaginta non <span><input type="text" data-expected="satis"/></span> est!" Medus: "Accipe nonaginta sestertios <span><input type="text" data-expected="aut"/></span> nullos!" Anulus ad digitum medium non <span><input type="text" data-expected="convenit"/></span>: digitus medius <span><input type="text" data-expected="nimis"/></span> magnus est. Sed anulus convenit ad digitum <span><input type="text" data-expected="quartum"/></span> [IV], qui non <span><input type="text" data-expected="tantus"/></span> est quantus digitus <span><input type="text" data-expected="medius"/>.</span> Lÿdia laeta digitum suum <span><input type="text" data-expected="aspicit"/></span> et cum Medo a taberna <span><input type="text" data-expected="abit"/>.</span> Lÿdia Medo viam <span><input type="text" data-expected="monstrat"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A
new file mode 100644
index 0000000..a719f16
--- /dev/null
+++ b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A
@@ -0,0 +1,2 @@
+In Italia sunt multi pastor_es_. Numerus pastor_um_ magnus est. Pastor Iulii unum can_em_ et multas ov_es_ habet. Pastor est dominus can_is_ et ov_ium_. Can_is_ et ov_es_ pastor_em_ amant. Cibus ov_ium_ est herba, cibus pastor_is_ est panis. Pastor pan_em_ est.<br>
+In coll_e_ una arbor est. Pastor cum can_e_ et ov_ibus_ ad arbor_em_ it. Iam pastor in umbra arbor_is_ iacet. Arbor pastor_i_ et can_i_ et ov_ibus_ umbram dat, sed ov_is_ nigra in sol_e_ iacet. Nullae nub_es_ ante sol_em_ sunt. In silva multae arbor_es_ sunt, sub arbor_ibus_ umbra est. Ov_is_ nigra a pastor_e_ ceterisque ov_ibus_ discedit. Canis ov_em_ videt.
\ No newline at end of file
diff --git a/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A.html b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A.html
new file mode 100644
index 0000000..d175770
--- /dev/null
+++ b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_A.html
@@ -0,0 +1,2 @@
+In Italia sunt multi <span>pastor<input type="text" data-expected="es"/>.</span> Numerus <span>pastor<input type="text" data-expected="um"/></span> magnus est. Pastor Iulii unum <span>can<input type="text" data-expected="em"/></span> et multas <span>ov<input type="text" data-expected="es"/></span> habet. Pastor est dominus <span>can<input type="text" data-expected="is"/></span> et <span>ov<input type="text" data-expected="ium"/>.</span> <span>Can<input type="text" data-expected="is"/></span> et <span>ov<input type="text" data-expected="es"/></span> <span>pastor<input type="text" data-expected="em"/></span> amant. Cibus <span>ov<input type="text" data-expected="ium"/></span> est herba, cibus <span>pastor<input type="text" data-expected="is"/></span> est panis. Pastor <span>pan<input type="text" data-expected="em"/></span> est.<br>
+In <span>coll<input type="text" data-expected="e"/></span> una arbor est. Pastor cum <span>can<input type="text" data-expected="e"/></span> et <span>ov<input type="text" data-expected="ibus"/></span> ad <span>arbor<input type="text" data-expected="em"/></span> it. Iam pastor in umbra <span>arbor<input type="text" data-expected="is"/></span> iacet. Arbor <span>pastor<input type="text" data-expected="i"/></span> et <span>can<input type="text" data-expected="i"/></span> et <span>ov<input type="text" data-expected="ibus"/></span> umbram dat, sed <span>ov<input type="text" data-expected="is"/></span> nigra in <span>sol<input type="text" data-expected="e"/></span> iacet. Nullae <span>nub<input type="text" data-expected="es"/></span> ante <span>sol<input type="text" data-expected="em"/></span> sunt. In silva multae <span>arbor<input type="text" data-expected="es"/></span> sunt, sub <span>arbor<input type="text" data-expected="ibus"/></span> umbra est. <span>Ov<input type="text" data-expected="is"/></span> nigra a <span>pastor<input type="text" data-expected="e"/></span> ceterisque <span>ov<input type="text" data-expected="ibus"/></span> discedit. Canis <span>ov<input type="text" data-expected="em"/></span> videt.
\ No newline at end of file
diff --git a/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B
new file mode 100644
index 0000000..458ad04
--- /dev/null
+++ b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B
@@ -0,0 +1,2 @@
+Pastor et centum _oves_ in _campo_ sunt. Pastor ovibus aquam et _cibum_ dat. Cibus ovium est _herba_, cibus pastoris est _panis_. Pastor panem _est_. Oves herbam _edunt_ et aquam _bibunt_ e _rivo_.<br>
+Sol _lucet_, nulla _nubes_ in caelo _supra_ hunc campum videtur. In colle una _arbor_ est, in _silva_ multae arbores sunt. Sub arboribus umbra est. Pastor oves suas ad arborem _ducit_. _Dum_ pastor in _umbra_ arboris iacet, ovis nigra ceteras oves _relinquit_ et silvam _petit_. In terra sunt _vestigia_ lupi; lupus _ipse_ non procul abest. Lupus in silva cibum _quaerit_, dum pastor et _canis_ ovem quaerunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B.html b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B.html
new file mode 100644
index 0000000..b524a56
--- /dev/null
+++ b/app/templates/Pensa/09_Pastor_et_Oves_Pensum_B.html
@@ -0,0 +1,2 @@
+Pastor et centum <span><input type="text" data-expected="oves"/></span> in <span><input type="text" data-expected="campo"/></span> sunt. Pastor ovibus aquam et <span><input type="text" data-expected="cibum"/></span> dat. Cibus ovium est <span><input type="text" data-expected="herba"/>,</span> cibus pastoris est <span><input type="text" data-expected="panis"/>.</span> Pastor panem <span><input type="text" data-expected="est"/>.</span> Oves herbam <span><input type="text" data-expected="edunt"/></span> et aquam <span><input type="text" data-expected="bibunt"/></span> e <span><input type="text" data-expected="rivo"/>.</span><br>
+Sol <span><input type="text" data-expected="lucet"/>,</span> nulla <span><input type="text" data-expected="nubes"/></span> in caelo <span><input type="text" data-expected="supra"/></span> hunc campum videtur. In colle una <span><input type="text" data-expected="arbor"/></span> est, in <span><input type="text" data-expected="silva"/></span> multae arbores sunt. Sub arboribus umbra est. Pastor oves suas ad arborem <span><input type="text" data-expected="ducit"/>.</span> <span><input type="text" data-expected="Dum"/></span> pastor in <span><input type="text" data-expected="umbra"/></span> arboris iacet, ovis nigra ceteras oves <span><input type="text" data-expected="relinquit"/></span> et silvam <span><input type="text" data-expected="petit"/>.</span> In terra sunt <span><input type="text" data-expected="vestigia"/></span> lupi; lupus <span><input type="text" data-expected="ipse"/></span> non procul abest. Lupus in silva cibum <span><input type="text" data-expected="quaerit"/>,</span> dum pastor et <span><input type="text" data-expected="canis"/></span> ovem quaerunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
new file mode 100644
index 0000000..cfa0255
--- /dev/null
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
@@ -0,0 +1,2 @@
+Av_es_ in aer_e_ volant. Pisc_es_ in aqua natant. Iulia neque vol_are_ neque nat_are_ potest. Homo duos ped_es_ habet, itaque homo ambul_are_ potest. Homo mortuus se mov_ere_ non potest. Spir_are_ necesse est homini, nam sine anima nemo viv_ere_ potest. Cum homo spirat, anima in pulmon_es_ intrat et ex pulmon_ibus_ exit. Homo qui spirat mortuus es_se_ non potest. Homin_es_ deos vid_ere_ non possunt. Dei ab homin_ibus_ vid_eri_ non possunt. Nemo pisces numer_are_ potest. Pisces numer_ari_ non possunt. Sinecunia cibus em_i_ non potest.<br>
+Pueri Iuliam can_ere_ audiunt. Marcus Quintum ad terram cad_ere_ videt. Iulius Marcum clam_are_ audit. Pueri saccum a Iulio in mensa pon_i_ et aper_iri_ vident.
\ No newline at end of file
diff --git a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html
new file mode 100644
index 0000000..245d57f
--- /dev/null
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html
@@ -0,0 +1,2 @@
+<span>Av<input type="text" data-expected="es"/></span> in <span>aer<input type="text" data-expected="e"/></span> volant. <span>Pisc<input type="text" data-expected="es"/></span> in aqua natant. Iulia neque <span>vol<input type="text" data-expected="are"/></span> neque <span>nat<input type="text" data-expected="are"/></span> potest. Homo duos <span>ped<input type="text" data-expected="es"/></span> habet, itaque homo <span>ambul<input type="text" data-expected="are"/></span> potest. Homo mortuus se <span>mov<input type="text" data-expected="ere"/></span> non potest. <span>Spir<input type="text" data-expected="are"/></span> necesse est homini, nam sine anima nemo <span>viv<input type="text" data-expected="ere"/></span> potest. Cum homo spirat, anima in <span>pulmon<input type="text" data-expected="es"/></span> intrat et ex <span>pulmon<input type="text" data-expected="ibus"/></span> exit. Homo qui spirat mortuus <span>es<input type="text" data-expected="se"/></span> non potest. <span>Homin<input type="text" data-expected="es"/></span> deos <span>vid<input type="text" data-expected="ere"/></span> non possunt. Dei ab <span>homin<input type="text" data-expected="ibus"/></span> <span>vid<input type="text" data-expected="eri"/></span> non possunt. Nemo pisces <span>numer<input type="text" data-expected="are"/></span> potest. Pisces <span>numer<input type="text" data-expected="ari"/></span> non possunt. Sinecunia cibus <span>em<input type="text" data-expected="i"/></span> non potest.<br>
+Pueri Iuliam <span>can<input type="text" data-expected="ere"/></span> audiunt. Marcus Quintum ad terram <span>cad<input type="text" data-expected="ere"/></span> videt. Iulius Marcum <span>clam<input type="text" data-expected="are"/></span> audit. Pueri saccum a Iulio in mensa <span>pon<input type="text" data-expected="i"/></span> et <span>aper<input type="text" data-expected="iri"/></span> vident.
\ No newline at end of file
diff --git a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B
new file mode 100644
index 0000000..88a6c16
--- /dev/null
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B
@@ -0,0 +1,2 @@
+Leo et aquila _bestiae_ sunt. Viri et feminae _homines_ sunt. Mercurius non homo, sed _deus_ est. In aqua sunt _pisces_. In aere sunt _aves_. Quid agunt pisces et _aves_? Pisces in aqua _natant_, aves in aere _volant_. Avis duas _alas_ habet, itaque avis volare _potest_. Avis quae volat alas _movet_. Cum homo ambulat, _pedes_ moventur. Cum homo _spirat_, anima in _pulmones_ intrat. Homo qui spirat _vivus_ est, qui non spirat _mortuus_ est. Nam sine anima _nemo_ vivere potest. Spirare homini _necesse_ est.<br>
+Iulia _canit_ [= cantat]. Iulia _vocem_ pulchram habet. Pueri _nidos_ quaerunt. Nidi sunt inter _ramos_ et folia arborum. In nidis avium sunt _ova_ aut pulli. Aves non pullos vivos, sed ova _pariunt_. Quintus in arborem _ascendit_ et IV _pullos_ videt in nido. Ramus qui nidum _sustinet_ tenuis est. Ramus tenuis puerum _crassum_ sustinere non potest: Quintus ad terram _cadit_. Marcus eum cadere videt et _perterritus_ est.
\ No newline at end of file
diff --git a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B.html b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B.html
new file mode 100644
index 0000000..b6de512
--- /dev/null
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_B.html
@@ -0,0 +1,2 @@
+Leo et aquila <span><input type="text" data-expected="bestiae"/></span> sunt. Viri et feminae <span><input type="text" data-expected="homines"/></span> sunt. Mercurius non homo, sed <span><input type="text" data-expected="deus"/></span> est. In aqua sunt <span><input type="text" data-expected="pisces"/>.</span> In aere sunt <span><input type="text" data-expected="aves"/>.</span> Quid agunt pisces et <span><input type="text" data-expected="aves"/></span>? Pisces in aqua <span><input type="text" data-expected="natant"/>,</span> aves in aere <span><input type="text" data-expected="volant"/>.</span> Avis duas <span><input type="text" data-expected="alas"/></span> habet, itaque avis volare <span><input type="text" data-expected="potest"/>.</span> Avis quae volat alas <span><input type="text" data-expected="movet"/>.</span> Cum homo ambulat, <span><input type="text" data-expected="pedes"/></span> moventur. Cum homo <span><input type="text" data-expected="spirat"/>,</span> anima in <span><input type="text" data-expected="pulmones"/></span> intrat. Homo qui spirat <span><input type="text" data-expected="vivus"/></span> est, qui non spirat <span><input type="text" data-expected="mortuus"/></span> est. Nam sine anima <span><input type="text" data-expected="nemo"/></span> vivere potest. Spirare homini <span><input type="text" data-expected="necesse"/></span> est.<br>
+Iulia <span><input type="text" data-expected="canit"/></span> [= cantat]. Iulia <span><input type="text" data-expected="vocem"/></span> pulchram habet. Pueri <span><input type="text" data-expected="nidos"/></span> quaerunt. Nidi sunt inter <span><input type="text" data-expected="ramos"/></span> et folia arborum. In nidis avium sunt <span><input type="text" data-expected="ova"/></span> aut pulli. Aves non pullos vivos, sed ova <span><input type="text" data-expected="pariunt"/>.</span> Quintus in arborem <span><input type="text" data-expected="ascendit"/></span> et IV <span><input type="text" data-expected="pullos"/></span> videt in nido. Ramus qui nidum <span><input type="text" data-expected="sustinet"/></span> tenuis est. Ramus tenuis puerum <span><input type="text" data-expected="crassum"/></span> sustinere non potest: Quintus ad terram <span><input type="text" data-expected="cadit"/>.</span> Marcus eum cadere videt et <span><input type="text" data-expected="perterritus"/></span> est.
\ No newline at end of file
diff --git a/text2pensum.py b/text2pensum.py
index a3223b4..c50958e 100644
--- a/text2pensum.py
+++ b/text2pensum.py
@@ -10,7 +10,7 @@ for filename in sys.argv[1:]:
 	html_input_head = '<input type="text" data-expected="'
 	html_input_tail = '"/>'
 	html_span_tail = '</span>'
-	content = re.sub(r'(\s|\")([a-zA-Z\-\ÿ]+|)_([a-zA-Z\-]+)_(\.|)', r'\1' + html_span_head + r'\2' + html_input_head + r'\3' + html_input_tail + r'\4' + html_span_tail, content)
+	content = re.sub(r'(\s|\"|)([a-zA-Z\-\ÿ]+|)_([a-zA-Z\-]+)_(\.|\,|)', r'\1' + html_span_head + r'\2' + html_input_head + r'\3' + html_input_tail + r'\4' + html_span_tail, content)
 
 	# Replace vowel-dash-vowel with vowels with macrons
 	content = content.replace('A-A', 'Ā')