From c59eb00138fe93e44eb8a4a376ba0d8b8bfb3775 Mon Sep 17 00:00:00 2001
From: sergiusz <sergiusz.warga@gmail.com>
Date: Fri, 25 Dec 2020 00:14:40 +0100
Subject: [PATCH 1/4] Added macrons

---
 app/templates/Pensa/01_Imperium_Romanum_Pensum_A        | 6 +++---
 app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html   | 6 +++---
 app/templates/Pensa/01_Imperium_Romanum_Pensum_B        | 4 ++--
 app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html   | 4 ++--
 app/templates/Pensa/02_Familia_Romana_Pensum_A          | 6 +++---
 app/templates/Pensa/02_Familia_Romana_Pensum_A.html     | 6 +++---
 app/templates/Pensa/02_Familia_Romana_Pensum_B          | 6 +++---
 app/templates/Pensa/02_Familia_Romana_Pensum_B.html     | 6 +++---
 app/templates/Pensa/03_Puer_Improbus_Pensum_A           | 2 +-
 app/templates/Pensa/03_Puer_Improbus_Pensum_A.html      | 2 +-
 app/templates/Pensa/03_Puer_Improbus_Pensum_B           | 2 +-
 app/templates/Pensa/03_Puer_Improbus_Pensum_B.html      | 2 +-
 app/templates/Pensa/04_Dominus_et_Servi_Pensum_B        | 2 +-
 app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html   | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_A         | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html    | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_B         | 2 +-
 app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html    | 2 +-
 app/templates/Pensa/06_Via_Latina_Pensum_A              | 2 +-
 app/templates/Pensa/06_Via_Latina_Pensum_A.html         | 2 +-
 app/templates/Pensa/06_Via_Latina_Pensum_B              | 4 ++--
 app/templates/Pensa/06_Via_Latina_Pensum_B.html         | 4 ++--
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A          | 4 ++--
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html     | 4 ++--
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B          | 4 ++--
 app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html     | 4 ++--
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A      | 2 +-
 app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html | 2 +-
 28 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A
index 506653a..3196278 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A
@@ -1,4 +1,4 @@
 Ni-ilus fluvi_us_ est. Ni-ilus et Rhe-enus fluvi_i-i_ _sunt_. Cre-eta i-insul_a_ _est_. Cre-eta et Rhodus i-insul_ae_ sunt. Brundisium oppid_um_ _est_. Brundisium et Tu-usculum oppid_a_ _sunt_.<br>
