From 4b11f001033c31cf22cda6f3d77dc2b5f013cd5b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 23 Nov 2023 03:01:03 +0000 Subject: CTAN sync 202311230301 --- macros/latex/contrib/codedescribe/README.md | 6 +- .../contrib/codedescribe/doc/codedescribe.pdf | Bin 250689 -> 251836 bytes .../contrib/codedescribe/doc/codedescribe.tex | 21 ++-- .../contrib/codedescribe/latex/codedescribe.sty | 25 ++-- .../contrib/codedescribe/latex/codelisting.sty | 36 ++++-- macros/latex/contrib/coolfn/README | 5 +- macros/latex/contrib/coolfn/coolfn.sty | 15 +-- .../latex/contrib/coolfn/coolfndocumentation.pdf | Bin 52355 -> 66798 bytes .../latex/contrib/coolfn/coolfndocumentation.tex | 29 +++-- macros/latex/contrib/hvextern/Changes | 1 + macros/latex/contrib/hvextern/README | 4 +- macros/latex/contrib/hvextern/doc/hvextern.pdf | Bin 1498330 -> 1483008 bytes macros/latex/contrib/hvextern/doc/hvextern.tex | 27 +++-- macros/latex/contrib/hvextern/latex/hvextern.sty | 17 ++- .../contrib/hvextern/script/hvextern-checkfile.lua | 0 .../latex/contrib/nicematrix/nicematrix-code.dtx | 129 ++++++++++++++++----- .../latex/contrib/nicematrix/nicematrix-code.pdf | Bin 964932 -> 968279 bytes .../latex/contrib/nicematrix/nicematrix-french.pdf | Bin 596890 -> 600879 bytes .../latex/contrib/nicematrix/nicematrix-french.tex | 14 +++ macros/latex/contrib/nicematrix/nicematrix.pdf | Bin 615920 -> 617157 bytes macros/latex/contrib/nicematrix/nicematrix.tex | 19 +++ macros/latex/contrib/pfarrei/README | 30 ++++- macros/latex/contrib/pfarrei/pfarrei.dtx | 27 +++-- macros/latex/contrib/pfarrei/pfarrei.pdf | Bin 500246 -> 477420 bytes 24 files changed, 291 insertions(+), 114 deletions(-) mode change 100644 => 100755 macros/latex/contrib/hvextern/script/hvextern-checkfile.lua (limited to 'macros/latex') diff --git a/macros/latex/contrib/codedescribe/README.md b/macros/latex/contrib/codedescribe/README.md index ee3db68821..2ef3da2514 100644 --- a/macros/latex/contrib/codedescribe/README.md +++ b/macros/latex/contrib/codedescribe/README.md @@ -86,7 +86,11 @@ The Current Maintainer of this work is Alceu Frigeri ## Changelog -* Version 1.1 (this) + +* Version 1.2 (this) + - Added of format key: basicstyle + +* Version 1.1 - Added two commands to allow customization - requiring (now) pifont for EXP/rEXP - Added a date command (auxiliary command) diff --git a/macros/latex/contrib/codedescribe/doc/codedescribe.pdf b/macros/latex/contrib/codedescribe/doc/codedescribe.pdf index 9e2924847f..59e01cf487 100644 Binary files a/macros/latex/contrib/codedescribe/doc/codedescribe.pdf and b/macros/latex/contrib/codedescribe/doc/codedescribe.pdf differ diff --git a/macros/latex/contrib/codedescribe/doc/codedescribe.tex b/macros/latex/contrib/codedescribe/doc/codedescribe.tex index 4b2a03ecbe..93d26b249c 100644 --- a/macros/latex/contrib/codedescribe/doc/codedescribe.tex +++ b/macros/latex/contrib/codedescribe/doc/codedescribe.tex @@ -197,6 +197,13 @@ Sets the indentation to be used when 'demonstrating' \LaTeX\ code (\tsobj[code]{ When typesetting the 'code demo' (\tsobj{\tsdemo}) a set of rules is drawn. The Default, 1, equals to \tsobj{\arrayrulewidth} (usually 0.4pt). \end{codedescribe} +\begin{codedescribe}[key,new=2023/11/18]{basicstyle}%-very-long-long-long,xyz,xyh,kjh,ljd,kls} +\begin{codesyntax} % + \tsobj[key]{basicstyle} +\end{codesyntax} +Sets the base font style used when typesetting the 'code demo', default being \tsobj{\footnotesize\ttfamily} +\end{codedescribe} + \section{codedescribe Package} @@ -309,17 +316,17 @@ For instance, the many optional \tsobj[arg]{*arg} are defined as follow: \tsmacro{\begin{codedescribe}}[obj-type]{csv-list} \ldots \tsmacro{\end{codedescribe}}{} -\end{codesyntax}[Note 1:] +\end{codesyntax} This is the main environment to describe \tsobj[env]{Macros, Functions, Variable, Environments, etc.} \tsobj[meta]{csv-list} is typeset in the margin. The optional \tsobj[oarg]{obj-type} defines the object-type format. \end{codedescribe} -\begin{tsremark} +\begin{tsremark}[Note~1:] One can change the rule color with the key \tsobj[keys]{rulecolor}, for instance \tsmacro{\begin{codedescribe}[rulecolor=white]}{} will remove the rules. \end{tsremark} -\begin{tsremark}[Note 2:] -Besides that, one can use the keys \tsobj[keys]{new,update,note} to further customize it as: \tsverb{\begin{codedescribe}[new=2023/05/01,update=2023/05/1,note={this is an example}]} +\begin{tsremark}[Note~2:] +Besides that, one can use the keys \tsobj[keys]{new,update,note} to further customize it as: \tsverb{\begin{codedescribe} [new=2023/05/01, update=2023/05/1, note={this is an example}]} \end{tsremark} -\begin{tsremark}[Note 3:] +\begin{tsremark}[Note~3:] Finally, one can use \tsobj[key]{EXP,rEXP} to add a star \ding{72} or a hollow star \ding{73}, as per expl3/doc3 conventions (if expandable, restricted expandable or not). \end{tsremark} @@ -421,10 +428,10 @@ This is just a short-cut for\par \tsobj[code]{\tsobj [code] {macro-list}} \tsobj \tsmacro{\typesetverb}[obj-type]{verbatim text} \tsmacro{\tsverb}[obj-type]{verbatim text} \end{codesyntax} - Typesets \tsobj[marg]{verbatim text} as is (verbatim...). \tsobj[oarg]{obj-type} defines the used format. The difference with \tsverb{\tsobj[verb]{something}} is that \tsmeta{something} can contain commas (which, otherwise, would be interpreted as a list separator in \tsobj{\tsobj}. + Typesets \tsobj[marg]{verbatim text} as is (verbatim...). \tsobj[oarg]{obj-type} defines the used format. The difference with \tsverb{\tsobj[verb]{something}} is that \tsmeta{verbatim text} can contain commas (which, otherwise, would be interpreted as a list separator in \tsobj{\tsobj}. \end{codedescribe} \begin{tsremark} -This is meant to short expressions, and not multi-line, complex code (one is better of, then, using \ref{codelist}). \tsobj[meta]{verbatim text} must be balanced ! otherwise, some low level \TeX\ errors may pop out. +This is meant for short expressions, and not multi-line, complex code (one is better of, then, using \ref{codelist}). \tsobj[meta]{verbatim text} must be balanced ! otherwise, some low level \TeX\ errors may pop out. \end{tsremark} diff --git a/macros/latex/contrib/codedescribe/latex/codedescribe.sty b/macros/latex/contrib/codedescribe/latex/codedescribe.sty index a260c0d422..aa4b61ad5d 100644 --- a/macros/latex/contrib/codedescribe/latex/codedescribe.sty +++ b/macros/latex/contrib/codedescribe/latex/codedescribe.sty @@ -12,18 +12,18 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version 1.1 (2023/05/16) +%% This is version {1.2} {2023/11/18} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/codedescribe %% %%%============================================================================== \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\RequirePackage{ expl3 } + \ProvidesExplPackage {codedescribe} - {2023/05/16} - {1.1} + {2023/11/18} + {1.2} {LaTeX Code Description/Documentation} %%%%%%% @@ -34,11 +34,11 @@ %%%%%%% \keys_define:nn { codedescribe / pkg info} { - name .code:n = codedescribe , - prefix .code:n = codedesc , - date .code:n = 2023/05/16 , - version .code:n = 1.1 , - description .code:n = \LaTeX~Code~Description/Documentation + name .code:n = {codedescribe} , + prefix .code:n = {codedesc} , + date .code:n = {2023/11/18} , + version .code:n = {1.2} , + description .code:n = {\LaTeX~Code~Description/Documentation} } \cs_if_exist:NF \__codedesc_pkg_info:nn { @@ -47,6 +47,13 @@ } \cs_if_exist:NF \PkgInfo { \NewDocumentCommand \PkgInfo {mm} { \keys_set:nn {#1 / pkg info}{#2} } } +\cs_if_exist:NF \PkgDescription + { + \NewDocumentCommand \PkgDescription {m} + { + \noindent Package~ \textbf{\PkgInfo{#1}{name}}~Version:~\PkgInfo{#1}{version}~ -~ \PkgInfo{#1}{date}\par \emph{\PkgInfo{#1}{description}}~\par + } + } %%%%%%% %%% End of cut-n-paste %%%%%%% diff --git a/macros/latex/contrib/codedescribe/latex/codelisting.sty b/macros/latex/contrib/codedescribe/latex/codelisting.sty index c02633d912..b4a939034d 100644 --- a/macros/latex/contrib/codedescribe/latex/codelisting.sty +++ b/macros/latex/contrib/codedescribe/latex/codelisting.sty @@ -12,18 +12,18 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version 1.1 (2023/05/16) +%% This is version {1.2} {2023/11/18} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/codedescribe %% %%%============================================================================== \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\RequirePackage{ expl3 } + \ProvidesExplPackage {codelisting} - {2023/05/16} - {1.1} + {2023/11/18} + {1.2} {LaTeX Code Listing} %%%%%%% @@ -34,11 +34,11 @@ %%%%%%% \keys_define:nn { codelisting / pkg info} { - name .code:n = codelisting , - prefix .code:n = codelist , - date .code:n = 2023/05/16 , - version .code:n = 1.1 , - description .code:n = \LaTeX~Code~Listing + name .code:n = {codelisting} , + prefix .code:n = {codelist} , + date .code:n = {2023/11/18} , + version .code:n = {1.2} , + description .code:n = {\LaTeX~Code~Listing} } \cs_if_exist:NF \__codedesc_pkg_info:nn { @@ -47,6 +47,13 @@ } \cs_if_exist:NF \PkgInfo { \NewDocumentCommand \PkgInfo {mm} { \keys_set:nn {#1 / pkg info}{#2} } } +\cs_if_exist:NF \PkgDescription + { + \NewDocumentCommand \PkgDescription {m} + { + \noindent Package~ \textbf{\PkgInfo{#1}{name}}~Version:~\PkgInfo{#1}{version}~ -~ \PkgInfo{#1}{date}\par \emph{\PkgInfo{#1}{description}}~\par + } + } %%%%%%% %%% End of cut-n-paste %%%%%%% @@ -262,6 +269,12 @@ ruleht .usage:n = general, ruleht .code:n = { \tl_set:Nn \l__codelist_ruleheight_tl {#1} }, ruleht .default:n = 1, + + basicstyle .usage:n = general, + basicstyle .code:n = { \tl_set:Nn \l__codelist_basicstyle_tl {#1} }, + basicstyle .default:n = \footnotesize\ttfamily , + + \l__codelist_basicstyle_tl default .usage:n = general, default .meta:n = { @@ -280,7 +293,8 @@ numbers , numberstyle , parindent , codeprefix , resultprefix , - ruleht , + ruleht , + basicstyle , }, } @@ -414,7 +428,7 @@ frame = none, aboveskip = 0pt,%-2ex, belowskip = 0pt,%-2ex, - basicstyle = \footnotesize\ttfamily , + basicstyle = {\l__codelist_basicstyle_tl}, %%\footnotesize\ttfamily , rulesep = 0pt, breaklines = true, breakindent = 3em, diff --git a/macros/latex/contrib/coolfn/README b/macros/latex/contrib/coolfn/README index 8572f3fb7d..220cb4f4e8 100644 --- a/macros/latex/contrib/coolfn/README +++ b/macros/latex/contrib/coolfn/README @@ -1,6 +1,8 @@ coolfn - a package for cool footnotes -version: 1.1.0 + + +version: 1.2.0 This package provides formatting for footnotes in long legal documents, using hanging indents to make them look nicer @@ -12,5 +14,6 @@ For suggestions, feature requests, and bug reports, please use the project's GitHub site: https://github.com/ezgranet/coolfn Version history: +16/11/2023: Fixed issue with width of footnote block 27/02/2023 Update with bottom footnotes 06/10/2022 Package creation \ No newline at end of file diff --git a/macros/latex/contrib/coolfn/coolfn.sty b/macros/latex/contrib/coolfn/coolfn.sty index f8bdc2dffc..dfe27d611c 100644 --- a/macros/latex/contrib/coolfn/coolfn.sty +++ b/macros/latex/contrib/coolfn/coolfn.sty @@ -1,6 +1,6 @@ -\def\coolfnversionnumber{1.1.0} +\def\coolfnversionnumber{1.2.0} \ProvidesPackage{coolfn} -[2023/27/02\coolfnversionnumber\ +[2023/11/16\coolfnversionnumber\ A cool way to format footnotes] % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -63,11 +63,12 @@ \newlength{\lengthb}%maths again \newlength{\lengthc} \setlength{\lengthc}{\fnindent} -\setlength{\lengthb}{1.75\lengthc}%parblock -\makeatletter -\@ifclassloaded{memoir}{}{\usepackage{hanging}} -\makeatother - % for hanging paragraphs +\setlength{\lengthb}{1.25\lengthc}%parblock +%\makeatletter +%\@ifclassloaded{memoir}{}{ +\usepackage{hanging} +%} + % for hanging paragraphs \renewcommand\footnoterule{} % ^ no one wants a rule sep for FN! \AtBeginDocument{\flushbottom} diff --git a/macros/latex/contrib/coolfn/coolfndocumentation.pdf b/macros/latex/contrib/coolfn/coolfndocumentation.pdf index d273760f60..1a67ebfce1 100644 Binary files a/macros/latex/contrib/coolfn/coolfndocumentation.pdf and b/macros/latex/contrib/coolfn/coolfndocumentation.pdf differ diff --git a/macros/latex/contrib/coolfn/coolfndocumentation.tex b/macros/latex/contrib/coolfn/coolfndocumentation.tex index 43d3576b25..55239c143b 100644 --- a/macros/latex/contrib/coolfn/coolfndocumentation.tex +++ b/macros/latex/contrib/coolfn/coolfndocumentation.tex @@ -59,9 +59,9 @@ breaklines, firstnumber=last ] {latex} -\def\coolfnversionnumber{1.1.0} +\def\coolfnversionnumber{1.2.0} \ProvidesPackage{coolfn} -[2023/27/02\coolfnversionnumber\ +[2023/11/16\coolfnversionnumber\ A cool way to format footnotes] % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -82,8 +82,7 @@ firstnumber=last %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% -% from% -% tex.stackexchange.com/questions/305033/ +% from https://tex.stackexchange.com/questions/305033/is-there-a-latex-package-that-defines-an-environment-for-parskip-like-capabiliti %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage[bottom]{footmisc} @@ -125,11 +124,12 @@ firstnumber=last \newlength{\lengthb}%maths again \newlength{\lengthc} \setlength{\lengthc}{\fnindent} -\setlength{\lengthb}{1.75\lengthc}%parblock -\makeatletter -\@ifclassloaded{memoir}{}{\usepackage{hanging}} -\makeatother - % for hanging paragraphs +\setlength{\lengthb}{1.25\lengthc}%parblock +%\makeatletter +%\@ifclassloaded{memoir}{}{ +\usepackage{hanging} +%} + % for hanging paragraphs \renewcommand\footnoterule{} % ^ no one wants a rule sep for FN! \AtBeginDocument{\flushbottom} @@ -161,7 +161,6 @@ firstnumber=last %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% - \end{minted} @@ -172,8 +171,18 @@ firstnumber=last \section{Version History} + +\subsection*{\texttt{1.2.0}} + + + +\ttfamily 16 November 2023: Fixed issue with width of footnote block + + \subsection*{\texttt{1.1.0}} + + \ttfamily 27 February 2023: Fixed issue with footnotes at the bottom \subsection*{\texttt{1.0.0}} diff --git a/macros/latex/contrib/hvextern/Changes b/macros/latex/contrib/hvextern/Changes index ac24c74145..a68cd3d68f 100644 --- a/macros/latex/contrib/hvextern/Changes +++ b/macros/latex/contrib/hvextern/Changes @@ -1,5 +1,6 @@ hvextern.sty ---------------- +v 0.37b 2023-11-22 - fix typo in documentation v 0.37a 2023-11-20 - fix bug in documentation v 0.37 2023-08-29 - do not write files without --shell-escape v 0.36 2023-08-24 - added option "vshift" for inline objects diff --git a/macros/latex/contrib/hvextern/README b/macros/latex/contrib/hvextern/README index c79f2266ee..adbd87ba71 100644 --- a/macros/latex/contrib/hvextern/README +++ b/macros/latex/contrib/hvextern/README @@ -6,11 +6,11 @@ The main LaTeX document must be run with the option --shell-escape %% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. diff --git a/macros/latex/contrib/hvextern/doc/hvextern.pdf b/macros/latex/contrib/hvextern/doc/hvextern.pdf index a6755a2935..43c19c90f5 100644 Binary files a/macros/latex/contrib/hvextern/doc/hvextern.pdf and b/macros/latex/contrib/hvextern/doc/hvextern.pdf differ diff --git a/macros/latex/contrib/hvextern/doc/hvextern.tex b/macros/latex/contrib/hvextern/doc/hvextern.tex index 619ca1254a..6dcdf79d54 100644 --- a/macros/latex/contrib/hvextern/doc/hvextern.tex +++ b/macros/latex/contrib/hvextern/doc/hvextern.tex @@ -1,7 +1,6 @@ -%% $Id: hvextern.tex 819 2023-11-20 20:37:38Z herbert $ -%\RequirePackage{pdfmanagement-testphase} -\DocumentMetadata{} -\documentclass[english,a4paper,twoside]{article} +%% $Id: hvextern.tex 822 2023-11-22 12:16:48Z herbert $ +\DocumentMetadata{}% for lualatex and pstricks +\documentclass[english,paper=a4,twoside,usegeometry]{scrartcl} \usepackage{babel} \usepackage{libertinus} \setmonofont[Scale=MatchLowercase,FakeStretch=0.88]{AnonymousPro} @@ -9,10 +8,13 @@ FakeStretch=0.90,Ligatures=ResetAll%,RawFeature=-tlig ]{Noto Sans Mono} \newfontfamily\CodeTwo{CODE2000}[Scale=MatchLowercase] + +\usepackage[includeheadfoot,bmargin=1cm,tmargin=5mm,textwidth=16cm]{geometry} + \usepackage{iftex} -\usepackage{fancyhdr} -\pagestyle{fancy} +\usepackage[automark]{scrlayer-scrpage} +\pagestyle{scrheadings} \usepackage{hvlogos} \usepackage%[checkCode] {hvextern} @@ -34,7 +36,7 @@ \begin{document} \title{Writing, running and including the output of external documents from within a main\newline \LaTeX\ document~--v. \hvexternFileversion} -\author{Herbert Voß \url{hvoss@tug.org}\thanks{Thanks to Karl Berry; +\author{Herbert Voß \url{hvoss@tug.org}\thanks{Thanks to Karl Berry; Denis Bitouzé; Werner Lemberg; Rolf Niepraschk}} \maketitle \tableofcontents @@ -45,7 +47,7 @@ Werner Lemberg; Rolf Niepraschk}} showFilename,verbose} -\clearpage +%\clearpage \section{Loading the package} @@ -65,7 +67,7 @@ external code changed. This doesn't depends on the setting of the option \Lkeywo \begin{sloppypar} This package allows to write external \MP, \TeX, \ConTeXt, \LaTeX, \LuaTeX, \LuaLaTeX, \XeTeX, \XeLaTeX, \Index{Lua}, \Index{Perl}, \Index{Java} and/or \Index{Python} -source code, which will then be run via \texttt{shell escape} to create a PDF oder text output to include +source code, which will then be run via \texttt{shell escape} to create a PDF or text output to include it into the main \LaTeX\ document. \end{sloppypar} @@ -124,11 +126,12 @@ with \XeLaTeX\ and the output is insert as pdf image: 美好的一天. \end{document} \end{externalDocument} +% The current filename of the above example is \hvExternFilename\ and for the source see page \pageref{inline-exa}. - -Let's show another example which needs a \pdfLaTeX\ run. The \Index{source} code itself is also not +Let's show another example which needs a \pdfLaTeX\ run. The \Index{source} code +itself is also not shown by the environment \Lenv{externalDocument}. @@ -1561,7 +1564,7 @@ other examples, you can set \Lkeyword{showoutput} to false. \end{externalDocument} -\clearpage%%%%%%%%%%%%%% +%\clearpage%%%%%%%%%%%%%% \section{Defining new marker} Suppose you do not want for a \LaTeX\ document the complete body part between \Lcs{begin} diff --git a/macros/latex/contrib/hvextern/latex/hvextern.sty b/macros/latex/contrib/hvextern/latex/hvextern.sty index b7e422958e..0883697e79 100644 --- a/macros/latex/contrib/hvextern/latex/hvextern.sty +++ b/macros/latex/contrib/hvextern/latex/hvextern.sty @@ -1,4 +1,4 @@ -%% $Id: hvextern.sty 819 2023-11-20 20:37:38Z herbert $ +%% $Id: hvextern.sty 824 2023-11-22 12:26:34Z herbert $ %% This is file `hvextern.sty', %% %% Copyright (C) 2016-23 @@ -9,11 +9,11 @@ %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\def\hvexternFileversion{0.37a} -\ProvidesFile{hvextern}[2023/11/20 v\hvexternFileversion: package for running external documents (HV)] +\def\hvexternFileversion{0.37b} +\ProvidesFile{hvextern}[2023/11/22 v\hvexternFileversion: package for running external documents (HV)] \newif\ifhv@extern@checkCode \hv@extern@checkCodefalse @@ -143,8 +143,7 @@ } \define@boolkey{hv}[hv@extern@]{shellesc}[true]{} \define@key{hv}{aboveskip}[\medskipamount]{\setlength\hv@extern@aboveskip{#1}} -\define@key{hv}{belowpreambleskip}[2pt%\smallskipamount -]{\setlength\hv@extern@belowpreambleskip{#1}} +\define@key{hv}{belowpreambleskip}[2pt]{\setlength\hv@extern@belowpreambleskip{#1}} \define@key{hv}{belowbodyskip}[\smallskipamount]{\setlength\hv@extern@belowbodyskip{#1}} \define@key{hv}{belowskip}[\medskipamount]{\setlength\hv@extern@belowskip{#1}} @@ -201,8 +200,8 @@ cropmargin=2,% 2pb margin eps=false,% create an eps output? aboveskip=\medskipamount,% space above everything - belowpreambleskip=2pt,%\smallskipamount,% space below preamble - belowbodyskip=2pt,%\smallskipamount,% space below body + belowpreambleskip=2pt, %\smallskipamount,% space below preamble + belowbodyskip=2pt, %\smallskipamount,% space below body belowskip=\medskipamount,% space below everything }% } @@ -446,7 +445,7 @@ %% \newenvironment{externalDocument}[2][] {% - \the\hv@extern@belowbodyskip\par + %\the\hv@extern@belowbodyskip\par% only for debug \ifhv@extern@shellesc\gdef\hv@run@options{ --shell-escape }\else\gdef\hv@run@options{}\fi% \xdef\hvExternFilename{#2-\arabic{hv@example@counter}}% \gdef\hv@extern@savePara{#1}% diff --git a/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua b/macros/latex/contrib/hvextern/script/hvextern-checkfile.lua old mode 100644 new mode 100755 diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx index d70404e997..63334d973f 100644 --- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx +++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx @@ -17,8 +17,8 @@ % % \fi % \iffalse -\def\myfileversion{6.25b} -\def\myfiledate{2023/11/16} +\def\myfileversion{6.26} +\def\myfiledate{2023/11/22} % % %<*batchfile> @@ -770,14 +770,21 @@ version 2005/12/01 or later. } % \end{macrocode} % The classes of REVTeX do their own redefinition of |\array| and that's why the -% previous mechanisme is not compatible with REVTeX. However, it would probably +% previous mechanism is not compatible with REVTeX. However, it would probably % be possible to do something similar for REVTeX... % \begin{macrocode} -\bool_if:NTF \c_@@_revtex_bool - { \cs_new_protected:Npn \@@_redefine_mkpream: { } } +\hook_gput_code:nnn { begindocument } { . } { - \cs_new_protected:Npn \@@_redefine_mkpream: - { \cs_set_eq:NN \@mkpream \@@_mkpream: } + \bool_if:NTF \c_@@_revtex_bool + { \cs_new_protected:Npn \@@_redefine_mkpream: { } } + { + \IfPackageLoadedTF { arydshln } + { \cs_new_protected:Npn \@@_redefine_mkpream: { } } + { + \cs_new_protected:Npn \@@_redefine_mkpream: + { \cs_set_eq:NN \@mkpream \@@_mkpream: } + } + } } % \end{macrocode} % @@ -1536,8 +1543,14 @@ version 2005/12/01 or later. % \end{macrocode} % % \medskip -% For the vertical position, the possible values are |c|, |t| and |b|. Of -% course, it would be interesting to program a key |T| and a key |B|. +% If the final user has used the special color ``|nocolor|'', the following flag +% will be raised. +% \begin{macrocode} +\bool_new:N \@@_nocolor_used_bool +% \end{macrocode} +% +% \medskip +% For the vertical position, the possible values are |c|, |t| and |b|. % \begin{macrocode} \str_new:N \l_@@_vpos_of_block_str \str_set:Nn \l_@@_vpos_of_block_str { c } @@ -4145,6 +4158,12 @@ version 2005/12/01 or later. \cs_new_protected:Npn \@@_exec_code_before: { \seq_gclear_new:N \g_@@_colors_seq +% \end{macrocode} +% The sequence |\g_@@_colors_seq| will always contain as first element the +% special color |nocolor|: when that color is used, no color will be applied in +% the corresponding cells by the other coloring commands of \pkg{nicematrix}. +% \begin{macrocode} + \@@_add_to_colors_seq:nn { { nocolor } } { } \bool_gset_false:N \g_@@_recreate_cell_nodes_bool \group_begin: % \end{macrocode} @@ -10222,17 +10241,26 @@ version 2005/12/01 or later. \@@_clip_with_rounded_corners: \seq_map_indexed_inline:Nn \g_@@_colors_seq { - \begin { pgfscope } - \@@_color_opacity ##2 - \use:c { g_@@_color _ ##1 _tl } - \tl_gclear:c { g_@@_color _ ##1 _tl } - \pgfusepath { fill } - \end { pgfscope } + \int_compare:nNnTF { ##1 } = 1 + { + \cs_set_eq:NN \@@_cartesian_path:n \@@_cartesian_path_nocolor:n + \use:c { g_@@_color _ 1 _tl } + \cs_set_eq:NN \@@_cartesian_path:n \@@_cartesian_path_normal:n + } + { + \begin { pgfscope } + \@@_color_opacity ##2 + \use:c { g_@@_color _ ##1 _tl } + \tl_gclear:c { g_@@_color _ ##1 _tl } + \pgfusepath { fill } + \end { pgfscope } + } } \endpgfpicture } % \end{macrocode} % +% % \bigskip % The following command will extract the potential key |opacity| in its optional % argument (between square brackets) and (of course) then apply the command |\color|. @@ -10603,15 +10631,18 @@ version 2005/12/01 or later. % This command is in particular used in |\@@_rectanglecolor:nnn| (used in % |\@@_rectanglecolor|, itself used in |\@@_cellcolor|). % \begin{macrocode} -\cs_new_protected:Npn \@@_cartesian_path:n #1 +\cs_new_protected:Npn \@@_cartesian_path_normal:n #1 { - \bool_lazy_and:nnT - { ! \seq_if_empty_p:N \l_@@_corners_cells_seq } - { \dim_compare_p:nNn { #1 } = \c_zero_dim } + \bool_lazy_any:nT { - \@@_expand_clist:NN \l_@@_cols_tl \c@jCol - \@@_expand_clist:NN \l_@@_rows_tl \c@iRow + { ! \seq_if_empty_p:N \l_@@_corners_cells_seq } + { \dim_compare_p:nNn { #1 } = \c_zero_dim } + { ! \@@_nocolor_used_bool } } + { + \@@_expand_clist:NN \l_@@_cols_tl \c@jCol + \@@_expand_clist:NN \l_@@_rows_tl \c@iRow + } % \end{macrocode} % We begin the loop over the columns. % \begin{macrocode} @@ -10672,9 +10703,13 @@ version 2005/12/01 or later. \@@_qpoint:n { row - \l_tmpa_tl } \dim_set:Nn \l_@@_tmpd_dim { \pgf@y + 0.5 \arrayrulewidth } \pgfsetcornersarced { \pgfpoint { #1 } { #1 } } - \pgfpathrectanglecorners - { \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim } - { \pgfpoint \l_tmpa_dim \l_tmpb_dim } + \cs_if_exist:cF + { @@ _ \l_tmpa_tl _ \l_@@_tmpc_tl _ nocolor } + { + \pgfpathrectanglecorners + { \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim } + { \pgfpoint \l_tmpa_dim \l_tmpb_dim } + } } } } @@ -10691,6 +10726,30 @@ version 2005/12/01 or later. % % % \bigskip +% Despite its name, the following command does not create a PGF path. It +% declares as colored by the ``empty color'' all the cells in what would be the +% path. Hence, the other coloring instructions of \pkg{nicematrix} won't put +% color in those cells. +% the +% \begin{macrocode} +\cs_new_protected:Npn \@@_cartesian_path_nocolor:n #1 + { + \bool_set_true:N \@@_nocolor_used_bool + \@@_expand_clist:NN \l_@@_cols_tl \c@jCol + \@@_expand_clist:NN \l_@@_rows_tl \c@iRow +% \end{macrocode} +% We begin the loop over the columns. +% \begin{macrocode} + \clist_map_inline:Nn \l_@@_rows_tl + { + \clist_map_inline:Nn \l_@@_cols_tl + { \cs_set:cpn { @@ _ ##1 _ ####1 _ nocolor } { } } + } + } +% \end{macrocode} +% +% +% \bigskip % The following command will be used only with |\l_@@_cols_tl| and |\c@jCol| (first % case) or with |\l_@@_rows_tl| and |\c@iRow| (second case). For instance, with % |\l_@@_cols_tl| equal to |2,4-6,8-*| and |\c@jCol| equal to |10|, the clist @@ -12754,7 +12813,7 @@ version 2005/12/01 or later. { % \end{macrocode} % If the first mandatory argument of the command (which is the size of the block -% with the syntax $i$|-|$j$) has not be provided by the user, you use |1-1| +% with the syntax $i$|-|$j$) has not been provided by the user, you use |1-1| % (that is to say a block of only one cell). % \begin{macrocode} \peek_remove_spaces:n @@ -15584,12 +15643,22 @@ version 2005/12/01 or later. \fp_min:nn { \fp_min:nn - { \dim_ratio:nn { \g_@@_tmpd_dim } { \box_wd:N \l_tmpa_box } } - { \dim_ratio:nn { \g_tmpb_dim } { \box_ht_plus_dp:N \l_tmpa_box } } + { + \dim_ratio:nn + { \g_@@_tmpd_dim } + { \box_wd:N \l_tmpa_box } + } + { + \dim_ratio:nn + { \g_tmpb_dim } + { \box_ht_plus_dp:N \l_tmpa_box } + } } { 1.0 } } - \box_scale:Nnn \l_tmpa_box { \fp_use:N \l_tmpa_fp } { \fp_use:N \l_tmpa_fp } + \box_scale:Nnn \l_tmpa_box + { \fp_use:N \l_tmpa_fp } + { \fp_use:N \l_tmpa_fp } \pgfpicture \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse @@ -15680,8 +15749,8 @@ version 2005/12/01 or later. \fp_min:nn { \fp_min:nn - { \dim_ratio:nn { \g_@@_tmpd_dim } { \box_wd:N \l_tmpa_box } } - { \dim_ratio:nn { \g_tmpb_dim } { \box_ht_plus_dp:N \l_tmpa_box } } + { \dim_ratio:nn \g_@@_tmpd_dim { \box_wd:N \l_tmpa_box } } + { \dim_ratio:nn \g_tmpb_dim { \box_ht_plus_dp:N \l_tmpa_box } } } { 1.0 } } diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf index acdf19c303..5bf3af42b3 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-code.pdf and b/macros/latex/contrib/nicematrix/nicematrix-code.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf index 1217b82fdf..7ed598c337 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-french.pdf and b/macros/latex/contrib/nicematrix/nicematrix-french.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex index b81d87457f..1524409d3f 100644 --- a/macros/latex/contrib/nicematrix/nicematrix-french.tex +++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex @@ -2507,6 +2507,20 @@ six \\ sept \\ \end{NiceTabular} +\subsection{La couleur spécial «nocolor»} + +\index{nocolor} + +\colorbox{yellow!50}{\textbf{Nouveau 6.26}}\enskip L'extension \pkg{nicematrix} +propose la couleur spéciale |nocolor| utilisable dans toutes les commandes de +coloriage fournies par \pkg{nicematrix} (dans le |\CodeBefore| ou bien dans le +tableau proprement dit). + +Les cases marquées par cette couleur ne seront pas coloriées, quelles que soient +les autres commandes de coloriage qui auraient pu s'appliquer à ces cases. + +La couleur |nocolor| fournit donc un moyen commode de faire des exceptions à +l'action d'une commande de coloriage générale. \section{La commande \textbackslash RowStyle} diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf index 051d396651..242451d506 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix.pdf and b/macros/latex/contrib/nicematrix/nicematrix.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex index 64aaf68522..ec7ed5c96d 100644 --- a/macros/latex/contrib/nicematrix/nicematrix.tex +++ b/macros/latex/contrib/nicematrix/nicematrix.tex @@ -2442,6 +2442,21 @@ seven \\ \end{NiceTabular} +\subsection{The special color ``nocolor''} + +\index{nocolor} + +\colorbox{yellow!50}{\textbf{New 6.26}}\enskip The extension \pkg{nicematrix} +provides the special color |nocolor| which may be used in all the coloring +commands provided by \pkg{nicematrix} (in the |\CodeBefore| or the array +itself). + +The cells marked by this color won't be colored, whatever the other instructions +of coloring which may apply to these cells. + +Therefore, the color |nocolor| is an easy way to add an exception to a more +general coloring command. + \section{The command \textbackslash RowStyle} \label{RowStyle} @@ -7173,6 +7188,10 @@ The successive versions of the file |nicematrix.sty| provided by TeXLive are ava \nolinkurl{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty} } +\subsection*{Changes between version 6.25 and 6.26} + +Special color |nocolor|. + \subsection*{Changes between version 6.24 and 6.25} Correction of several bugs. diff --git a/macros/latex/contrib/pfarrei/README b/macros/latex/contrib/pfarrei/README index 267356c694..42468cd9f6 100644 --- a/macros/latex/contrib/pfarrei/README +++ b/macros/latex/contrib/pfarrei/README @@ -1,9 +1,9 @@ -$Id: README 36 2013-10-16 18:54:26Z mjk $ +$Id: README 37 2023-11-22 18:54:26Z ps $ ============================================================================ pfarrei - A bundle of executables, LaTeX documents and packages for pastors ---------------------------------------------------------------------------- -Maintainer: Markus Kohm -E-Mail: komascript at gmx info +Maintainer: Unmaintained +E-Mail: - Abstract: In "Die TeXnische Komödie" 1/2013 Christian Justen told about his practise using LaTeX at his work as pastor. One point was to arrange A5 papers onto A4 landscape paper @@ -15,7 +15,7 @@ Abstract: In "Die TeXnische Komödie" 1/2013 Christian Justen told environments to help for that too. Requires: LaTeX2e, ifpdf, pdfpages, TeXLua License: LPPL 1.3c or later -State: Maintained +State: Unmaintained Topics: compact output, typically multiple pages/sheet ---------------------------------------------------------------------------- Special installation note: @@ -60,4 +60,26 @@ Special installation note: `pfarrei.tds.zip' at a TEXMF tree and additionally copying the binary to the binary directory of the TeX distribution as described above. +---------------------------------------------------------------------------- +Version history + +* 2023-11-22 (r37) - Maintenance update/bugfix (Pavel Sanda) + - package has no more active maintainer + - fix of broken a5toa4 script: + MK: "Some time ago, the behaviour of "pdflatex" (and also the other engines) + changed when using the "--output-directory" option, which unfortunately + means that "a5toa4" no longer works." + PS: a5toa4 now only worked when *path* was provided with filename. r37 fixes + this. Tested on TL 2020,2022,2023. Notably not tested with MikTeX & Windows. + Feel free to contact me with feedback for this particular issue. + (sanda@lyx.org) + +* 2013-11-21 (r36) - Update (Markus Kohm) + - LaTeX package provides special title page for booklets + - LaTeX package provides special page break limitations for booklets + - Fix for: package name; debugging output; + - installation instructions (MiKTeX!) + +* 2013-03-14 (r20) - Initial upload to CTAN (Markus Kohm) + ============================================================================ diff --git a/macros/latex/contrib/pfarrei/pfarrei.dtx b/macros/latex/contrib/pfarrei/pfarrei.dtx index 17ab114049..9f3b663a51 100644 --- a/macros/latex/contrib/pfarrei/pfarrei.dtx +++ b/macros/latex/contrib/pfarrei/pfarrei.dtx @@ -12,9 +12,9 @@ % and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01. % -% This work has the LPPL maintenance status `maintained'. +% This work has the LPPL maintenance status `unmaintained'. % -% The Current Maintainer and author of this work is Markus Kohm. +% This package is currently unmaintained. % % This work consists of the files `README' and `pfarrei.dtx'. % @@ -36,9 +36,9 @@ % und Version 1.3c ist Teil aller Verteilungen von LaTeX % Version 2005/12/01. % -% Dieses Wert hat den LPPL-Verwaltungszustand `maintained' (verwaltet). +% Dieses Wert hat den LPPL-Verwaltungszustand `unmaintained' (verwaltet). % -% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm. +% Autor dieses Werkes ist Markus Kohm. % % Das Werk besteht aus den Dateien `README' und `pfarrei.dtx'. % @@ -72,10 +72,10 @@ \begingroup \def\revisiondate$#1: #2-#3-#4 #5${% \gdef\pfarreirevisiondate{#2/#3/#4}% - }\revisiondate$Date: 2013-10-16 20:54:26 +0200 (Mi, 16. Okt 2013) $ + }\revisiondate$Date: 2023-11-22 20:54:26 +0200 (Mi, 22. Nov 2023) $ \def\revision$#1: #2 #3${% \gdef\pfarreirevision{#2}% - }\revision$Revision: 36 $ + }\revision$Revision: 37 $ \endgroup %<*dtx> \def\LaTeXformat{LaTeX2e} @@ -152,9 +152,10 @@ with the work `pfarrei'. You may however distribute the work for additional information. -This work has the LPPL maintenance status `maintained'. +This work has the LPPL maintenance status `unmaintained'. -The Current Maintainer of this work is Markus Kohm. + +This package is currently unmaintained. The list of files belonging to the work `pfarrei' is given in the file `pfarrei.dtx'. @@ -1034,7 +1035,7 @@ the file `pfarrei.dtx'. %<*a5toa4> % \fi^^A meta-comment % \begin{macrocode} --- $Id: pfarrei.dtx 36 2013-10-16 18:54:26Z mjk $ +-- $Id: pfarrei.dtx 37 2023-11-22 18:54:26Z ps $ kpse.set_program_name(arg[-1], 'a5toa4') require('pfarrei.pfarrei') @@ -1049,7 +1050,7 @@ require('pfarrei.pfarrei') %<*pfarrei> % \fi^^A meta-comment % \begin{macrocode} -local version_number = string.sub( '$Revision: 36 $', 12, -2 ) +local version_number = string.sub( '$Revision: 37 $', 12, -2 ) local action_version = ' r' .. version_number .. '\n' .. [[ Copyright (c) 2013 Markus Kohm. @@ -1121,11 +1122,15 @@ while arg[i] do -- build the temporary tex file local tmpdir = os.tmpdir("pfarrei.XXXXXX" ) local tmpfile = string.match( arg[i], '.*/(.*)$') or arg[i] + -- pdflatex's -output-directory search for source pdf works with path specification but fails + -- when simple file name in the current working directory is provided, we need to provide '../' then + local local_source='' + if tmpfile == arg[i] then local_source = '../' end local basename = string.match( tmpfile,'(.*)%.[^.]*$') or tmpfile tmpfile = tmpdir..'/'..basename..'.tex' local file = assert( io.open( tmpfile, 'w' ) ) if booklet then assert( file:write("\\PassOptionsToPackage{booklet}{pfarrei}\n") ) end - assert( file:write("\\def\\OriginalFile{",arg[i],"}\n") ) + assert( file:write("\\def\\OriginalFile{"..local_source,arg[i],"}\n") ) assert( file:write("\\input{a5toa4.tex}\n") ) assert( file:flush() ) file:close() diff --git a/macros/latex/contrib/pfarrei/pfarrei.pdf b/macros/latex/contrib/pfarrei/pfarrei.pdf index c14311d9a4..cf8d080be8 100644 Binary files a/macros/latex/contrib/pfarrei/pfarrei.pdf and b/macros/latex/contrib/pfarrei/pfarrei.pdf differ -- cgit v1.2.3