stable 2005.08.15

2 files changed, 158 insertions, 19 deletions

diff --git a/metapost/context/base/mp-spec.mp b/metapost/context/base/mp-spec.mp
index bef6cd2fa..9fe3c724f 100644
--- a/metapost/context/base/mp-spec.mp
+++ b/metapost/context/base/mp-spec.mp
@@ -705,3 +705,71 @@ enddef ;
 % spotcolor is already scaled
 
 endinput ;
+
+% just an exercise (due to a question by Chof on the context mailing list); scaling of
+% 'special' colors is not possible and the next solution is incomplete (spot colors,
+% transparency, etc); watch the the tricky chained macro construction
+
+% vardef normalgray(expr s      ) = (s,s,s) enddef ;
+% vardef normalrgb (expr r,g,b  ) = (r,g,b) enddef ;
+% vardef normalcmyk(expr c,m,y,k) = if cmykcolors : save ok ; boolean ok ; if unknown cmykcolorhash[c][m][y][k] : ok := false ; elseif cmykcolorhash[c][m][y][k] = -1 : ok := false ; else : ok := true ; fi ; if not ok : save s ; string s ; s := dddecimal (c,m,y) & " " & decimal k ; _cmyk_counter_ := _cmyk_counter_ + 1 ; cmykcolorpattern[_cmyk_counter_/1000] := s ; cmykcolorhash[c][m][y][k] := _cmyk_counter_ ; flush_special(1, 7, decimal _cmyk_counter_ & " " & s) ; _local_specials_ := _local_specials_ & " cmykcolorhash[" & decimal c & "][" & decimal m & "][" & decimal y & "][" & decimal k & "] := -1 ; " ; fi ; (_special_signal_/1000,1/1000,cmykcolorhash[c][m][y][k]/1000) else : (1-c-k,1-m-k,1-y-k) fi enddef ;
+
+% vardef gray(expr s)       = normalgray(s      ) enddef ;
+% vardef rgb (expr r,g,b)   = normalrgb (r,g,b  ) enddef ;
+% vardef cmyk(expr c,m,y,k) = normalcmyk(c,m,y,k) enddef ;
+
+% numeric _scaled_color_t_ ;
+% color   _scaled_color_c_ ;
+
+% def withscaledcolor =
+%     hide (
+%         _scaled_color_t_ := 0 ; % direct
+%         def gray(expr s) =
+%             hide (
+%                 _gray_s_ := s ;
+%                 _scaled_color_t_ := 1; % gray
+%             )
+%             0
+%         enddef ;
+%         def rgb (expr r,g,b) =
+%             hide (
+%                 _rgb_r_ := r ; _rgb_g_ := g ; _rgb_b_ := b ;
+%                 _scaled_color_t_ := 2 ; % rgb
+%             )
+%             0
+%         enddef ;
+%         def cmyk (expr c,m,y,k) =
+%             hide (
+%                 _cmyk_c_ := c ; _cmyk_m_ := m ; _cmyk_y_ := y ; _cmyk_k_ := k ;
+%                 _scaled_color_t_ := 3 ; % cmyk
+%             )
+%             0
+%         enddef ; )
+%     dowithscaledcolor
+% enddef ;
+
+% def dowithscaledcolor expr t =
+%     hide (
+%         if color t : _scaled_color_c_ := t fi ;
+%         vardef gray(expr s)       = normalgray(s)       enddef ;
+%         vardef rgb (expr r,g,b)   = normalrgb (r,g,b)   enddef ;
+%         vardef cmyk(expr c,m,y,k) = normalcmyk(c,m,y,k) enddef ;
+%     )
+% enddef ;
+
+% def by expr s =
+%     if     _scaled_color_t_ = 0 :
+%         withcolor s*_scaled_color_c_
+%     elseif _scaled_color_t_ = 1 :
+%         withcolor gray(s*_gray_s_)
+%     elseif _scaled_color_t_ = 2 :
+%         withcolor rgb (s*_rgb_r_, s*_rgb_g_, s*_rgb_b_)
+%     elseif _scaled_color_t_ = 3 :
+%         withcolor cmyk(s*_cmyk_c_, s*_cmyk_m_, s*_cmyk_y_, s*_cmyk_k_)
+%     fi
+% enddef ;
+
+% fill fullcircle scaled 10cm withscaledcolor cmyk(0,0,1,0) by .5 ;
+% fill fullcircle scaled  8cm withscaledcolor rgb (0,0,1)   by .5 ;
+% fill fullcircle scaled  6cm withscaledcolor gray(1)       by .5 ;
+% fill fullcircle scaled  4cm withscaledcolor     (0,1,0)   by .5 ;
diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index 5c7353e38..925b9ca44 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -1772,25 +1772,77 @@ enddef ;
 % Thanks to Jens-Uwe Morawski for pointing out that we need
 % to treat bounded and clipped components as local pictures.
 
