From 94d83f84758766511c5e324721e39fea6ab71dae Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 31 Oct 2008 13:58:00 +0100 Subject: stable 2008.10.31 13:58 --- metapost/context/base/mp-char.mp | 8 +++-- metapost/context/base/mp-core.mp | 77 +++++++++++++++------------------------- metapost/context/base/mp-mlib.mp | 42 ++++++++++++++++------ metapost/context/base/mp-tool.mp | 7 ++++ 4 files changed, 73 insertions(+), 61 deletions(-) (limited to 'metapost') diff --git a/metapost/context/base/mp-char.mp b/metapost/context/base/mp-char.mp index cd774d509..786c1f904 100644 --- a/metapost/context/base/mp-char.mp +++ b/metapost/context/base/mp-char.mp @@ -28,7 +28,7 @@ def save_text_position (expr p) = % beware: clip shift needed savedata "\MPposition{" & decimal current_position & "}{" & decimal xpart p & "}{" - & decimal ypart p & "}" ; + & decimal ypart p & "}%" ; enddef ; %D settings @@ -900,6 +900,7 @@ def begin_chart (expr n, maxx, maxy) = chart_figure := n ; chart_scale := 1 ; if chart_figure>0: beginfig(chart_figure) ; fi ; + startsavingdata ; initialize_grid (maxx, maxy) ; bboxmargin := 0 ; cmin_x := 1 ; @@ -932,14 +933,15 @@ def end_chart = decimal xpart llcorner p & "}{" & decimal ypart llcorner p & "}{" & decimal xpart urcorner p & "}{" & - decimal ypart urcorner p & "}" ; + decimal ypart urcorner p & "}%" ; savedata "\MPareapath{" & decimal (xpart llcorner p + 2chart_offset) & "}{" & decimal (ypart llcorner p + 2chart_offset) & "}{" & decimal (xpart urcorner p - 2chart_offset) & "}{" & - decimal (ypart urcorner p - 2chart_offset) & "}" ; + decimal (ypart urcorner p - 2chart_offset) & "}%" ; currentpicture := currentpicture scaled chart_scale ; + stopsavingdata ; if chart_figure>0: endfig ; fi ; enddef ; diff --git a/metapost/context/base/mp-core.mp b/metapost/context/base/mp-core.mp index 2b62559b8..0bf19b8a5 100644 --- a/metapost/context/base/mp-core.mp +++ b/metapost/context/base/mp-core.mp @@ -1,15 +1,3 @@ -%D \module -%D [ file=mp-core.mp, -%D version=2000.something, % 1999.08.12, -%D title=\CONTEXT\ \METAPOST\ graphics, -%D subtitle=core interfacing, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See licen-en.pdf for -%C details. if unknown context_tool : input mp-tool ; fi ; if known context_core : endinput ; fi ; @@ -135,7 +123,6 @@ def initialize_area_par (expr fn,fx,fy,fw,fh,fd, numeric mpos ; mpos := 6 ; freeze_box(mpos) ; -% do_initialize_area (fpos, tpos) ; do_initialize_par (fpos, tpos, mpos, ffpos, 0,0,0,0,0,0) ; enddef ; @@ -422,7 +409,6 @@ def prepare_multi_pars (expr fn,fx,fy,fw,fh,fd, pair par_start_pos ; -% par_start_pos := llxy[fpos] if par_indent<0: shifted (-par_indent,0) fi ; par_start_pos := llxy[fpos] if par_indent <0: shifted (-par_indent, 0) fi @@ -521,10 +507,8 @@ par_hang_after := ra + estimated_par_lines(py-fy) ; if (par_hang_indent>0) and (par_hang_after<0) and obey_multi_par_hang : pair _ul_ ; _ul_ := (xpart ulcorner multipar, ypart snapped_multi_pos(ulxy[fpos])); pair _pa_ ; _pa_ := _ul_ shifted (0,par_hang_after*par_line_height) ; -% _pa_ := (xpart _pa_,max(ypart _pa_,ypart llcorner multipar)) ; _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart llcorner multipar)) ; if same_area : -% _pa_ := (xpart _pa_,max(ypart _pa_,ypart llxy[tpos])) ; _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart llxy[tpos])) ; fi ; if obey_multi_par_more and (round(par_line_height)>0) : @@ -541,7 +525,6 @@ par_hang_after := ra + estimated_par_lines(py-fy) ; vardef right_top_hang (expr same_area) = -% par_hang_after := ra - estimated_par_lines(py-fy) ; par_hang_after := ra + estimated_par_lines(py-fy) ; if (par_hang_indent<0) and (par_hang_after<0) and obey_multi_par_hang : @@ -588,7 +571,6 @@ fi ; fi enddef ; -% here vardef x_right_top_hang (expr i, t) = par_hang_after := min(0,ra + estimated_multi_par_height(i,t)) ; @@ -600,14 +582,6 @@ if t : _pa_ := (xpart _pa_,max(ypart _pa_,ypart snapped_multi_pos(urxy[tpos]))) ; fi ; -%todo -% -%if abs(ypart _pa_-ypart llxy[tpos]) 1) : % rest of chain / todo : hang -% we need to test, else we get a RealPageNumber)) : @@ -1079,9 +1043,6 @@ def sort_multi_pars = fi ; enddef ; -% This collapses successive areas (possibly interrupted by -% floats. First we need to sort the areas, since they are -% normally in de order start, end, inbetween. def collapse_multi_pars = if nofmultipars>1 : @@ -1110,20 +1071,40 @@ multirefs[_nofmultipars_] := multirefs[i+1] ; fi ; enddef ; +% def draw_multi_pars = +% for i=1 upto nofmultipars : +% do_draw_par(multipars[i]) ; +% if boxgridtype= 1 : +% draw baseline_grid (multipars[i],up,true ) ; % withcolor boxgridcolor ; +% elseif boxgridtype= 2 : +% draw baseline_grid (multipars[i],up,false) ; % withcolor boxgridcolor ; +% elseif boxgridtype= 3 : +% draw baseline_grid (multipars[i],up,true ) ; % withcolor boxgridcolor ; +% draw baseline_grid (multipars[i],up,true ) +% shifted (0,ExHeight) ; % withcolor boxgridcolor ; +% elseif boxgridtype= 4 : +% draw baseline_grid (multipars[i],up,true ) +% shifted (0,ExHeight/2) ; % withcolor boxgridcolor ; +% elseif boxgridtype=11 : +% draw graphic_grid(multipars[i],boxgriddistance,boxgriddistance,boxgriddistance/2,boxgriddistance/2) ; +% elseif boxgridtype=12 : +% draw graphic_grid(multipars[i],boxgriddistance,boxgriddistance,0,0) ; +% fi ; +% endfor ; +% enddef ; + def draw_multi_pars = for i=1 upto nofmultipars : do_draw_par(multipars[i]) ; if boxgridtype= 1 : - draw baseline_grid (multipars[i],up,true ) ; % withcolor boxgridcolor ; + draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) ; % withcolor boxgridcolor ; elseif boxgridtype= 2 : - draw baseline_grid (multipars[i],up,false) ; % withcolor boxgridcolor ; + draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,false) ; % withcolor boxgridcolor ; elseif boxgridtype= 3 : - draw baseline_grid (multipars[i],up,true ) ; % withcolor boxgridcolor ; - draw baseline_grid (multipars[i],up,true ) - shifted (0,ExHeight) ; % withcolor boxgridcolor ; + draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) ; % withcolor boxgridcolor ; + draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight) ; % withcolor boxgridcolor ; elseif boxgridtype= 4 : - draw baseline_grid (multipars[i],up,true ) - shifted (0,ExHeight/2) ; % withcolor boxgridcolor ; + draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight/2) ; % withcolor boxgridcolor ; elseif boxgridtype=11 : draw graphic_grid(multipars[i],boxgriddistance,boxgriddistance,boxgriddistance/2,boxgriddistance/2) ; elseif boxgridtype=12 : @@ -1231,7 +1212,6 @@ let draw_area = draw_box ; let anchor_area = anchor_box ; let anchor_par = anchor_box ; -% new and experimental and yet undocumented numeric sync_n[], sync_p[][], sync_w[][], sync_h[][], sync_d[][], sync_t[][] ; pair sync_xy[][] ; color sync_c[][] ; @@ -1286,7 +1266,6 @@ vardef PrepareSyncTasks(expr n, collapse, extendtop, prestartnext) = NOfSyncPaths := NOfSyncPaths + 1 ; if not ok : if i>1 : -% not yet correct when two of the same follow each other if sync_t[n][i-1] = sync_t[n][i] : SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, PaperHeight, -PaperHeight) ; SyncTasks[NOfSyncPaths] := i ; @@ -1394,3 +1373,5 @@ def ProcessSyncTask(expr p, c) = enddef ; endinput ; + +end diff --git a/metapost/context/base/mp-mlib.mp b/metapost/context/base/mp-mlib.mp index 81bb07caf..134cd12a3 100644 --- a/metapost/context/base/mp-mlib.mp +++ b/metapost/context/base/mp-mlib.mp @@ -35,29 +35,51 @@ vardef rawtextext(expr str) = _tt_n_ := _tt_n_ + 1 ; _tt_p_ := image ( draw _tt_p_ ; - draw unitsquare withprescript "tf" withpostscript decimal _tt_n_ & ":" & str ; + addto currentpicture doublepath unitsquare withprescript "tf" withpostscript decimal _tt_n_ & ":" & str ; ) ; - draw unitsquare ; + draw unitsquare withpen pencircle scaled 0 ; ) else : image ( _tt_n_ := _tt_n_ + 1 ; - draw unitsquare + addto currentpicture doublepath unitsquare xscaled _tt_w_[_tt_n_] yscaled (_tt_h_[_tt_n_] + _tt_d_[_tt_n_]) withprescript "ts" withpostscript decimal _tt_n_ & ":" & str ; - ) + ) shifted (0,-_tt_d_[_tt_n_]) fi enddef ; +pair laboff.d, laboff.dlft, laboff.drt ; % new positional suffixes +pair laboff.origin, laboff.raw ; % graph mess + +laboff.d := laboff ; labxf.d := labxf ; labyf.d := labyf ; +laboff.dlft := laboff.lft ; labxf.dlft := labxf.lft ; labyf.dlft := labyf.lft ; +laboff.drt := laboff.rt ; labxf.drt := labxf.rt ; labyf.drt := labyf.rt ; + +labtype := 0 ; labtype.lft := 1 ; labtype.rt := 2 ; +labtype.bot := 3 ; labtype.top := 4 ; labtype.ulft := 5 ; +labtype.urt := 6 ; labtype.llft := 7 ; labtype.lrt := 8 ; +labtype.d := 10 ; labtype.dlft := 11 ; labtype.drt := 12 ; +labtype.origin := 0 ; labtype.raw := 0 ; + +laboff.origin = (infinity,infinity) ; labxf.origin := 0 ; labyf.origin := 0 ; +laboff.raw = (infinity,infinity) ; labxf.raw := 0 ; labyf.raw := 0 ; + +vardef thetextext@#(expr p,z) = % adapted copy of thelabel@ + p + if (labtype@# >= 10) : shifted (0,ypart center p) fi + shifted (z + labeloffset*laboff@# - (labxf@#*lrcorner p + labyf@#*ulcorner p + (1-labxf@#-labyf@#)*llcorner p)) +enddef; + vardef textext@#(expr txt) = - interim labeloffset := textextoffset ; - if string txt : - thelabel@#(rawtextext(txt),origin) - else : - thelabel@#(txt,origin) - fi + interim labeloffset := textextoffset ; + if string txt : + thetextext@#(rawtextext(txt),origin) + else : + thetextext@#(txt,origin) + fi enddef ; def circular_shade (expr p, n, ca, cb) = diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp index c1def83b3..ccec2f3c8 100644 --- a/metapost/context/base/mp-tool.mp +++ b/metapost/context/base/mp-tool.mp @@ -115,6 +115,12 @@ enddef ; % & "&ddecimal urcorner currentpicture" % & ");"; +%D Crap (experimental, not used): + +def forcemultipass = + % extra_endfig := extra_endfig & "special(" & ditto & "%%MetaPostOption: multipass" & ditto & ");" ; +enddef ; + %D Colors: nocolormodel := 1 ; @@ -228,6 +234,7 @@ enddef ; def finishsavingdata = if savingdatadone : write EOF to data_mpd_file ; + savingdatadone := false ; fi ; enddef ; -- cgit v1.2.3