-Rhenus fluvi_us_ magn_us_ est. Tiberis est fluvi_us_ parv_us_. Rhenus et Danuvius non fluvi_i_ parv_i_, sed fluvi_i_ magn_i_ sunt. Sardinia insul_a_ magn_a_ est. Melita insul_a_ parv_a_ est. Sardinia et Sicilia non insul_ae_ parv_ae_, sed insul_ae_ magn_ae_ sunt. Brundisium non oppid_um_ parv_um_, sed oppid_um_ magn_um_ est. Tusculum et Delphi non oppid_a_ magn_a_, sed oppid_a_ parv_a_ sunt.<br>
-Creta insul_a_ Graec_a_ est. Lesbos et Chios et Naxus sunt insul_ae_ Graec_ae_. In Graecia mult_ae_ insul_ae_ sunt. In Gallia sunt mult_i_ fluvi_i_. In Italia mult_a_ oppid_a_ sunt. In Arabia sunt pauc_i_ fluvi_i_ et pauc_a_ oppid_a_.<br>
-A et B litter_ae_ Latin_ae_ sunt. C quoque litter_a_ Latin_a_ est. Multi et pauci vocabul_a_ Latin_a_ sunt. Ubi quoque vocabul_um_ Latin_um_ est. I et II numer_i_ Roman_i_ sunt. III quoque numer_us_ Roman_us_ est.
\ No newline at end of file
+Rhēnus fluvi_us_ magn_us_ est. Tiberis est fluvi_us_ parv_us_. Rhēnus et Dānuvius nōn fluvi_ī_ parv_ī_, sed fluvi_ī_ magn_ī_ sunt. Sardinia īnsul_a_ magn_a_ est. Melita īnsul_a_ parv_a_ est. Sardinia et Sicilia nōn īnsul_ae_ parv_ae_, sed īnsul_ae_ magn_ae_ sunt. Brundisium nōn oppid_um_ parv_um_, sed oppid_um_ magn_um_ est. Tūsculum et Delphī non oppid_a_ magn_a_, sed oppid_a_ parv_a_ sunt.<br>
+Crēta īnsul_a_ Graec_a_ est. Lesbos et Chios et Naxus sunt īnsul_ae_ Graec_ae_. In Graeciā mult_ae_ īnsul_ae_ sunt. In Galliaa sunt mult_ī_ fluvi_ī_. In Italiā mult_a_ oppid_a_ sunt. In Arabiā sunt pauc_ī_ fluvi_ī_ et pauc_a_ oppid_a_.<br>
+A et B litter_ae_ Latīn_ae_ sunt. C quoque litter_a_ Latīn_a_ est. Multī et paucī vocābul_a_ Latīn_a_ sunt. Ubi quoque vocābul_um_ Latīn_um_ est. I et II numer_i_ Rōmān_i_ sunt. III quoque numer_us_ Rōmān_us_ est.
\ No newline at end of file
diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
index d1f804c..e84ee34 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>
-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
+Rhēnus <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> Rhēnus et Dānuvius nōn fluvi_ī_ parv_ī_, sed fluvi_ī_ magn_ī_ sunt. Sardinia ī<span>nsul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita ī<span>nsul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia nōn ī<span>nsul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/>,</span> sed ī<span>nsul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium nōn <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. Tūsculum et Delphī 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>
+Crēta ī<span>nsul<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/></span> est. Lesbos et Chios et Naxus sunt ī<span>nsul<input type="text" data-expected="ae"/></span> <span>Graec<input type="text" data-expected="ae"/>.</span> In Graeciā <span>mult<input type="text" data-expected="ae"/></span> ī<span>nsul<input type="text" data-expected="ae"/></span> sunt. In Galliaa sunt mult_ī_ fluvi_ī_. In Italiā <span>mult<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/></span> sunt. In Arabiā sunt pauc_ī_ fluvi_ī_ 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> Latī<span>n<input type="text" data-expected="ae"/></span> sunt. C quoque <span>litter<input type="text" data-expected="a"/></span> Latī<span>n<input type="text" data-expected="a"/></span> est. Multī et paucī vocā<span>bul<input type="text" data-expected="a"/></span> Latī<span>n<input type="text" data-expected="a"/></span> sunt. Ubi quoque vocā<span>bul<input type="text" data-expected="um"/></span> Latī<span>n<input type="text" data-expected="um"/></span> est. I et II <span>numer<input type="text" data-expected="i"/></span> Rōmā<span>n<input type="text" data-expected="i"/></span> sunt. III quoque <span>numer<input type="text" data-expected="us"/></span> Rōmā<span>n<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 b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B
index 56c70bc..ff52288 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_B
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B
@@ -1,2 +1,2 @@
-Sicilia _insula_ est. Italia insula _non_ est. Rhenus _fluvius_ est. Brundisium _oppidum_ est. Sicilia et Sardinia _insulae_ magnae sunt. Melita insula _parva_ est. Britannia non _insula_ parva, sed _insula_ _magna_ est. Brundisium non _oppidum_ _parvum_, sed _oppidum_ magnum est. Est_ne_ Brundisium in Graecia? Brundisium _non_ est in Graecia, _sed_ in Italia. _Ubi_ est Sparta? Sparta est in Graecia. Sparta oppidum _Graecum_ est. Delphi _quoque_ oppidum Graecum est. Euboea, Naxus, Lesbos, Chios _insulae_ Graecae sunt. In Graecia sunt _multae_ insulae.
-Quid est III? III _numerus_ est. Quid est A? A littera est. A, B, C _litterae_ Latinae sunt. _Num_ Γ littera Latina est? Γ _non_ littera _Latina_, sed littera _Graeca_ est. Insula _vocabulum_ Latinum est.
\ No newline at end of file
+Sicilia _īnsula_ est. Italia īnsula _nōn_ est. Rhēnus _fluvius_ est. Brundisium _oppidum_ est. Sicilia et Sardinia _īnsulae_ magnae sunt. Melita īnsula _parva_ est. Britannia nōn _īnsula_ parva, sed _īnsula_ _magna_ est. Brundisium nōn _oppidum_ _parvum_, sed _oppidum_ magnum est. Est_ne_ Brundisium in Graeciā? Brundisium _nōn_ est in Graeciā, _sed_ in Italiā. _Ubi_ est Sparta? Sparta est in Graeciā. Sparta oppidum _Graecum_ est. Delphī _quoque_ oppidum Graecum est. Euboea, Naxus, Lesbos, Chios _īnsulae_ Graecae sunt. In Graeciā sunt _multae_ īnsulae.
+Quid est III? III _numerus_ est. Quid est A? A littera est. A, B, C _litterae_ Latīnae sunt. _Num_ Γ littera Latīna est? Γ _nōn_ littera _Latīna_, sed littera _Graeca_ est. Īnsula _vocabulum_ Latinum 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 a25c001..3dcd711 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 _īnsula_ est. Italia īnsula _nōn_ est. Rhēnus <span><input type="text" data-expected="fluvius"/></span> est. Brundisium <span><input type="text" data-expected="oppidum"/></span> est. Sicilia et Sardinia _īnsulae_ magnae sunt. Melita īnsula <span><input type="text" data-expected="parva"/></span> est. Britannia nōn _īnsula_ parva, sed _īnsula_ <span><input type="text" data-expected="magna"/></span> est. Brundisium nōn <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 Graeciā? Brundisium _nōn_ est in Graeciā, <span><input type="text" data-expected="sed"/></span> in Italiā. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graeciā. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphī <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios _īnsulae_ Graecae sunt. In Graeciā sunt <span><input type="text" data-expected="multae"/></span> īnsulae.
+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> Latīnae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latīna est? Γ _nōn_ littera _Latīna_, sed littera <span><input type="text" data-expected="Graeca"/></span> est. Īnsula <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 b/app/templates/Pensa/02_Familia_Romana_Pensum_A
index 13d8209..b164a1d 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_A
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_A
@@ -1,3 +1,3 @@
-Marcus fili_us_ Iulii est. Iulia fili_a_ Iulii est. Iulius est vir Roman_us_. Aemilia femin_a_ Roman_a_ est. Iulius domin_us_, Aemilia domin_a_ est. Medus serv_us_ Graec_us_ est, Delia est ancill_a_ Graec_a_. Sparta oppid_um_ Graec_um_ est.
-Iulius pater Marc_i_ est. Marcus est filius Iuli_i_ et Aemili_ae_. Medus servus Iuli_i_ est: Iulius est dominus serv_i_. Iulius dominus Med_i_ et Dav_i_ est: Iulius dominus serv_orum_ est. Numerus serv_orum_ magnus est. Delia est ancilla Aemili_ae_: Aemilia domina ancill_ae_ est. Aemilia domina Deli_ae_ et Syr_ae_ est: Aemilia domina ancill_arum_ est. In familia Iuli_i_ est magnus numerus serv_orum_ et ancill_arum_. Aemilia mater Marc_i_ et Quint_i_ et Iuli_ae_ est. Marcus, Quintus Iuliaque sunt liberi Iuli_i_ et Aemili_ae_. Numerus liber_orum_ est tres. Numerus serv_orum_ est centum.
-In pagina prima capitul_i_ secund_i_ multa vocabula nova sunt. Numerus capitul_orum_ non parvus est.
\ No newline at end of file
+Mārcus fīli_us_ Iūliī est. Iūlia fīli_a_ Iūliī est. Iūlius est vir Rōmān_us_. Aemilia fēmin_a_ Rōmān_a_ est. Iūlius domin_us_, Aemilia domin_a_ est. Mēdus serv_us_ Graec_us_ est, Dēlia est ancill_a_ Graec_a_. Sparta oppid_um_ Graec_um_ est.
+Iūlius pater Mārc_i_ est. Mārcus est fīlius Iūli_ī_ et Aemili_ae_. Mēdus servus Iūli_ī_ est: Iūlius est dominus serv_i_. Iūlius dominus Mēd_i_ et Dāv_i_ est: Iūlius dominus serv_orum_ est. Numerus serv_orum_ magnus est. Dēlia est ancilla Aemili_ae_: Aemilia domina ancill_ae_ est. Aemilia domina Dēli_ae_ et Syr_ae_ est: Aemilia domina ancill_arum_ est. In familiā Iūli_ī_ est magnus numerus serv_orum_ et ancill_arum_. Aemilia māter Marc_ī_ et Qūint_ī_ et Iūli_ae_ est. Mārcus, Quīntus Iūliaque sunt līberī Iūli_ī_ et Aemili_ae_. Numerus līber_orum_ est trēs. Numerus serv_orum_ est centum.
+In pāginā prīmā capitul_i_ secund_i_ multa vocābula nova sunt. Numerus capitul_orum_ nōn parvus 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 8ea9c63..01863fe 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.
-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
+Mārcus fī<span>li<input type="text" data-expected="us"/></span> Iūliī est. Iūlia fī<span>li<input type="text" data-expected="a"/></span> Iūliī est. Iūlius est vir Rōmā<span>n<input type="text" data-expected="us"/>.</span> Aemilia fē<span>min<input type="text" data-expected="a"/></span> Rōmā<span>n<input type="text" data-expected="a"/></span> est. Iūlius <span>domin<input type="text" data-expected="us"/>,</span> Aemilia <span>domin<input type="text" data-expected="a"/></span> est. Mēdus <span>serv<input type="text" data-expected="us"/></span> <span>Graec<input type="text" data-expected="us"/></span> est, Dēlia 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.
+Iūlius pater Mā<span>rc<input type="text" data-expected="i"/></span> est. Mārcus est fīlius Iūli_ī_ et <span>Aemili<input type="text" data-expected="ae"/>.</span> Mēdus servus Iūli_ī_ est: Iūlius est dominus <span>serv<input type="text" data-expected="i"/>.</span> Iūlius dominus Mē<span>d<input type="text" data-expected="i"/></span> et Dā<span>v<input type="text" data-expected="i"/></span> est: Iūlius dominus <span>serv<input type="text" data-expected="orum"/></span> est. Numerus <span>serv<input type="text" data-expected="orum"/></span> magnus est. Dēlia 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 Dē<span>li<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 familiā Iūli_ī_ est magnus numerus <span>serv<input type="text" data-expected="orum"/></span> et <span>ancill<input type="text" data-expected="arum"/>.</span> Aemilia māter Marc_ī_ et Qūint_ī_ et Iū<span>li<input type="text" data-expected="ae"/></span> est. Mārcus, Quīntus Iūliaque sunt līberī Iūli_ī_ et <span>Aemili<input type="text" data-expected="ae"/>.</span> Numerus lī<span>ber<input type="text" data-expected="orum"/></span> est trēs. Numerus <span>serv<input type="text" data-expected="orum"/></span> est centum.
+In pāginā prīmā <span>capitul<input type="text" data-expected="i"/></span> <span>secund<input type="text" data-expected="i"/></span> multa vocābula nova sunt. Numerus <span>capitul<input type="text" data-expected="orum"/></span> nōn parvus est.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_B b/app/templates/Pensa/02_Familia_Romana_Pensum_B
index de8d102..96efed8 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_B
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_B
@@ -1,4 +1,4 @@
-Marcus _puer_ Romanus est. Iulius _vir_ Romanus est. Aemilia est _femina_ Romana. Iulius est _pater_ Marci et Quinti et Iuliae. In _familia_ Iulii sunt tres _liberi_: duo _filii_ et una _filia_. _Mater_ liberorum est Aemilia.<br>
-_Quis_ est Davus? Davus est _servus_ Iulii. Iulius _dominus_ Davi est. _Quae_ est Syra? Syra _ancilla_ Aemiliae est. Aemilia est _domina_ Syrae.<br>
-Cornelius: "_Quot_ servi sunt in familia tua?" Iulius: "In familia _mea_ sunt _centum_ [C] servi." Cornelius: "Familia _tua_ magna est!"<br>
+Mārcus _puer_ Rōmānus est. Iūlius _vir_ Rōmānus est. Aemilia est _femina_ Rōmāna. Iūlius est _pater_ Marci et Quinti et Iuliae. In _familia_ Iulii sunt tres _liberi_: duo _filii_ et una _filia_. _Mater_ liberorum est Aemilia.<br>
+_Quis_ est Davus? Davus est _servus_ Iulii. Iūlius _dominus_ Davi est. _Quae_ est Syra? Syra _ancilla_ Aemiliae est. Aemilia est _domina_ Syrae.<br>
+Cornelius: "_Quot_ servi sunt in familia tua?" Iūlius: "In familia _mea_ sunt _centum_ [C] servi." Cornelius: "Familia _tua_ magna est!"<br>
 'LINGVA LATINA' est titulus _libri_ tui Latini.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_B.html b/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
