v1.0.1

T-F-S · Aug 8, 2023 · 717d52e · 717d52e
1 parent 7d03f74
commit 717d52e
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+# The LaTeX package tikzfill - version 1.0.1 (2023/08/08)
 
 
-> Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+> Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 
 > This work may be distributed and/or modified under the
 > conditions of the LaTeX Project Public License, either version 1.3

diff --git a/doc/latex/tikzfill/CHANGES.md b/doc/latex/tikzfill/CHANGES.md
@@ -17,21 +17,18 @@ and this project adheres to
 
 
 
-## [1.0.1] - 2022-xx-xx
+## [1.0.1] - 2023-08-08
 
 ### Added
 - Input of `expl3-generic` where `ExplSyntaxOn` is not defined (issue #1)
 
-### Changed
-### Deprecated
-
 ### Removed
 - Library `fill.image`: Unused code fragments
 
 ### Fixed
 - Spelling of LaTeX etc. inside the documentation (issue #1)
-
-### Security
+- Package loading implementation changed to LaTeX2e by adapting a TikZ macro
+    to fix package loading problems (issue #2)
 
 
 

diff --git a/doc/latex/tikzfill/README.md b/doc/latex/tikzfill/README.md
@@ -1,7 +1,7 @@
-# The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+# The LaTeX package tikzfill - version 1.0.1 (2023/08/08)
 
 
-> Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+> Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 
 > This work may be distributed and/or modified under the
 > conditions of the LaTeX Project Public License, either version 1.3

diff --git a/doc/latex/tikzfill/tikzfill-doc.sty b/doc/latex/tikzfill/tikzfill-doc.sty
@@ -1,9 +1,9 @@
 % !TeX encoding=UTF-8
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -18,10 +18,9 @@
 %%
 %% This work consists of all files listed in README.md
 %%
-\def\version{1.0.1pre1}%
-\def\datum{2022/07/22}%
+\def\version{1.0.1}%
+\def\datum{2023/08/08}%
 
-\def\tikzfillpkgprefix{}
 \IfFileExists{tikzfill-doc.cfg}{\input{tikzfill-doc.cfg}}{}
 
 \RequirePackage[T1]{fontenc}
@@ -32,7 +31,11 @@
 \RequirePackage[svgnames,table,hyperref]{xcolor}
 \RequirePackage{tikz,siunitx,xfp,tabularray}
 \usetikzlibrary{patterns,shadings,fadings}
-\RequirePackage{\tikzfillpkgprefix tikzfill}
+\ifdefined\tikzfillpkgprefix
+  \RequirePackage{\tikzfillpkgprefix tikzfill}
+\else
+  \RequirePackage{tikzfill}
+\fi
 \RequirePackage{varioref}
 \RequirePackage[pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks]{hyperref}
 \urlstyle{sf}

diff --git a/doc/latex/tikzfill/tikzfill.pdf b/doc/latex/tikzfill/tikzfill.pdf
diff --git a/doc/latex/tikzfill/tikzfill.tex b/doc/latex/tikzfill/tikzfill.tex
@@ -1,10 +1,10 @@
 % \LaTeX-Main\
 % !TeX encoding=UTF-8
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -92,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:[email protected]}{[email protected]}}\par\medskip
 \normalsize\url{https://www.ctan.org/pkg/tikzfill}\par
 \url{https://github.com/T-F-S/tikzfill}

diff --git a/tex/latex/tikzfill/tikzfill-common.sty b/tex/latex/tikzfill/tikzfill-common.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -18,41 +18,38 @@
 %% This work consists of all files listed in README.md
 %%
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesPackage{tikzfill-common}[2022/07/22 v1.0.1pre1 Auxiliary code for tikzfill]
+\ProvidesPackage{tikzfill-common}[2023/08/08 v1.0.1 Auxiliary code for tikzfill]
 \RequirePackage{tikz}
-\ifx\ExplSyntaxOn\undefined
-  \input expl3-generic\relax
-\fi
-\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/tex/latex/tikzfill/tikzfill.hexagon.sty b/tex/latex/tikzfill/tikzfill.hexagon.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% 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/22 v1.0.1pre1 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/tex/latex/tikzfill/tikzfill.image.sty b/tex/latex/tikzfill/tikzfill.image.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% 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/22 v1.0.1pre1 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/tex/latex/tikzfill/tikzfill.rhombus.sty b/tex/latex/tikzfill/tikzfill.rhombus.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% 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/22 v1.0.1pre1 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/tex/latex/tikzfill/tikzfill.sty b/tex/latex/tikzfill/tikzfill.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% 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/22 v1.0.1pre1 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/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex b/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README.md
 %%
-\ProvidesFile{tikzlibraryfill.hexagon.code.tex}[2022/07/22 v1.0.1pre1 Hexagon pattern library]
+\ProvidesFile{tikzlibraryfill.hexagon.code.tex}[2023/08/08 v1.0.1 Hexagon pattern library]
 
 \usetikzlibrary{patterns.meta}
 

diff --git a/tex/latex/tikzfill/tikzlibraryfill.image.code.tex b/tex/latex/tikzfill/tikzlibraryfill.image.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README.md
 %%
-\ProvidesFile{tikzlibraryfill.image.code.tex}[2022/07/22 v1.0.1pre1 Image filling library]
+\ProvidesFile{tikzlibraryfill.image.code.tex}[2023/08/08 v1.0.1 Image filling library]
 
 \ifx\ExplSyntaxOn\undefined
   \input expl3-generic\relax

diff --git a/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex b/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tikzfill - version 1.0.1pre1 (2022/07/22)
+%% 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 <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2022-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the