Merge pull request pgf-tikz#1108 from hmenke/flatten

Flatten the loading hierarchy
DominikPeters · Dec 16, 2021 · 475b536 · 475b536
2 parents 28b9756 + 5d099a8
commit 475b536
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 34 deletions.
diff --git a/tex/generic/pgf/basiclayer/pgfcore.code.tex b/tex/generic/pgf/basiclayer/pgfcore.code.tex
@@ -12,8 +12,13 @@
 \newif\ifpgf@draftmode
 \def\pgf@typeout{\immediate\write0}
 
-\input pgfmath.code.tex
-\input pgfint.code.tex
+\ifdefined\pgfmathloaded\else
+  \input pgfmath.code.tex
+\fi
+
+\ifdefined\pgfintloaded\else
+  \input pgfint.code.tex
+\fi
 
 \input pgfcorepoints.code.tex
 \input pgfcorepathconstruct.code.tex
@@ -27,12 +32,10 @@
 \input pgfcorearrows.code.tex
 \input pgfcoreshade.code.tex
 \input pgfcoreimage.code.tex
+\input pgfcoreexternal.code.tex
 \input pgfcorelayers.code.tex
 \input pgfcoretransparency.code.tex
 \input pgfcorepatterns.code.tex
 \input pgfcorerdf.code.tex
 
-\pgfutil@ifundefined{pgf@texdist@protect}{%
-    \def\pgf@texdist@protect{}%
-}{}
 \endinput
diff --git a/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex b/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex
@@ -239,6 +239,4 @@
   \pgfuseimage{pgflastimage}}
 
 
-\input pgfcoreexternal.code.tex
-
 \endinput
diff --git a/tex/generic/pgf/math/pgfmath.code.tex b/tex/generic/pgf/math/pgfmath.code.tex
@@ -20,6 +20,17 @@
   \input pgfkeys.code.tex
 \fi
 
+\input pgfmathutil.code.tex
+\input pgfmathparser.code.tex
+\input pgfmathfunctions.code.tex
+\input pgfmathfunctions.basic.code.tex
+\input pgfmathfunctions.trigonometric.code.tex
+\input pgfmathfunctions.random.code.tex
+\input pgfmathfunctions.comparison.code.tex
+\input pgfmathfunctions.base.code.tex
+\input pgfmathfunctions.round.code.tex
+\input pgfmathfunctions.misc.code.tex
+\input pgfmathfunctions.integerarithmetics.code.tex
 \input pgfmathcalc.code.tex
 \input pgfmathfloat.code.tex
 

diff --git a/tex/generic/pgf/math/pgfmathcalc.code.tex b/tex/generic/pgf/math/pgfmathcalc.code.tex
@@ -11,11 +11,6 @@
 %
 % Version 1.414213 29/9/2007
 
-\input pgfmathutil.code.tex
-\input pgfmathparser.code.tex
-\input pgfmathfunctions.code.tex
-%\input pgfmathbase.code.tex
-
 % \pgfmathsetlength, \pgfmathaddtolength
 %
 % #1 = dimension register

diff --git a/tex/generic/pgf/math/pgfmathfloat.code.tex b/tex/generic/pgf/math/pgfmathfloat.code.tex
@@ -1637,12 +1637,7 @@
 % variables in /pgf/number format).
 %
 % You may specify optional arguments with \pgfmathprintnumber[...].
-\def\pgfmathprintnumber{%
-    % \protect allows to supply \pgfmathprintnumber inside of latex
-    % captions. The \csname yields \relax in case protect is undefined.
-    \pgf@texdist@protect\pgfmathprintnumber@protected
-}%
-\def\pgfmathprintnumber@protected{%
+\pgfutil@protected\def\pgfmathprintnumber{%
     \pgfutil@ifnextchar[%
         {\pgfmathprintnumber@OPT}%
         {\pgfmathprintnumber@noopt}%

diff --git a/tex/generic/pgf/math/pgfmathfunctions.code.tex b/tex/generic/pgf/math/pgfmathfunctions.code.tex
@@ -262,17 +262,6 @@
     \pgfmathredeclarefunction{#1}{#2}%
 }%
 
-\input pgfmathfunctions.basic.code.tex
-\input pgfmathfunctions.trigonometric.code.tex
-\input pgfmathfunctions.random.code.tex
-\input pgfmathfunctions.comparison.code.tex
-\input pgfmathfunctions.base.code.tex
-\input pgfmathfunctions.round.code.tex
-\input pgfmathfunctions.misc.code.tex
-\input pgfmathfunctions.integerarithmetics.code.tex
-
-
-
 % Local Variables:
 % tab-width: 2
 % End:
diff --git a/tex/generic/pgf/systemlayer/pgfsys.code.tex b/tex/generic/pgf/systemlayer/pgfsys.code.tex
@@ -11,7 +11,9 @@
 
 
 % Load key mechanism
-\input pgfkeys.code.tex
+\ifdefined\pgfkeysloaded\else
+  \input pgfkeys.code.tex
+\fi
 
 % "pgf" is a family
 \pgfkeys{/pgf/.is family}

diff --git a/tex/generic/pgf/utilities/pgfcalendar.code.tex b/tex/generic/pgf/utilities/pgfcalendar.code.tex
@@ -9,7 +9,9 @@
 
 \ProvidesFileRCS{pgfcalendar.code.tex}
 
-\input pgfint.code.tex
+\ifdefined\pgfintloaded\else
+  \input pgfint.code.tex
+\fi
 
 % Translation stuff
 

diff --git a/tex/generic/pgf/utilities/pgffor.code.tex b/tex/generic/pgf/utilities/pgffor.code.tex
@@ -10,7 +10,9 @@
 \ProvidesPackageRCS{pgffor.code.tex}
 
 % pgfmath is needed
-\input pgfmath.code.tex
+\ifdefined\pgfmathloaded\else
+  \input pgfmath.code.tex
+\fi
 
 \newdimen\pgffor@iter
 \newdimen\pgffor@skip

diff --git a/tex/latex/pgf/basiclayer/pgfcore.sty b/tex/latex/pgf/basiclayer/pgfcore.sty
@@ -12,8 +12,6 @@
 \RequirePackage{keyval}
 \RequirePackage{xcolor}
 
-\def\pgf@texdist@protect{\protect}%
-
 \input{pgfcore.code.tex}
 
 \endinput