index 76d8946..ceb5505 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
@@ -1,4 +1,4 @@
-Marcus <span><input type="text" data-expected="puer"/></span> Romanus est. Iulius <span><input type="text" data-expected="vir"/></span> Romanus est. Aemilia est <span><input type="text" data-expected="femina"/></span> Romana. Iulius est <span><input type="text" data-expected="pater"/></span> Marci et Quinti et Iuliae. In <span><input type="text" data-expected="familia"/></span> Iulii sunt tres <span><input type="text" data-expected="liberi"/></span>: duo <span><input type="text" data-expected="filii"/></span> et una <span><input type="text" data-expected="filia"/>.</span> <span><input type="text" data-expected="Mater"/></span> liberorum est Aemilia.<br>
-<span><input type="text" data-expected="Quis"/></span> est Davus? Davus est <span><input type="text" data-expected="servus"/></span> Iulii. Iulius <span><input type="text" data-expected="dominus"/></span> Davi est. <span><input type="text" data-expected="Quae"/></span> est Syra? Syra <span><input type="text" data-expected="ancilla"/></span> Aemiliae est. Aemilia est <span><input type="text" data-expected="domina"/></span> Syrae.<br>
-Cornelius: "<span><input type="text" data-expected="Quot"/></span> servi sunt in familia tua?" Iulius: "In familia <span><input type="text" data-expected="mea"/></span> sunt <span><input type="text" data-expected="centum"/></span> [C] servi." Cornelius: "Familia <span><input type="text" data-expected="tua"/></span> magna est!"<br>
+Mārcus <span><input type="text" data-expected="puer"/></span> Rōmānus est. Iūlius <span><input type="text" data-expected="vir"/></span> Rōmānus est. Aemilia est <span><input type="text" data-expected="femina"/></span> Rōmāna. Iūlius est <span><input type="text" data-expected="pater"/></span> Marci et Quinti et Iuliae. In <span><input type="text" data-expected="familia"/></span> Iulii sunt tres <span><input type="text" data-expected="liberi"/></span>: duo <span><input type="text" data-expected="filii"/></span> et una <span><input type="text" data-expected="filia"/>.</span> <span><input type="text" data-expected="Mater"/></span> liberorum est Aemilia.<br>
+<span><input type="text" data-expected="Quis"/></span> est Davus? Davus est <span><input type="text" data-expected="servus"/></span> Iulii. Iūlius <span><input type="text" data-expected="dominus"/></span> Davi est. <span><input type="text" data-expected="Quae"/></span> est Syra? Syra <span><input type="text" data-expected="ancilla"/></span> Aemiliae est. Aemilia est <span><input type="text" data-expected="domina"/></span> Syrae.<br>
+Cornelius: "<span><input type="text" data-expected="Quot"/></span> servi sunt in familia tua?" Iūlius: "In familia <span><input type="text" data-expected="mea"/></span> sunt <span><input type="text" data-expected="centum"/></span> [C] servi." Cornelius: "Familia <span><input type="text" data-expected="tua"/></span> magna est!"<br>
 'LINGVA LATINA' est titulus <span><input type="text" data-expected="libri"/></span> tui Latini.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_A b/app/templates/Pensa/03_Puer_Improbus_Pensum_A
index eb23624..5f7a805 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_A
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_A
@@ -1,2 +1,2 @@
 Cur Marc_us_ Iuliam pulsat? Marcus Iuli_am_ pulsat, quia Iuli_a_ cantat. Iuli_a_ plor_at_, quia Marcus e_am_ pulsat. Iulia: "Mamma! Marcus _me_ pulsat." Aemilia puell_am_ aud_it_ et ven_it_. Mater Quint_um_ videt et e_um_ interrog_at_: "Quis me voc_at_?" Quint_us_ respond_et_: "Iulia _te_ vocat."<br>
