diff --git a/template/classic/bp.typ b/template/classic/bp.typ index 8fc9e8c..fbd0c9f 100644 --- a/template/classic/bp.typ +++ b/template/classic/bp.typ @@ -21,7 +21,7 @@ // document info title, author, author_gender, supervisor, consultant, study_programme, study_branch, - abstract_content, acknowledgement_content, keywords, + year_of_study, abstract_content, acknowledgement_content, keywords, content ) = { @@ -49,7 +49,7 @@ mainpage( faculty_id, language, "bp", title, author, supervisor, consultant, study_programme, - study_branch, + year_of_study, study_branch, ); assignment(language, assignment_document); default_styling(false, faculty_color, { diff --git a/template/classic/classic.typ b/template/classic/classic.typ index eb7cb45..d5a4977 100644 --- a/template/classic/classic.typ +++ b/template/classic/classic.typ @@ -12,8 +12,8 @@ language, faculty_id, document_type, citation_file, assignment_document, // document info - title, author, author_gender, supervisor, consultant, study_programme, study_branch, abstract, - acknowledgement, keywords, + title, author, author_gender, supervisor, consultant, study_programme, study_branch, + year_of_study, abstract, acknowledgement, keywords, // content content, @@ -42,6 +42,7 @@ consultant, study_programme, study_branch, + year_of_study, abstract, acknowledgement, keywords, diff --git a/template/classic/common.typ b/template/classic/common.typ index 06d537a..6e29936 100644 --- a/template/classic/common.typ +++ b/template/classic/common.typ @@ -1,6 +1,6 @@ #import "../theme.typ": faculty_logotype, tul_logomark, faculty_color #import "../lang.typ": get_lang_item -#import "../utils.typ": is_none, assert_dict_has +#import "../utils.typ": is_none, assert_dict_has, map_none #let base_font = "Inter"; #let mono_font = "Noto Sans Mono"; @@ -119,7 +119,7 @@ faculty_id, language, document_type, - title, author, supervisor, consultant, study_programme, study_branch, + title, author, supervisor, consultant, study_programme, study_branch, year_of_study, ) = { let info_name_value_padding = 5em; let info_name_min_width = 10em; @@ -141,11 +141,12 @@ // other info // [field_name, field_value, bold] let info_fields = ( - ("study_programme", study_programme, false), - ("study_branch", study_branch, false), ("author", author, true), ("supervisor", person_info(supervisor, "supervisor"), false), ("consultant", person_info(consultant, "consultant"), false), + ("study_programme", study_programme, false), + ("study_branch", study_branch, false), + ("year_of_study", map_none(year_of_study, (v) => str(v) + "."), false), ) context { let max_field_name_width = calc.max(..info_fields.map((v) => { @@ -180,7 +181,7 @@ faculty_id, language, document_type, - title, author, supervisor, consultant, study_programme, study_branch + title, author, supervisor, consultant, study_programme, study_branch, year_of_study, ) = { import "../utils.typ": has_all_none, map_none let nonetype = type(none); @@ -195,7 +196,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)), + map_none(study_branch, (v) => v.at(language)), year_of_study, ); v(5em); }, bottom); diff --git a/template/classic/other.typ b/template/classic/other.typ index a7c1572..b24580b 100644 --- a/template/classic/other.typ +++ b/template/classic/other.typ @@ -18,15 +18,18 @@ faculty_id, faculty_color, language, assignment_document, citation_file, // document info - title, author, _, supervisor, consultant, study_programme, study_branch, abstract_content, - _, keywords, + title, author, _, supervisor, consultant, study_programme, study_branch, year_of_study, + abstract_content, _, keywords, content ) = { assert_not_none(title, "title"); assert_dict_has((language,), title, "title"); - mainpage(faculty_id, language, none, title, author, supervisor, consultant, study_programme, study_branch); + mainpage( + faculty_id, language, none, title, author, supervisor, consultant, study_programme, + study_branch, year_of_study, + ); default_styling(true, faculty_color, { toc(language); tablelist(language); diff --git a/template/lang.json b/template/lang.json index 4fd9733..ae9d5e9 100644 --- a/template/lang.json +++ b/template/lang.json @@ -6,6 +6,7 @@ "consultant": "Konzultant práce", "study_programme": "Studijní program", "study_branch": "Studijní obor", + "year_of_study": "Ročník", "bp": "Bakalářská práce", @@ -56,6 +57,7 @@ "consultant": "Consultant", "study_programme": "Study programme", "study_branch": "Study branch", + "year_of_study": "Year of study", "bp": "Bachelor thesis", diff --git a/template/template.typ b/template/template.typ index 15e12d4..86cda83 100644 --- a/template/template.typ +++ b/template/template.typ @@ -46,7 +46,8 @@ // document info title: none, keywords: none, abstract: none, acknowledgement: none, author: none, - author_gender: none, supervisor: none, consultant: none, programme: none, branch: none, + author_gender: none, supervisor: none, consultant: none, programme: none, + branch: none, year_of_study: none, // links assignment: none, citations: "citations.bib", @@ -81,6 +82,7 @@ programme, "dictionary[string : string] | none", "study programme argument" ); assert_type_signature(branch, "dictionary[string : string] | none", "study branch 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"); @@ -100,7 +102,7 @@ templates.at(style)( lang, faculty, document, citations, assignment, title, author, author_gender, supervisor, consultant, - programme, branch, abstract, acknowledgement, keywords, content + programme, branch, year_of_study, abstract, acknowledgement, keywords, content ); import "prototyping.typ": assert_release_ready