diff --git a/linguistic-abbreviations.typ b/linguistic-abbreviations.typ
index be7886a..b48fce4 100644
--- a/linguistic-abbreviations.typ
+++ b/linguistic-abbreviations.typ
@@ -123,89 +123,95 @@
   })
 }
 
-#let p1 = { mark_used("1"); smallcaps[1] }
-#let p2 = { mark_used("2"); smallcaps[2] }
-#let p3 = { mark_used("3"); smallcaps[3] }
-#let A = { mark_used("A"); smallcaps[a] }
-#let abl = { mark_used("ABL"); smallcaps[abl] }
-#let abs = { mark_used("ABS");smallcaps[abs] }
-#let acc = { mark_used("ACC");smallcaps[acc] }
-#let adj = { mark_used("ADJ"); smallcaps[adj] }
-#let adv = { mark_used("ADV"); smallcaps[adv] }
-#let agr = { mark_used("AGR"); smallcaps[agr] }
-#let all = { mark_used("ALL"); smallcaps[all] }
-#let antip = { mark_used("ANTIP"); smallcaps[antip] }
-#let appl = { mark_used("APPL"); smallcaps[appl] }
-#let art = { mark_used("ART"); smallcaps[art] }
-#let aux = { mark_used("AUX"); smallcaps[aux] }
-#let ben = { mark_used("BEN"); smallcaps[ben] }
-#let caus = { mark_used("CAUS"); smallcaps[caus] }
-#let clf = { mark_used("CLF"); smallcaps[clf] }
-#let com = { mark_used("COM"); smallcaps[com] }
-#let comp = { mark_used("COMP"); smallcaps[comp] }
-#let compl = { mark_used("COMPL"); smallcaps[compl] }
-#let cond = { mark_used("COND"); smallcaps[cond] }
-#let cop = { mark_used("COP"); smallcaps[cop] }
-#let cvb = { mark_used("CVB"); smallcaps[cvb] }
-#let dat = { mark_used("DAT"); smallcaps[dat] }
-#let decl = { mark_used("DECL"); smallcaps[decl] }
-#let def = { mark_used("DEF"); smallcaps[def] }
-#let dem = { mark_used("DEM"); smallcaps[dem] }
-#let det = { mark_used("DET"); smallcaps[det] }
-#let dist = { mark_used("DIST"); smallcaps[dist] }
-#let distr = { mark_used("DISTR"); smallcaps[distr] }
-#let du = { mark_used("DU"); smallcaps[du] }
-#let dur = { mark_used("DUR"); smallcaps[dur] }
-#let erg = { mark_used("ERG"); smallcaps[erg] }
-#let excl = { mark_used("EXCL"); smallcaps[excl] }
-#let f = { mark_used("F"); smallcaps[f] }
-#let foc = { mark_used("FOC"); smallcaps[foc] }
-#let fut = { mark_used("FUT"); smallcaps[fut] }
-#let gen = { mark_used("GEN"); smallcaps[gen] }
-#let imp = { mark_used("IMP"); smallcaps[imp] }
-#let incl = { mark_used("INCL"); smallcaps[incl] }
-#let ind = { mark_used("IND"); smallcaps[ind] }
-#let indf = { mark_used("INDF"); smallcaps[indf] }
-#let inf = { mark_used("INF"); smallcaps[inf] }
-#let ins = { mark_used("INS"); smallcaps[ins] }
-#let intr = { mark_used("INTR"); smallcaps[intr] }
-#let ipfv = { mark_used("IPFV"); smallcaps[ipfv] }
-#let irr = { mark_used("IRR"); smallcaps[irr] }
-#let loc = { mark_used("LOC"); smallcaps[loc] }
-#let m = { mark_used("M"); smallcaps[m] }
-#let n = { mark_used("N"); smallcaps[n] }
-//TODO special handling?
-//#let n- = { mark_used("N-"); smallcaps[n-] }
-#let neg = { mark_used("NEG"); smallcaps[neg] }
-#let nmlz = { mark_used("NMLZ"); smallcaps[nmlz] }
-#let nom = { mark_used("NOM"); smallcaps[nom] }
-#let obj = { mark_used("OBJ"); smallcaps[obj] }
-#let obl = { mark_used("OBL"); smallcaps[obl] }
-#let P = { mark_used("P"); smallcaps[p] }
-#let pass = { mark_used("PASS"); smallcaps[pass] }
-#let pfv = { mark_used("PFV"); smallcaps[pfv] }
-#let pl = { mark_used("PL"); smallcaps[pl] }
-#let poss = { mark_used("POSS"); smallcaps[poss] }
-#let pred = { mark_used("PRED"); smallcaps[pred] }
-#let prf = { mark_used("PRF"); smallcaps[prf] }
-#let prs = { mark_used("PRS"); smallcaps[prs] }
-#let prog = { mark_used("PROG"); smallcaps[prog] }
-#let proh = { mark_used("PROH"); smallcaps[proh] }
-#let prox = { mark_used("PROX"); smallcaps[prox] }
-#let pst = { mark_used("PST"); smallcaps[pst] }
-#let ptcp = { mark_used("PTCP"); smallcaps[ptcp] }
-#let purp = { mark_used("PURP"); smallcaps[purp] }
-#let q = { mark_used("Q"); smallcaps[q] }
-#let quot = { mark_used("QUOT"); smallcaps[quot] }
-#let recp = { mark_used("RECP"); smallcaps[recp] }
-#let refl = { mark_used("REFL"); smallcaps[refl] }
-#let rel = { mark_used("REL"); smallcaps[rel] }
-#let res = { mark_used("RES"); smallcaps[res] }
-#let s = { mark_used("S"); smallcaps[s] }
-#let sbj = { mark_used("SBJ"); smallcaps[sbj] }
-#let sbjv = { mark_used("SBJV"); smallcaps[sbjv] }
-#let sg = { mark_used("SG"); smallcaps[sg] }
-#let top = { mark_used("TOP"); smallcaps[top] }
-#let tr = { mark_used("TR"); smallcaps[tr] }
-#let voc = { mark_used("VOC"); smallcaps[voc] }
+#let emit_abbreviation(symbol) = {
+  mark_used(symbol)
+  smallcaps(lower(symbol))
+}
+
+
+#let p1 = emit_abbreviation("1")
+#let p2 = emit_abbreviation("2")
+#let p3 = emit_abbreviation("3")
+#let A = emit_abbreviation("A")
+#let abl = emit_abbreviation("ABL")
+#let abs = emit_abbreviation("ABS")
+#let acc = emit_abbreviation("ACC")
+#let adj = emit_abbreviation("ADJ")
+#let adv = emit_abbreviation("ADV")
+#let agr = emit_abbreviation("AGR")
+#let all = emit_abbreviation("ALL")
+#let antip = emit_abbreviation("ANTIP")
+#let appl = emit_abbreviation("APPL")
+#let art = emit_abbreviation("ART")
+#let aux = emit_abbreviation("AUX")
+#let ben = emit_abbreviation("BEN")
+#let caus = emit_abbreviation("CAUS")
+#let clf = emit_abbreviation("CLF")
+#let com = emit_abbreviation("COM")
+#let comp = emit_abbreviation("COMP")
+#let compl = emit_abbreviation("COMPL")
+#let cond = emit_abbreviation("COND")
+#let cop = emit_abbreviation("COP")
+#let cvb = emit_abbreviation("CVB")
+#let dat = emit_abbreviation("DAT")
+#let decl = emit_abbreviation("DECL")
+#let def = emit_abbreviation("DEF")
+#let dem = emit_abbreviation("DEM")
+#let det = emit_abbreviation("DET")
+#let dist = emit_abbreviation("DIST")
+#let distr = emit_abbreviation("DISTR")
+#let du = emit_abbreviation("DU")
+#let dur = emit_abbreviation("DUR")
+#let erg = emit_abbreviation("ERG")
+#let excl = emit_abbreviation("EXCL")
+#let f = emit_abbreviation("F")
+#let foc = emit_abbreviation("FOC")
+#let fut = emit_abbreviation("FUT")
+#let gen = emit_abbreviation("GEN")
+#let imp = emit_abbreviation("IMP")
+#let incl = emit_abbreviation("INCL")
+#let ind = emit_abbreviation("IND")
+#let indf = emit_abbreviation("INDF")
+#let inf = emit_abbreviation("INF")
+#let ins = emit_abbreviation("INS")
+#let intr = emit_abbreviation("INTR")
+#let ipfv = emit_abbreviation("IPFV")
+#let irr = emit_abbreviation("IRR")
+#let loc = emit_abbreviation("LOC")
+#let m = emit_abbreviation("M")
+#let n = emit_abbreviation("N")
+//TODO special handling?
+//#let n- = emit_abbreviation("N-")
+#let neg = emit_abbreviation("NEG")
+#let nmlz = emit_abbreviation("NMLZ")
+#let nom = emit_abbreviation("NOM")
+#let obj = emit_abbreviation("OBJ")
+#let obl = emit_abbreviation("OBL")
+#let P = emit_abbreviation("P")
+#let pass = emit_abbreviation("PASS")
+#let pfv = emit_abbreviation("PFV")
+#let pl = emit_abbreviation("PL")
+#let poss = emit_abbreviation("POSS")
+#let pred = emit_abbreviation("PRED")
+#let prf = emit_abbreviation("PRF")
+#let prs = emit_abbreviation("PRS")
+#let prog = emit_abbreviation("PROG")
+#let proh = emit_abbreviation("PROH")
+#let prox = emit_abbreviation("PROX")
+#let pst = emit_abbreviation("PST")
+#let ptcp = emit_abbreviation("PTCP")
+#let purp = emit_abbreviation("PURP")
+#let q = emit_abbreviation("Q")
+#let quot = emit_abbreviation("QUOT")
+#let recp = emit_abbreviation("RECP")
+#let refl = emit_abbreviation("REFL")
+#let rel = emit_abbreviation("REL")
+#let res = emit_abbreviation("RES")
+#let s = emit_abbreviation("S")
+#let sbj = emit_abbreviation("SBJ")
+#let sbjv = emit_abbreviation("SBJV")
+#let sg = emit_abbreviation("SG")
+#let top = emit_abbreviation("TOP")
+#let tr = emit_abbreviation("TR")
+#let voc = emit_abbreviation("VOC")