-Iulius dorm_it_. Quintus Iuli_um_ voc_at_: "Pater!" Marcus rid_et_, quia Iuli_us_ non venit. Aemilia Marc_um_ verber_at_. Iulius ven_it_, quia Marc_us_ plorat. Iulius Aemili_am_ et Marc_um_ et Quint_um_ et Iuli_am_ videt. Iulius: "Puer qui parv_am_ puell_am_ pulsat improbus est." Iulius puer_um_ improb_um_ verberat. Quem Iuli_us_ verberat? Puer qu_em_ Iulius verberat est Marcus. Marcus plor_at_. Puer qu_i_ plorat laet_us_ non est. Puella qu_ae_ cantat laet_a_ est.
\ No newline at end of file
+Iūlius dorm_it_. Quintus Iuli_um_ voc_at_: "Pater!" Marcus rid_et_, quia Iuli_us_ non venit. Aemilia Marc_um_ verber_at_. Iūlius ven_it_, quia Marc_us_ plorat. Iūlius Aemili_am_ et Marc_um_ et Quint_um_ et Iuli_am_ videt. Iūlius: "Puer qui parv_am_ puell_am_ pulsat improbus est." Iūlius puer_um_ improb_um_ verberat. Quem Iuli_us_ verberat? Puer qu_em_ Iūlius verberat est Marcus. Marcus plor_at_. Puer qu_i_ plorat laet_us_ non est. Puella qu_ae_ cantat laet_a_ 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 c75a824..d6c71d9 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
+Iūlius <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> Iūlius <span>ven<input type="text" data-expected="it"/>,</span> quia <span>Marc<input type="text" data-expected="us"/></span> plorat. Iūlius <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. Iūlius: "Puer qui <span>parv<input type="text" data-expected="am"/></span> <span>puell<input type="text" data-expected="am"/></span> pulsat improbus est." Iūlius <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> Iūlius 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 b/app/templates/Pensa/03_Puer_Improbus_Pensum_B
index 87f0367..dae5fe6 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_B
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_B
@@ -1 +1 @@
-Puella _cantat_: "Lalla." Puella _quae_ cantat est Iulia. Iulia _laeta_ est. Puer improbus puellam _pulsat_. Puella _plorat_: "Uhuhu!" Puer _ridet_: "Hahahae!" Puer _qui_ ridet est Marcus. Iulia Aemiliam _vocat_: "Mamma!" Aemilia _venit_, et Quintum _interrogat_: "Cur Iulia plorat?" Quintus _respondet_: "Iulia plorat, _quia_ Marcus eam pulsat." Aemilia: "Marcus puer _probus_ non est, puer _improbus_ est! Ubi est pater?" Aemilia Iulium non _videt_. Quintus: "Pater non _hic_ est." Quintus Iulium _vocat_: "Pater!" Iulius Quintum non _audit_. _Cur_ Iulius Quintum non audit? Iulius eum non audit, quia _dormit_. Marcus plorat, _quia_ Aemilia eum verberat. Iulius Marcum audit; _iam_ Iulius non dormit. _Quem_ Aemilia verberat? Aemilia Marcum _verberat_. Puer _quem_ Aemilia verberat improbus est. Iulia laeta non est _neque_ ridet.
\ No newline at end of file
+Puella _cantat_: "Lalla." Puella _quae_ cantat est Iulia. Iulia _laeta_ est. Puer improbus puellam _pulsat_. Puella _plorat_: "Uhuhu!" Puer _ridet_: "Hahahae!" Puer _qui_ ridet est Marcus. Iulia Aemiliam _vocat_: "Mamma!" Aemilia _venit_, et Quintum _interrogat_: "Cur Iulia plorat?" Quintus _respondet_: "Iulia plorat, _quia_ Marcus eam pulsat." Aemilia: "Marcus puer _probus_ non est, puer _improbus_ est! Ubi est pater?" Aemilia Iulium non _videt_. Quintus: "Pater non _hic_ est." Quintus Iulium _vocat_: "Pater!" Iūlius Quintum non _audit_. _Cur_ Iūlius Quintum non audit? Iūlius eum non audit, quia _dormit_. Marcus plorat, _quia_ Aemilia eum verberat. Iūlius Marcum audit; _iam_ Iūlius non dormit. _Quem_ Aemilia verberat? Aemilia Marcum _verberat_. Puer _quem_ Aemilia verberat improbus est. Iulia laeta non est _neque_ ridet.
\ 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 824ffd6..992f369 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!" Iūlius Quintum non <span><input type="text" data-expected="audit"/>.</span> <span><input type="text" data-expected="Cur"/></span> Iūlius Quintum non audit? Iūlius 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. Iūlius Marcum audit; <span><input type="text" data-expected="iam"/></span> Iūlius 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_B b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
index 051a51f..3fcb5a0 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
@@ -1,4 +1,4 @@
 In sacculo-o Iu-ulii-i _pecu-uniam_ est. Iu-ulius pecu-uniam _numerat_: "U-Unus, duo, tre-es, _quattuor_, _qui-inque_, sex, _septem_, _octo-o_, _novem_, _decem_." In _sacculo-o_ no-on centum, sed _tantum_ decem nummi-i sunt.<br>
 Da-avus dominum _salu-utat_: "Salve-e, domine!" Iu-ulius _respondet_: "Po-one sacculum tuum in _me-ensa-a_!" Da-avus sacculum _suum_ in me-ensa-a _po-onit_. Sacculus Davi _vacuus_ est, in sacculo _eius_ [: Davi] _nulla_ pecunia est. Davus sacculum suum _sumit_ et discedit.
-Iulius: "Mede! Veni!" Medus non venit, quia _is_ [: Medus] pecuniam Iulii _habet_. Iulius baculum, _quod_ in mensa est, sumit et _discedit_.
+Iūlius: "Mede! Veni!" Medus non venit, quia _is_ [: Medus] pecuniam Iulii _habet_. Iūlius baculum, _quod_ in mensa est, sumit et _discedit_.
 Dominus imperat, bonus servus _paret_.
\ 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 f5d6307..4757e5a 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>
 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>
+Iūlius: "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> Iūlius 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 b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
index 8b36463..ded5cbf 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
@@ -1,2 +1,2 @@
-Iulius et Aemilia in vill_a_ habit_ant_ cum liber_is_ et serv_is_. Dominus mult_os_ serv_os_ et mult_as_ ancill_as_ habet.<br>
+Iūlius et Aemilia in vill_a_ habit_ant_ cum liber_is_ et serv_is_. Dominus mult_os_ serv_os_ et mult_as_ ancill_as_ habet.<br>
 Aemilia in peristÿl_o_ est cum Marc_o_ et Quint_o_ et Iuli_a_. Iulia mult_as_ ros_as_ in hort_o_ vid_et_ et ab Aemili_a_ disced_it_. Iam Aemilia puell_am_ non vid_et_, neque pueri eam vid_ent_. Aemilia: "Marce et Quinte! Voc_ate_ Iuliam!" Pueri Iuli_am_ voc_ant_: "Iulia! Ven_i_!" et Iulia puer_os_ voc_at_: "Marce et Quinte! Ven_ite_!" Iulia pueros non aud_it_, sed pueri Iuli_am_ aud_iunt_. Iulia: "Cur pueri non ven_iunt_?" Iulia ex hort_o_ venit cum V ros_is_ pulchr_is_. Iulia: "Vid_e_ ros_as_ meas, mater! Vid_ete_, pueri!" Marcus: "Rosae pulchrae sunt, puella sine ros_is_ pulchra non est!" Iulia cum un_a_ ros_a_ disced_it_. Pueri rid_ent_. Aemilia: "Tac_ete_, pueri! Sum_ite_ ros_as_ et disced_ite_!" Pueri ros_as_ sum_unt_ et disced_unt_; in atri_o_ aqu_am_ sum_unt_ ex impluvi_o_ et ros_as_ in aqu_a_ pon_unt_.
