diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/metalogox/README.txt | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/metalogox/metalogox.pdf | bin | 595498 -> 607693 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikzdotncross/README.md | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.pdf | bin | 244270 -> 244699 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.tex | 3 | ||||
-rw-r--r-- | Master/texmf-dist/ls-R | 12 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 75 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/metalogox/metalogox.dtx | 17 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/metalogox/metalogox.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/listings.4ht | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/metalogox/metalogox.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tikzdotncross/tikzdotncross.sty | 12 |
13 files changed, 149 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/metalogox/README.txt b/Master/texmf-dist/doc/latex/metalogox/README.txt index 39c6ab1695d..d0c9fee73fb 100644 --- a/Master/texmf-dist/doc/latex/metalogox/README.txt +++ b/Master/texmf-dist/doc/latex/metalogox/README.txt @@ -1,8 +1,8 @@ The LaTeX metalogox package Automatically adjusts the TeX logo and related, depending on the font. -v1.06 -Copyright 2019, 2023–2024 Brian Dunn — https://github.com/bdtc/metalogox +v1.07 +Copyright 2019, 2023–2025 Brian Dunn — https://github.com/bdtc/metalogox LaTeX Project Public License, version 1.3 The metalogox package extends the metalogo package to automatically adjust diff --git a/Master/texmf-dist/doc/latex/metalogox/metalogox.pdf b/Master/texmf-dist/doc/latex/metalogox/metalogox.pdf Binary files differindex e1c13afc9f8..1733777fbd3 100644 --- a/Master/texmf-dist/doc/latex/metalogox/metalogox.pdf +++ b/Master/texmf-dist/doc/latex/metalogox/metalogox.pdf diff --git a/Master/texmf-dist/doc/latex/tikzdotncross/README.md b/Master/texmf-dist/doc/latex/tikzdotncross/README.md index a3c4a261a20..af8c7d19c6c 100644 --- a/Master/texmf-dist/doc/latex/tikzdotncross/README.md +++ b/Master/texmf-dist/doc/latex/tikzdotncross/README.md @@ -70,7 +70,10 @@ The Current Maintainer of this work is Alceu Frigeri - documentation in PDF format ------------- -* Version 1.2 (this) +* Version 1.2b (this) + - correcting package dependencies (issue #1). + +* Version 1.2 - Added some package options, to change pin defaults, see documentation. * Version 1.1 diff --git a/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.pdf b/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.pdf Binary files differindex e2e476b8c7f..2b7ebc3345f 100644 --- a/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.pdf +++ b/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.pdf diff --git a/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.tex b/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.tex index 317fbdb200e..b149f10a1e8 100644 --- a/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.tex +++ b/Master/texmf-dist/doc/latex/tikzdotncross/tikzdotncross.tex @@ -15,7 +15,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {1.2} {2024/10/22} +%% This is version {1.2b} {2025/01/23} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/tikzdotncross @@ -28,7 +28,6 @@ \SetEnumitemKey{miditemsep}{parsep=0ex,itemsep=0.4ex} \usepackage[american,siunitx,cuteinductors,smartlabels,arrowmos,EFvoltages,betterproportions]{circuitikz} -\usetikzlibrary{math} \usepackage{tikzdotncross} \RequirePackage[hidelinks,hypertexnames=false]{hyperref} \begin{document} diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R index 9b2e4563817..6543a7fadb1 100644 --- a/Master/texmf-dist/ls-R +++ b/Master/texmf-dist/ls-R @@ -14176,6 +14176,7 @@ asternote asy-overview asyfig asypictureb +atableau atbegshi atenddvi atendofenv @@ -18387,6 +18388,13 @@ test-asyfig.tex README asypictureB.pdf +./doc/latex/atableau: +LICENSE +README.md +atableau.ini +atableau.pdf +atableau.tex + ./doc/latex/atbegshi: README.md atbegshi-example1.tex @@ -233497,6 +233505,7 @@ asternote asyfig asymptote asypictureb +atableau atenddvi atendofenv atkinson @@ -237841,6 +237850,9 @@ ocg.sty ./tex/latex/asypictureb: asypictureB.sty +./tex/latex/atableau: +atableau.sty + ./tex/latex/atenddvi: atenddvi-2019-12-11.sty atenddvi.sty diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 4389e27806f..9ab8767ae2f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2025-01-23 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (listigns.4ht): fixed support for the list of + listings. + https://tex.stackexchange.com/a/734717/2891 + 2025-01-21 Michal Hoftich <michal.h21@gmail.com> * tex4ht-fonts-modern.tex diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 9444558ddda..7c5241fde87 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1628 2025-01-18 17:47:47Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1632 2025-01-23 12:34:17Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2025 TeX Users Group @@ -20646,6 +20646,39 @@ By Igor A. Kotelnikov. Not available in the public domain? >>> %%%%%%%%%%%%%%%% +\Chapter{Standalone} +%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%% +\Section{standalone} +%%%%%%%%%%%%%%%%%%%%%%%% + +\<standalone.4ht\><<< +% standalone.4ht (|version), generated from |jobname.tex +% Copyright 2025 TeX Users Group +|<TeX4ht license text|> +|<standalone standaloneenv|> + +\Hinput{standalone} +\endinput +>>> \AddFile{}{standalone} + +The \Verb'\standaloneenv' command patches an environment in a way that the +environment produces a separate page. This can cause issues with environments that +are also patched by TeX4ht, for example tikzpicture. This happens with the +tikz class option for Stadnalone. The result is that TikZ pictures are not +converted to images correctly. + +I think we can just disable this command. + +\<standalone standaloneenv\><<< +% save the original meaning if we want to use it eventually +\let\:standaloneenv\standaloneenv +% but disable if by default +\let\standaloneenv\@gobble +>>> + +%%%%%%%%%%%%%%%% \Part{AMS} %%%%%%%%%%%%%%%% @@ -34035,6 +34068,7 @@ Configurations in math mode are named after the command with the "-math" suffix. % Copyright |CopyYear.2001. Eitan M. Gurari |<TeX4ht copywrite|> |<listings sty|> +|<listings list of|> |<lstmisc sty|> \Hinput{listings} \endinput @@ -34104,17 +34138,48 @@ See \Link[https://tex.stackexchange.com/q/719828/2891]{}{}for example\EndLink. \NewConfigure{lstinline}{2} >>> -\<listings sty\><<< +It seems that \Verb|\addcontentsline| is redefined in listings, which prevents +correct handling of \Verb|\lstlistoflistings|. We need to pass our definition +of \Verb|\addcontentsline| which can then be used to write the correct TOC +information to the .4tc file. + +\<listings list of\><<< +\def\lst:newaddcontentsline#1#2#3{\gHAdvance\TitleCount by 1 + {\protect:wrtoc% + \protected@edef\:temp{#3}% + \protected@edef\:temp{\the\:tokwrite{\string\doTocEntry% + \string\toclol% identify this entry as list of listings + {\thetable}{\string\csname\space a:TocLink\string\endcsname% + {\FileNumber}{\cur:th \:currentlabel}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}% + {}\relax}}\:temp% +}}% +>>> + +We need to redefine \Verb|\addcontentsline| inside of Listing's version of MakeCaption. + +\<listings list of\><<< \pend:defI\lst@MakeCaption{% - \let\lst:addcontentsline\addcontentsline - \def\addcontentsline{\gHAdvance\TitleCount by 1 - \lst:addcontentsline}% + \let\lst:addcontentsline\addcontentsline% + \let\addcontentsline\lst:newaddcontentsline% } \append:defI\lst@MakeCaption{% + % insert destination ID for the list of listings + \Link{}{\cur:th\:currentlabel}\EndLink \let\addcontentsline\lst:addcontentsline } >>> +And lastly, we need to use TeX4ht commands to print th elist of listings. + +\<listings list of\><<< +\ConfigureToc{lol} {}{\empty}{}{\newline} +\AtBeginDocument{% +\def\lstlistoflistings{\bgroup% + \ifdefined\chapter\chapter*{\lstlistlistingname}\else\section*{\lstlistlistingname}\fi% + \TableOfContents[lol]% + \egroup}} +>>> + \<lstmisc sty\><<< \HLet\lst@frameInit=\empty \HLet\lst@frameExit=\empty diff --git a/Master/texmf-dist/source/latex/metalogox/metalogox.dtx b/Master/texmf-dist/source/latex/metalogox/metalogox.dtx index a42751ae3cd..6e530331b70 100644 --- a/Master/texmf-dist/source/latex/metalogox/metalogox.dtx +++ b/Master/texmf-dist/source/latex/metalogox/metalogox.dtx @@ -1,7 +1,7 @@ -% +%% % \iffalse meta-comment % -% Copyright 2019, 2023--2024 Brian Dunn +% Copyright 2019, 2023--2025 Brian Dunn % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{metalogox} -%<package> [2024/03/07 v1.06 Extends the metalogo package with font detection.] +%<package> [2025/01/23 v1.07 Extends the metalogo package with font detection.] % %<*driver> \documentclass{ltxdoc} @@ -165,6 +165,7 @@ pageanchor=true, % \changes{v1.04}{2024/01/26}{2024/01/26} % \changes{v1.05}{2024/03/01}{2024/03/01} % \changes{v1.06}{2024/03/07}{2024/03/07} +% \changes{v1.07}{2025/01/23}{2025/01/23} @@ -184,7 +185,7 @@ pageanchor=true, % % \bigskip % -% {\small\textcopyright{} 2019, 2023--2024} Brian Dunn\\ \small \url{https://github.com/bdtc/metalogox} +% {\small\textcopyright{} 2019, 2023--2025} Brian Dunn\\ \small \url{https://github.com/bdtc/metalogox} % % \vspace{.5in} % @@ -380,10 +381,12 @@ pageanchor=true, % \section{Code} % % \subsection{Required packages} +% +% \changes{v1.07}{2024/09/15}{\pkg{xparse} only if old format.} % \begin{macrocode} \RequirePackage{metalogo} -\RequirePackage{xparse} +\IfFormatAtLeastTF{2020-10-01}{}{\RequirePackage{xparse}} \RequirePackage{etoolbox} % \end{macrocode} @@ -1265,6 +1268,7 @@ pageanchor=true, % \changes{v1.05}{2024/03/01}{Fixed Erewhon.} % \changes{v1.06}{2024/03/04}{Improved detection of Archiv0, % Atkinson Hyperlegible, Cuprum, Eczar, Ibarra, Nunito.} +% \changes{v1.07}{2025/01/23}{Added arsenal.} % \begin{macrocode} \MLX@@detectone{AccanthisADFStdNoThree}{accanthis}{accanthis}% \MLX@@detectone{AccanthisADFStdNo3}{accanthis}{accanthis}% @@ -1278,6 +1282,7 @@ pageanchor=true, \MLX@@detectone{AntykwaTorunska}{anttor}{antpolt}% \MLX@@detectone{ArchivZero}{Archiv0}{helvetica}% \MLX@@detectone{Archiv0}{Archiv0}{helvetica}% +\MLX@@detectone{arsenal}{Arsenal}{alegreya}% \MLX@@detectone{fav}{arev}{vera}% \MLX@@detectone{Arimo}{Arimo}{helvetica}% \MLX@@detectone{atkinsn}{Atkinson Hyperlegible}{helvetica}% @@ -1569,7 +1574,7 @@ pageanchor=true, {% \PackageWarningNoLine{metalogox} {% - Did not find font \MLX@@thisfont.\MessageBreak + Did not find font \MLX@@thisfont.\MessageBreak% To improve \string\LaTeX, and related logos:\MessageBreak% \string\usepackage[option]{metalogox}\MessageBreak% Common options: times, bookman for serif,\MessageBreak% diff --git a/Master/texmf-dist/source/latex/metalogox/metalogox.ins b/Master/texmf-dist/source/latex/metalogox/metalogox.ins index 0279849a881..078eccc8e5f 100644 --- a/Master/texmf-dist/source/latex/metalogox/metalogox.ins +++ b/Master/texmf-dist/source/latex/metalogox/metalogox.ins @@ -20,7 +20,7 @@ %% \usedir{tex/latex/ package } \preamble This is a generated file. -Copyright 2019 Brian Dunn +Copyright 2019–2025 Brian Dunn This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht index 00b7058447c..4bb4811cb2d 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht @@ -1,23 +1,23 @@ -% listings.4ht (2024-06-10-14:03), generated from tex4ht-4ht.tex +% listings.4ht (2025-01-23-12:56), generated from tex4ht-4ht.tex % Copyright 2001-2009 Eitan M. Gurari -% Copyright 2009-2024 TeX Users Group +% Copyright 2009-2025 TeX Users Group % % This work may be distributed and/or modified under the % 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 +% https://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions % of LaTeX version 2005/12/01 or later. % % This work has the LPPL maintenance status "maintained". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-06-10-14:03} +\immediate\write-1{version 2025-01-23-12:56} \@ifpackageloaded{xcolor}{}{% \RequirePackage{xcolor} @@ -51,14 +51,6 @@ \fi% } \NewConfigure{lstinline}{2} -\pend:defI\lst@MakeCaption{% - \let\lst:addcontentsline\addcontentsline - \def\addcontentsline{\gHAdvance\TitleCount by 1 - \lst:addcontentsline}% -} -\append:defI\lst@MakeCaption{% - \let\addcontentsline\lst:addcontentsline -} \ConfigureToc{lol} {}{\empty}{}{\newline} \lst@UserCommand\lstlistoflistings{\bgroup% \ifdefined\chapter\chapter*{\lstlistlistingname}\else\section*{\lstlistlistingname}\fi% @@ -105,6 +97,31 @@ \Configure{lst@Kern}{0.499em}{0.1em} \def\lst@outputspace{\HCode{ }} +\def\lst:newaddcontentsline#1#2#3{\gHAdvance\TitleCount by 1 + {\protect:wrtoc% + \protected@edef\:temp{#3}% + \protected@edef\:temp{\the\:tokwrite{\string\doTocEntry% + \string\toclol% identify this entry as list of listings + {\thetable}{\string\csname\space a:TocLink\string\endcsname% + {\FileNumber}{\cur:th \:currentlabel}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}% + {}\relax}}\:temp% +}}% +\pend:defI\lst@MakeCaption{% + \let\lst:addcontentsline\addcontentsline% + \let\addcontentsline\lst:newaddcontentsline% +} +\append:defI\lst@MakeCaption{% + % insert destination ID for the list of listings + \Link{}{\cur:th\:currentlabel}\EndLink + \let\addcontentsline\lst:addcontentsline +} +\ConfigureToc{lol} {}{\empty}{}{\newline} +\AtBeginDocument{% +\def\lstlistoflistings{\bgroup% + \ifdefined\chapter\chapter*{\lstlistlistingname}\else\section*{\lstlistlistingname}\fi% + \TableOfContents[lol]% + \egroup}} + \HLet\lst@frameInit=\empty \HLet\lst@frameExit=\empty diff --git a/Master/texmf-dist/tex/latex/metalogox/metalogox.sty b/Master/texmf-dist/tex/latex/metalogox/metalogox.sty index e12f6802497..8309bbcb60e 100644 --- a/Master/texmf-dist/tex/latex/metalogox/metalogox.sty +++ b/Master/texmf-dist/tex/latex/metalogox/metalogox.sty @@ -6,7 +6,7 @@ %% %% metalogox.dtx (with options: `package') %% This is a generated file. -%% Copyright 2019 Brian Dunn +%% Copyright 2019–2025 Brian Dunn %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -15,14 +15,15 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. +%% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{metalogox} - [2024/03/07 v1.06 Extends the metalogo package with font detection.] + [2025/01/23 v1.07 Extends the metalogo package with font detection.] \RequirePackage{metalogo} -\RequirePackage{xparse} +\IfFormatAtLeastTF{2020-10-01}{}{\RequirePackage{xparse}} \RequirePackage{etoolbox} \newcommand*{\MLX@default}{% @@ -516,6 +517,7 @@ \MLX@@detectone{AntykwaTorunska}{anttor}{antpolt}% \MLX@@detectone{ArchivZero}{Archiv0}{helvetica}% \MLX@@detectone{Archiv0}{Archiv0}{helvetica}% +\MLX@@detectone{arsenal}{Arsenal}{alegreya}% \MLX@@detectone{fav}{arev}{vera}% \MLX@@detectone{Arimo}{Arimo}{helvetica}% \MLX@@detectone{atkinsn}{Atkinson Hyperlegible}{helvetica}% @@ -802,7 +804,7 @@ {% \PackageWarningNoLine{metalogox} {% - Did not find font \MLX@@thisfont.\MessageBreak + Did not find font \MLX@@thisfont.\MessageBreak% To improve \string\LaTeX, and related logos:\MessageBreak% \string\usepackage[option]{metalogox}\MessageBreak% Common options: times, bookman for serif,\MessageBreak% diff --git a/Master/texmf-dist/tex/latex/tikzdotncross/tikzdotncross.sty b/Master/texmf-dist/tex/latex/tikzdotncross/tikzdotncross.sty index 84d6613c104..3236e652b5c 100644 --- a/Master/texmf-dist/tex/latex/tikzdotncross/tikzdotncross.sty +++ b/Master/texmf-dist/tex/latex/tikzdotncross/tikzdotncross.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {1.2} {2024/10/22} +%% This is version {1.2b} {2025/01/23} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/tikzdotncross @@ -26,8 +26,8 @@ \ProvidesExplPackage {tikzdotncross} - {2024/10/22} - {1.2} + {2025/01/23} + {1.2b} {Marking coordinates and crossing paths} %%%%%%% @@ -40,8 +40,8 @@ { name .code:n = {tikzdotncross} , prefix .code:n = {tikzdotncross} , - date .code:n = {2024/10/22}, - version .code:n = {1.2} , + date .code:n = {2025/01/23}, + version .code:n = {1.2b} , description .code:n = {Marking~ coordinates~ and~ crossing~ paths} } \cs_if_exist:NF \PkgInfo @@ -96,7 +96,7 @@ \ExplSyntaxOff %\makeatletter -\usetikzlibrary{intersections} +\usetikzlibrary{math,intersections} %% %% There is no easy and clean way |