From 2b7ff17f067d7801d14d2cc8edac4715b963f680 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 8 Aug 2023 19:52:16 +0000 Subject: tikzfill (8aug23) git-svn-id: svn://tug.org/texlive/trunk@67847 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tikzfill/CHANGES.md | 17 ++++- Master/texmf-dist/doc/latex/tikzfill/README.md | 4 +- .../texmf-dist/doc/latex/tikzfill/tikzfill-doc.sty | 19 +++--- Master/texmf-dist/doc/latex/tikzfill/tikzfill.pdf | Bin 721265 -> 648702 bytes Master/texmf-dist/doc/latex/tikzfill/tikzfill.tex | 30 ++++----- .../tex/latex/tikzfill/tikzfill-common.sty | 71 ++++++++++----------- .../tex/latex/tikzfill/tikzfill.hexagon.sty | 14 ++-- .../tex/latex/tikzfill/tikzfill.image.sty | 14 ++-- .../tex/latex/tikzfill/tikzfill.rhombus.sty | 14 ++-- Master/texmf-dist/tex/latex/tikzfill/tikzfill.sty | 14 ++-- .../tikzfill/tikzlibraryfill.hexagon.code.tex | 9 ++- .../latex/tikzfill/tikzlibraryfill.image.code.tex | 36 ++--------- .../tikzfill/tikzlibraryfill.rhombus.code.tex | 7 +- 13 files changed, 125 insertions(+), 124 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tikzfill/CHANGES.md b/Master/texmf-dist/doc/latex/tikzfill/CHANGES.md index 23037f13d1c..dd974c3f3d6 100644 --- a/Master/texmf-dist/doc/latex/tikzfill/CHANGES.md +++ b/Master/texmf-dist/doc/latex/tikzfill/CHANGES.md @@ -17,7 +17,22 @@ and this project adheres to -## [1.00] - 2022-07-20 +## [1.0.1] - 2023-08-08 + +### Added +- Input of `expl3-generic` where `ExplSyntaxOn` is not defined (issue #1) + +### Removed +- Library `fill.image`: Unused code fragments + +### Fixed +- Spelling of LaTeX etc. inside the documentation (issue #1) +- Package loading implementation changed to LaTeX2e by adapting a TikZ macro + to fix package loading problems (issue #2) + + + +## [1.0.0] - 2022-07-20 ### Added - Initial public release diff --git a/Master/texmf-dist/doc/latex/tikzfill/README.md b/Master/texmf-dist/doc/latex/tikzfill/README.md index 2ce0a8735a9..b7ef262905e 100644 --- a/Master/texmf-dist/doc/latex/tikzfill/README.md +++ b/Master/texmf-dist/doc/latex/tikzfill/README.md @@ -1,7 +1,7 @@ -# The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +# The LaTeX package tikzfill - version 1.0.1 (2023/08/08) -> Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +> Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm > 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/doc/latex/tikzfill/tikzfill-doc.sty b/Master/texmf-dist/doc/latex/tikzfill/tikzfill-doc.sty index 60b1320964b..11bdfb87a83 100644 --- a/Master/texmf-dist/doc/latex/tikzfill/tikzfill-doc.sty +++ b/Master/texmf-dist/doc/latex/tikzfill/tikzfill-doc.sty @@ -1,9 +1,9 @@ % !TeX encoding=UTF-8 -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill-doc.sty: style file for the documentation %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,17 +18,11 @@ %% %% This work consists of all files listed in README.md %% -\def\version{1.0.0}% -\def\datum{2022/07/20}% +\def\version{1.0.1}% +\def\datum{2023/08/08}% -\def\tikzfillpkgprefix{} \IfFileExists{tikzfill-doc.cfg}{\input{tikzfill-doc.cfg}}{} -% prevent hypdoc from loading (sets hyperindex=false) -%\@namedef{ver@hypdoc.sty}{9999/12/31} -%\@namedef{opt@hypdoc.sty}{hypdoc} - - \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} \RequirePackage[english]{babel} @@ -37,6 +31,11 @@ \RequirePackage[svgnames,table,hyperref]{xcolor} \RequirePackage{tikz,siunitx,xfp,tabularray} \usetikzlibrary{patterns,shadings,fadings} +\ifdefined\tikzfillpkgprefix + \RequirePackage{\tikzfillpkgprefix tikzfill} +\else + \RequirePackage{tikzfill} +\fi \RequirePackage{varioref} \RequirePackage[pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks]{hyperref} \urlstyle{sf} diff --git a/Master/texmf-dist/doc/latex/tikzfill/tikzfill.pdf b/Master/texmf-dist/doc/latex/tikzfill/tikzfill.pdf index e68d134f782..3c9f52c33ba 100644 Binary files a/Master/texmf-dist/doc/latex/tikzfill/tikzfill.pdf and b/Master/texmf-dist/doc/latex/tikzfill/tikzfill.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikzfill/tikzfill.tex b/Master/texmf-dist/doc/latex/tikzfill/tikzfill.tex index 4762f597713..618c215ea2f 100644 --- a/Master/texmf-dist/doc/latex/tikzfill/tikzfill.tex +++ b/Master/texmf-dist/doc/latex/tikzfill/tikzfill.tex @@ -1,10 +1,10 @@ % \LaTeX-Main\ % !TeX encoding=UTF-8 -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill.tex: Manual %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -23,8 +23,6 @@ \documentclass[a4paper,11pt]{article} \usepackage{tikzfill-doc} -\usepackage{\tikzfillpkgprefix tikzfill} - \hypersetup{ pdftitle={Manual for the tikzfill package}, pdfauthor={Thomas F. Sturm}, @@ -94,7 +92,7 @@ \end{tcolorbox} {\large Thomas F.~Sturm% \footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik, - Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany; + University of the Bundeswehr Munich, D-85577 Neubiberg, Germany; email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip \normalsize\url{https://www.ctan.org/pkg/tikzfill}\par \url{https://github.com/T-F-S/tikzfill} @@ -124,13 +122,13 @@ add further options to fill \tikzname\ paths with images and patterns. For \LaTeX, the provided libraries can be loaded using the preferred \tikzname\ mechanism by \begin{dispListing*}{} -\usetikzlibrary{fill.***} % LATEX (primary choice) and plain TEX +\usetikzlibrary{fill.***} % LaTeX (primary choice) and plain TeX \end{dispListing*} where |***| is to be replaced by the actual library name found on the following pages. Alternatively, the libraries can be loaded using \LaTeX\ style files \begin{dispListing*}{} -\usepackage{tikzfill.***} % LATEX (secondary choice) +\usepackage{tikzfill.***} % LaTeX (secondary choice) \end{dispListing*} If you want to load all \tikzname\ libraries of this package, you can use @@ -146,9 +144,9 @@ the following \LaTeX\ style file \section{Image and Picture Fill Library}\label{sec:imagefill}% \begin{dispListing*}{title=\tikzname\ Library |fill.image|} -\usetikzlibrary{fill.image} % LATEX (primary choice) and plain TEX -\usetikzlibrary[fill.image] % ConTEXt -\usepackage{tikzfill.image} % LATEX (secondary choice) +\usetikzlibrary{fill.image} % LaTeX (primary choice) and plain TeX +\usetikzlibrary[fill.image] % ConTeXt +\usepackage{tikzfill.image} % LaTeX (secondary choice) \end{dispListing*} This library defines options to fill graphs with images or arbitray pictures. @@ -575,9 +573,9 @@ completely rewritten with |expl3|. \section{Hexagon Pattern Library}\label{sec:hexagon}% \begin{dispListing*}{title=\tikzname\ Library |fill.hexagon|} -\usetikzlibrary{fill.hexagon} % LATEX (primary choice) and plain TEX -\usetikzlibrary[fill.hexagon] % ConTEXt -\usepackage{tikzfill.hexagon} % LATEX (secondary choice) +\usetikzlibrary{fill.hexagon} % LaTeX (primary choice) and plain TeX +\usetikzlibrary[fill.hexagon] % ConTeXt +\usepackage{tikzfill.hexagon} % LaTeX (secondary choice) \end{dispListing*} Based on |patterns.meta|, this library defines new hexagon patterns to fill graphs. @@ -1130,9 +1128,9 @@ Both bands together build a uniform combined pattern. \section{Rhombus Pattern Library}\label{sec:rhombus}% \begin{dispListing*}{title=\tikzname\ Library |fill.rhombus|} -\usetikzlibrary{fill.rhombus} % LATEX (primary choice) and plain TEX -\usetikzlibrary[fill.rhombus] % ConTEXt -\usepackage{tikzfill.rhombus} % LATEX (secondary choice) +\usetikzlibrary{fill.rhombus} % LaTeX (primary choice) and plain TeX +\usetikzlibrary[fill.rhombus] % ConTeXt +\usepackage{tikzfill.rhombus} % LaTeX (secondary choice) \end{dispListing*} Based on |patterns.meta|, this library defines new rhombus patterns to fill graphs. diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzfill-common.sty b/Master/texmf-dist/tex/latex/tikzfill/tikzfill-common.sty index 2adb2a7cea0..b381e2164a5 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzfill-common.sty +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzfill-common.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill-common.sty: auxiliary code for library loading %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,39 +18,38 @@ %% This work consists of all files listed in README.md %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesPackage{tikzfill-common}[2022/07/20 v1.0.0 Auxiliary code for tikzfill] +\ProvidesPackage{tikzfill-common}[2023/08/08 v1.0.1 Auxiliary code for tikzfill] \RequirePackage{tikz} -\ExplSyntaxOn - -\cs_new_nopar:Npn \__tikzfill_usetikzlibrary:n #1 - { - \cs_if_exist:NTF \tikzfillpkgprefix - { - \bool_set:Nn \l_tmpa_bool { \tl_if_blank_p:V \tikzfillpkgprefix } - } - { - \bool_set_true:N \l_tmpa_bool - } - \bool_if:NTF \l_tmpa_bool - { - \usetikzlibrary{ #1 } - } - { - \cs_if_exist:NF \l__tikzfill_library_seq - { - \seq_new:N \l__tikzfill_library_seq - } - \seq_set_from_clist:Nn \l__tikzfill_library_seq { #1 } - \seq_map_inline:Nn \l__tikzfill_library_seq - { - \cs_if_exist:cF { tikz@library@ ##1 @loaded } - { - \cs_gset:cpn { tikz@library@ ##1 @loaded }{} - \input{ \tikzfillpkgprefix tikzlibrary ##1 .code.tex} - } - } - } - } - -\ExplSyntaxOff +% adapted copy of \use@@tikzlibrary from tikz.code.tex +\def\tikzfill@use@@tikzlibrary#1{% + \edef\pgf@list{#1}% + \pgfutil@for\pgf@temp:=\pgf@list\do{% + \expandafter\pgfkeys@spdef\expandafter\pgf@temp\expandafter{\pgf@temp}% + \ifx\pgf@temp\pgfutil@empty + \else + \expandafter\ifx\csname tikz@library@\pgf@temp @loaded\endcsname\relax% + \expandafter\global\expandafter\let\csname tikz@library@\pgf@temp @loaded\endcsname=\pgfutil@empty% + \expandafter\edef\csname tikz@library@#1@atcode\endcsname{\the\catcode`\@} + \expandafter\edef\csname tikz@library@#1@barcode\endcsname{\the\catcode`\|} + \expandafter\edef\csname tikz@library@#1@dollarcode\endcsname{\the\catcode`\$} + \catcode`\@=11 + \catcode`\|=12 + \catcode`\$=3 + \pgfutil@InputIfFileExists{\tikzfillpkgprefix tikzlibrary\pgf@temp.code.tex}{}{ + \pgfutil@IfFileExists{\tikzfillpkgprefix pgflibrary\pgf@temp.code.tex}{% + \expandafter\usepgflibrary\expandafter{\pgf@temp}% + }{% + \tikzerror{I did not find the tikz library + '\pgf@temp'. I looked for files named + \tikzfillpkgprefix tikzlibrary\pgf@temp.code.tex and + \tikzfillpkgprefix pgflibrary\pgf@temp.code.tex, but neither + could be found in the current texmf trees.} + }}% + \catcode`\@=\csname tikz@library@#1@atcode\endcsname + \catcode`\|=\csname tikz@library@#1@barcode\endcsname + \catcode`\$=\csname tikz@library@#1@dollarcode\endcsname + \fi% + \fi% + }% +} diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.hexagon.sty b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.hexagon.sty index 66ad292e479..db1ed81575b 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.hexagon.sty +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.hexagon.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill.hexagon.sty: filling with hexagon patterns %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,8 +17,10 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesPackage{tikzfill.hexagon}[2022/07/20 v1.0.0 Hexagon pattern library for TikZ] +\ProvidesPackage{tikzfill.hexagon}[2023/08/08 v1.0.1 Hexagon pattern library for TikZ] \RequirePackage{tikzfill-common} -\ExplSyntaxOn -\__tikzfill_usetikzlibrary:n { fill.hexagon } -\ExplSyntaxOff +\ifdefined\tikzfillpkgprefix + \tikzfill@use@@tikzlibrary{fill.hexagon} +\else + \usetikzlibrary{fill.hexagon} +\fi diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.image.sty b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.image.sty index fb7bb3e0302..b18b4338e5f 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.image.sty +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.image.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill.image.sty: filling with images %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,8 +17,10 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesPackage{tikzfill.image}[2022/07/20 v1.0.0 Image filling library for TikZ] +\ProvidesPackage{tikzfill.image}[2023/08/08 v1.0.1 Image filling library for TikZ] \RequirePackage{tikzfill-common} -\ExplSyntaxOn -\__tikzfill_usetikzlibrary:n { fill.image } -\ExplSyntaxOff +\ifdefined\tikzfillpkgprefix + \tikzfill@use@@tikzlibrary{fill.image} +\else + \usetikzlibrary{fill.image} +\fi diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.rhombus.sty b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.rhombus.sty index 58deb476557..778bae1f304 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.rhombus.sty +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.rhombus.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill.rhombus.sty: filling with rhombus patterns %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,8 +17,10 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesPackage{tikzfill.rhombus}[2022/07/20 v1.0.0 Rhombus pattern library for TikZ] +\ProvidesPackage{tikzfill.rhombus}[2023/08/08 v1.0.1 Rhombus pattern library for TikZ] \RequirePackage{tikzfill-common} -\ExplSyntaxOn -\__tikzfill_usetikzlibrary:n { fill.rhombus } -\ExplSyntaxOff +\ifdefined\tikzfillpkgprefix + \tikzfill@use@@tikzlibrary{fill.rhombus} +\else + \usetikzlibrary{fill.rhombus} +\fi diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.sty b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.sty index c9a622b9e55..6a07bbef827 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzfill.sty +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzfill.sty @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzfill.sty: load all fill libraries %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,8 +17,10 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesPackage{tikzfill}[2022/07/20 v1.0.0 Image and pattern libraries for TikZ] +\ProvidesPackage{tikzfill}[2023/08/08 v1.0.1 Image and pattern libraries for TikZ] \RequirePackage{tikzfill-common} -\ExplSyntaxOn -\__tikzfill_usetikzlibrary:n { fill.image, fill.hexagon, fill.rhombus } -\ExplSyntaxOff +\ifdefined\tikzfillpkgprefix + \tikzfill@use@@tikzlibrary{fill.image,fill.hexagon,fill.rhombus} +\else + \usetikzlibrary{fill.image,fill.hexagon,fill.rhombus} +\fi diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex index 2fccee15b99..518d9a9f995 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzlibraryfill.hexagon.code.tex: filling with hexagon patterns %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,10 +17,13 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesFile{tikzlibraryfill.hexagon.code.tex}[2022/07/20 v1.0.0 Hexagon pattern library] +\ProvidesFile{tikzlibraryfill.hexagon.code.tex}[2023/08/08 v1.0.1 Hexagon pattern library] \usetikzlibrary{patterns.meta} +\ifx\ExplSyntaxOn\undefined + \input expl3-generic\relax +\fi \ExplSyntaxOn \int_new:N \l__tikzfill_hex_ring_int diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.image.code.tex b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.image.code.tex index ed20d0e7808..988ea178272 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.image.code.tex +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.image.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzlibraryfill.image.code.tex: filling with images %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,8 +17,11 @@ %% %% This work consists of all files listed in README.md %% -\ProvidesFile{tikzlibraryfill.image.code.tex}[2022/07/20 v1.0.0 Image filling library] +\ProvidesFile{tikzlibraryfill.image.code.tex}[2023/08/08 v1.0.1 Image filling library] +\ifx\ExplSyntaxOn\undefined + \input expl3-generic\relax +\fi \ExplSyntaxOn \box_new:N \l__tikzfill_img_box @@ -139,33 +142,6 @@ } -\cs_new_nopar:Npn \xxxx__tikzfill_img_compute_scales: - { - \fp_set:Nn \l_tmpa_fl { \box_wd:N \l__tikzfill_img_box } - \fp_compare:nNnTF \l_tmpa_fl < {1pt} - { - \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \c_one_fp - } - { - \fp_set:Nn \l__tikzfill_img_scale_x_fp - { - \l__tikzfill_img_scale_tl*\l__tikzfill_img_width_tl / \l_tmpa_fl - } - } - \fp_set:Nn \l_tmpb_fl { \box_ht:N \l__tikzfill_img_box + \box_dp:N \l__tikzfill_img_box } - \fp_compare:nNnTF \l_tmpb_fl < {1pt} - { - \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \c_one_fp - } - { - \fp_set:Nn \l__tikzfill_img_scale_y_fp - { - \l__tikzfill_img_scale_tl*\l__tikzfill_img_height_tl / \l_tmpb_fl - } - } - } - - \cs_new_nopar:Npn \__tikzfill_img_compute_scales: { \dim_set:Nn \l_tmpa_dim { \box_wd:N \l__tikzfill_img_box } diff --git a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex index e425470c44b..f33bfd3aaf8 100644 --- a/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex +++ b/Master/texmf-dist/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex @@ -1,8 +1,8 @@ -%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20) +%% The LaTeX package tikzfill - version 1.0.1 (2023/08/08) %% tikzlibraryfill.rhombus.code.tex: filling with rhombus patterns %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm +%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -21,6 +21,9 @@ \usetikzlibrary{patterns.meta} +\ifx\ExplSyntaxOn\undefined + \input expl3-generic\relax +\fi \ExplSyntaxOn \fp_new:N \l__tikzfill_rho_angle_fp -- cgit v1.2.3