From fb8f0178a957d045f6b876e11ab2beb02d1ac08a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 30 Dec 2023 03:00:54 +0000 Subject: CTAN sync 202312300300 --- .../contrib/schooldocs/schooldocs-examples.pdf | Bin 397588 -> 390596 bytes macros/latex/contrib/schooldocs/schooldocs.dtx | 40 +++++++++++---------- macros/latex/contrib/schooldocs/schooldocs.pdf | Bin 156220 -> 156752 bytes 3 files changed, 22 insertions(+), 18 deletions(-) (limited to 'macros/latex/contrib/schooldocs') diff --git a/macros/latex/contrib/schooldocs/schooldocs-examples.pdf b/macros/latex/contrib/schooldocs/schooldocs-examples.pdf index ec6210a259..e4277bbdbe 100644 Binary files a/macros/latex/contrib/schooldocs/schooldocs-examples.pdf and b/macros/latex/contrib/schooldocs/schooldocs-examples.pdf differ diff --git a/macros/latex/contrib/schooldocs/schooldocs.dtx b/macros/latex/contrib/schooldocs/schooldocs.dtx index 04c468b3dd..d1cd9a484b 100644 --- a/macros/latex/contrib/schooldocs/schooldocs.dtx +++ b/macros/latex/contrib/schooldocs/schooldocs.dtx @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[2005/12/01] %\ProvidesPackage{schooldocs} %<*package> - [2023/08/28 v1.3 .dtx schooldocs file] + [2023/12/28 v1.4 .dtx Layout styles for school documents] % % %<*driver> @@ -37,6 +37,7 @@ \usepackage{spacingtricks} \usepackage{schooldocs} \usepackage{hyperref} +\usepackage{metalogo} %\usepackage{geometry} \geometry{textwidth=355pt,vmarginratio=1:1,hmarginratio=3:2} % modified by schoodocs loading, very close from the default geometry used by ltxdoc @@ -79,7 +80,7 @@ % % \fi % -% \CheckSum{811} +% \CheckSum{805} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -109,10 +110,11 @@ % - sffamily discarded from the default titlestyle % - smalltitletopskip changed from -2.0cm to -1.32cm} % \changes{v1.2}{2023/01/24}{ -% Small changes in documentation (charter font is now used) -% and examples files (with several fonts)} -% \changes{v1.3}{2023/08/28}{ -% - English documentation corrections} +% Small changes in the documentation (charter font is now used) +% and the examples file (with several fonts)} +% \changes{v1.3}{2023/08/28}{English corrections in the documentation} +% \changes{v1.4}{2023/12/28}{ +% headtitlestyle in exam and collection styles set to scshape instead of MakeUppercase} % % \GetFileInfo{schooldocs.dtx} % @@ -218,7 +220,7 @@ % \begin{center} % \begin{tabular}{ll} % \hline -% macro & example \\ +% Macro & Example \\ % \hline % |\title| & |\title[The classic style]{The classic style layout}| \\ % |\subject| & |\subject[Pathography / M2A]{Pathography / Master 2A}| \\ @@ -400,7 +402,7 @@ % \end{stylex} % \qquad % \begin{stylex} -% {\headtitlestyle TITLE} \hfill {\headsubjectstyle Subject} \par +% {\headtitlestyle Title} \hfill {\headsubjectstyle Subject} \par % \vspace{-1.9ex}\rule{0.82\mpwd}{0.1pt} % % \vspace{1.01\mpwd} @@ -421,7 +423,7 @@ % \end{stylex} % \qquad % \begin{stylex} -% {\headtitlestyle TITLE} \hfill {\headsubjectstyle Section} \par +% {\headtitlestyle Title} \hfill {\headsubjectstyle Section} \par % \vspace{-1.9ex}\rule{0.82\mpwd}{0.1pt} % % \vspace{1.01\mpwd} @@ -494,7 +496,7 @@ % \begin{center} \small % \begin{tabular}{ccc} % \hline -% parameter & default settings & special settings \\ +% Parameter & Default settings & Special settings \\ % \hline % |titlecolor| & |black| & \\ % |\titlestyle| & |\LARGE\bfseries| & |\LARGE\MakeUppercase| \\ @@ -559,7 +561,7 @@ % \begin{center} % \begin{tabular}{cc} % \hline -% parameter & default setting \\ +% Parameter & Default setting \\ % \hline % |headingcolor| & |black| \\ % |\headstyle| & |\small\color{headingcolor}| \\ @@ -574,9 +576,6 @@ % \end{tabular} % \end{center} % -% The \textbf{exam} and \textbf{collection} styles have a specific setting for -% |\headtitlestyle|, which is defined by |\renewcommand{\headtitlestyle}{\MakeUppercase}|. -% % \medskip % Macros that enable the display (or removal) of the rule in the header % \footnote{In fact, we have redefined the \texttt{\bs headrule} macro @@ -666,7 +665,14 @@ \newcommand*\identityname{\GetTranslation{schooldocs-name}} % \end{macrocode} +% Whether in French or German, the word that translates `correctname' contains +% an accented letter. The |\correct| macro will add this translated word to the title. +% However, when compiling with pdf\LaTeX\ and using the \textsf{hyperref} package, +% the encoding of these accented characters might be incorrect in the PDF metadata. +% In this case, compile with \XeLaTeX\ or add |\renewcommand\correctname{...}| +% in the preamble. % +% \medskip % \subsection{Information fields} % % Once defined, information fields are initially set to empty @@ -952,7 +958,6 @@ \let\subtitle\relax % because KOMA-Script uses it \newcommand\subtitle[1]{\long\def\@subtitle{##1}} \subtitle{} - \renewcommand{\headtitlestyle}{\MakeUppercase} \lhead{\headstyle \ifthenelse{\thepage=1}{}{\headtitlestyle{\@headtitle}}} \rhead{\headstyle @@ -998,7 +1003,6 @@ } \fancypagestyle{collection}{% - \renewcommand{\headtitlestyle}{\MakeUppercase} \lhead{\headstyle\headtitlestyle\@headtitle} \AtBeginDocument{\renewcommand{\sectionmark}[1]{\markboth{##1}{}}} \rhead{\headstyle\headsubjectstyle\leftmark} %\@section @@ -1036,8 +1040,8 @@ % \end{macrocode} % % In the \textbf{collection} style, -% we redefine |\sectionmark| using |\AtBeginDocument| to prevent |\MakeUppercase| -% from removing the section number +% we redefine |\sectionmark| using |\AtBeginDocument| to prevent a possible redefinition +% of |\headtitlestyle| as |\MakeUppercase| from removing the section number % (alternatively, you can use |\nouppercase| here). % % The |\ifthenelse| command doesn't function properly when |\and| is used within |\author|. diff --git a/macros/latex/contrib/schooldocs/schooldocs.pdf b/macros/latex/contrib/schooldocs/schooldocs.pdf index f46c1774f3..18ba710bac 100644 Binary files a/macros/latex/contrib/schooldocs/schooldocs.pdf and b/macros/latex/contrib/schooldocs/schooldocs.pdf differ -- cgit v1.2.3