summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/mfpic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-27 01:23:09 +0000
committerKarl Berry <karl@freefriends.org>2009-11-27 01:23:09 +0000
commit5647d8caa246f321a52c4b2e3a3c863ebf7be802 (patch)
tree2303f97899eb94b63d55031d00956e4d0562610b /Master/texmf-dist/source/generic/mfpic
parentfe72ad90ddffe706b2dd4f72337956dd9cb541c9 (diff)
mfpic 1.03 (26nov09)
git-svn-id: svn://tug.org/texlive/trunk@16182 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/mfpic')
-rw-r--r--Master/texmf-dist/source/generic/mfpic/grafbase.dtx20
-rw-r--r--Master/texmf-dist/source/generic/mfpic/mfpic.dtx24
-rw-r--r--Master/texmf-dist/source/generic/mfpic/mfpic.ins2
3 files changed, 24 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
index 2f37e8a20ef..87cff9829cb 100644
--- a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
+++ b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
@@ -1,6 +1,6 @@
% \iffalse
%%% File: grafbase.dtx
-%%% A part of mfpic 1.02 2009/10/29
+%%% A part of mfpic 1.03 2009/11/18
%%%
% -------------------------------------------------------------------
%
@@ -19,8 +19,8 @@
%
%<*driver>
\ProvidesFile{grafbase.dtx}
- [2009/10/29 v1.02. Metafont/post macros to interface with mfpic.]%
-\documentclass[draft]{ltxdoc}
+ [2009/11/18 v1.03. Metafont/post macros to interface with mfpic.]%
+\documentclass{ltxdoc}
\usepackage{docmfp}
\addtolength{\textwidth}{.5878pt}
@@ -185,7 +185,7 @@ fi
boolean grafbase; grafbase := true;
string fileversion, filedate;
-fileversion := "1.02"; filedate := "2009/10/29";
+fileversion := "1.03"; filedate := "2009/11/18";
message " Loading grafbase macros, version " & fileversion & " " &
filedate & ".";
@@ -232,7 +232,7 @@ def checkversions (expr g)=
fi
enddef;
-checkversions (102);
+checkversions (103);
% \end{macrocode}
%
@@ -715,7 +715,7 @@ if has_cmyk :
% \DescribeRoutine{iscolor}
% A variable is taken to be a color if it can validly follow
% \mfc{withcolor}. This includes boolean, though we hope no one tries to
-% use it.
+% use that.
% \begin{macrocode}
vardef makecmyk primary clr =
colorchoice (clr)(cmykblack)(cmykgray(clr))
@@ -748,7 +748,9 @@ else:
% The \gbc{make*} functions are simpler in early \MP{}, though not as
% simple as in \MF{}. Ditto
% \DescribeRoutine{iscolor}
-% \gbc{iscolor}.
+% \gbc{iscolor}. The parentheses in \gbc{iscolor} are necessary to force
+% \MP{} to see this \mfc{color} as the start of a boolean expression and
+% not a type declaration.
% \begin{macrocode}
vardef gray (expr g) = rgbgray(g) enddef;
vardef grayscalegray (expr g) = rgbgray(g) enddef;
@@ -768,7 +770,7 @@ else:
(rgbtogray (redpart clr, greenpart clr, bluepart clr))
enddef;
def makecmyk = makergb enddef;
- vardef iscolor expr clr = color clr enddef;
+ vardef iscolor expr clr = (color clr) enddef;
fi
%</MP>
@@ -794,7 +796,7 @@ vardef makegray primary clr =
enddef;
def makergb = makegray enddef;
def makecmyk = makegray enddef;
-vardef iscolor expr clr = color clr enddef;
+vardef iscolor expr clr = (color clr) enddef;
%</MF>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
index 6fa82af9255..940ee1651f5 100644
--- a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
+++ b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
@@ -1,6 +1,6 @@
% \iffalse
%%% File: mfpic.dtx
-%%% A part of mfpic 1.02 2009/10/29
+%%% A part of mfpic 1.03 2009/11/18
%%%
% -------------------------------------------------------------------
%
@@ -22,10 +22,10 @@
%</driver>
%<sty>\ProvidesPackage{mfpic}
%<*sty>
- [2009/10/29 v1.02. Macros for drawing with Metafont/MetaPost.]%
+ [2009/11/18 v1.03. Macros for drawing with Metafont/MetaPost.]%
%</sty>
%<*driver>
-\documentclass[draft]{ltxdoc}
+\documentclass{ltxdoc}
\addtolength{\textwidth}{.5878pt}
@@ -106,7 +106,7 @@
\end{document}
%</driver>
%\fi
-% \CheckSum{5116}
+% \CheckSum{5119}
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -170,9 +170,9 @@
\ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi%
{%
\catcode\lq\.12 \catcode\lq\/12%
- \gdef\mfpfileversion{1.02}%
- \gdef\mfpfiledate{2009/10/29}%
- \gdef\mfpicversion{102}%
+ \gdef\mfpfileversion{1.03}%
+ \gdef\mfpfiledate{2009/11/18}%
+ \gdef\mfpicversion{103}%
}%
% \end{macrocode}
%
@@ -353,14 +353,14 @@
% didn't work in \ConTeXt{} the last few times I tried.
%
% Here we see if \cs{documentstyle} is defined, and then make sure
-% we are not in \AmSTeX{}. Probably there is a better command to test,
-% and perhaps we should just test whether the functionality required is
-% present, but I'm not really sure how best to do either of those.
+% we are not in \AmSTeX{}. We used to detect \AmSTeX{} by checking
+% \cs{fmtname}. This leads to problems if some other format inputs
+% \file{amstex.tex} and redefined \cs{fmtname}. Thus we will now check
+% \cs{amstexloaded@}.
% \begin{macrocode}
\newif\ifmfp@latex \mfp@latexfalse
\mfp@ifdefined\documentstyle
- {\def\mfp@tempa{AmS-TeX}%
- \ifx \fmtname\mfp@tempa \mfp@DBlog{AmS-TeX detected.}%
+ {\ifx \amstexloaded@\relax \mfp@DBlog{AmS-TeX detected.}%
\else \mfp@DBlog{LaTeX detected.}\mfp@latextrue
\fi}%
{\mfp@DBlog{Neither LaTeX nor AmS-TeX detected.}}%
diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.ins b/Master/texmf-dist/source/generic/mfpic/mfpic.ins
index baf542747d9..bae706a9a6a 100644
--- a/Master/texmf-dist/source/generic/mfpic/mfpic.ins
+++ b/Master/texmf-dist/source/generic/mfpic/mfpic.ins
@@ -1,5 +1,5 @@
%%% File: mfpic.ins
-%%% A part of mfpic 1.02 2009/10/29
+%%% A part of mfpic 1.03 2009/11/18
%%%
\input docstrip
\keepsilent