\ 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 bcab091..9c05d01 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>
+Iūlius 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
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B
index 5b9fa8e..160b5ae 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B
@@ -1,3 +1,3 @@
-Iulius in magna _villa_ _habitat_. Aemilia cum _eo_ [:Iulio] habitat. Iulius Aemiliam _amat_, quia _ea_ [: Aemilia] bona et _pulchra_ femina est.
+Iūlius in magna _villa_ _habitat_. Aemilia cum _eo_ [:Iulio] habitat. Iūlius Aemiliam _amat_, quia _ea_ [: Aemilia] bona et _pulchra_ femina est.
 Aemilia in peristÿlo est _cum_ liberis suis, sed _sine_ viro suo. Iulia _ab_ Aemilia discedit; iam puella in _horto_ est. Iulia rosas _carpit_ et _ex_ horto venit cum V _rosis_. Puella laeta est: rosae eam _delectant_.
 Ubi est impluvium? _Id_ [: impluvium] est in _atrio_. In impluvio _aqua_ est. In atrio nullae _fenestrae_ sunt.
\ 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 df8e252..a421bac 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.
+Iūlius 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. Iūlius 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 b/app/templates/Pensa/06_Via_Latina_Pensum_A
index 18346ff..a090a25 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_A
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_A
@@ -1,4 +1,4 @@
-Iulius ab oppid_o_ Tusculo ad vill_am_ su_am_ it. Villa eius prope Tuscul_um_ est. Iulius in lectica est inter Urs_um_ et Dav_um_. Dominus a servis port_atur_. Ursus et Davus non saccos port_ant_, sacc_i_ a Syro et Leandro port_antur_. Saccus quem Leander port_at_ non tam parvus est quam saccus qui a Syro port_atur_.
+Iūlius ab oppid_o_ Tusculo ad vill_am_ su_am_ it. Villa eius prope Tuscul_um_ est. Iūlius in lectica est inter Urs_um_ et Dav_um_. Dominus a servis port_atur_. Ursus et Davus non saccos port_ant_, sacc_i_ a Syro et Leandro port_antur_. Saccus quem Leander port_at_ non tam parvus est quam saccus qui a Syro port_atur_.
 Medus non est apud domin_um_, nam servus malus dominum tim_et_. Dominus a serv_o_ mal_o_ tim_etur_. Dominus serv_um_ mal_um_ voc_at_ neque ab eo aud_itur_. Serv_us_ mal_us_ a domin_o_ voc_atur_ neque eum aud_it_.
 Quo it Medus? Rom_am_ it. Unde venit? Medus Tuscul_o_ venit. Ante Med_um_ est Roma, Tusculum post e_um_ est. Cornelius non Tusculo Romam, sed Rom_a_ Tuscul_um_ it, nam is Tuscul_i_ habitat. Cornelius non ambulat, sed equ_o_ veh_itur_.
 Lÿdia, amica Medi, Rom_ae_ habitat. Iam Medus Rom_ae_ apud Lÿdi_am_ est. Medus amic_am_ su_am_ salut_at_ et ab amic_a_ su_a_ salut_atur_, nam Lÿdia Med_um_ am_at_ et ab e_o_ am_atur_.
\ 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 918c848..af789f9 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>
+Iūlius 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. Iūlius 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
diff --git a/app/templates/Pensa/06_Via_Latina_Pensum_B b/app/templates/Pensa/06_Via_Latina_Pensum_B
index ec2714d..9794c9a 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_B
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_B
@@ -1,2 +1,2 @@
-Ostia non _procul_ a Roma, sed _prope_ Romam est. _Unde_ venit Iulius? Tusculo venit et _ad_ villam it. Duo servi eum _portant_. Syrus et Leander, qui _post_ lecticam ambulant, duos _saccos_ portant. Saccus Syri non _tam_ magnus est _quam_ saccus qui a Leandro portatur, _itaque_ Syrus non tam _fessus_ est quam Leander.
-Medus _apud_ dominum non est, nam Medus dominum iratum _timet_. Medus servus _malus_ [= improbus] est; _itaque_ Medus et Iulius non _amici_, sed inimici sunt. Via Latina, quae est _inter_ Romam et Capuam, non tam _longa_ est quam _via_ Appia. _Quo_ ambulat Medus? Is Romam ambulat, _nam_ amica eius Romae habitat. Cornelius _autem_ [= sed C.] Roma Tusculum _it_. Tusculum est _ante_ eum, _post_ eum est Roma. Cornelius equo _vehitur_, is non _ambulat_. Iulius et Cornelius ad villas suas _eunt_.
\ No newline at end of file
+Ostia non _procul_ a Roma, sed _prope_ Romam est. _Unde_ venit Iūlius? Tusculo venit et _ad_ villam it. Duo servi eum _portant_. Syrus et Leander, qui _post_ lecticam ambulant, duos _saccos_ portant. Saccus Syri non _tam_ magnus est _quam_ saccus qui a Leandro portatur, _itaque_ Syrus non tam _fessus_ est quam Leander.
+Medus _apud_ dominum non est, nam Medus dominum iratum _timet_. Medus servus _malus_ [= improbus] est; _itaque_ Medus et Iūlius non _amici_, sed inimici sunt. Via Latina, quae est _inter_ Romam et Capuam, non tam _longa_ est quam _via_ Appia. _Quo_ ambulat Medus? Is Romam ambulat, _nam_ amica eius Romae habitat. Cornelius _autem_ [= sed C.] Roma Tusculum _it_. Tusculum est _ante_ eum, _post_ eum est Roma. Cornelius equo _vehitur_, is non _ambulat_. Iūlius et Cornelius ad villas suas _eunt_.
\ 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 be4b7a8..d4cbc09 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
+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 Iūlius? 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 Iūlius 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> Iūlius 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
index 988a851..25b54c4 100644
--- a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A
@@ -1,2 +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
+Iūlius Marc_o_, fili_o_ su_o_, malum dat. Iūlius Marc_o_ et Quint_o_, fili_is_ su_is_, mala dat. Iūlius 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. Iūlius Aemili_ae_ osculum dat. Iūlius 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
index a2a88fa..35dabe2 100644
--- a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_A.html
@@ -1,2 +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
+Iūlius <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. Iūlius <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. Iūlius 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. Iūlius <span>Aemili<input type="text" data-expected="ae"/></span> osculum dat. Iūlius <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
index 5453fc8..e05c986 100644
--- a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B
@@ -1,3 +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.
+Iūlius ad villam _advenit_. Ostiarius ostium _aperit_ et post eum _claudit_.<br>
+Sacci non vacui, sed _pleni_ sunt. Iūlius: "Videte, pueri: Hic saccus plenus _malorum_ est. Ecce malum tuum, Marce." Iūlius Marco malum _dat_. Iūlius 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
index c273cc1..b68fc3c 100644
--- a/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html
+++ b/app/templates/Pensa/07_Puella_et_Rosa_Pensum_B.html
@@ -1,3 +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.
+Iūlius 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. Iūlius: "Videte, pueri: Hic saccus plenus <span><input type="text" data-expected="malorum"/></span> est. Ecce malum tuum, Marce." Iūlius Marco malum <span><input type="text" data-expected="dat"/>.</span> Iūlius 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/10_Bestiae_et_Homines_Pensum_A b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
index cfa0255..1a3ddcd 100644
--- a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A
@@ -1,2 +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
+Pueri Iuliam can_ere_ audiunt. Marcus Quintum ad terram cad_ere_ videt. Iūlius 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
index 245d57f..90debc6 100644
--- a/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html
+++ b/app/templates/Pensa/10_Bestiae_et_Homines_Pensum_A.html
@@ -1,2 +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
+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. Iūlius 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

