various wip fixes

This commit is contained in:
jeltz 2023-08-28 13:02:49 +02:00
parent e2aee201ef
commit d2880c0555
Signed by: jeltz
GPG key ID: 800882B66C0C3326

View file

@ -62,15 +62,15 @@
% Section % Section
\skip_const:Nn \c__note_section_skip \skip_const:Nn \c__note_section_skip
{ ( \c__note_par_skip * 150 ) / 100 } { ( \c__note_par_skip * 200 ) / 100 }
% Subsection % Subsection
\skip_const:Nn \c__note_subsection_skip \skip_const:Nn \c__note_subsection_skip
{ ( \c__note_par_skip * 135 ) / 100 } { ( \c__note_par_skip * 160 ) / 100 }
% Subsubsection % Subsubsection
\skip_const:Nn \c__note_subsubsection_skip \skip_const:Nn \c__note_subsubsection_skip
{ ( \c__note_par_skip * 120 ) / 100 } { ( \c__note_par_skip * 130 ) / 100 }
% Total spacing between successive list items % Total spacing between successive list items
\skip_const:Nn \c__note_list_total_item_sep_skip \skip_const:Nn \c__note_list_total_item_sep_skip
@ -145,14 +145,9 @@
\ProcessKeysOptions { note/options } \ProcessKeysOptions { note/options }
\bool_gset:Nn \g__note_show_head_bool \str_if_eq:VnF \g__note_mode_str { note }
{ {
\str_case:VnF \g__note_mode_str \bool_gset_false:N \g__note_show_head_bool
{
{ letter } { \c_false_bool }
{ brief } { \c_false_bool }
}
{ \c_true_bool }
} }
@ -160,6 +155,7 @@
\RequirePackage { fontspec } \RequirePackage { fontspec }
\RequirePackage { xparse } \RequirePackage { xparse }
\RequirePackage { etl }
\RequirePackage [ latin, english, french ] { babel } \RequirePackage [ latin, english, french ] { babel }
\RequirePackage [ babel ] { csquotes } \RequirePackage [ babel ] { csquotes }
\RequirePackage { enumitem } \RequirePackage { enumitem }
@ -304,9 +300,16 @@
%% Section %% Section
\str_if_eq:VnT \g__note_mode_str { brief }
{
\cs_gset_eq:NN \sectionbreak \clearpage
}
\titleformat { \section } \titleformat { \section }
[ block ] [ block ]
{ {
%\str_if_eq:VnT \g__note_mode_str { brief }
% { \centering }
\sffamily \Large \bfseries \sffamily \Large \bfseries
\color { note/dark-blue } \color { note/dark-blue }
} }
@ -314,10 +317,10 @@
{ \skip_use:N \c__note_heading_sep_skip } { \skip_use:N \c__note_heading_sep_skip }
{#1} {#1}
\titlespacing \section %\titlespacing \section
{ 0pt } % { 0pt }
{ \skip_use:N \c__note_section_skip } % { \skip_use:N \c__note_section_skip }
{ \skip_use:N \c__note_section_skip } % { \skip_use:N \c__note_section_skip }
\tl_gset:Nn \thesection \tl_gset:Nn \thesection
{ \Roman { section } } { \Roman { section } }
@ -334,10 +337,10 @@
{ \skip_use:N \c__note_heading_sep_skip } { \skip_use:N \c__note_heading_sep_skip }
{#1} {#1}
\titlespacing \subsection %\titlespacing \subsection
{ 0pt } % { 0pt }
{ \skip_use:N \c__note_subsection_skip } % { \skip_use:N \c__note_subsection_skip }
{ \skip_use:N \c__note_subsection_skip } % { \skip_use:N \c__note_subsection_skip }
\tl_gset:Nn \thesubsection \tl_gset:Nn \thesubsection
{ \thesection . \Alph { subsection } } { \thesection . \Alph { subsection } }
@ -354,10 +357,10 @@
{ \skip_use:N \c__note_heading_sep_skip } { \skip_use:N \c__note_heading_sep_skip }
{#1} {#1}
\titlespacing \subsubsection %\titlespacing \subsubsection
{ 0pt } % { 0pt }
{ \skip_use:N \c__note_subsubsection_skip } % { \skip_use:N \c__note_subsubsection_skip }
{ \skip_use:N \c__note_subsubsection_skip } % { \skip_use:N \c__note_subsubsection_skip }
\tl_gset:Nn \thesubsubsection \tl_gset:Nn \thesubsubsection
{ \thesubsection . \arabic { subsubsection } } { \thesubsection . \arabic { subsubsection } }
@ -874,7 +877,7 @@
%%% End of page %%% End of page
\NewDocumentEnvironment { endofpage } {} \NewDocumentEnvironment { endofpage } {}
{ \vfill } { \vfill } % FIXME
{} {}
@ -893,9 +896,11 @@
{ {
\kern -3pt \kern -3pt
\textcolor { note/dark-blue } \textcolor { note/dark-blue }
{ \rule { .25 \textwidth } { .75pt } } { \hrule height .75pt width .25 \textwidth }
\vspace { .5em } \vspace { .5em }
} }
\cs_gset:Npn \@makefnmark
{ \hbox { \textsuperscript { \sffamily \@thefnmark } } }
} }
@ -956,7 +961,7 @@
\tl_if_empty:nF {##3} \tl_if_empty:nF {##3}
{ {
, \\ , \\
\textit { ##3 } { \itshape ##3 }
} }
} }
\end { \tl_use:N \l__note_sigs_flush_tl } \end { \tl_use:N \l__note_sigs_flush_tl }
@ -967,11 +972,13 @@
\DeclareDocumentCommand \opening {m} \DeclareDocumentCommand \opening {m}
{ {
#1 #1
\vspace* { 1em } \vspace { 1em }
} }
\DeclareDocumentCommand \closing {m} \DeclareDocumentCommand \closing {m}
{ {
\vspace* { 1em } \vspace { 1em }
#1 #1
} }
\flushbottom