texlive[65650] Master/texmf-dist: schooldocs (26jan23)
commits+karl at tug.org
commits+karl at tug.org
Fri Jan 27 23:02:04 CET 2023
Revision: 65650
http://tug.org/svn/texlive?view=revision&revision=65650
Author: karl
Date: 2023-01-27 23:02:03 +0100 (Fri, 27 Jan 2023)
Log Message:
-----------
schooldocs (26jan23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/schooldocs/schooldocs-examples.pdf
trunk/Master/texmf-dist/doc/latex/schooldocs/schooldocs.pdf
trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx
trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
Modified: trunk/Master/texmf-dist/doc/latex/schooldocs/schooldocs-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/schooldocs/schooldocs.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx 2023-01-27 22:01:47 UTC (rev 65649)
+++ trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx 2023-01-27 22:02:03 UTC (rev 65650)
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{schooldocs}
%<*package>
- [2021/09/18 v1.1 .dtx schooldocs file]
+ [2023/01/25 v1.2 .dtx schooldocs file]
%</package>
%
%<*driver>
@@ -30,10 +30,13 @@
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[english]{babel}
-\usepackage{lmodern}
+\usepackage{charter}
\usepackage{lipsum}
\usepackage{hyperref}
\usepackage{boxedminipage2e}
+\usepackage{sectsty}
+\usepackage{spacingtricks}
+\usepackage{centeredline}
\usepackage{schooldocs}
%\usepackage{geometry}
\geometry{textwidth=355pt,vmarginratio=1:1,hmarginratio=3:2}
@@ -44,8 +47,8 @@
\newlength{\mpwd} \setlength{\mpwd}{5.25cm}
\newenvironment{stylex}{\begin{boxedminipage}[c][1.3\mpwd][t]{\mpwd}\tiny
}{\end{boxedminipage}}
-\newcommand*{\centered}[1]{{\setlength{\parskip}{0pt}\par\noindent\hfill
- #1\hfill\mbox{}}}
+\definecolor{darkbrown}{rgb}{0.5,0.1,0.1}
+\allsectionsfont{\color{darkbrown}} %\sffamily
\providecommand\headtitlestyle{\scshape}
\providecommand\headsubjectstyle{\scshape}
\providecommand\schoolstyle{\scshape}
@@ -62,7 +65,8 @@
\hypersetup{%
colorlinks,
- linkcolor=blue,
+ linkcolor=red,
+ filecolor=blue,
pdftitle={schoodocs},
pdfsubject={LaTeX package},
pdfauthor={Antoine Missier}
@@ -76,7 +80,7 @@
%</driver>
% \fi
%
-% \CheckSum{766}
+% \CheckSum{811}
%
% \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
@@ -100,6 +104,14 @@
% \changes{v0.2}{2020/05/04}{Examples file}
% \changes{v1.0}{2020/07/13}{Initial public version with documentation in English}
% \changes{v1.1}{2021/09/18}{Using the translations package for internationalization}
+% \changes{v1.2}{2022/11/14}{
+% - New parameter smalltitletopskip,
+% - Forename discarded from the identity style,
+% - 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)}
%
% \GetFileInfo{schooldocs.dtx}
%
@@ -111,7 +123,7 @@
% It can be used for exercises sheets, exams, course materials.
% The package sets the page geometry (dimensions of text and margins)
% and the title typesetting;
-% the various \emph{styles} define the header, footer and title formatting,
+% various \emph{styles} define header, footer and title formatting,
% Many features are freely configurable.
% Six different styles are proposed which are named:
% \begin{center} \bfseries
@@ -120,8 +132,8 @@
% \end{center}
% If the document is an exam subject to be completed and returned,
% we have a particular style, \textbf{identity}, in which
-% left and center parts of the header are replaced by the words
-% \textsf{\identityname} and \textsf{\identityforename}.
+% left part of the header is replaced by
+% ``\identityname'', whereas center and right parts are empty.
%
% \medskip
% The styles are presented in paragraph \ref{par:styles}
@@ -132,7 +144,7 @@
%
% \subsection{Choosing a style}
% After loading the package with |\usepackage{schooldocs}|,
-% we define the style by placing |\pagestyle|\marg{style} in the preamble.
+% the style is defined by placing |\pagestyle|\marg{style} in the preamble.
% This command comes from the package \textsf{fancyhdr} by Piet van Oostrum.
% It can be placed before of after entering information described in the next subsection.
%
@@ -153,19 +165,20 @@
% instead of \meta{title}.
% When not provided, the mandatory argument \meta{title} will be used in headers.
%
-% The macros |\date| and |\author| have not been redefined but the information provided
+% The macros |\date| and |\author| have not been redefined but information provided
% is also used in titles, headers or footers
-% (depending on the style used)\footnote{The macro \texttt{\bslash and},
+% (depending on the style used)
+% \footnote{The macro \texttt{\bslash and},
% sometimes used in \texttt{\bslash author}
% to typeset a title with several authors, doesn't work here,
-% except in the \textbf{collection} style. It produced a compilation error.
+% except in the \textbf{collection} style. It produces a compilation error.
% The macro \texttt{\bslash thanks} also doesn't work but without producing error.}.
%
% \pagebreak
% \medskip
% \DescribeMacro{\subject} \DescribeMacro{\school} \DescribeMacro{\institute}
-% In addition to the previous ones, we provide two other information macros,
-% used in the title, or the headers or the footers, depending on the style:
+% In addition to the previous ones, two other information macros are provided,
+% used in the title, headers or footers, depending on the style:
% |\subject| and |\school| (or its alias |\institute|).
% The macro |\subject| has an optional argument, like in |\title|:
% |\subject|\oarg{head}\marg{title} which allows to place an alternative text
@@ -172,15 +185,16 @@
% in header, different from the one displayed in the title.
%
% \medskip
-% The information macros, that have to be called in the preamble\footnote{%
-% Nevertheless, the macros \texttt{\bslash date} and \texttt{\bslash author}
+% Information macros have to be called in the preamble
+% \footnote{Nevertheless, the macros \texttt{\bslash date} and \texttt{\bslash author}
% can be used in the document body.},
-% are optional. If omitted the corresponding field will be empty,
+% they are optional. If omitted, the corresponding field will be empty,
% except for the date which will display today's date.
% So, if you do not want any date, just write |\date{}|.
-% When title elements like subject, date are missing, the title height will be reduced accordingly.
+% When title elements like subject or date are missing, the title height
+% will be reduced accordingly.
%
-% Except |\date|, all these information macros accept multi-line arguments,
+% Except for |\date|, all these information macros accept multi-line arguments,
% for example |\school{Royal College of Pataphysics\\London}|.
% To typeset the main title on two (or more) lines, use |\\[1ex]|
% for a good vertical spacing.
@@ -187,7 +201,8 @@
%
% When using the \textsf{hyperref} package (by Sebastian Rahtz and Heiko Oberdiek)
% to produce a pdf output, information provided by |\title|, |\subject| and |\author|
-% (and |\school|\footnote{The \emph{author} field of the pdf properties will be filled
+% (and |\school|
+% \footnote{The \emph{author} field of the pdf properties will be filled
% like this: \textsf{author (school)},
% but \texttt{\bs author} should be called before \texttt{\bs school} in the preamble.
% })
@@ -224,10 +239,10 @@
% by the macro |\maketitle|, which should be placed after |\begin{document}|.
% This command has been redefined by the package.
% Indeed, the standard title produced by the \LaTeX\ class \texttt{article},
-% seems inappropriate for school documents like an exercise sheet for example.
-% The macro redefinition reduces the vertical space before the title
-% and typesets an horizontal rule to separate the title from the following text.
-% By default, the title is centered but we can change this,
+% seems inappropriate for school documents like exercise sheets for example.
+% Vertical space before the title is reduced and
+% an horizontal rule is typeset to separate the title from the following text.
+% By default, the title is centered but one can change this,
% as presented in section \ref{par:title-set}, to get
% a left or right-aligned title (an also boxed).
% Various titles are presented in the file
@@ -236,13 +251,13 @@
% The macro has on optional parameter |\maketitle|\oarg{rulelength}
% to set the length of the separation rule, by default 2.5\,cm.
% The rule can be totally removed by setting the
-% optional argument to 0\,cm; we can also make a rule of
+% optional argument to 0\,cm; you can also typeset a rule of
% whole line width with |\maketitle[\linewidth]| or |\maketitle[\textwidth]|.
%
% Each style has its own title formatting. Nevertheless the package provides
% a ``standard'' title when no style is loaded or with
% the \LaTeX\ styles \textbf{empty} or \textbf{plain}.
-% The \textbf{elegant} style keeps also this ``standard'' style.
+% The \textbf{elegant} style keeps also this ``standard'' title style.
%
% \medskip
% \DescribeMacro{\seprule}
@@ -253,11 +268,11 @@
% \medskip
% \DescribeMacro{\correct}
% For typesetting a correct version of an exercise sheet, we provide the macro |\correct|,
-% which adds \textsf{-- Correct Version} to the title.
+% which adds ``-- Correct Version'' to the title.
% It should be placed in the preamble.
% Combined with packages that deal with multiple versions of a document,
% this macro avoids to define different titles for a an exercise sheet an its correct version.
-% However in the \textbf{exam} style, the text \textsf{Correct version}
+% However in the \textbf{exam} style, the text ``Correct version''
% will not be added in the title (except in headers), but will be substituted for
% the subtitle.
%
@@ -266,7 +281,7 @@
% As in the package \textsf{phfnote} by Philippe Faist, it seems wisely
% to propose a compact title, where information
% provided by |\title|, |\subject| and |\date| are presented
-% on a single line (see \textsf{schooldocs-examples.pdf}).
+% on a single line, depending on the selected style (see \textsf{schooldocs-examples.pdf}).
% The rule is always displayed and expands on the whole line width.
%
% \subsection{Style layouts} \label{par:styles}
@@ -283,9 +298,11 @@
% We present below miniature views to show the layout of the different styles.
% The file \href{run:schooldocs-examples.pdf}{\textsf{schooldocs-examples.pdf}}
% gives a real view of them.
-% The rule (width) under the header or over the footer
-% is freely configurable, as well as the format of each element and
-% also some space settings, see section \ref{par:head-settings}.
+% For several styles, a rule is typeset under the header.
+% It can be displayed or discarded by setting its width, and likewise for a rule
+% over the footer.
+% The format of each element and also some space settings
+% are freely configurable, see section \ref{par:head-settings}.
%
% \medskip
% \begin{stylex}
@@ -292,7 +309,7 @@
% {\schoolstyle School} \hfill {Author}\\[-0.3ex]
% {\headsubjectstyle Subject} \hfill {date}\\
% \vspace{0.04\mpwd}
-% \centered{\footnotesize\sffamily\bfseries The classic style}
+% \centered{\footnotesize\bfseries The classic style}
% \vspace{-0.25ex}\centered{\rule{0.15\mpwd}{0.1pt}}
% \vspace{0.85\mpwd}
% \centered{1/2}
@@ -309,7 +326,7 @@
% \begin{stylex}
% \mbox{}\vspace{0.03\mpwd}
% \begin{center}
-% {\footnotesize\sffamily\bfseries The elegant style}\\[1.7ex]
+% {\footnotesize\bfseries The elegant style}\\[1.7ex]
% {\scriptsize Subject} \\[0.5ex]
% {\scriptsize date} \\
% \vspace{-0.5ex}\rule{0.15\mpwd}{0.1pt}
@@ -326,7 +343,7 @@
% \begin{stylex}
% \mbox{}\vspace{0.03\mpwd}
% \begin{center}
-% {\footnotesize\sffamily\bfseries The modern style}\\[1.7ex]
+% {\footnotesize\bfseries The modern style}\\[1.7ex]
% {\scriptsize Subject} \\
% \vspace{-0.5ex}\rule{0.15\mpwd}{0.1pt}
% \end{center}
@@ -346,7 +363,7 @@
% \begin{stylex}
% \mbox{}\vspace{0.03\mpwd}
% \begin{center}
-% {\footnotesize\sffamily\bfseries The soft style}\\
+% {\footnotesize\bfseries The soft style}\\
% \vspace{-0.5ex}\rule{0.15\mpwd}{0.1pt}
% \end{center}
% \vspace{0.83\mpwd}
@@ -406,10 +423,9 @@
% \end{stylex}
% \bigskip
%
-% In the \textbf{collection} style, usefull for longer documents,
-% the name of the current section appears in the right header
-% and changes as things progress
-% as in the \LaTeX\ \textbf{book} class.
+% The \textbf{collection} style is useful for longer documents.
+% In it the name of the current section appears in the right header
+% and changes as things progress, as in the \LaTeX\ \textbf{book} class.
%
% \section{Settings}
%
@@ -422,32 +438,37 @@
% the \textsf{typearea} package or \textsf{KOMA-Script} bundle documentation)
% the ratio between the text body (the type area as named by typographers)
% and the page size must be the same horizontally and vertically.
-% This ratio gauges the ``shades of gray'' of a page.
+% This ratio gauges the ``shade of gray'' of a page.
% The default scale in the \textsf{geometry} package is 0.7.
-% For school documents, it seems that this setting leaves too much white space in the margins, thus this ratio has been set to 0.75.
-% Of course, it can be freely redefined with the |\geometry| command.
+% For school documents, it seems that this setting leaves too much white
+% space in margins, thus this ratio has been set to 0.75.
+% It can be redefined with the |\newgeometry| command
+% \footnote{You can also call \textsf{geometry} before \textsf{schooldocs}.
+% Setting the scale factor several times doesn't work.}.
% Furthermore, according to ``canons of page construction'', in a one-sided document,
% the ratio between the left and right margins should be 1:1,
-% while the ratio between the top and bottom margins should be 1:2.
+% while the ratio between top and bottom margins should be 1:2.
% It seems that this recommended ratio of 1:2 is seldom observed
% and it produces a very wide bottom margin.
-% Besides, when loading the \textsf{geometry} package, the default vertical ratio is 2:3 and not 1:2.
+% Besides, when loading the \textsf{geometry} package, the default vertical
+% ratio is 2:3 and not 1:2.
% To get more balanced margins, we have prefer to set it at 3:4:
-% |\geometry{scale=0.75,vmarginratio=3:4,heightrounded}|\footnote{The option
-% \texttt{heightrounded} rounds text height to $n$-times ($n$ an integer) the height of a line, to avoid ``underfull vbox'' in some cases.}.
+% |\geometry{scale=0.75,vmarginratio=3:4,heightrounded}|
+% \footnote{The option \texttt{heightrounded} rounds text height to $n$-times
+% ($n$ an integer) the height of a line, to avoid ``underfull vbox'' in some cases.}.
%
% \subsection{Title settings} \label{par:title-set}
%
% Several parameters allow to customize the title composition.
-% They are presented in the following table with their default value.
-% Colors are changed with |\definecolor|, macros with |\renewcommand|
+% They are presented in the following table with their default settings.
+% Colors can be changed with |\definecolor|, macros with |\renewcommand|
% and lengths with |\setlength|.
-% Most of command names are explicit enough to give some information about their use.
-%
-% Let us specify nevertheless that |\titleflush| manages the alignment:
+% Most of command names are explicit and don't need to give any information about their use.
+% |\titleflush| manages the alignment:
% centered by default, it can be left-aligned with
% |\renewcommand{\titleflush}{flushleft}| or right-aligned with
-% |\renewcommand{\titleflush}{flushright}|\footnote{This macro has no effect
+% |\renewcommand{\titleflush}{flushright}|
+% \footnote{This macro has no effect
% with the \textbf{exam} and \textbf{collection} styles,
% the title is always centered.}.
%
@@ -455,7 +476,7 @@
% and \emph{subject}, except for the \textbf{classic} and \textbf{soft} styles,
% witch contain only the field \emph{title}, or if the field \emph{subject}
% is not given.
-% Vertical spaces between other title fields are defined in relation to
+% Vertical space between other title fields is defined in relation to
% |\titlesep| (|0.5\titlesep| for most).
%
% Unless otherwise stated, the column ``special settings'' of the following table
@@ -467,12 +488,13 @@
% parameter & default settings & special settings \\
% \hline
% |titlecolor| & |black| & \\
-% |\titlestyle| & |\LARGE\sffamily\bfseries| & |\LARGE\MakeUppercase| \\
+% |\titlestyle| & |\LARGE\bfseries| & |\LARGE\MakeUppercase| \\
% |\subjectstyle| & |\large| & |\Large\bfseries|\\
% |\datestyle| & |\large| \\
% |\smalltitledatestyle| & |\large\slshape| & \\
% |\titleflush| & |center| & \\
-% |\titletopskip| & -1.32\,cm & -0.67\,cm (\textbf{classic}), 0.67\,cm \\
+% |\titletopskip| & -1.32\,cm & -0.67\,cm (\textbf{classic, soft}), 0.67\,cm \\
+% |\smalltitletopskip| & -1.32\,cm & \\
% |\titlebottomskip| & |\medskipamount| \\
% |\titlesep| & |2\medskipamount| & |2\bigskipamount| \\
% |\seprulewidth| & 0.3\,pt &\\
@@ -489,32 +511,34 @@
%
% In the \textbf{collection} style, the fields
% \emph{school} and \emph{author} are included into the title. Their features are then
-% controlled by |\authorstyle|\footnote{For other styles, the macro
-% \texttt{\bs authorstyle} belongs to headers or footers parameters.} set to |\Large|.
+% controlled by |\authorstyle|
+% \footnote{For other styles, the macro \texttt{\bs authorstyle}
+% belongs to headers or footers parameters.} set to |\Large|.
%
-% If we want to create a separate page for the title, in particular for the
-% \textbf{exam} or \textbf{collection} styles, we can place |\maketitle| into
+% To create a separate page for the title
+% (in particular for \textbf{exam} or \textbf{collection}), you can place |\maketitle| into
% an environment |titlepage| provided by \LaTeX.
%
% \medskip
% \DescribeMacro{\boxedshape}
-% A particular formatting has been predefined to produce a slightly shaded box around the title: |\boxedshape|\marg{text}
+% A particular formatting has been predefined to produce a slightly
+% shaded box around the title: |\boxedshape|\marg{text}
% (thanks to the \textsf{fancybox} package by Timothy Van Zandt).
-% It is not activated by default but it can be used within the
-% command |\titlestyle| if we want to get this kind of effect, e.g.
-% |\renewcommand{\titlestyle}{\LARGE\sffamily\bfseries\boxedshape}|.
+% It can be used within the
+% command |\titlestyle| if we want to get this kind of effect, \eg
+% \centeredline{|\renewcommand{\titlestyle}{\LARGE\sffamily\bfseries\boxedshape}|.}
%
% \subsection{Headers and footers} \label{par:head-settings}
%
-% Headers and footers typeset is produced thanks to
-% dedicated macros\footnote{The \textsf{fancyhdr} package
+% The typeset of headers and footers is produced thanks to dedicated macros
+% \footnote{The \textsf{fancyhdr} package
% provides the commands \texttt{\bs lhead}, \texttt{\bs chead}, \texttt{\bs rhead}
% for the left, center and right parts of the header, and the same for the footer:
% \texttt{\bs lfoot}, \texttt{\bs cfoot} and \texttt{\bs rfoot}.}
% of the \textsf{fancyhdr} package.
-% As for the title, several macros allow to customize certain settings.
+% As for the title, several macros allow to customize some settings.
% They are presented in the table below.
-% Let us specify that |\pagenamestyle| defines the format of the word \emph{page}
+% Let us specify that |\pagenamestyle| defines the format of the word ``\emph{page}''
% used in front of the page number.
%
% The |\headstyle| and |\footstyle| commands are generic for all elements
@@ -542,31 +566,30 @@
% |\headtitlestyle|, defined by |\renewcommand{\headtitlestyle}{\MakeUppercase}|.
%
% \medskip
-% Macros that allow to display (or remove) the rule in the header\footnote{Indeed
-% we have redefined the \texttt{\bs headrule} macro
-% such that the rule never appears
-% on the first page.}
+% Macros that allow to display (or remove) the rule in the header
+% \footnote{Indeed we have redefined the \texttt{\bs headrule} macro
+% such that the rule never appears on the first page.}
% or the footer
% come from the \textsf{fancyhdr} package. For example, in any style,
-% we remove the rule in the header with:
+% the rule in the header is removed with:
% |\renewcommand{\headrulewidth}{0pt}|,
-% and display it in the footer with:
+% and displayed in the footer with:
% |\renewcommand\footrulewidth{0.4pt}|
%
% \subsection{Internationalization}
-% Four keywords are used by the package: \emph{page}, \emph{Correct version},
-% \emph{Name} and \emph{Forename},
-% defined by the macros |\pagename|, |\correctname|, |\identityname| and |\identityforename|.
-% |\pagename| is used in header or footer, |\correctname| by the macro |\correct|
-% and both others by the \textbf{identity} style.
-% These keywords get automatic translation in a few languages\footnote{Translation
-% is currently integrated into the package for the following languages:
-% French, German, Spanish, Italian, Portuges.}
-% according to the selected language by \textsf{babel} package or \textsf{polyglossia}.
+% Three keywords are used by the package: \emph{page}, \emph{Correct version},
+% and \emph{Name},
+% defined by the macros |\pagename|, |\correctname| and |\identityname|.
+% |\pagename| is used in the header or the footer, |\correctname| by the macro |\correct|
+% and |\identityname| by the \textbf{identity} style.
+% These keywords get automatic translation in a few languages
+% \footnote{Translation is currently integrated into the package
+% for the following languages:
+% French, German, Spanish, Italian, Portuguese.}
+% according to the selected language by the \textsf{babel} or \textsf{polyglossia} package.
% They can be redefined, with |\renewcommand|,
-% which should be placed \emph{after} |\begin{document}|,
-% or else we can use macros from the \textsf{translations} package by Clemens Niederberger
-% (allowing dynamic language change), e.g.\\
+% or else you can use macros from the \textsf{translations} package by Clemens Niederberger
+% (allowing dynamic language change), \eg
% |\DeclareTranslation{romanian}{pagin\u{a}}| (in the preamble).
%
%
@@ -577,10 +600,7 @@
% \subsection{Required packages and geometry settings}
%
% \begin{macrocode}
-\ProvidesPackage{schooldocs}
-\NeedsTeXFormat{LaTeX2e}
-
-\RequirePackage{geometry}
+\@ifpackageloaded{geometry}{}{\RequirePackage{geometry}}
\let\footruleskip\relax % because memoir class uses it
\RequirePackage{fancyhdr}
\RequirePackage{ifthen}
@@ -592,10 +612,11 @@
\geometry{scale=0.75,vmarginratio=3:4,heightrounded}
% \end{macrocode}
-% It is recommended to define the settings with the command |\geometry|
-% rather than as option when loading the package \textsf{geometry}, to avoid option clash.
-%
-% To change the scale factor, if the |\geometry| command doesn't work, use |\newgeometry|.
+% If the \textsf{geometry} package has been loaded before,
+% we don't load it to avoid option clash.
+%
+% To change the scale factor, use |\newgeometry| because
+% the |\geometry| command will not do it when the scale is already defined.
%\medskip
% \subsection{Internationalization}
%
@@ -603,42 +624,34 @@
\DeclareTranslationFallback{schooldocs-pagename}{page}
\DeclareTranslationFallback{schooldocs-correct}{Correct version}
\DeclareTranslationFallback{schooldocs-name}{Name:}
-\DeclareTranslationFallback{schooldocs-forename}{Forename:}
\DeclareTranslation{english}{schooldocs-pagename}{page}
\DeclareTranslation{english}{schooldocs-correct}{Correct version}
\DeclareTranslation{english}{schooldocs-name}{Name:}
-\DeclareTranslation{english}{schooldocs-forename}{Forename:}
\DeclareTranslation{french}{schooldocs-pagename}{page}
\DeclareTranslation{french}{schooldocs-correct}{Corrigé}
\DeclareTranslation{french}{schooldocs-name}{Nom :}
-\DeclareTranslation{french}{schooldocs-forename}{Prénom :}
\DeclareTranslation{german}{schooldocs-pagename}{Seite}
\DeclareTranslation{german}{schooldocs-correct}{Musterlösung}
\DeclareTranslation{german}{schooldocs-name}{Name:}
-\DeclareTranslation{german}{schooldocs-forename}{Vorname:}
\DeclareTranslation{spanish}{schooldocs-pagename}{página}
\DeclareTranslation{spanish}{schooldocs-correct}{Correccion}
\DeclareTranslation{spanish}{schooldocs-name}{Apellido:}
-\DeclareTranslation{spanish}{schooldocs-forename}{Nombre:}
\DeclareTranslation{italian}{schooldocs-pagename}{pagina}
\DeclareTranslation{italian}{schooldocs-correct}{Corretto}
\DeclareTranslation{italian}{schooldocs-name}{Nome:}
-\DeclareTranslation{italian}{schooldocs-forename}{Conome:}
\DeclareTranslation{portuges}{schooldocs-pagename}{página}
\DeclareTranslation{portuges}{schooldocs-correct}{Corrigiu}
\DeclareTranslation{portuges}{schooldocs-name}{Nome:}
-\DeclareTranslation{portuges}{schooldocs-forename}{Primeiro nome:}
\newcommand*\pagename{\GetTranslation{schooldocs-pagename}}
\newcommand*\correctname{\GetTranslation{schooldocs-correct}}
\newcommand*\identityname{\GetTranslation{schooldocs-name}}
-\newcommand*\identityforename{\GetTranslation{schooldocs-forename}}
% \end{macrocode}
%
@@ -681,12 +694,13 @@
% First we present the title settings.
% \begin{macrocode}
\definecolor{titlecolor}{named}{black}
-\newcommand{\titlestyle}{\LARGE\sffamily\bfseries}
+\newcommand{\titlestyle}{\LARGE\bfseries}
\newcommand{\subjectstyle}{\large}
\newcommand{\datestyle}{\large}
\newcommand{\smalltitledatestyle}{\large\slshape}
\newcommand{\titleflush}{center}
\newlength{\titletopskip} \setlength{\titletopskip}{-1.32cm}
+\newlength{\smalltitletopskip} \setlength{\smalltitletopskip}{-1.32cm}
\newlength{\titlesep} \setlength{\titlesep}{2\medskipamount}
\newlength{\titlebottomskip} \setlength{\titlebottomskip}{\medskipamount}
\newlength{\seprulewidth} \setlength{\seprulewidth}{0.3pt}
@@ -725,7 +739,7 @@
% The |\headrule| macro redefinition allow to remove the rule on the first page.
%
% The header height is set to |\baselineskip| to avoid
-% error messages (``headheight too small'') when the text size is
+% error messages (``\texttt{headheight too small}'') when the text size is
% greater than or equal to |\small|.
%
% \subsection{Title composition}
@@ -749,7 +763,7 @@
}
\newcommand{\makesmalltitle}{
- \mbox{}\par\vspace{1.5\titletopskip}
+ \mbox{}\par\vspace{\smalltitletopskip}
\begin{center}
{\color{titlecolor}
{\titlestyle{\@title}}
@@ -779,7 +793,7 @@
%|\correctname| can be redefined by \textsf{babel} at |\begin{document}|.
%
% \medskip
-% \subsection{The basic styles}
+% \subsection{Basic styles}
%
% The header in the \textbf{classic} style is displayed on two lines, therefore we have to increase the height
% |\headheight|.
@@ -805,6 +819,17 @@
\ifthenelse{\lengthtest{##1>0cm}}{\rule{##1}{\seprulewidth}}{}
\end{\titleflush}
\vspace{\titlebottomskip}
+ }
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \subjectstyle\@subject
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
}
}
@@ -847,6 +872,17 @@
\end{\titleflush}
\vspace{\titlebottomskip}
}
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \subjectstyle\@subject
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
+ }
}
\fancypagestyle{soft}{%
@@ -873,18 +909,29 @@
\ifthenelse{\lengthtest{##1>0cm}}{\rule{##1}{\seprulewidth}}{}
\end{\titleflush}
\vspace{\titlebottomskip}
+ }
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \mbox{}
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
}
}
\fancypagestyle{identity}{%
\lhead{\headstyle\headtitlestyle \identityname}
- \chead{\headstyle\headtitlestyle \identityforename}
+ \chead{}
\rhead{}
}
% \end{macrocode}
%
-% \subsection{The extended styles}
+% \subsection{Extended styles}
%
% \begin{macrocode}
\fancypagestyle{exam}{%
Modified: trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty 2023-01-27 22:01:47 UTC (rev 65649)
+++ trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty 2023-01-27 22:02:03 UTC (rev 65650)
@@ -22,11 +22,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{schooldocs}
- [2021/09/18 v1.1 .dtx schooldocs file]
-\ProvidesPackage{schooldocs}
-\NeedsTeXFormat{LaTeX2e}
-
-\RequirePackage{geometry}
+ [2023/01/25 v1.2 .dtx schooldocs file]
+\@ifpackageloaded{geometry}{}{\RequirePackage{geometry}}
\let\footruleskip\relax % because memoir class uses it
\RequirePackage{fancyhdr}
\RequirePackage{ifthen}
@@ -40,42 +37,34 @@
\DeclareTranslationFallback{schooldocs-pagename}{page}
\DeclareTranslationFallback{schooldocs-correct}{Correct version}
\DeclareTranslationFallback{schooldocs-name}{Name:}
-\DeclareTranslationFallback{schooldocs-forename}{Forename:}
\DeclareTranslation{english}{schooldocs-pagename}{page}
\DeclareTranslation{english}{schooldocs-correct}{Correct version}
\DeclareTranslation{english}{schooldocs-name}{Name:}
-\DeclareTranslation{english}{schooldocs-forename}{Forename:}
\DeclareTranslation{french}{schooldocs-pagename}{page}
\DeclareTranslation{french}{schooldocs-correct}{Corrigé}
\DeclareTranslation{french}{schooldocs-name}{Nom :}
-\DeclareTranslation{french}{schooldocs-forename}{Prénom :}
\DeclareTranslation{german}{schooldocs-pagename}{Seite}
\DeclareTranslation{german}{schooldocs-correct}{Musterlösung}
\DeclareTranslation{german}{schooldocs-name}{Name:}
-\DeclareTranslation{german}{schooldocs-forename}{Vorname:}
\DeclareTranslation{spanish}{schooldocs-pagename}{página}
\DeclareTranslation{spanish}{schooldocs-correct}{Correccion}
\DeclareTranslation{spanish}{schooldocs-name}{Apellido:}
-\DeclareTranslation{spanish}{schooldocs-forename}{Nombre:}
\DeclareTranslation{italian}{schooldocs-pagename}{pagina}
\DeclareTranslation{italian}{schooldocs-correct}{Corretto}
\DeclareTranslation{italian}{schooldocs-name}{Nome:}
-\DeclareTranslation{italian}{schooldocs-forename}{Conome:}
\DeclareTranslation{portuges}{schooldocs-pagename}{página}
\DeclareTranslation{portuges}{schooldocs-correct}{Corrigiu}
\DeclareTranslation{portuges}{schooldocs-name}{Nome:}
-\DeclareTranslation{portuges}{schooldocs-forename}{Primeiro nome:}
\newcommand*\pagename{\GetTranslation{schooldocs-pagename}}
\newcommand*\correctname{\GetTranslation{schooldocs-correct}}
\newcommand*\identityname{\GetTranslation{schooldocs-name}}
-\newcommand*\identityforename{\GetTranslation{schooldocs-forename}}
\renewcommand{\title}[2][]{\long\def\@title{#2}
\ifthenelse{\equal{#1}{}}{\def\@headtitle{#2}}{\def\@headtitle{#1}}
@@ -99,12 +88,13 @@
\def\@subject{}
\def\@headsubject{}
\definecolor{titlecolor}{named}{black}
-\newcommand{\titlestyle}{\LARGE\sffamily\bfseries}
+\newcommand{\titlestyle}{\LARGE\bfseries}
\newcommand{\subjectstyle}{\large}
\newcommand{\datestyle}{\large}
\newcommand{\smalltitledatestyle}{\large\slshape}
\newcommand{\titleflush}{center}
\newlength{\titletopskip} \setlength{\titletopskip}{-1.32cm}
+\newlength{\smalltitletopskip} \setlength{\smalltitletopskip}{-1.32cm}
\newlength{\titlesep} \setlength{\titlesep}{2\medskipamount}
\newlength{\titlebottomskip} \setlength{\titlebottomskip}{\medskipamount}
\newlength{\seprulewidth} \setlength{\seprulewidth}{0.3pt}
@@ -150,7 +140,7 @@
}
\newcommand{\makesmalltitle}{
- \mbox{}\par\vspace{1.5\titletopskip}
+ \mbox{}\par\vspace{\smalltitletopskip}
\begin{center}
{\color{titlecolor}
{\titlestyle{\@title}}
@@ -193,6 +183,17 @@
\end{\titleflush}
\vspace{\titlebottomskip}
}
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \subjectstyle\@subject
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
+ }
}
\fancypagestyle{elegant}{%
@@ -234,6 +235,17 @@
\end{\titleflush}
\vspace{\titlebottomskip}
}
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \subjectstyle\@subject
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
+ }
}
\fancypagestyle{soft}{%
@@ -261,11 +273,22 @@
\end{\titleflush}
\vspace{\titlebottomskip}
}
+ \renewcommand{\makesmalltitle}{
+ \mbox{}\par\vspace{\smalltitletopskip}
+ \begin{center}
+ {\color{titlecolor}
+ {\titlestyle{\@title}}
+ \hfill \mbox{}
+ }
+ \rule{\linewidth}{\seprulewidth}
+ \end{center}
+ \vspace{\titlebottomskip}
+ }
}
\fancypagestyle{identity}{%
\lhead{\headstyle\headtitlestyle \identityname}
- \chead{\headstyle\headtitlestyle \identityforename}
+ \chead{}
\rhead{}
}
More information about the tex-live-commits
mailing list.