diff --git a/chapters/introduction/presentation.typ b/chapters/introduction/presentation.typ index 0fe511c..b25606c 100644 --- a/chapters/introduction/presentation.typ +++ b/chapters/introduction/presentation.typ @@ -1,5 +1,6 @@ #import "../../setup/setup.typ": gls, nogls, ravhelp + = Introduction @fk_draan:short. diff --git a/setup/glossary.typ b/setup/glossary.typ index 13dd5e2..15fe455 100644 --- a/setup/glossary.typ +++ b/setup/glossary.typ @@ -17,7 +17,6 @@ yaml(file).map(entry => { let result = (:) - // ----- Convert each YAML field to its Typst representation ----- for (key, value) in entry { result.insert( key, @@ -46,14 +45,6 @@ ) } - // ----- Fill in missing optional fields ----- - if "short" not in result { - result.insert("short", none) - } - if "sort" not in result { - result.insert("sort", result.long) - } - result }) } @@ -62,7 +53,6 @@ #let read-glossary(files) = { let entries = () - // ----- Normalize a single file into an array ----- if type(files) != array { files = (files,) } @@ -70,13 +60,18 @@ for file in files { let new = read-glossary-entries(file) - // ----- Reject duplicate glossary keys ----- for entry in new { let duplicate = entries.find(e => e.key == entry.key) if duplicate != none { panic( - "Found duplicate key `" + entry.key + "` in files `" + file + "`", + "Found duplicate key `" + + entry.key + + "` in files `" + + file + + "` and `" + + duplicate.file + + "`", ) } }