From 5a0064827efacbe962c03bc5bea384eee89655dc Mon Sep 17 00:00:00 2001
From: sergiusz <sergiusz.warga@gmail.com>
Date: Wed, 6 Jan 2021 01:54:53 +0100
Subject: [PATCH 2/4] Added macrons to regex

---
 app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html | 4 ++--
 app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html | 4 ++--
 app/templates/Pensa/02_Familia_Romana_Pensum_A.html   | 2 +-
 text2pensum.py                                        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
index e84ee34..593fea3 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>
-Rhēnus <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> Rhēnus et Dānuvius nōn fluvi_ī_ parv_ī_, sed fluvi_ī_ magn_ī_ sunt. Sardinia ī<span>nsul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita ī<span>nsul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia nōn ī<span>nsul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/>,</span> sed ī<span>nsul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium nōn <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. Tūsculum et Delphī 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>
-Crēta ī<span>nsul<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/></span> est. Lesbos et Chios et Naxus sunt ī<span>nsul<input type="text" data-expected="ae"/></span> <span>Graec<input type="text" data-expected="ae"/>.</span> In Graeciā <span>mult<input type="text" data-expected="ae"/></span> ī<span>nsul<input type="text" data-expected="ae"/></span> sunt. In Galliaa sunt mult_ī_ fluvi_ī_. In Italiā <span>mult<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/></span> sunt. In Arabiā sunt pauc_ī_ fluvi_ī_ et <span>pauc<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/>.</span><br>
+Rhēnus <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> Rhēnus et Dānuvius nōn <span>fluvi<input type="text" data-expected="ī"/></span> <span>parv<input type="text" data-expected="ī"/>,</span> sed <span>fluvi<input type="text" data-expected="ī"/></span> <span>magn<input type="text" data-expected="ī"/></span> sunt. Sardinia ī<span>nsul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita ī<span>nsul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia nōn ī<span>nsul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/>,</span> sed ī<span>nsul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium nōn <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. Tūsculum et Delphī 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>
+Crēta ī<span>nsul<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/></span> est. Lesbos et Chios et Naxus sunt ī<span>nsul<input type="text" data-expected="ae"/></span> <span>Graec<input type="text" data-expected="ae"/>.</span> In Graeciā <span>mult<input type="text" data-expected="ae"/></span> ī<span>nsul<input type="text" data-expected="ae"/></span> sunt. In Galliaa sunt <span>mult<input type="text" data-expected="ī"/></span> <span>fluvi<input type="text" data-expected="ī"/>.</span> In Italiā <span>mult<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/></span> sunt. In Arabiā sunt <span>pauc<input type="text" data-expected="ī"/></span> <span>fluvi<input type="text" data-expected="ī"/></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> Latī<span>n<input type="text" data-expected="ae"/></span> sunt. C quoque <span>litter<input type="text" data-expected="a"/></span> Latī<span>n<input type="text" data-expected="a"/></span> est. Multī et paucī vocā<span>bul<input type="text" data-expected="a"/></span> Latī<span>n<input type="text" data-expected="a"/></span> sunt. Ubi quoque vocā<span>bul<input type="text" data-expected="um"/></span> Latī<span>n<input type="text" data-expected="um"/></span> est. I et II <span>numer<input type="text" data-expected="i"/></span> Rōmā<span>n<input type="text" data-expected="i"/></span> sunt. III quoque <span>numer<input type="text" data-expected="us"/></span> Rōmā<span>n<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 3dcd711..c63dc3e 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 _īnsula_ est. Italia īnsula _nōn_ est. Rhēnus <span><input type="text" data-expected="fluvius"/></span> est. Brundisium <span><input type="text" data-expected="oppidum"/></span> est. Sicilia et Sardinia _īnsulae_ magnae sunt. Melita īnsula <span><input type="text" data-expected="parva"/></span> est. Britannia nōn _īnsula_ parva, sed _īnsula_ <span><input type="text" data-expected="magna"/></span> est. Brundisium nōn <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 Graeciā? Brundisium _nōn_ est in Graeciā, <span><input type="text" data-expected="sed"/></span> in Italiā. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graeciā. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphī <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios _īnsulae_ Graecae sunt. In Graeciā sunt <span><input type="text" data-expected="multae"/></span> īnsulae.
-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> Latīnae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latīna est? Γ _nōn_ littera _Latīna_, sed littera <span><input type="text" data-expected="Graeca"/></span> est. Īnsula <span><input type="text" data-expected="vocabulum"/></span> Latinum est.
\ No newline at end of file
+Sicilia <span><input type="text" data-expected="īnsula"/></span> est. Italia īnsula <span><input type="text" data-expected="nōn"/></span> est. Rhēnus <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="īnsulae"/></span> magnae sunt. Melita īnsula <span><input type="text" data-expected="parva"/></span> est. Britannia nōn <span><input type="text" data-expected="īnsula"/></span> parva, sed <span><input type="text" data-expected="īnsula"/></span> <span><input type="text" data-expected="magna"/></span> est. Brundisium nōn <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 Graeciā? Brundisium <span><input type="text" data-expected="nōn"/></span> est in Graeciā, <span><input type="text" data-expected="sed"/></span> in Italiā. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graeciā. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphī <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios <span><input type="text" data-expected="īnsulae"/></span> Graecae sunt. In Graeciā sunt <span><input type="text" data-expected="multae"/></span> īnsulae.
+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> Latīnae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latīna est? Γ <span><input type="text" data-expected="nōn"/></span> littera <span><input type="text" data-expected="Latīna"/>,</span> sed littera <span><input type="text" data-expected="Graeca"/></span> est. Īnsula <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 01863fe..389ffc7 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 @@
 Mārcus fī<span>li<input type="text" data-expected="us"/></span> Iūliī est. Iūlia fī<span>li<input type="text" data-expected="a"/></span> Iūliī est. Iūlius est vir Rōmā<span>n<input type="text" data-expected="us"/>.</span> Aemilia fē<span>min<input type="text" data-expected="a"/></span> Rōmā<span>n<input type="text" data-expected="a"/></span> est. Iūlius <span>domin<input type="text" data-expected="us"/>,</span> Aemilia <span>domin<input type="text" data-expected="a"/></span> est. Mēdus <span>serv<input type="text" data-expected="us"/></span> <span>Graec<input type="text" data-expected="us"/></span> est, Dēlia 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.
