diff options
Diffstat (limited to 'metapost')
| -rw-r--r-- | metapost/context/base/mpiv/mp-tool.mpiv | 14 | ||||
| -rw-r--r-- | metapost/context/base/mpxl/mp-tool.mpxl | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv index 611eafe77..495900fa2 100644 --- a/metapost/context/base/mpiv/mp-tool.mpiv +++ b/metapost/context/base/mpiv/mp-tool.mpiv @@ -548,7 +548,7 @@ def mfun_tool_striped_set_options(expr option) = enddef ; vardef mfun_tool_striped_number(expr option, p, s_n, s_slot) text extra = - image ( +% image ( begingroup ; save pattern, shape, bounds, penwidth, used_n, used_slot ; picture pattern, shape ; path bounds ; numeric used_s, used_slot ; @@ -585,7 +585,7 @@ vardef mfun_tool_striped_number(expr option, p, s_n, s_slot) text extra = addto currentpicture also shape ; fi ; endgroup ; - ) +% ) enddef ; def mfun_tool_striped_angle_action text extra = @@ -596,7 +596,7 @@ def mfun_tool_striped_angle_action text extra = enddef ; vardef mfun_tool_striped_angle(expr option, p, s_angle, s_gap) text extra = - image ( +% image ( begingroup ; save pattern, shape, mask, maximum, minimum, centrum, used_angle, used_gap ; picture pattern, shape, mask ; numeric maximum, minimum ; pair centrum ; numeric used_angle, used_gap ; @@ -637,7 +637,7 @@ vardef mfun_tool_striped_angle(expr option, p, s_angle, s_gap) text extra = fi ; currentpicture := currentpicture shifted centrum ; endgroup ; - ) +% ) enddef; newinternal striped_normal_inner ; striped_normal_inner := 1 ; @@ -646,11 +646,13 @@ newinternal striped_normal_outer ; striped_normal_outer := 3 ; newinternal striped_reverse_outer ; striped_reverse_outer := 4 ; secondarydef p anglestriped s = - mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s) + % mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s) + image(mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s)) % for 'withcolor' enddef ; secondarydef p numberstriped s = - mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s) + % mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s) + image(mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s)) % for 'withcolor' enddef ; % for old times sake: diff --git a/metapost/context/base/mpxl/mp-tool.mpxl b/metapost/context/base/mpxl/mp-tool.mpxl index 31be9707a..474b68353 100644 --- a/metapost/context/base/mpxl/mp-tool.mpxl +++ b/metapost/context/base/mpxl/mp-tool.mpxl @@ -575,7 +575,7 @@ def mfun_tool_striped_set_options(expr option) = enddef ; vardef mfun_tool_striped_number(expr option, p, asked_n, asked_slot) text extra = - image ( +% image ( begingroup ; save pattern, shape, bounds, penwidth, used_n, used_slot ; picture pattern, shape ; path bounds ; numeric used_s, used_slot ; @@ -614,7 +614,7 @@ vardef mfun_tool_striped_number(expr option, p, asked_n, asked_slot) text extra addto currentpicture also shape ; fi ; endgroup ; - ) +% ) enddef ; % def mfun_tool_striped_angle_action text extra = @@ -633,7 +633,7 @@ def mfun_tool_striped_angle_action text extra = enddef ; vardef mfun_tool_striped_angle(expr option, p, asked_angle, asked_gap) text extra = - image ( +% image ( begingroup ; save pattern, shape, mask, maximum, minimum, centrum, used_angle, used_gap ; picture pattern, shape, mask ; numeric maximum, minimum ; pair centrum ; numeric used_angle, used_gap ; @@ -677,7 +677,7 @@ vardef mfun_tool_striped_angle(expr option, p, asked_angle, asked_gap) text extr fi ; currentpicture := currentpicture shifted centrum ; endgroup ; - ) +% ) enddef; newinternal striped_normal_inner ; striped_normal_inner := 1 ; @@ -686,11 +686,13 @@ newinternal striped_normal_outer ; striped_normal_outer := 3 ; newinternal striped_reverse_outer ; striped_reverse_outer := 4 ; secondarydef p anglestriped s = - mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s) + % mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s) + image(mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s)) % for 'withcolor' enddef ; secondarydef p numberstriped s = - mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s) + % mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s) + image(mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s)) % for 'withcolor' enddef ; % for old times sake: |