From fd0d152c51083065c89e21c2685289ea8b4eace7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Bal=C3=A1=C5=BE?= Date: Mon, 25 Nov 2024 16:41:34 +0000 Subject: [PATCH] Major overhaul of scholar templates --- modules/scholar/templates/base.jtt | 2 +- modules/scholar/templates/homework-solutions.jtt | 2 +- modules/scholar/templates/homework-students.jtt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/scholar/templates/base.jtt b/modules/scholar/templates/base.jtt index dcf624d3..3751ccac 100644 --- a/modules/scholar/templates/base.jtt +++ b/modules/scholar/templates/base.jtt @@ -15,7 +15,7 @@ \titleformat{\section}[block]{\vspace*{-10mm}\Huge\bfseries\centering}{\Roman{section}. }{0pt}{} \titleformat{\subsection}[hang]{\LARGE\bfseries\vspace{4mm}\vspace*{-4mm}}{}{0pt}{} \titleformat{\subsubsection}[hang]{\large\bfseries}{}{0pt}{}[] - \titleformat{\paragraph}[hang]{\bfseries}{}{0pt}{}[] + \titleformat{\paragraph}[hang]{\it\bfseries}{}{0pt}{}[] \titleformat{\subparagraph}[hang]{\it\bfseries}{}{0pt}{}[] \titlespacing{\section}{0pt}{6mm}{2mm} \titlespacing{\subsection}{0pt}{6mm}{4mm} diff --git a/modules/scholar/templates/homework-solutions.jtt b/modules/scholar/templates/homework-solutions.jtt index 33832ab6..0c71f165 100644 --- a/modules/scholar/templates/homework-solutions.jtt +++ b/modules/scholar/templates/homework-solutions.jtt @@ -7,7 +7,7 @@ (@ endblock solution @) (@ block subsolution @) - \subsubsection{(* i18n.captions.solution.singular|capitalize *)} + \paragraph{(* i18n.captions.solution.singular|capitalize *)} \setActive{\rootDirectory/(* module.id *)/(* course.id *)/(* year.id *)/(* self.typedir() *)/(* issue.id *)/(* problem.id *)/(* subproblem.id *)}% \protectedInput{\activeDirectory/solution.tex} (@ endblock subsolution @) diff --git a/modules/scholar/templates/homework-students.jtt b/modules/scholar/templates/homework-students.jtt index cefd065e..a252730d 100644 --- a/modules/scholar/templates/homework-students.jtt +++ b/modules/scholar/templates/homework-students.jtt @@ -8,7 +8,7 @@ (* problem.name *)(@ if 'bonus' in problem and problem.bonus @) (bonus)(@ endif @)% }{% \thesubsection{} (* problem.name *)(@ if 'bonus' in problem and problem.bonus @) (bonus)(@ endif @)% - }% + } } \label{sec:(* problem.id *)} \protectedInput{\activeDirectory/problem.tex} @@ -25,7 +25,8 @@ }% } \label{sec:(* problem.id*)-(* subproblem.id *)} - \protectedInput{\activeDirectory/(* problem.id *)/(* subproblem.id *)/problem.tex} + \setActive{\rootDirectory/(* module.id *)/(* course.id *)/(* year.id *)/(* self.typedir() *)/(* issue.id *)/(* problem.id *)} + \protectedInput{\activeDirectory/(* subproblem.id *)/problem.tex} (@ block subsolution scoped @)(@ endblock subsolution @) (@ endfor @) (@ endif @)