Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flatten the loading hierarchy #1108

Merged
merged 2 commits into from
Dec 16, 2021
Merged

Flatten the loading hierarchy #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17352e2
refactor: Simplify loading by delegating to top-level files
hmenke Dec 15, 2021
5d099a8
refactor(pgfcore): replace nested \protect by \protected\def
hmenke Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions tex/generic/pgf/basiclayer/pgfcore.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 0 additions & 2 deletions tex/generic/pgf/basiclayer/pgfcoreimage.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,4 @@
\pgfuseimage{pgflastimage}}


\input pgfcoreexternal.code.tex

\endinput
11 changes: 11 additions & 0 deletions tex/generic/pgf/math/pgfmath.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions tex/generic/pgf/math/pgfmathcalc.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions tex/generic/pgf/math/pgfmathfloat.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}%
Expand Down
11 changes: 0 additions & 11 deletions tex/generic/pgf/math/pgfmathfunctions.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
4 changes: 3 additions & 1 deletion tex/generic/pgf/systemlayer/pgfsys.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 3 additions & 1 deletion tex/generic/pgf/utilities/pgfcalendar.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

\ProvidesFileRCS{pgfcalendar.code.tex}

\input pgfint.code.tex
\ifdefined\pgfintloaded\else
\input pgfint.code.tex
\fi

% Translation stuff

Expand Down
4 changes: 3 additions & 1 deletion tex/generic/pgf/utilities/pgffor.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tex/latex/pgf/basiclayer/pgfcore.sty
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
\RequirePackage{keyval}
\RequirePackage{xcolor}

\def\pgf@texdist@protect{\protect}%

\input{pgfcore.code.tex}

\endinput