-Iūlius pater Mā<span>rc<input type="text" data-expected="i"/></span> est. Mārcus est fīlius Iūli_ī_ et <span>Aemili<input type="text" data-expected="ae"/>.</span> Mēdus servus Iūli_ī_ est: Iūlius est dominus <span>serv<input type="text" data-expected="i"/>.</span> Iūlius dominus Mē<span>d<input type="text" data-expected="i"/></span> et Dā<span>v<input type="text" data-expected="i"/></span> est: Iūlius dominus <span>serv<input type="text" data-expected="orum"/></span> est. Numerus <span>serv<input type="text" data-expected="orum"/></span> magnus est. Dēlia 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 Dē<span>li<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 familiā Iūli_ī_ est magnus numerus <span>serv<input type="text" data-expected="orum"/></span> et <span>ancill<input type="text" data-expected="arum"/>.</span> Aemilia māter Marc_ī_ et Qūint_ī_ et Iū<span>li<input type="text" data-expected="ae"/></span> est. Mārcus, Quīntus Iūliaque sunt līberī Iūli_ī_ et <span>Aemili<input type="text" data-expected="ae"/>.</span> Numerus lī<span>ber<input type="text" data-expected="orum"/></span> est trēs. Numerus <span>serv<input type="text" data-expected="orum"/></span> est centum.
+Iūlius pater Mā<span>rc<input type="text" data-expected="i"/></span> est. Mārcus est fīlius Iū<span>li<input type="text" data-expected="ī"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Mēdus servus Iū<span>li<input type="text" data-expected="ī"/></span> est: Iūlius est dominus <span>serv<input type="text" data-expected="i"/>.</span> Iūlius dominus Mē<span>d<input type="text" data-expected="i"/></span> et Dā<span>v<input type="text" data-expected="i"/></span> est: Iūlius dominus <span>serv<input type="text" data-expected="orum"/></span> est. Numerus <span>serv<input type="text" data-expected="orum"/></span> magnus est. Dēlia 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 Dē<span>li<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 familiā Iū<span>li<input type="text" data-expected="ī"/></span> est magnus numerus <span>serv<input type="text" data-expected="orum"/></span> et <span>ancill<input type="text" data-expected="arum"/>.</span> Aemilia māter <span>Marc<input type="text" data-expected="ī"/></span> et Qū<span>int<input type="text" data-expected="ī"/></span> et Iū<span>li<input type="text" data-expected="ae"/></span> est. Mārcus, Quīntus Iūliaque sunt līberī Iū<span>li<input type="text" data-expected="ī"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Numerus lī<span>ber<input type="text" data-expected="orum"/></span> est trēs. Numerus <span>serv<input type="text" data-expected="orum"/></span> est centum.
 In pāginā prīmā <span>capitul<input type="text" data-expected="i"/></span> <span>secund<input type="text" data-expected="i"/></span> multa vocābula nova sunt. Numerus <span>capitul<input type="text" data-expected="orum"/></span> nōn parvus est.
\ No newline at end of file
diff --git a/text2pensum.py b/text2pensum.py
index c50958e..2aef827 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', 'Ā')

From 72b9a5dbc011f0cbdf52aa2c5330f10c7633bb3a Mon Sep 17 00:00:00 2001
From: sergiusz <sergiusz.warga@gmail.com>
Date: Wed, 6 Jan 2021 02:24:33 +0100
Subject: [PATCH 3/4] Fixed cloze validation

---
 app/templates/Pensum_cloze.html | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/templates/Pensum_cloze.html b/app/templates/Pensum_cloze.html
index 27954dd..c8f651e 100644
--- a/app/templates/Pensum_cloze.html
+++ b/app/templates/Pensum_cloze.html
@@ -45,11 +45,11 @@
 			return mapper[char];
 		}
 