-def recolor suffix p = p := repathed (0,p) enddef ;
-def refill  suffix p = p := repathed (1,p) enddef ;
-def redraw  suffix p = p := repathed (2,p) enddef ;
-def retext  suffix p = p := repathed (3,p) enddef ;
-def untext  suffix p = p := repathed (4,p) enddef ;
-
-primarydef p recolored t = repathed(0,p) t enddef ;
-primarydef p refilled  t = repathed(1,p) t enddef ;
-primarydef p redrawn   t = repathed(2,p) t enddef ;
-primarydef p retexted  t = repathed(3,p) t enddef ;
-primarydef p untexted  t = repathed(4,p) t enddef ;
+def recolor   suffix p = p := repathed (0,p) enddef ;
+def refill    suffix p = p := repathed (1,p) enddef ;
+def redraw    suffix p = p := repathed (2,p) enddef ;
+def retext    suffix p = p := repathed (3,p) enddef ;
+def untext    suffix p = p := repathed (4,p) enddef ;
+
+% primarydef p recolored t = repathed(0,p) t enddef ;
+% primarydef p refilled  t = repathed(1,p) t enddef ;
+% primarydef p redrawn   t = repathed(2,p) t enddef ;
+% primarydef p retexted  t = repathed(3,p) t enddef ;
+% primarydef p untexted  t = repathed(4,p) t enddef ;
 
 color refillbackground ; refillbackground := (1,1,1) ;
 
+% vardef repathed (expr mode, p) text t =
+%   begingroup ;
+%   if mode=0 : save withcolor ; remapcolors ; fi ;
+%   save _p_, _pp_, _f_, _b_, _t_ ;
+%   picture _p_, _pp_ ; color _f_ ; path _b_ ; transform _t_ ;
+%   _b_ := boundingbox p ; _p_ := nullpicture ;
+%   for i within p :
+%     _f_ := (redpart i, greenpart i, bluepart i) ;
+%     if     bounded i :
+%       _pp_ := repathed(mode,i) t ;
+%       setbounds _pp_ to pathpart i ;
+%       addto _p_ also _pp_ ;
+%     elseif clipped i :
+%       _pp_ := repathed(mode,i) t ;
+%       clip _pp_ to pathpart i ;
+%       addto _p_ also _pp_ ;
+%     elseif stroked i :
+%       addto _p_ doublepath pathpart i
+%         dashed dashpart i withpen penpart i
+%         withcolor _f_ % (redpart i, greenpart i, bluepart i)
+%         if mode=2 : t fi ;
+%     elseif filled  i :
+%       addto _p_ contour pathpart i
+%         withcolor _f_
+%         if (mode=1) and (_f_<>refillbackground) : t fi ;
+%     elseif textual i : % textpart i <> "" :
+%       if mode <> 4 :
+%         % transform _t_ ;
+%         % (xpart _t_, xxpart _t_, xypart _t_)  = (xpart  i, xxpart i, xypart i) ;
+%         % (ypart _t_, yypart _t_, yxpart _t_)  = (ypart  i, yypart i, yxpart i) ;
+%         % addto _p_ also
+%         %   textpart i infont fontpart i % todo : other font
+%         %   transformed _t_
+%         %   withpen penpart i
+%         %   withcolor _f_
+%         %   if mode=3 : t fi ;
+%         addto _p_ also i if mode=3 : t fi ;
+%       fi ;
+%     else :
+%       addto _p_ also i ;
+%     fi ;
+%   endfor ;
+%   setbounds _p_ to _b_ ;
+%   _p_
+%   endgroup
+% enddef ;
+
+def restroke  suffix p = p := repathed (21,p) enddef ; % keep attributes
+def reprocess suffix p = p := repathed (22,p) enddef ; % no attributes
+
+% also 11 and 12
+
 vardef repathed (expr mode, p) text t =
   begingroup ;
   if mode=0 : save withcolor ; remapcolors ; fi ;
-  save _p_, _pp_, _f_, _b_, _t_ ;
-  picture _p_, _pp_ ; color _f_ ; path _b_ ; transform _t_ ;
+  save _p_, _pp_, _ppp_, _f_, _b_, _t_ ;
+  picture _p_, _pp_, _ppp_ ; color _f_ ; path _b_ ; transform _t_ ;
   _b_ := boundingbox p ; _p_ := nullpicture ;
   for i within p :
     _f_ := (redpart i, greenpart i, bluepart i) ;
@@ -1803,14 +1855,33 @@ vardef repathed (expr mode, p) text t =
       clip _pp_ to pathpart i ;
       addto _p_ also _pp_ ;
     elseif stroked i :
-      addto _p_ doublepath pathpart i
-        dashed dashpart i withpen penpart i
-        withcolor _f_ % (redpart i, greenpart i, bluepart i)
-        if mode=2 : t fi ;
+      if mode=21 :
+        _ppp_ := i ; % indirectness is needed
+        addto _p_ also image(scantokens(t & " pathpart _ppp_")
+          dashed dashpart i withpen penpart i
+          withcolor _f_ ; ) ;
+      elseif mode=22 :
+        _ppp_ := i ; % indirectness is needed
+        addto _p_ also image(scantokens(t & " pathpart _ppp_")) ;
+      else :
+        addto _p_ doublepath pathpart i
+          dashed dashpart i withpen penpart i
+          withcolor _f_ % (redpart i, greenpart i, bluepart i)
+          if mode=2 : t fi ;
+      fi ;
     elseif filled  i :
-      addto _p_ contour pathpart i
-        withcolor _f_
+      if mode=11 :
+        _ppp_ := i ; % indirectness is needed
+        addto _p_ also image(scantokens(t & " pathpart _ppp_")
+          withcolor _f_ ; ) ;
+      elseif mode=12 :
+        _ppp_ := i ; % indirectness is needed
+        addto _p_ also image(scantokens(t & " pathpart _ppp_")) ;
+      else :
+        addto _p_ contour pathpart i
+          withcolor _f_
         if (mode=1) and (_f_<>refillbackground) : t fi ;
+      fi ;
     elseif textual i : % textpart i <> "" :
       if mode <> 4 :
         % transform _t_ ;