diff --git a/documentation.typ b/documentation.typ index fcb12aa..da8fd31 100644 --- a/documentation.typ +++ b/documentation.typ @@ -356,7 +356,7 @@ Zvýrazněné hodnoty jsou základní -- pokud vynecháte parametr, pak bude pou - Je vyžadován jazyk, který je vybrán pro celou šablonu -- tohle je pojistka, aby uživatel šablony nevynechal vybraný jazyk #line() -- `branch` (studijní obor) +- `specialization` (specializace) - Stejně jako #link(, [`programme`]) #line() - `abstract` (abstrakt) diff --git a/template/classic/bp.typ b/template/classic/bp.typ index 0e10061..acc2627 100644 --- a/template/classic/bp.typ +++ b/template/classic/bp.typ @@ -20,7 +20,7 @@ faculty_id, faculty_color, language, assignment_document, citation_file, // document info - title, author, author_pronouns, supervisor, consultant, study_programme, study_branch, + title, author, author_pronouns, supervisor, consultant, study_programme, study_specialization, year_of_study, abstract_content, acknowledgement_content, keywords, content @@ -31,8 +31,8 @@ assert_not_none(study_programme, "study programme"); assert_dict_has((language,), study_programme, "study programme"); - assert_not_none(study_branch, "study branch"); - assert_dict_has((language,), study_branch, "study branch"); + assert_not_none(study_specialization, "study specialization"); + assert_dict_has((language,), study_specialization, "study specialization"); assert_not_none(abstract_content, "abstract"); assert_dict_has(force_langs, abstract_content, "abstract"); @@ -49,7 +49,7 @@ mainpage( faculty_id, language, "bp", title, author, supervisor, consultant, study_programme, - study_branch, year_of_study, + study_specialization, year_of_study, ); assignment(language, assignment_document); default_styling(false, faculty_color, { diff --git a/template/classic/classic.typ b/template/classic/classic.typ index e135132..d39d66d 100644 --- a/template/classic/classic.typ +++ b/template/classic/classic.typ @@ -13,7 +13,7 @@ language, faculty_id, document_type, citation_file, assignment_document, // document info - title, author, author_pronouns, supervisor, consultant, study_programme, study_branch, + title, author, author_pronouns, supervisor, consultant, study_programme, study_specialization, year_of_study, abstract, acknowledgement, keywords, // content @@ -28,7 +28,7 @@ assert_in_dict(document_type, document_types, "document type"); map_none(title, (v) => assert_dict_has((language,), v, "title")); map_none(study_programme, (v) => assert_dict_has((language,), v, "study programme")); - map_none(study_branch, (v) => assert_dict_has((language,), v, "study branch")); + map_none(study_specialization, (v) => assert_dict_has((language,), v, "study specialization")); map_none(acknowledgement, (v) => assert_dict_has((language,), v, "acknowledgement content")); document_types.at(document_type)( @@ -43,7 +43,7 @@ supervisor, consultant, study_programme, - study_branch, + study_specialization, year_of_study, abstract, acknowledgement, diff --git a/template/classic/common.typ b/template/classic/common.typ index bb4f518..f24d7a0 100644 --- a/template/classic/common.typ +++ b/template/classic/common.typ @@ -135,7 +135,7 @@ faculty_id, language, document_type, - title, author, supervisor, consultant, study_programme, study_branch, year_of_study, + title, author, supervisor, consultant, study_programme, study_specialization, year_of_study, ) = { let info_name_value_padding = 5em; let info_name_min_width = 10em; @@ -161,7 +161,7 @@ ("supervisor", person_info(supervisor, "supervisor"), false), ("consultant", person_info(consultant, "consultant"), false), ("study_programme", study_programme, false), - ("study_branch", study_branch, false), + ("study_specialization", study_specialization, false), ("year_of_study", map_none(year_of_study, (v) => str(v) + "."), false), ) context { @@ -197,7 +197,7 @@ faculty_id, language, document_type, - title, author, supervisor, consultant, study_programme, study_branch, year_of_study, + title, author, supervisor, consultant, study_programme, study_specialization, year_of_study, ) = { import "../utils.typ": has_all_none, map_none let nonetype = type(none); @@ -212,7 +212,7 @@ info( faculty_id, language, document_type, map_none(title, (v) => v.at(language)), author, supervisor, consultant, map_none(study_programme, (v) => v.at(language)), - map_none(study_branch, (v) => v.at(language)), year_of_study, + map_none(study_specialization, (v) => v.at(language)), year_of_study, ); v(5em); }, bottom); diff --git a/template/classic/dp.typ b/template/classic/dp.typ index f694ade..f2bea74 100644 --- a/template/classic/dp.typ +++ b/template/classic/dp.typ @@ -20,7 +20,7 @@ faculty_id, faculty_color, language, assignment_document, citation_file, // document info - title, author, author_pronouns, supervisor, consultant, study_programme, study_branch, + title, author, author_pronouns, supervisor, consultant, study_programme, study_specialization, year_of_study, abstract_content, acknowledgement_content, keywords, content @@ -31,7 +31,7 @@ assert_not_none(study_programme, "study programme"); assert_dict_has((language,), study_programme, "study programme"); - map_none(study_branch, (v) => assert_dict_has((language,), v, "study branch")); + map_none(study_specialization, (v) => assert_dict_has((language,), v, "study specialization")); assert_not_none(abstract_content, "abstract"); assert_dict_has(force_langs, abstract_content, "abstract"); @@ -48,7 +48,7 @@ mainpage( faculty_id, language, "dp", title, author, supervisor, consultant, study_programme, - study_branch, year_of_study, + study_specialization, year_of_study, ); assignment(language, assignment_document); default_styling(false, faculty_color, { diff --git a/template/classic/other.typ b/template/classic/other.typ index d44c94b..9b685df 100644 --- a/template/classic/other.typ +++ b/template/classic/other.typ @@ -19,7 +19,7 @@ faculty_id, faculty_color, language, assignment_document, citation_file, // document info - title, author, _, supervisor, consultant, study_programme, study_branch, year_of_study, + title, author, _, supervisor, consultant, study_programme, study_specialization, year_of_study, abstract_content, _, keywords, content @@ -29,7 +29,7 @@ mainpage( faculty_id, language, none, title, author, supervisor, consultant, study_programme, - study_branch, year_of_study, + study_specialization, year_of_study, ); default_styling(true, faculty_color, { toc(language); diff --git a/template/lang.json b/template/lang.json index 6f80889..769989d 100644 --- a/template/lang.json +++ b/template/lang.json @@ -5,7 +5,7 @@ "supervisor": "Vedoucí práce", "consultant": "Konzultant práce", "study_programme": "Studijní program", - "study_branch": "Studijní obor", + "study_specialization": "Specializace", "year_of_study": "Ročník", "bp": "Bakalářská práce", @@ -73,7 +73,7 @@ "supervisor": "Supervisor", "consultant": "Consultant", "study_programme": "Study programme", - "study_branch": "Study branch", + "study_specialization": "Specialization", "year_of_study": "Year of study", "bp": "Bachelor thesis", diff --git a/template/template.typ b/template/template.typ index 33a648d..b19ba2e 100644 --- a/template/template.typ +++ b/template/template.typ @@ -32,7 +32,7 @@ // - supervisor (str): The name of the document's supervisor. // - consultant (str): The name of the document's consultant. // - programme (dictionary): Study programme. -// - branch (disctionary): Study branch +// - specialization (disctionary): Study specialization // - abstract (dictionary): The abstract. // - keywords (dictionary): The abstract keywords. // - assignment (str): Filepath of the assignment document/page. @@ -47,7 +47,7 @@ // document info title: none, keywords: none, abstract: none, acknowledgement: none, author: none, author_pronouns: none, supervisor: none, consultant: none, programme: none, - branch: none, year_of_study: none, + specialization: none, year_of_study: none, // links assignment: none, citations: "citations.bib", @@ -81,7 +81,9 @@ assert_type_signature( programme, "dictionary[string : string] | none", "study programme argument" ); - assert_type_signature(branch, "dictionary[string : string] | none", "study branch argument"); + assert_type_signature( + specialization, "dictionary[string : string] | none", "study specialization argument" + ); assert_type_signature(year_of_study, "integer | none", "year of study"); assert_type_signature(assignment, "string | none", "assignment document argument"); assert_type_signature(citations, "string", "citations file argument"); @@ -102,7 +104,7 @@ templates.at(style)( lang, faculty, document, citations, assignment, title, author, author_pronouns, supervisor, consultant, - programme, branch, year_of_study, abstract, acknowledgement, keywords, content + programme, specialization, year_of_study, abstract, acknowledgement, keywords, content ); import "prototyping.typ": assert_release_ready diff --git a/theses/bp.typ b/theses/bp.typ index cf638b7..4506aca 100644 --- a/theses/bp.typ +++ b/theses/bp.typ @@ -14,7 +14,7 @@ supervisor: "Ondřej Mekina", consultant: "Michal Procházka (nepovinný údaj)", programme: (cs: "Můj krásný studijní program"), - branch: (cs: "Můj krásný studijní obor"), + specialization: (cs: "Moje krásná studijní specializace"), abstract: ( cs: [ Tento dokument slouží jako praktická ukázka všech důležitcýh funkcí šablony _tultemplate2_,