summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-04 22:58:15 +0000
committerKarl Berry <karl@freefriends.org>2012-11-04 22:58:15 +0000
commitcc14f05300604ee3a793fc3d489bfe31048a342d (patch)
treedc9b7f6b152654519e986a66bfbfb789944e53b1
parent752bbec2052b05f1d87f656a2fd985019745d23a (diff)
tikzscale (4nov12)
git-svn-id: svn://tug.org/texlive/trunk@28170 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdfbin127846 -> 127846 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdfbin349577 -> 350047 bytes
-rw-r--r--Master/texmf-dist/source/latex/tikzscale/tikzscale.dtx26
-rw-r--r--Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty8
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
-rw-r--r--TODO9
6 files changed, 30 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf
index 9aceb627943..16cd3643485 100644
--- a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf
+++ b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf b/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf
index b90069c09b7..adfa36e300f 100644
--- a/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf
+++ b/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tikzscale/tikzscale.dtx b/Master/texmf-dist/source/latex/tikzscale/tikzscale.dtx
index d5f7a29bb9e..86edfbf42d4 100644
--- a/Master/texmf-dist/source/latex/tikzscale/tikzscale.dtx
+++ b/Master/texmf-dist/source/latex/tikzscale/tikzscale.dtx
@@ -95,7 +95,7 @@ and the derived files tikzscale.ins,
%</internal>
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikzscale}[2012/11/02 v0.1.2 tikzscale LaTeX package]
+\ProvidesPackage{tikzscale}[2012/11/03 v0.1.3 tikzscale LaTeX package]
\RequirePackage{graphicx}
\RequirePackage{etoolbox}
\RequirePackage{pgfkeys}
@@ -186,6 +186,7 @@ and the derived files tikzscale.ins,
%\changes{v0.1}{2012/10/31}{First public release}
%\changes{v0.1.1}{2012/11/02}{Fix some bugs, increase robustness, regenerate externalized files less often}
%\changes{v0.1.2}{2012/11/02}{Fix whitespace issues}
+%\changes{v0.1.3}{2012/11/02}{Fix error when loading TikZ but not PGFPlots; Fix error when scaling complicated TikZ graphics}
% \section{Introduction}
% When dealing with graphics, there are different scaling demands. For \emph{absolute} scaling, a width and/or height is given. Opposed to that, for relativ scaling, a horizontal and/or vertical scaling factor is needed. This package only is about absolute scaling of tikzpicture environments. The different absolute scaling demands and their solutions are shown in table \ref{scalingDemands}.
% \begin{table}
@@ -386,6 +387,11 @@ and the derived files tikzscale.ins,
% \begin{itemize}
% \item Created the \cmd{\xcmd} macro for this package, which is used in the documentation.
% \end{itemize}
+% \item Prof. Kai Arzheimer
+% \begin{itemize}
+% \item Reported a bug when not using TikZ without PGFPlots, which lead to a fix.
+% \item Reported a bug that a non-existent macro is used, which lead to a fix.
+% \end{itemize}
% \end{itemize}
%
%
@@ -767,10 +773,20 @@ and the derived files tikzscale.ins,
\tikzscale@includeAxisRatio{#2}%
}{test {\ifundef{\requestedAxisRatio}}}{%
% \end{macrocode}
- % If only either width or height is given it can be a normal tikzpicture or a plot with axisratio=1. Let's guess that it is a plot with default axisratio. If the guess is wrong, the called function detects that scaling the plot does not work and automatically calls \cmd{\tikzscale@includeNormalTikzpicture}.
+ % Use this test as a check if PGFPlots has been loaded.
% \begin{macrocode}
- \def\requestedAxisRatio{1}%
- \tikzscale@includeAxisRatio{#2}%
+ \ifdef{\pgfplotsset}{%
+% \end{macrocode}
+ % If only either width or height is given it can be a normal tikzpicture or a plot with axisratio=1. Let's guess that it is a plot with default axisratio. If the guess is wrong, the called function detects that scaling the plot does not work and automatically calls \cmd{\tikzscale@includeNormalTikzpicture}.
+% \begin{macrocode}
+ \def\requestedAxisRatio{1}%
+ \tikzscale@includeAxisRatio{#2}%
+ }{%
+% \end{macrocode}
+ % If PGFPlots has not been loaded, it can only be a TikZPicture.
+% \begin{macrocode}
+ \tikzscale@includeNormalTikzpicture{#2}%
+ }%
}{%
% Everything else results in an error.
\tikzscale@invalidKeyError{#2}%
@@ -899,7 +915,7 @@ and the derived files tikzscale.ins,
% \end{macrocode}
% First divide before multiply to avoid overflowing (at 16384).
% \begin{macrocode}
- \pgfmathparsemacro{\errorRatio}{\measuredIntermediate/\requestedSize}%
+ \pgfmathsetmacro{\errorRatio}{\measuredIntermediate/\requestedSize}%
\pgfmathsetglobalmacro{\tikzscale@scale}{\tikzscale@scale/\errorRatio}%
}{%
\breakforeach%
diff --git a/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty b/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty
index db61273c40e..9213aff24eb 100644
--- a/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty
+++ b/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikzscale}[2012/11/02 v0.1.2 tikzscale LaTeX package]
+\ProvidesPackage{tikzscale}[2012/11/03 v0.1.3 tikzscale LaTeX package]
\RequirePackage{graphicx}
\RequirePackage{etoolbox}
\RequirePackage{pgfkeys}
@@ -206,9 +206,13 @@ axisratio/.value required
}{test {\ifdef{\requestedAxisRatio}}}{%
\tikzscale@includeAxisRatio{#2}%
}{test {\ifundef{\requestedAxisRatio}}}{%
+\ifdef{\pgfplotsset}{%
\def\requestedAxisRatio{1}%
\tikzscale@includeAxisRatio{#2}%
}{%
+\tikzscale@includeNormalTikzpicture{#2}%
+}%
+}{%
\tikzscale@invalidKeyError{#2}%
}%
}
@@ -265,7 +269,7 @@ axisratio/.value required
\foreach \l in {1,...,\maxTestIterations}{%
\tikzscale@measureSize{\measuredIntermediate}{#1}{#2}%
\tikzscale@ifSizeDifference{\measuredIntermediate-\requestedSize}{%
-\pgfmathparsemacro{\errorRatio}{\measuredIntermediate/\requestedSize}%
+\pgfmathsetmacro{\errorRatio}{\measuredIntermediate/\requestedSize}%
\pgfmathsetglobalmacro{\tikzscale@scale}{\tikzscale@scale/\errorRatio}%
}{%
\breakforeach%
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index fa9198d2468..8efc1d78f56 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -17,7 +17,7 @@ sub main {
# erroneous or problematic tds files (when new, tell RobinF and author)
$erroneous_tds = join ("|",
- qw(countriesofeurope engpron gost hacm he-she imtekda sourcesanspro spanish
+ qw(countriesofeurope engpron gost hacm he-she imtekda spanish
sttools titleps),
);
diff --git a/TODO b/TODO
index 0b6aa89004c..7b2199b0b65 100644
--- a/TODO
+++ b/TODO
@@ -93,14 +93,11 @@ plnfss # only a zip file on CTAN
2. Sources updates
==================
-ptex changes (pdvitype, etc.) should be merged into the main programs,
-instead of duplicating all the normal changes.
-
kpse: texmfdbs should not have to exclude non-!! dirs, should be able to
go back to just TEXMF. kpathsea should search the disk even if ls-R is
present, without !!. (koch 29dec06)
-dvips and all: snprintf
+dvips and all: snprintf, not sprintf, if any question
@@ -178,7 +175,7 @@ updmap-sys would do exactly the same thing, hence never conflict.
===============
rewrite fmtutil, texconfig
. in perl
- . work with multiple fmtutil.cnf files independently
+ . work with multiple fmtutil.cnf files independently, maybe.
rework the psnfss/fonts/metrics chaos
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=433137
@@ -208,7 +205,6 @@ repo: memman.pdf, etoolbox.pdf, hyperref README.pdf -- svn guesses
doc: web page on TeX (Live?) compilation
doc: utf-8 fails accent chars with texlive-ge
-tex: CTRL-C at "please enter file name" should dtrt
tex: --no-mktex=fmt should be supported
pdfopen: fixed http://magic.aladdin.cs.cmu.edu/wp-uploads/mavpdfopensrc.zip
dvips: comment line break http://groups.google.com/group/comp.text.tex/browse_thread/thread/b8ed25cc6153d5c
@@ -240,7 +236,6 @@ Things to do that karl noticed in TL'05, many still relevant :( --
dvips +ufoobar.map -> no error?
doc: bio of contributors, with pictures
doc: tex-live.sty no include lmodern, for German
- include ttftot42? xpdf? gs, gv
special.map: handle like main maps (wl mail, 19 Jun 2005 01:21:15 +0200)
5. WON'T DO: