texlive[73466] Master/texmf-dist: schooldocs (15jan25)
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 15 22:00:05 CET 2025
Revision: 73466
https://tug.org/svn/texlive?view=revision&revision=73466
Author: karl
Date: 2025-01-15 22:00:05 +0100 (Wed, 15 Jan 2025)
Log Message:
-----------
schooldocs (15jan25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/schooldocs/schooldocs.pdf
trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx
trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.ins
trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
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 2025-01-15 20:59:56 UTC (rev 73465)
+++ trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.dtx 2025-01-15 21:00:05 UTC (rev 73466)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020-2024 by Antoine Missier <antoine.missier at ac-toulouse.fr>
+% Copyright (C) 2020-2025 by Antoine Missier <antoine.missier at ac-toulouse.fr>
% ----------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{schooldocs}
%<*package>
- [2024/01/31 v1.5 .dtx Layout styles for school documents]
+ [2025/01/15 v1.6 Layout styles for school documents]
%</package>
%
%<*driver>
@@ -36,11 +36,11 @@
\usepackage{sectsty}
\usepackage{spacingtricks}
\usepackage{schooldocs}
-\usepackage{hyperref}
+\usepackage{hypdoc} % includes 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
+\geometry{textwidth=355pt,textheight=600pt,vmarginratio=1:1,hmarginratio=3:2}
+% modified by schoodocs, very close from the default geometry used by ltxdoc
\newcommand{\bs}{\textbackslash}
\setlength{\fboxsep}{13pt}
@@ -78,27 +78,8 @@
\PrintIndex
\end{document}
%</driver>
-% \fi
+% \fi%
%
-% \CheckSum{863}
-%
-% \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
-% Lower-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
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-%
% \changes{v0.0}{2010/09/01}{Initial personal version}
% \changes{v0.1}{2020/01/05}{Initial documentation in French}
% \changes{v0.2}{2020/05/04}{Examples file}
@@ -119,6 +100,8 @@
% - Possibility to call maketitle several times with different information fields
% that can be changed outside the preamble
% - The schooldocs-examples.pdf file is now generated in a single compilation}
+% \changes{v1.6}{2025/01/15}{
+% - Using totpages package instead of lastpage (nowadays incompatible with hyperref)}
%
% \GetFileInfo{schooldocs.dtx}
%
@@ -157,7 +140,7 @@
% It can be placed before of after entering the information described in the next subsection.
%
% \medskip
-% You can change the style of a particular page by placing
+% To change the style of a particular page place
% |\thispagestyle|\marg{style} on the page you desire.
% For example, on an appendix page that needs to be rendered
% you can use the command |\thispagestyle{identity}|.
@@ -619,7 +602,7 @@
\let\footruleskip\relax % because the memoir class uses it
\RequirePackage{fancyhdr}
\RequirePackage{ifthen}
-\RequirePackage{lastpage}
+\RequirePackage{totpages} % lastpage nowadays incompatible with hyperref
\RequirePackage{fancybox}
\RequirePackage{xcolor}
\RequirePackage{translations}
@@ -679,7 +662,7 @@
% \medskip
% \subsection{Information fields}
%
-% The PDF information fields are automatically filled in using the information macros,
+% The PDF information fields are filled in using the information macros,
% but this only works in the preamble, hence the test |\ifx at onlypreamble@notprerr|.
% This allows using these macros outside the preamble, which is the normal behavior
% for |\title|, |\date|, |\author|, etc. with the 'article' class.
@@ -692,7 +675,8 @@
\renewcommand{\title}[2][]{\long\def\@title{#2}
\ifthenelse{\equal{#1}{}}{\def\@headtitle{#2}}{\def\@headtitle{#1}}
\ifx\@onlypreamble\@notprerr\else
- \@ifpackageloaded{hyperref}{\hypersetup{pdftitle={\@headtitle}}}{}
+ \@ifpackageloaded{hyperref}%
+ {\hypersetup{pdftitle={\@headtitle}}}{}
\fi
}
\title{}
@@ -709,9 +693,11 @@
\let\subject\relax
\newcommand{\subject}[2][]{\long\def\@subject{#2}
- \ifthenelse{\equal{#1}{}}{\def\@headsubject{#2}}{\def\@headsubject{#1}}
+ \ifthenelse{\equal{#1}{}}%
+ {\def\@headsubject{#2}}{\def\@headsubject{#1}}
\ifx\@onlypreamble\@notprerr\else
- \@ifpackageloaded{hyperref}{\hypersetup{pdfsubject={\@headsubject}}}{}
+ \@ifpackageloaded{hyperref}%
+ {\hypersetup{pdfsubject={\@headsubject}}}{}
\fi
}
\def\@subject{}
@@ -775,7 +761,7 @@
% of the rule on the first page.
%
% The header height is set to |\baselineskip| to prevent
-% error messages (``\texttt{headheight too small}'') when the text size is
+% some error messages (``\texttt{headheight too small}'') when the text size is
% equal to or greater than |\small|.
%
% \subsection{Title composition}
@@ -799,7 +785,7 @@
\par\vspace{0.5\titlesep} \datestyle\@date}
\par\vspace{0.5\titlesep}
}
- \ifthenelse{\lengthtest{##1 > 0cm}}{\rule{##1}{\seprulewidth}}{}
+ \ifthenelse{\lengthtest{##1>0cm}}{\rule{##1}{\seprulewidth}}{}
\end{\titleflush}
\vspace{\titlebottomskip}
}
@@ -854,7 +840,7 @@
\headsubjectstyle\@subject}{\headtitlestyle\@headtitle} }
\rhead{\headstyle\ifthenelse{\thepage=1}{\authorstyle\@author\mbox{}\\
\headdatestyle\@date}{\headsubjectstyle\@headsubject}}
- \cfoot{\footstyle \thepage /\pageref{LastPage}}
+ \cfoot{\footstyle \thepage /\pageref{TotPages}}
\setlength{\titletopskip}{-0.67cm}
\renewcommand{\maketitle}[1][\seprulelength]{%
\newpage\mbox{}\par\vspace{\titletopskip}
@@ -884,7 +870,7 @@
\ifthenelse{\thepage=1}{}{\headtitlestyle\@headtitle}}
\rhead{\headstyle
\ifthenelse{\thepage=1}{}{%
- \pagenamestyle\pagename~\thepage /\pageref{LastPage}}}
+ \pagenamestyle\pagename~\thepage /\pageref{TotPages}}}
\lfoot{\ifthenelse{\thepage=1}{\footstyle\schoolstyle\@school}{}}
\cfoot{}
\rfoot{\ifthenelse{\thepage=1}{\footstyle\authorstyle\@author}{}}
@@ -897,7 +883,7 @@
\ifthenelse{\thepage=1}{}{\headsubjectstyle\@headsubject}}
\lfoot{\ifthenelse{\thepage=1}{\footstyle\schoolstyle\@school}{}}
\cfoot{\ifthenelse{\thepage=1}{}{
- \footstyle\thepage /\pageref{LastPage}}}
+ \footstyle\thepage /\pageref{TotPages}}}
\rfoot{\footstyle\ifthenelse{\thepage=1}{%
\authorstyle\@author
\ifx\@author\empty\else\\ \fi
@@ -935,7 +921,7 @@
\ifthenelse{\thepage=1}{}{\headtitlestyle\@headtitle}}
\rhead{\headstyle
\ifthenelse{\thepage=1}{}{%
- \pagenamestyle\pagename~\thepage /\pageref{LastPage}}}
+ \pagenamestyle\pagename~\thepage /\pageref{TotPages}}}
\lfoot{\footstyle{\schoolstyle\@school}
\ifthenelse{\thepage=1}{\ifx\@author\empty\else\\ \fi
\authorstyle\@author}{}
@@ -993,7 +979,7 @@
\schoolstyle\@school
}
\cfoot{}
- \rfoot{\footstyle \pagenamestyle\pagename~\thepage/\pageref{LastPage}}
+ \rfoot{\footstyle \pagenamestyle\pagename~\thepage/\pageref{TotPages}}
\setlength{\titletopskip}{0.67cm}
\setlength{\titlesep}{2\bigskipamount}
\renewcommand{\titlestyle}{\LARGE\MakeUppercase}
Modified: trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.ins 2025-01-15 20:59:56 UTC (rev 73465)
+++ trunk/Master/texmf-dist/source/latex/schooldocs/schooldocs.ins 2025-01-15 21:00:05 UTC (rev 73466)
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2020-2024 by Antoine Missier <antoine.missier at ac-toulouse.fr>
+%% Copyright (C) 2020-2025 by Antoine Missier <antoine.missier at ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2020-2024 by Antoine Missier <antoine.missier at ac-toulouse.fr>
+Copyright (C) 2020-2025 by Antoine Missier <antoine.missier at ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
Modified: trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty 2025-01-15 20:59:56 UTC (rev 73465)
+++ trunk/Master/texmf-dist/tex/latex/schooldocs/schooldocs.sty 2025-01-15 21:00:05 UTC (rev 73466)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2020-2024 by Antoine Missier <antoine.missier at ac-toulouse.fr>
+%% Copyright (C) 2020-2025 by Antoine Missier <antoine.missier at ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,12 +22,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{schooldocs}
- [2024/01/31 v1.5 .dtx Layout styles for school documents]
+ [2025/01/15 v1.6 Layout styles for school documents]
\@ifpackageloaded{geometry}{}{\RequirePackage{geometry}}
\let\footruleskip\relax % because the memoir class uses it
\RequirePackage{fancyhdr}
\RequirePackage{ifthen}
-\RequirePackage{lastpage}
+\RequirePackage{totpages} % lastpage nowadays incompatible with hyperref
\RequirePackage{fancybox}
\RequirePackage{xcolor}
\RequirePackage{translations}
@@ -70,7 +70,8 @@
\renewcommand{\title}[2][]{\long\def\@title{#2}
\ifthenelse{\equal{#1}{}}{\def\@headtitle{#2}}{\def\@headtitle{#1}}
\ifx\@onlypreamble\@notprerr\else
- \@ifpackageloaded{hyperref}{\hypersetup{pdftitle={\@headtitle}}}{}
+ \@ifpackageloaded{hyperref}%
+ {\hypersetup{pdftitle={\@headtitle}}}{}
\fi
}
\title{}
@@ -87,9 +88,11 @@
\let\subject\relax
\newcommand{\subject}[2][]{\long\def\@subject{#2}
- \ifthenelse{\equal{#1}{}}{\def\@headsubject{#2}}{\def\@headsubject{#1}}
+ \ifthenelse{\equal{#1}{}}%
+ {\def\@headsubject{#2}}{\def\@headsubject{#1}}
\ifx\@onlypreamble\@notprerr\else
- \@ifpackageloaded{hyperref}{\hypersetup{pdfsubject={\@headsubject}}}{}
+ \@ifpackageloaded{hyperref}%
+ {\hypersetup{pdfsubject={\@headsubject}}}{}
\fi
}
\def\@subject{}
@@ -142,7 +145,7 @@
\par\vspace{0.5\titlesep} \datestyle\@date}
\par\vspace{0.5\titlesep}
}
- \ifthenelse{\lengthtest{##1 > 0cm}}{\rule{##1}{\seprulewidth}}{}
+ \ifthenelse{\lengthtest{##1>0cm}}{\rule{##1}{\seprulewidth}}{}
\end{\titleflush}
\vspace{\titlebottomskip}
}
@@ -186,7 +189,7 @@
\headsubjectstyle\@subject}{\headtitlestyle\@headtitle} }
\rhead{\headstyle\ifthenelse{\thepage=1}{\authorstyle\@author\mbox{}\\
\headdatestyle\@date}{\headsubjectstyle\@headsubject}}
- \cfoot{\footstyle \thepage /\pageref{LastPage}}
+ \cfoot{\footstyle \thepage /\pageref{TotPages}}
\setlength{\titletopskip}{-0.67cm}
\renewcommand{\maketitle}[1][\seprulelength]{%
\newpage\mbox{}\par\vspace{\titletopskip}
@@ -216,7 +219,7 @@
\ifthenelse{\thepage=1}{}{\headtitlestyle\@headtitle}}
\rhead{\headstyle
\ifthenelse{\thepage=1}{}{%
- \pagenamestyle\pagename~\thepage /\pageref{LastPage}}}
+ \pagenamestyle\pagename~\thepage /\pageref{TotPages}}}
\lfoot{\ifthenelse{\thepage=1}{\footstyle\schoolstyle\@school}{}}
\cfoot{}
\rfoot{\ifthenelse{\thepage=1}{\footstyle\authorstyle\@author}{}}
@@ -229,7 +232,7 @@
\ifthenelse{\thepage=1}{}{\headsubjectstyle\@headsubject}}
\lfoot{\ifthenelse{\thepage=1}{\footstyle\schoolstyle\@school}{}}
\cfoot{\ifthenelse{\thepage=1}{}{
- \footstyle\thepage /\pageref{LastPage}}}
+ \footstyle\thepage /\pageref{TotPages}}}
\rfoot{\footstyle\ifthenelse{\thepage=1}{%
\authorstyle\@author
\ifx\@author\empty\else\\ \fi
@@ -267,7 +270,7 @@
\ifthenelse{\thepage=1}{}{\headtitlestyle\@headtitle}}
\rhead{\headstyle
\ifthenelse{\thepage=1}{}{%
- \pagenamestyle\pagename~\thepage /\pageref{LastPage}}}
+ \pagenamestyle\pagename~\thepage /\pageref{TotPages}}}
\lfoot{\footstyle{\schoolstyle\@school}
\ifthenelse{\thepage=1}{\ifx\@author\empty\else\\ \fi
\authorstyle\@author}{}
@@ -320,7 +323,7 @@
\schoolstyle\@school
}
\cfoot{}
- \rfoot{\footstyle \pagenamestyle\pagename~\thepage/\pageref{LastPage}}
+ \rfoot{\footstyle \pagenamestyle\pagename~\thepage/\pageref{TotPages}}
\setlength{\titletopskip}{0.67cm}
\setlength{\titlesep}{2\bigskipamount}
\renewcommand{\titlestyle}{\LARGE\MakeUppercase}
More information about the tex-live-commits
mailing list.