summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-01-27 22:02:03 +0000
committerKarl Berry <karl@freefriends.org>2023-01-27 22:02:03 +0000
commitacd3db7c10ec5287424333afd469e73569b08715 (patch)
tree11e587bafc9ffa1af043a45019ea298b6a03f0a7 /Master/texmf-dist/tex
parentf074d4449ca328892d4fe440362b471cd7be5f0b (diff)
schooldocs (26jan23)
git-svn-id: svn://tug.org/texlive/trunk@65650 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty55
1 files changed, 39 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty b/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
index ff5c96d8f71..4f5213604e4 100644
--- a/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
+++ b/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
@@ -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{}
}