Calibrage des lignes

diff --git a/metapost.php b/metapost.php
index 2101690..81b6ced 100644 (file)
--- a/metapost.php
+++ b/metapost.php
@@ -44,28 +44,43 @@ $language_data = array (
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
         1 => array( # type
-            'boolean','color','cmykcolor','expr','numeric','pair','path','pen','string','suffix','text','picture','transform'
+            'boolean','color','cmykcolor','expr','numeric','pair','path','pen',
+            'string','suffix','text','picture','transform'
         ),
         2 => array( # file construction
-            'beginfig','begingroup','def','end','enddef','endfig','endgroup','hide','image','input','let','makepen','makepath','newinternal','primary','primarydef','save','secondarydef','shipout','special','tertiarydef','vardef'
+            'beginfig','begingroup','def','end','enddef','endfig','endgroup',
+            'hide','image','input','let','makepen','makepath','newinternal',
+            'primary','primarydef','save','secondarydef','shipout','special',
+            'tertiarydef','vardef'
         ),
         3 => array( # programmation structure
-            'else','elseif','endfor','exitif','exitunless','fi','for','forever','forsuffix','if','step','until','upto'
+            'else','elseif','endfor','exitif','exitunless','fi','for','forever',
+            'forsuffix','if','step','until','upto'
         ),
         4 => array( # operations return pair
-            'bot','dir','direction of','intersectionpoint','intiersectiontimes','lft','llcorner','lrcorner','penoffset of','point of','postcontrol of','precontrol of','rt','ulcorner','unitvector','urcorner','top','z'
+            'bot','dir','direction of','intersectionpoint','intiersectiontimes',
+            'lft','llcorner','lrcorner','penoffset of','point of','postcontrol of',
+            'precontrol of','rt','ulcorner','unitvector','urcorner','top','z'
         ),
         5 => array( # operations return path or picture or pen
-            'bbox','center','cutafter','cutbefore','dashpart','dashpattern','glyph of','infont','pathpart','penpart','reverse','subpath of'
+            'bbox','center','cutafter','cutbefore','dashpart','dashpattern',
+            'glyph of','infont','pathpart','penpart','reverse','subpath of'
         ),
         6 => array( # operations return string (or complementary)
             'closefrom','fontpart','readfrom','str','substring of','textpart'
         ),
         7 => array( #  operations return numeric
-            'abs','angle','arclength','arctime of','ASCII','blackpart','bluepart','ceiling','char','colormodel','cosd','cyanpart','decimal','decr','directionpoint of','directiontime of','div','dotprod','floor','fontsize','greenpart','greypart','hex','incr','length','magentapart','max','mexp','min','mlog','mod','normaldeviate','oct','redpart','round','sind','sqrt','uniformdeviate','xpart','xxpart','xypart','yellowpart','ypart','yxpart','yypart'
+            'abs','angle','arclength','arctime of','ASCII','blackpart','bluepart',
+            'ceiling','char','colormodel','cosd','cyanpart','decimal','decr',
+            'directionpoint of','directiontime of','div','dotprod','floor',
+            'fontsize','greenpart','greypart','hex','incr','length','magentapart',
+            'max','mexp','min','mlog','mod','normaldeviate','oct','redpart','round',
+            'sind','sqrt','uniformdeviate','xpart','xxpart','xypart','yellowpart',
+            'ypart','yxpart','yypart'
         ),
         8 => array( #  operations return boolean
-            'and','bounded', 'clipped','filled','known','not','odd','or','rgbcolor','stroked','textual','unknown'
+            'and','bounded', 'clipped','filled','known','not','odd','or','rgbcolor',
+            'stroked','textual','unknown'
         ),
         9 => array( # operations return color
             'colorpart'
@@ -74,38 +89,67 @@ $language_data = array (
             'inverse'
         ),
         11 => array( # constructors
-            'also','buildcycle','contour','controls','cycle','doublepath','setbounds','to','whatever'
+            'also','buildcycle','contour','controls','cycle','doublepath',
+            'setbounds','to','whatever'
         ),
         12 => array( # labels
-            'label','label.bot','label.top','label.llft','label.lft','label.ulft','label.lrt','label.rt','label.urt','labels','labels.bot','labels.top','labels.llft','labels.lft','labels.ulft','labels.lrt','labels.rt','labels.urt','thelabel','thelabel.bot','thelabel.top','thelabel.llft','thelabel.lft','thelabel.ulft','thelabel.lrt','thelabel.rt','thelabel.urt','dotlabel','dotlabel.bot','dotlabel.top','dotlabel.llft','dotlabel.lft','dotlabel.ulft','dotlabel.lrt','dotlabel.rt','dotlabel.urt'
+            'label','label.bot','label.top','label.llft','label.lft','label.ulft',
+            'label.lrt','label.rt','label.urt','labels','labels.bot','labels.top',
+            'labels.llft','labels.lft','labels.ulft','labels.lrt','labels.rt',
+            'labels.urt','thelabel','thelabel.bot','thelabel.top','thelabel.llft',
+            'thelabel.lft','thelabel.ulft','thelabel.lrt','thelabel.rt',
+            'thelabel.urt','dotlabel','dotlabel.bot','dotlabel.top','dotlabel.llft',
+            'dotlabel.lft','dotlabel.ulft','dotlabel.lrt','dotlabel.rt',
+            'dotlabel.urt'
         ),
         13 => array(# general transformations
-            'about','reflected','reflectedaround','rotated','rotatedabout','rotatedaround','scaled','slanted','shifted','transformed','xscaled','yscaled','zscaled'
+            'about','reflected','reflectedaround','rotated','rotatedabout',
+            'rotatedaround','scaled','slanted','shifted','transformed','xscaled',
+            'yscaled','zscaled'
         ),
         14 => array(# draw instructions
-            'addto','clip','cutdraw','draw','drawarrow','drawdblarrow','drawdot','fill','filldraw','undraw','unfill','unfilldraw'
+            'addto','clip','cutdraw','draw','drawarrow','drawdblarrow','drawdot',
+            'fill','filldraw','undraw','unfill','unfilldraw'
         ),
         15 => array(# style of drawing
-            'dashed','drawoptions','pickup','withcmykcolor','withcolor','withgreyscale','withpen','withpostscript','withprescript','withrgbcolor','curl','tension'
+            'dashed','drawoptions','pickup','withcmykcolor','withcolor',
+            'withgreyscale','withpen','withpostscript','withprescript',
+            'withrgbcolor','curl','tension'
         ),
         16 => array(# read write show
-            'errhelp','errmessage','fontmapfile','fontmapline','interim','loggingall','message','scantokens','show','showdependencies','showtoken','showvariable','tracingall','tracingnone','write to'
+            'errhelp','errmessage','fontmapfile','fontmapline','interim',
+            'loggingall', 'message','scantokens','show','showdependencies',
+            'showtoken','showvariable','tracingall','tracingnone','write to'
         ),
         17 => array(# Internal variables with numeric values
-            'ahangle','ahlength','bboxmargin','charcode','day','defaultcolormodel','defaultpen','defaultscale','dotlabeldiam','hour','labeloffset','linecap','linejoin','minute','miterlimit','month','mpprocset','pausing','prologues','restoreclipcolor','showstopping','time','tracingcapsules','tracingchoices','tracingcommands','tracingequations','tracinglostchars','tracingmacros','tracingonline','tracingoutput','tracingrestores','tracingspecs','tracingstats','tracingtitles','troffmode','truecorners','warningcheck','year'
+            'ahangle','ahlength','bboxmargin','charcode','day','defaultcolormodel',
+            'defaultpen','defaultscale','dotlabeldiam','hour','labeloffset',
+            'linecap','linejoin','minute','miterlimit','month','mpprocset',
+            'pausing','prologues','restoreclipcolor','showstopping','time',
+            'tracingcapsules','tracingchoices','tracingcommands','tracingequations',
+            'tracinglostchars','tracingmacros','tracingonline','tracingoutput',
+            'tracingrestores','tracingspecs','tracingstats','tracingtitles',
+            'troffmode','truecorners','warningcheck','year'
         ),
         18 => array(# Internal string variables
             'filenametemplate','jobname','outputformat','outputtemplate'
         ),
         19 => array(# other predefined variables
-            'background','currentpen','currentpicture','cuttings','defaultfont','extra_beginfig','extra_endfig'
+            'background','currentpen','currentpicture','cuttings','defaultfont',
+            'extra_beginfig','extra_endfig'
         ),
         20 => array(# predefined constants
-            'beveled','black','blue','bp','butt','cc','cm','dd','ditto','down','epsilon','evenly','EOF','false','fullcircle','green','halfcircle','identity','left','mitered','mm','mpversion','nullpen','nullpicture','origin','pc','pencircle','pensquare','pt','quartercircle','red','right','rounded','squared','true','unitsquare','up','white','withdots'
+            'beveled','black','blue','bp','butt','cc','cm','dd','ditto','down',
+            'epsilon','evenly','EOF','false','fullcircle','green','halfcircle',
+            'identity','left','mitered','mm','mpversion','nullpen','nullpicture',
+            'origin','pc','pencircle','pensquare','pt','quartercircle','red',
+            'right','rounded','squared','true','unitsquare','up','white',
+            'withdots'
         )
     ),
     'SYMBOLS' => array(
-        '&',':=','=','+','-','*','**','/','++','+-+','<','>','>=','<=','<>','#@','@','@#'
+        '&',':=','=','+','-','*','**','/','++','+-+','<','>','>=','<=','<>',
+        '#@','@','@#'
     ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,