From 22536bb2b5257046d271b1eaa11b4a275d5ec041 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Jan 2019 22:40:38 +0000 Subject: pgf (5jan19) git-svn-id: svn://tug.org/texlive/trunk@49607 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty | 2 +- .../tex/latex/pgf/compatibility/pgfarrows.sty | 2 +- .../tex/latex/pgf/compatibility/pgfautomata.sty | 2 +- .../pgf/compatibility/pgfcomp-version-0-65.sty | 2 +- .../pgf/compatibility/pgfcomp-version-1-18.sty | 2 +- .../tex/latex/pgf/compatibility/pgfheaps.sty | 2 +- .../tex/latex/pgf/compatibility/pgfnodes.sty | 2 +- .../tex/latex/pgf/compatibility/pgfshade.sty | 2 +- .../tex/latex/pgf/doc/pgfmanual.code.tex | 2 +- .../tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex | 17 +++- .../latex/pgf/doc/pgfmanual.prettyprinter.code.tex | 51 ++++++---- .../libraries/tikzlibraryexternal.code.tex | 5 + .../tex/latex/pgf/utilities/pgfpages.sty | 105 +++++++++++++++++++++ .../texmf-dist/tex/latex/pgf/utilities/xxcolor.sty | 2 +- 14 files changed, 166 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pgf') diff --git a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty index 05bc35f3b57..710eea546b4 100644 --- a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty +++ b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty @@ -10,7 +10,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.15 2015/08/07 10:17:34 cfeuersaenger Exp $ +\ProvidesPackageRCS{pgf.sty} \def\pgf@draft{} \DeclareOption{draft}{\def\pgf@draft{\pgf@draftmodetrue}} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfarrows.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfarrows.sty index 2c0a90b4fa5..419be0065b2 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfarrows.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfarrows.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfarrows.sty,v 1.3 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS{pgfarrows.sty} \RequirePackage{pgf} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfautomata.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfautomata.sty index 965fa30fed7..d43cdd4f782 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfautomata.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfautomata.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfautomata.sty,v 1.3 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS{pgfautomata.sty} \RequirePackage{pgf} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty index 09f6fda3149..571f2e5b3c2 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcomp-version-0-65.sty,v 1.7 2007/07/03 07:52:35 tantau Exp $ +\ProvidesPackageRCS{pgfcomp-version-0-65.sty} \def\pgfdirection#1{\csname pgf@direction#1\endcsname} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-1-18.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-1-18.sty index f279fc89112..470868e793b 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-1-18.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-1-18.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcomp-version-1-18.sty,v 1.1 2007/07/23 21:23:14 tantau Exp $ +\ProvidesPackageRCS{pgfcomp-version-1-18.sty} \def\pgfsetshapeinnerxsep#1{\pgfset{inner xsep=#1}} \def\pgfsetshapeinnerysep#1{\pgfset{inner ysep=#1}} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfheaps.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfheaps.sty index 9d4a1324025..ed5a95c1530 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfheaps.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfheaps.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfheaps.sty,v 1.3 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS{pgfheaps.sty} \RequirePackage{pgf} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfnodes.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfnodes.sty index 1308cc761b2..33a76867961 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfnodes.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfnodes.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfnodes.sty,v 1.3 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS{pgfnodes.sty} \RequirePackage{pgf} diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfshade.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfshade.sty index 373fbb06837..29d430e34f7 100644 --- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfshade.sty +++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfshade.sty @@ -9,7 +9,7 @@ \RequirePackage{pgfrcs} -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfshade.sty,v 1.3 2006/10/11 15:22:27 tantau Exp $ +\ProvidesPackageRCS{pgfshade.sty} \RequirePackage{pgf} diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex index 1c20205676b..5850362e9d5 100644 --- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex +++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex @@ -33,7 +33,7 @@ % % -\def\pgfmanual@warning#1{\immediate\write16{! Package pgfmanual Warning: #1}}% +\def\pgfmanual@warning#1{\pgf@typeout{! Package pgfmanual Warning: #1}}% \pgfkeys{ diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex index ba9ed33e243..bdae790399e 100644 --- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex +++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex @@ -53,6 +53,13 @@ \newif\ifpgfmanualshowlabels +% FIXME : \cleanedhypertarget/\cleanedhyperlink have been introduced +% in http://pgf.cvs.sourceforge.net/viewvc/pgf/pgf/latex/pgf/doc/pgfmanual.pdflinks.code.tex?r1=1.15&r2=1.16 +% but they are not present on my (CFR) system... what problem did they +% address/how can we satisfy this dependency? +\pgfutil@IfUndefined{cleanedhypertarget}{\let\cleanedhypertarget=\hypertarget}{} +\pgfutil@IfUndefined{cleanedhyperlink}{\let\cleanedhyperlink=\hyperlink}{} + \pgfkeys{% /codeexample/prettyprint/cs arguments/pgfkeys/.initial=1, /codeexample/prettyprint/cs/pgfkeys/.code 2 args={\pgfmanualpdfref{#1}{#1}\{\pgfmanualprettyprintpgfkeys{#2}\pgfmanualclosebrace}, @@ -135,9 +142,9 @@ \gdef\pgfmanualpdf@installreplacements{% \def\marg##1{{##1}}% \def\oarg##1{[##1]}% - \def\meta##1{<##1>}% + \def\meta##1{meta(##1)}% \def\x{x}% - \def\textbackslash{}% + \def\textbackslash{back/}% \def\\{\textbackslash}% \def\space{:}% \edef\ {\space}% @@ -231,9 +238,9 @@ \expandafter\gdef\csname pgfd@lbl@\pgfmanualpdflabel@@\endcsname{w}% 1. remember the label AND remember that we "w"rote it into the pdf. \edef\pgfmanualpdflabel@@{\pgfkeysvalueof{/pdflinks/internal link prefix}.\pgfmanualpdflabel@@}% \ifvmode% - \expandafter\hypertarget\expandafter{\pgfmanualpdflabel@@}{#2}% + \expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{#2}% \else% - {\setbox0=\hbox{\raise1em\hbox{\expandafter\hypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2% + {\setbox0=\hbox{\raise1em\hbox{\expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2% \fi% \else #2% @@ -280,7 +287,7 @@ }% \def\pgfmanualpdfref@#1#2{% \pgfkeysgetvalue{/pdflinks/internal link prefix}\pgfmanual@temp - \expandafter\hyperlink\expandafter{\pgfmanual@temp.#1}{\pgfkeysvalueof{/pdflinks/render hyperlink/.@cmd}{#2}\pgfeov}% + \expandafter\cleanedhyperlink\expandafter{\pgfmanual@temp.#1}{\pgfkeysvalueof{/pdflinks/render hyperlink/.@cmd}{#2}\pgfeov}% \ifpgfmanualshowlabels \pgfkeysvalueof{/pdflinks/show labels code/.@cmd}{#1}\pgfeov \fi diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex index 3ef113dc154..f01db1e2cee 100644 --- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex +++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex @@ -425,14 +425,14 @@ }% \def\pgfmanual@pretty@collectpoint{% - \let\pgfmanualprettyprinterhandlecollectedargs=\pgfmanual@pretty@collectargs@finish@collectpoint + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanual@pretty@collectargs@finish@collectpoint \expandafter\pgfmanualprettyprintercollectupto\pgfmanual@pretty@rroundbrace {\afterpgfmanual@pretty@collectpoint}% } { \catcode`\:=12 -\gdef\pgfmanual@pretty@collectargs@finish@collectpoint#1{% +\gdef\pgfmanual@pretty@collectargs@finish@collectpoint#1#2{% \expandafter\pgfutil@in@\pgfmanual@pretty@colon{#1}% \ifpgfutil@in@ \def\pgfmanual@pretty@collectpoint@getcoordsystem##1:##2\relax{% @@ -449,14 +449,14 @@ \expandafter\def\expandafter\pgfmanual@loc@TMPa\expandafter{\expandafter{\pgfmanual@pretty@glob@TMPa}{##2}}% \expandafter\pgfmanual@loc@TMPb\pgfmanual@loc@TMPa\pgfeov }% - \ifpgfmanualprettyprinterfoundterminator + \if1#2% \pgfmanual@pretty@collectpoint@getcoordsystem#1)\relax \else \pgfmanual@pretty@collectpoint@getcoordsystem#1\relax \fi \else \def\pgfmanual@loc@TMPb{\pgfkeysvalueof{/codeexample/prettyprint/point/.@cmd}}% - \ifpgfmanualprettyprinterfoundterminator + \if1#2% \pgfmanual@loc@TMPb(#1)\pgfeov \else \pgfmanual@loc@TMPb(#1\pgfeov @@ -477,7 +477,7 @@ % a csname may only use letters. And: only letters have a % positive lcccode! \ifnum\lccode`#1=0 - \ifx\pgfmanual@loc@TMPb @% + \ifx\pgfmanual@loc@TMPb\pgfmanual@attext% % ok, we may also accept an `@': \edef\pgfmanual@loc@TMPa{\pgfmanual@loc@TMPa #1}% \else @@ -492,6 +492,7 @@ \pgfmanual@pretty@collectcs@loop@NEXT }% \def\afterpgfmanual@pretty@cs{\pgfmanual@pretty@mainloop}% +\def\pgfmanual@attext{@} \def\pgfmanual@pretty@collectcs@loop@END{% \pgfkeysifdefined{/codeexample/prettyprint/cs arguments/\pgfmanual@loc@TMPa}{% @@ -703,12 +704,25 @@ \newif\ifpgfmanualprettyprinterfoundterminator +\def\pgfmanualprettyprinterhandlecollectedargsVtwo@default#1#2{% + \if1#2% + \pgfmanualprettyprinterfoundterminatortrue + \else + \pgfmanualprettyprinterfoundterminatorfalse + \fi + \pgfmanualprettyprinterhandlecollectedargs{#1}% +}% +\def\pgfmanualprettyprintercollectupto@restore@callback{% + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanualprettyprinterhandlecollectedargsVtwo@default +}% +\pgfmanualprettyprintercollectupto@restore@callback + % Collects tokens inside of a token list up to a single delimiting token, dealing with nested % catcode-12-braces. % % #1: is the end token, the delimiter. It won't be collected. % #2: is code to invoke after -% \pgfmanualprettyprinterhandlecollectedargs has been invoked. +% \pgfmanualprettyprinterhandlecollectedargsVtwo has been invoked. % % PRECONDITION: % there is a large token list following @@ -717,17 +731,17 @@ % POSTCONDITION: % - the arguments will be collected as % ' := ' -% and then, \pgfmanualprettyprinterhandlecollectedargs{} will be -% invoked. Just define \pgfmanualprettyprinterhandlecollectedargs +% and then, +% \pgfmanualprettyprinterhandlecollectedargsVtwo{}{? 1 : 0} will be +% invoked. Just define +% \pgfmanualprettyprinterhandlecollectedargsVtwo % properly. % Then, #2 will be invoked. -% - The boolean \ifpgfmanualprettyprinterfoundterminator will be set to true if and only if '#1' has been found. % % @see \pgfmanualprettyprintercollectargcount for more details. % \def\pgfmanualprettyprintercollectupto#1#2{% \pgfmanualprettyprinterarghasunmatchedbracesfalse - \pgfmanualprettyprinterfoundterminatortrue \begingroup \def\pgfmanual@loc@delimittoken{#1}% \toksdef\t@afterpgfmanualprettyprinterhandlecollected=10 @@ -756,8 +770,8 @@ \ifnum\c@pgfmanual@pretty@openbracecount>0 \noexpand\pgfmanualprettyprinterarghasunmatchedbracestrue \fi - \noexpand\pgfmanualprettyprinterfoundterminatorfalse - \noexpand\pgfmanualprettyprinterhandlecollectedargs{\the\t@pgfmanual@currentarg}% + \noexpand\pgfmanualprettyprinterhandlecollectedargsVtwo{\the\t@pgfmanual@currentarg}{0}% + \noexpand\pgfmanualprettyprintercollectupto@restore@callback \the\t@afterpgfmanualprettyprinterhandlecollected \noexpand\pgfmanual@EOI% <- put this token back into token list! }% @@ -785,7 +799,8 @@ % do NOT include the delimit token. \edef\pgfmanual@pretty@collectupto@loop@NEXT{% \noexpand\endgroup - \noexpand\pgfmanualprettyprinterhandlecollectedargs{\the\t@pgfmanual@currentarg}% + \noexpand\pgfmanualprettyprinterhandlecollectedargsVtwo{\the\t@pgfmanual@currentarg}{1}% + \noexpand\pgfmanualprettyprintercollectupto@restore@callback \the\t@afterpgfmanualprettyprinterhandlecollected }% \else @@ -854,13 +869,15 @@ } \def\pgfmanual@pretty@pgfkeys{% - \let\pgfmanualprettyprinterhandlecollectedargs=\pgfmanual@pretty@pgfkeys@start + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanual@pretty@pgfkeys@start \pgfmanualprettyprintercollectupto]{\pgfmanual@pretty@mainloop}%% }% -\long\def\pgfmanual@pretty@pgfkeys@start#1{% +\long\def\pgfmanual@pretty@pgfkeys@start#1#2{% [% \pgfmanual@pretty@pgfkeys@loop#1\pgfmanual@EOI - ]% + \if1#2% + ]% + \fi }% % iterates through single tokens, detecting key names and values while % it goes. @@ -1034,7 +1051,7 @@ \fi \fi \if\pgfmanual@pretty@isconsumed0% - \def\pgfmanualprettyprinterhandlecollectedargs##1{\pgfmanual@pretty@pgfkeys@processvalue{##1}}% the braces will be handled separately. + \def\pgfmanualprettyprinterhandlecollectedargsVtwo##1##2{\pgfmanual@pretty@pgfkeys@processvalue{##1}}% the braces will be handled separately. \def\pgfmanual@pretty@pgfkeys@collectvalue@next{% \pgfmanualprettyprintercollectupto,{\afterpgfmanual@pretty@collectargs@finish@value}#1% }% diff --git a/Master/texmf-dist/tex/latex/pgf/frontendlayer/libraries/tikzlibraryexternal.code.tex b/Master/texmf-dist/tex/latex/pgf/frontendlayer/libraries/tikzlibraryexternal.code.tex index 2488dfa4e79..67d199476ea 100644 --- a/Master/texmf-dist/tex/latex/pgf/frontendlayer/libraries/tikzlibraryexternal.code.tex +++ b/Master/texmf-dist/tex/latex/pgf/frontendlayer/libraries/tikzlibraryexternal.code.tex @@ -29,6 +29,11 @@ % % ... also used for \pdf@shellescape. \usepackage{pdftexcmds} +\pgfutil@IfFileExists{atveryend.sty}{% + \usepackage{atveryend}% +}{% + \message{! Package tikz Warning: \string\usepackage{atveryend} impossible. Automatic resolving of references within external files impossible.}% +}% % source generic implementation: \input tikzexternalshared.code.tex diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty index 2144e9c7005..c652a2621b9 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty @@ -338,6 +338,111 @@ } +\pgfpagesdeclarelayout{6 on 1} +{ + \edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default + \edef\pgfpageoptionwidth{\the\paperheight} + \def\pgfpageoptionborder{0pt} +} +{ + \pgfpagesphysicalpageoptions + {% + logical pages=6,% + physical height=\pgfpageoptionheight,% + physical width=\pgfpageoptionwidth% + } + \ifdim\paperheight>\paperwidth\relax + % put side-by-side + \pgfpageslogicalpageoptions{1} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{2} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{3} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{4} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.167\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{5} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{6} + {% + border shrink=\pgfpageoptionborder,% + resized width=.25\pgfphysicalwidth,% + resized height=.5\pgfphysicalheight,% + center=\pgfpoint{.833\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% + \else + % stack on top of one another + \pgfpageslogicalpageoptions{1} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{2} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.75\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{3} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{4} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{5} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% + \pgfpageslogicalpageoptions{6} + {% + border shrink=\pgfpageoptionborder,% + resized width=.5\pgfphysicalwidth,% + resized height=.25\pgfphysicalheight,% + center=\pgfpoint{.75\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% + \fi +} + + \pgfpagesdeclarelayout{8 on 1} { \edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/xxcolor.sty b/Master/texmf-dist/tex/latex/pgf/utilities/xxcolor.sty index 7c2d666b8fc..d085debebdf 100644 --- a/Master/texmf-dist/tex/latex/pgf/utilities/xxcolor.sty +++ b/Master/texmf-dist/tex/latex/pgf/utilities/xxcolor.sty @@ -69,7 +69,7 @@ \g@addto@macro\XC@mcolor{% \ifnum\XC@nummixins>0% - \pgfutil@namelet{\string\color@XC@mixtmp}{\string\color@.}% + \colorlet{XC@mixtmp}{.}% \applycolormixins{XC@mixtmp}% \pgfutil@namelet{current@color}{\string\color@XC@mixtmp}% \fi% -- cgit v1.2.3