-		function input_to_nomacron(input) {
+		function to_nonmacron(input) {
 			return input.replace(/Ā|ā|Ē|ē|Ī|ī/, macron_to_nomacron);
 		}
 
-		function input_to_macron(input) {
+		function to_macron(input) {
 			return input.replace(/(\w)\1/, nomacron_to_macron);
 		}
 
@@ -59,17 +59,19 @@
 			const inputs = pensum.querySelectorAll('input');
 			
 			inputs.forEach((input) => {
-				if (input.type=="text" && document.getElementById('vowel_length').checked == false) {
-					is_macron_ok = (input.value == input_to_nomacron(input.dataset.expected));
-					is_double_ok = false;
-				} else {
-					is_double_ok = (input_to_macron(input.value) == input.dataset.expected);
-					is_macron_ok = (input.value == input.dataset.expected);
-				}
-				if (input.type=="text" && !(is_double_ok || is_macron_ok)) {
-					input.setAttribute("class", "incorrect");
-				} else if (input.type=="text") {
-					input.setAttribute("class", "correct");
+				if (input.type == "text") {
+					is_nonmacron_ok = false;
+					is_macron_ok = false;
+					if (document.getElementById('vowel_length').checked == false) {
+						is_nonmacron_ok = (to_nonmacron(input.value) == to_nonmacron(input.dataset.expected));
+					} else {
+						is_macron_ok = (input.value == input.dataset.expected);
+					}
+					if (is_nonmacron_ok || is_macron_ok) {
+						input.setAttribute("class", "correct");
+					} else {
+						input.setAttribute("class", "incorrect");
+					}
 				}
 			});
 

From 6c0adcb74586d3448bab787895a6860b77993dd6 Mon Sep 17 00:00:00 2001
From: sergiusz <sergiusz.warga@gmail.com>
Date: Thu, 7 Jan 2021 17:19:52 +0100
Subject: [PATCH 4/4] Introduced Exercitia

---
 app/routes.py                                 |  12 +-
 .../01_Imperium_Romanum_Exercitium_1          |   5 +
 app/templates/Exercitium_choice.html          | 109 ++++++++++++++++++
 app/templates/index.html                      |   7 +-
 text2exercitium.py                            |  31 +++++
 5 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100644 app/templates/Exercitia/01_Imperium_Romanum_Exercitium_1
 create mode 100644 app/templates/Exercitium_choice.html
 create mode 100644 text2exercitium.py

diff --git a/app/routes.py b/app/routes.py
index 49799b8..e5aa711 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -3,7 +3,9 @@ from flask import render_template, jsonify
 import os
 
 capitula = [
-	{'title': '01 Imperium Romanum'},
+	{'title': '01 Imperium Romanum',
+	 'pensa': ['A', 'B'],
+	 'exercitia': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]},
 	{'title': '02 Familia Romana'},
 	{'title': '03 Puer Improbus'},
 	{'title': '04 Dominus et Servi'},
@@ -24,8 +26,14 @@ for capitulum in capitula:
 def llpsi():
 	return render_template('index.html', capitula=capitula)
 
-@app.route('/llpsi/<path:pensum_id>')
+@app.route('/llpsi/pensum/<path:pensum_id>')
 def pensum(pensum_id):
 	filename = app.root_path + '/templates/Pensa/' + pensum_id + '.html'
 	with open(filename, 'r') as file:
 		return render_template('Pensum_cloze.html', pensum_title=pensum_id.replace('_', ' '), pensum_content=file.read())
+
+@app.route('/llpsi/pensum/<path:exercitium_id>')
+def exercitium(exercitium_id):
+	filename = app.root_path + '/templates/Exercitia/' + exercitium_id + '.html'
+	with open(filename, 'r') as file:
+		return render_template('Exercitium_choice.html', exercitium_title=exercitium_id.replace('_', ' '), exercitium_content=file.read())
diff --git a/app/templates/Exercitia/01_Imperium_Romanum_Exercitium_1 b/app/templates/Exercitia/01_Imperium_Romanum_Exercitium_1
new file mode 100644
index 0000000..b816118
--- /dev/null
+++ b/app/templates/Exercitia/01_Imperium_Romanum_Exercitium_1
@@ -0,0 +1,5 @@
+est|sunt
+Italia in Eurōpā _est_.
+Gallia in Eurōpā _est_.
+Italia et Gallia in Eurōpā _sunt_.
+Arabia in Eurōpā nōn _est_.
diff --git a/app/templates/Exercitium_choice.html b/app/templates/Exercitium_choice.html
new file mode 100644
index 0000000..c8f651e
--- /dev/null
+++ b/app/templates/Exercitium_choice.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="la">
+<head>
+	<meta charset="UTF-8"/>
+	<title>{{pensum_title}}</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1"/>
+	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/LLPSI.css') }}">
+	<script type="text/javascript">
+		function adjust_size() {
+			const pensum = document.querySelector('#pensum_content');
+			const inputs = pensum.querySelectorAll('input');
+			inputs.forEach((input) => {
+				if (input.type=="text") {
+					input.setAttribute("value", "");
+					input.setAttribute("style", "width: " + input.dataset.expected.length + "em");
+				}
+			});
+		}
+
+		function nomacron_to_macron(char) {
+			var mapper = {	'A': 'Ā',
+							'a': 'ā',
+							'E': 'Ē',
+							'e': 'ē',
+							'I': 'Ī',
+							'i': 'ī',
+							'O': 'Ō',
+							'o': 'ō',
+							'U': 'Ū',
+							'u': 'ū'};
+			return mapper[char[0]];
+		}
+
+		function macron_to_nomacron(char) {
+			var mapper = {	'Ā': 'A',
+							'ā': 'a',
+							'Ē': 'E',
+							'ē': 'e',
+							'Ī': 'I',
+							'ī': 'i',
+							'Ō': 'O',
+							'ō': 'o',
+							'Ū': 'U',
+							'ū': 'u'};
+			return mapper[char];
+		}
+
+		function to_nonmacron(input) {
+			return input.replace(/Ā|ā|Ē|ē|Ī|ī/, macron_to_nomacron);
+		}
+
+		function to_macron(input) {
+			return input.replace(/(\w)\1/, nomacron_to_macron);
+		}
+
+
+		function validate() {
+			const pensum = document.querySelector('#pensum_content');
+			const inputs = pensum.querySelectorAll('input');
+			
+			inputs.forEach((input) => {
+				if (input.type == "text") {
+					is_nonmacron_ok = false;
+					is_macron_ok = false;
+					if (document.getElementById('vowel_length').checked == false) {
+						is_nonmacron_ok = (to_nonmacron(input.value) == to_nonmacron(input.dataset.expected));
+					} else {
+						is_macron_ok = (input.value == input.dataset.expected);
+					}
+					if (is_nonmacron_ok || is_macron_ok) {
+						input.setAttribute("class", "correct");
+					} else {
+						input.setAttribute("class", "incorrect");
+					}
+				}
+			});
+
+			return false;
+		}
+
+		function show_answers() {
+			const pensum = document.querySelector('#pensum_content');
+			const inputs = pensum.querySelectorAll('input');
+			
+			inputs.forEach((input) => {
+				if (input.type=="text") {
+					input.value = input.dataset.expected;
+					input.removeAttribute("class");
+				}
+			});
+		}
+	</script>
+</head>
+<body>
+	<header>
+		<h1><a href="/llpsi">Lingua Latīna Per Sē Illūstrāta</a></h1>
+		<h2>{{pensum_title}}</h2>
+		<label class="toggle">
+			Quantitās: <input type="checkbox" id="vowel_length">
+		</label>
+	</header>
+	<div id="pensum_content">
+		<p>{{pensum_content|safe}}</p>
+		<br>
+		<button title="Check answers" onclick="return validate();">Mitte</button><button title="Show correct answers" onclick="return show_answers();">Responsa</button>
+	</div>
+	<script type="text/javascript">adjust_size();</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/templates/index.html b/app/templates/index.html
index 89eb0b0..95c038f 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -11,8 +11,11 @@
 	<dl>
 	{% for capitulum in capitula %}
 		<dt>{{capitulum.title}}
-			<dd><a href="/llpsi/{{capitulum.filename}}_Pensum_A">Pensum A</a></dd>
-			<dd><a href="/llpsi/{{capitulum.filename}}_Pensum_B">Pensum B</a></dd>
+			<dd><a href="/llpsi/pensum/{{capitulum.filename}}_Pensum_A">Pensum A</a></dd>
+			<dd><a href="/llpsi/pensum/{{capitulum.filename}}_Pensum_B">Pensum B</a></dd>
+			{% for exercitium in capitulum.exercitia %}
+			<dd><a href="/llpsi/exercitium/{{capitulum.filename}}_Exercitium_{{exercitium}}">Exercitium {{exercitium}}</a></dd>
+			{% endfor %}
 		</dt>
 	{% endfor %}
 	</dl>
diff --git a/text2exercitium.py b/text2exercitium.py
new file mode 100644
index 0000000..27037f7
--- /dev/null
+++ b/text2exercitium.py
@@ -0,0 +1,31 @@
+import sys
+import re
+
+for filename in sys.argv[1:]:
+	with open(filename, 'r') as infile:
+		content = infile.readlines()
+
+
+	to_use = content.pop(0).split('|')
+	html_header = 'To use: ' + to_use.str() + '<br>'
+	# Replace _string_ with html
+	html_span_head = '<span>'
+	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)
+
+	# Replace vowel-dash-vowel with vowels with macrons
+	content = content.replace('A-A', 'Ā')
+	content = content.replace('a-a', 'ā')
+	content = content.replace('E-E', 'Ē')
+	content = content.replace('e-e', 'ē')
+	content = content.replace('I-I', 'Ī')
+	content = content.replace('i-i', 'ī')
+	content = content.replace('O-O', 'Ō')
+	content = content.replace('o-o', 'ō')
+	content = content.replace('U-U', 'Ū')
+	content = content.replace('u-u', 'ū')
+
+	with open(filename + '.html', 'w') as outfile:
+		outfile.write(content)
\ No newline at end of file