summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def')
-rw-r--r--Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def22
1 files changed, 14 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
index b4a436a9520..e7100ce4d63 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2016 Clemens Niederberger
+% Copyright 2011-2017 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -167,6 +167,14 @@
\exsheets_new_heading_coffin:n {points}
\exsheets_new_heading_coffin:n {subtitle}
+\cs_new_protected:Npn \exsheets_heading_format:nn #1#2
+ {
+ \bool_if:NT \l__exsheets_inside_question_bool
+ { \tl_use:c {l_exsheets_heading_#1_question_format_tl} {#2} }
+ \bool_if:NT \l__exsheets_inside_solution_bool
+ { \tl_use:c {l_exsheets_heading_#1_solution_format_tl} {#2} }
+ }
+
% the `exsheets-heading' object:
% #1 = title,
% #2 = number,
@@ -266,7 +274,7 @@
\tl_use:N \l__exsheets_heading_title_format_tl
\strut
\tl_use:N \l__exsheets_heading_title_pre_code_tl
- { \tl_use:N \l_exsheets_heading_title_user_format_tl {#1} }
+ { \exsheets_heading_format:nn {title} {#1} }
\tl_use:N \l__exsheets_heading_title_post_code_tl
}
\hcoffin_set:Nn \l__exsheets_heading_number_coffin
@@ -276,22 +284,20 @@
{ \tl_use:N \l__exsheets_heading_number_format_tl }
\strut
\tl_use:N \l__exsheets_heading_number_pre_code_tl
- { \tl_use:N \l_exsheets_heading_title_user_format_tl {#2} }
+ { \exsheets_heading_format:nn {title} {#2} }
\tl_use:N \l__exsheets_heading_number_post_code_tl
}
\hcoffin_set:Nn \l__exsheets_heading_subtitle_coffin
{
\exsheets_if_question_subtitle:T
{
- \tl_if_blank:VTF \l__exsheets_heading_subtitle_format_tl
- { \tl_use:N \l__exsheets_heading_title_format_tl }
- { \tl_use:N \l__exsheets_heading_subtitle_format_tl }
\strut
\tl_use:N \l__exsheets_heading_subtitle_pre_code_tl
{
\group_begin:
- \tl_use:N \l_exsheets_heading_subtitle_user_format_tl
- { \exsheets_get_question_property:nn {subtitle} {#5} }
+ \exsheets_heading_format:nn
+ {subtitle}
+ { \exsheets_get_question_property:nn {subtitle} {#5} }
\group_end:
}
\tl_use:N \l__exsheets_heading_subtitle_post_code_tl