From fbf22006525c920e93b9f671c2af3d4df2be902e Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Mon, 12 Sep 2016 09:56:30 +0200 Subject: 2016-09-12 08:18:00 --- metapost/context/base/mpiv/mp-asnc.mpiv | 2 +- metapost/context/base/mpiv/mp-char.mpiv | 15 +++++++++++---- metapost/context/base/mpiv/mp-idea.mpiv | 14 ++++++++++++++ metapost/context/base/mpiv/mp-luas.mpiv | 4 +++- metapost/context/base/mpiv/mp-tool.mpiv | 3 +-- 5 files changed, 30 insertions(+), 8 deletions(-) (limited to 'metapost') diff --git a/metapost/context/base/mpiv/mp-asnc.mpiv b/metapost/context/base/mpiv/mp-asnc.mpiv index 2626e4d58..fba182a64 100644 --- a/metapost/context/base/mpiv/mp-asnc.mpiv +++ b/metapost/context/base/mpiv/mp-asnc.mpiv @@ -13,7 +13,7 @@ if known context_asnc : endinput ; fi ; -boolean context_av ; context_asnc := true ; +boolean context_asnc ; context_asnc := true ; % will be replaced diff --git a/metapost/context/base/mpiv/mp-char.mpiv b/metapost/context/base/mpiv/mp-char.mpiv index f604accd8..e878c2d16 100644 --- a/metapost/context/base/mpiv/mp-char.mpiv +++ b/metapost/context/base/mpiv/mp-char.mpiv @@ -678,14 +678,14 @@ vardef flow_valid_connection (expr xfrom, yfrom, xto, yto) = flow_xypoints[flow_xypoint] := flow_xylast ; for i=1 upto flow_max_x : for j=1 upto flow_max_y : % was bug: xfrom,yto - if not ( ( (i,j)=(xfrom,yfrom) ) or ( (i,j)=(xto,yto) ) ) : +% if not ( ( (i,j)=(xfrom,yfrom) ) or ( (i,j)=(xto,yto) ) ) : if not flow_xyfree[i][j] : vc := pp intersection_point flow_xypath[i][j] ; if intersection_found : ok := false fi ; fi ; - fi ; +% fi ; endfor ; endfor ; % if not ok: message("crossing") ; fi ; @@ -944,20 +944,27 @@ def flow_connect_bottom_right (expr n) (expr xfrom,yfrom,zfrom) (expr xto,yto,zt enddef ; def flow_draw_test_shape(expr x, y) = - flow_draw_shape(x,y,fullcircle, .7, .7) ; + flow_draw_shape(x,y,fullcircle,flow_shape_width/flow_grid_width,flow_shape_height/flow_grid_height) ; enddef ; def flow_draw_test_shapes = + flow_draw_test_area ; for i=1 upto flow_max_x : for j=1 upto flow_max_y : flow_draw_test_shape(i,j) ; + flow_chart_draw_label(i,j,"",textext("\ttx(" & decimal i & "," & decimal j & ")")) endfor ; endfor ; enddef; def flow_draw_test_area = pickup pencircle scaled .5flow_shape_line_width ; - draw (unitsquare xscaled flow_max_x yscaled flow_max_y shifted (1,1)) flow_scaled_to_grid withcolor blue ; + for i=1 upto flow_max_x + 1 : + draw ((i,1) -- (i,flow_max_y+1)) flow_scaled_to_grid withcolor white/2 ; + endfor ; + for i=1 upto flow_max_y + 1 : + draw ((1,i) -- (flow_max_x+1,i)) flow_scaled_to_grid withcolor white/2 ; + endfor ; enddef ; def flow_show_connection(expr n, m) = diff --git a/metapost/context/base/mpiv/mp-idea.mpiv b/metapost/context/base/mpiv/mp-idea.mpiv index 462d97553..d417ab51f 100644 --- a/metapost/context/base/mpiv/mp-idea.mpiv +++ b/metapost/context/base/mpiv/mp-idea.mpiv @@ -28,3 +28,17 @@ vardef somecolor = (1,1,0,0) enddef ; fill OverlayBox withcolor (rcomponent somecolor,gcomponent somecolor,bcomponent somecolor) ; fill OverlayBox withcolor (ccomponent somecolor,mcomponent somecolor,ycomponent somecolor,bcomponent somecolor) ; + +% def newcolor text v = forsuffixes i=v : save i ; color i ; endfor ; enddef ; +% def newnumeric text v = forsuffixes i=v : save i ; numeric i ; endfor ; enddef ; +% def newboolean text v = forsuffixes i=v : save i ; boolean i ; endfor ; enddef ; +% def newtransform text v = forsuffixes i=v : save i ; transform i ; endfor ; enddef ; +% def newpath text v = forsuffixes i=v : save i ; path i ; endfor ; enddef ; +% def newpicture text v = forsuffixes i=v : save i ; picture i ; endfor ; enddef ; +% def newstring text v = forsuffixes i=v : save i ; string i ; endfor ; enddef ; + +% width := 10 ; +% beginfig(1) ; +% newpath width, height ; width := origin -- cycle ; +% endfig ; +% width := 10 ; diff --git a/metapost/context/base/mpiv/mp-luas.mpiv b/metapost/context/base/mpiv/mp-luas.mpiv index 2c640960b..8c30da279 100644 --- a/metapost/context/base/mpiv/mp-luas.mpiv +++ b/metapost/context/base/mpiv/mp-luas.mpiv @@ -102,4 +102,6 @@ vardef MP@#(text t) = mlib_luas_lualist("MP." & str @#,t) enddef ; -def message = lua.mp.report enddef ; +def message expr t = + if t <> "" : lua.mp.report(t) fi ; +enddef ; diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv index 40090ccf2..1814399b5 100644 --- a/metapost/context/base/mpiv/mp-tool.mpiv +++ b/metapost/context/base/mpiv/mp-tool.mpiv @@ -1472,8 +1472,7 @@ extra_beginfig := extra_beginfig & " miterlimit := 10 ; " ; % restores extra_beginfig := extra_beginfig & " linejoin := rounded ; " ; % restores extra_beginfig := extra_beginfig & " linecap := rounded ; " ; % restores -%D Normally, arrowheads don't scale well. So we provide a -%D hack. +%D Normally, arrowheads don't scale well. So we provide a hack. boolean autoarrows ; autoarrows := false ; numeric ahfactor ; ahfactor := 2.5 ; -- cgit v1.2.3