diff options
71 files changed, 533 insertions, 230 deletions
diff --git a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua index 86cf73573..5c061e039 100644 --- a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua +++ b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua @@ -1,4 +1,4 @@ return { - ["commands"]={ "loadmodule", "dispose", "transparency", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "unittriangle", "fulltriangle", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "randomizedcontrols", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "boundingradius", "boundingcircle", "boundingpoint", "crossingunder", "insideof", "outsideof", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshaderadius", "withshadetransform", "withshadestep", "withshadefraction", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "colorlike", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "resetarrows", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "resolvedcolor", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath" }, + ["commands"]={ "loadmodule", "dispose", "nothing", "transparency", "tolist", "topath", "tocycle", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "unittriangle", "fulltriangle", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "randomizedcontrols", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "boundingradius", "boundingcircle", "boundingpoint", "crossingunder", "insideof", "outsideof", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshaderadius", "withshadetransform", "withshadestep", "withshadefraction", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "colorlike", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "resetarrows", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "resolvedcolor", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "pencilled", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath" }, ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption" }, }
\ No newline at end of file diff --git a/context/data/scite/context/lexers/data/scite-context-data-metapost.lua b/context/data/scite/context/lexers/data/scite-context-data-metapost.lua index 32b1d01a2..8d1b88052 100644 --- a/context/data/scite/context/lexers/data/scite-context-data-metapost.lua +++ b/context/data/scite/context/lexers/data/scite-context-data-metapost.lua @@ -3,7 +3,7 @@ return { ["disabled"]={ "verbatimtex", "troffmode" }, ["internals"]={ "mitered", "rounded", "beveled", "butt", "squared", "eps", "epsilon", "infinity", "bboxmargin", "ahlength", "ahangle", "labeloffset", "dotlabeldiam", "defaultpen", "defaultscale", "join_radius", "charscale", "ditto", "EOF", "pen_lft", "pen_rt", "pen_top", "pen_bot" }, ["metafont"]={ "autorounding", "beginchar", "blacker", "boundarychar", "capsule_def", "capsule_end", "change_width", "chardp", "chardx", "chardy", "charexists", "charext", "charht", "charic", "charlist", "charwd", "cull", "cullit", "currenttransform", "currentwindow", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "designsize", "display", "displaying", "endchar", "extensible", "extra_beginchar", "extra_endchar", "extra_setup", "fillin", "font_coding_scheme", "font_extra_space", "font_identifier", "font_normal_shrink", "font_normal_space", "font_normal_stretch", "font_quad", "font_size", "font_slant", "font_x_height", "fontdimen", "fontmaking", "gfcorners", "granularity", "grayfont", "headerbyte", "hppp", "hround", "imagerules", "italcorr", "kern", "labelfont", "ligtable", "lowres_fix", "makebox", "makegrid", "maketicks", "mode_def", "mode_setup", "nodisplays", "notransforms", "numspecial", "o_correction", "openit", "openwindow", "pixels_per_inch", "proofing", "proofoffset", "proofrule", "proofrulethickness", "rulepen", "screenchars", "screenrule", "screenstrokes", "screen_cols", "screen_rows", "showit", "slantfont", "smode", "smoothing", "titlefont", "totalweight", "tracingedges", "tracingpens", "turningcheck", "unitpixel", "vppp", "vround", "xoffset", "yoffset" }, - ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "interpath", "on", "off", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "readstring", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext" }, + ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "interpath", "on", "off", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "readstring", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext" }, ["shortcuts"]={ "..", "...", "--", "---", "&", "\\" }, ["tex"]={ "btex", "etex", "verbatimtex" }, }
\ No newline at end of file diff --git a/context/data/scite/context/scite-context-data-metafun.properties b/context/data/scite/context/scite-context-data-metafun.properties index 08f34b7d6..e2ec4c467 100644 --- a/context/data/scite/context/scite-context-data-metafun.properties +++ b/context/data/scite/context/scite-context-data-metafun.properties @@ -1,57 +1,58 @@ keywordclass.metafun.commands=\ -loadmodule dispose transparency sqr \ -log ln exp inv pow \ -pi radian tand cotd sin \ -cos tan cot atan asin \ -acos invsin invcos invtan acosh \ -asinh sinh cosh zmod paired \ -tripled unitcircle fulldiamond unitdiamond fullsquare \ -unittriangle fulltriangle llcircle lrcircle urcircle \ -ulcircle tcircle bcircle lcircle rcircle \ -lltriangle lrtriangle urtriangle ultriangle uptriangle \ -downtriangle lefttriangle righttriangle triangle smoothed \ -cornered superellipsed randomized randomizedcontrols squeezed \ -enlonged shortened punked curved unspiked \ -simplified blownup stretched enlarged leftenlarged \ -topenlarged rightenlarged bottomenlarged crossed laddered \ -randomshifted interpolated paralleled cutends peepholed \ -llenlarged lrenlarged urenlarged ulenlarged llmoved \ -lrmoved urmoved ulmoved rightarrow leftarrow \ -centerarrow boundingbox innerboundingbox outerboundingbox pushboundingbox \ -popboundingbox boundingradius boundingcircle boundingpoint crossingunder \ -insideof outsideof bottomboundary leftboundary topboundary \ -rightboundary xsized ysized xysized sized \ -xyscaled intersection_point intersection_found penpoint bbwidth \ -bbheight withshade withcircularshade withlinearshade defineshade \ -shaded shadedinto withshadecolors withshadedomain withshademethod \ -withshadefactor withshadevector withshadecenter withshadedirection withshaderadius \ -withshadetransform withshadestep withshadefraction cmyk spotcolor \ -multitonecolor namedcolor drawfill undrawfill inverted \ -uncolored softened grayed greyed onlayer \ -along graphictext loadfigure externalfigure figure \ -register outlinetext checkedbounds checkbounds strut \ -rule withmask bitmapimage colordecimals ddecimal \ -dddecimal ddddecimal colordecimalslist textext thetextext \ -rawtextext textextoffset texbox thetexbox rawtexbox \ -verbatim thelabel label autoalign transparent \ -withtransparency property properties withproperties asgroup \ -infont space crlf dquote percent \ -SPACE CRLF DQUOTE PERCENT grayscale \ -greyscale withgray withgrey colorpart colorlike \ -readfile clearxy unitvector center epsed \ -anchored originpath infinite break xstretched \ -ystretched snapped pathconnectors function constructedfunction \ -constructedpath constructedpairs straightfunction straightpath straightpairs \ -curvedfunction curvedpath curvedpairs evenly oddly \ -condition pushcurrentpicture popcurrentpicture arrowpath resetarrows \ -tensecircle roundedsquare colortype whitecolor blackcolor \ -basiccolors complementary complemented resolvedcolor normalfill \ -normaldraw visualizepaths detailpaths naturalizepaths drawboundary \ -drawwholepath drawpathonly visualizeddraw visualizedfill detaileddraw \ -draworigin drawboundingbox drawpath drawpoint drawpoints \ -drawcontrolpoints drawcontrollines drawpointlabels drawlineoptions drawpointoptions \ -drawcontroloptions drawlabeloptions draworiginoptions drawboundoptions drawpathoptions \ -resetdrawoptions undashed decorated redecorated undecorated \ +loadmodule dispose nothing transparency \ +tolist topath tocycle sqr log \ +ln exp inv pow pi \ +radian tand cotd sin cos \ +tan cot atan asin acos \ +invsin invcos invtan acosh asinh \ +sinh cosh zmod paired tripled \ +unitcircle fulldiamond unitdiamond fullsquare unittriangle \ +fulltriangle llcircle lrcircle urcircle ulcircle \ +tcircle bcircle lcircle rcircle lltriangle \ +lrtriangle urtriangle ultriangle uptriangle downtriangle \ +lefttriangle righttriangle triangle smoothed cornered \ +superellipsed randomized randomizedcontrols squeezed enlonged \ +shortened punked curved unspiked simplified \ +blownup stretched enlarged leftenlarged topenlarged \ +rightenlarged bottomenlarged crossed laddered randomshifted \ +interpolated paralleled cutends peepholed llenlarged \ +lrenlarged urenlarged ulenlarged llmoved lrmoved \ +urmoved ulmoved rightarrow leftarrow centerarrow \ +boundingbox innerboundingbox outerboundingbox pushboundingbox popboundingbox \ +boundingradius boundingcircle boundingpoint crossingunder insideof \ +outsideof bottomboundary leftboundary topboundary rightboundary \ +xsized ysized xysized sized xyscaled \ +intersection_point intersection_found penpoint bbwidth bbheight \ +withshade withcircularshade withlinearshade defineshade shaded \ +shadedinto withshadecolors withshadedomain withshademethod withshadefactor \ +withshadevector withshadecenter withshadedirection withshaderadius withshadetransform \ +withshadestep withshadefraction cmyk spotcolor multitonecolor \ +namedcolor drawfill undrawfill inverted uncolored \ +softened grayed greyed onlayer along \ +graphictext loadfigure externalfigure figure register \ +outlinetext checkedbounds checkbounds strut rule \ +withmask bitmapimage colordecimals ddecimal dddecimal \ +ddddecimal colordecimalslist textext thetextext rawtextext \ +textextoffset texbox thetexbox rawtexbox verbatim \ +thelabel label autoalign transparent withtransparency \ +property properties withproperties asgroup infont \ +space crlf dquote percent SPACE \ +CRLF DQUOTE PERCENT grayscale greyscale \ +withgray withgrey colorpart colorlike readfile \ +clearxy unitvector center epsed anchored \ +originpath infinite break xstretched ystretched \ +snapped pathconnectors function constructedfunction constructedpath \ +constructedpairs straightfunction straightpath straightpairs curvedfunction \ +curvedpath curvedpairs evenly oddly condition \ +pushcurrentpicture popcurrentpicture arrowpath resetarrows tensecircle \ +roundedsquare colortype whitecolor blackcolor basiccolors \ +complementary complemented resolvedcolor normalfill normaldraw \ +visualizepaths detailpaths naturalizepaths drawboundary drawwholepath \ +drawpathonly visualizeddraw visualizedfill detaileddraw draworigin \ +drawboundingbox drawpath drawpoint drawpoints drawcontrolpoints \ +drawcontrollines drawpointlabels drawlineoptions drawpointoptions drawcontroloptions \ +drawlabeloptions draworiginoptions drawboundoptions drawpathoptions resetdrawoptions \ +undashed pencilled decorated redecorated undecorated \ passvariable passarrayvariable tostring topair format \ formatted quotation quote startpassingvariable stoppassingvariable \ eofill eoclip nofill fillup eofillup \ diff --git a/context/data/scite/context/scite-context-data-metapost.properties b/context/data/scite/context/scite-context-data-metapost.properties index 886d6fd21..3a197144b 100644 --- a/context/data/scite/context/scite-context-data-metapost.properties +++ b/context/data/scite/context/scite-context-data-metapost.properties @@ -69,54 +69,54 @@ time tracingcapsules tracingchoices mpprocset tracingcommands \ tracingequations tracinglostchars tracingmacros tracingonline tracingoutput \ tracingrestores tracingspecs tracingstats tracingtitles truecorners \ warningcheck year false nullpicture pencircle \ -true and angle arclength arctime \ -ASCII boolean bot char color \ -cosd cycle decimal directiontime floor \ -fontsize hex infont intersectiontimes known \ -length llcorner lrcorner makepath makepen \ -mexp mlog normaldeviate not numeric \ -oct odd or path pair \ -pen penoffset picture point postcontrol \ -precontrol reverse rotated scaled shifted \ -sind slanted sqrt str string \ -subpath substring transform transformed ulcorner \ -uniformdeviate unknown urcorner xpart xscaled \ -xxpart xypart ypart yscaled yxpart \ -yypart zscaled addto clip input \ -interim let newinternal save setbounds \ -shipout show showdependencies showtoken showvariable \ -special begingroup endgroup of curl \ -tension and controls interpath on \ -off def vardef enddef expr \ -suffix text primary secondary tertiary \ -primarydef secondarydef tertiarydef randomseed also \ -contour doublepath withcolor withcmykcolor withpen \ -dashed if else elseif fi \ -for endfor forever exitif within \ -forsuffixes step until charlist extensible \ -fontdimen headerbyte kern ligtable boundarychar \ -chardp charext charht charic charwd \ -designsize fontmaking charexists cullit currenttransform \ -gfcorners grayfont hround imagerules lowres_fix \ -nodisplays notransforms openit displaying currentwindow \ -screen_rows screen_cols pixels_per_inch cull display \ -openwindow numspecial totalweight autorounding fillin \ -proofing tracingpens xoffset chardx granularity \ -smoothing turningcheck yoffset chardy hppp \ -tracingedges vppp extra_beginfig extra_endfig mpxbreak \ -endinput message delimiters turningnumber errmessage \ -readstring scantokens end outer inner \ -write to readfrom withprescript withpostscript \ -top bot lft rt ulft \ -urt llft lrt redpart greenpart \ -bluepart cyanpart magentapart yellowpart blackpart \ -prescriptpart postscriptpart rgbcolor cmykcolor colormodel \ -graypart greypart greycolor graycolor dashpart \ -penpart stroked filled textual clipped \ -bounded pathpart expandafter minute hour \ -outputformat outputtemplate filenametemplate fontmapfile fontmapline \ -fontpart fontsize glyph restoreclipcolor troffmode \ -runscript maketext +penspec true and angle arclength \ +arctime ASCII boolean bot char \ +color cosd cycle decimal directiontime \ +floor fontsize hex infont intersectiontimes \ +known length llcorner lrcorner makepath \ +makepen mexp mlog normaldeviate not \ +numeric oct odd or path \ +pair pen penoffset picture point \ +postcontrol precontrol reverse rotated scaled \ +shifted sind slanted sqrt str \ +string subpath substring transform transformed \ +ulcorner uniformdeviate unknown urcorner xpart \ +xscaled xxpart xypart ypart yscaled \ +yxpart yypart zscaled addto clip \ +input interim let newinternal save \ +setbounds shipout show showdependencies showtoken \ +showvariable special begingroup endgroup of \ +curl tension and controls interpath \ +on off def vardef enddef \ +expr suffix text primary secondary \ +tertiary primarydef secondarydef tertiarydef randomseed \ +also contour doublepath withcolor withcmykcolor \ +withpen dashed envelope if else \ +elseif fi for endfor forever \ +exitif within forsuffixes step until \ +charlist extensible fontdimen headerbyte kern \ +ligtable boundarychar chardp charext charht \ +charic charwd designsize fontmaking charexists \ +cullit currenttransform gfcorners grayfont hround \ +imagerules lowres_fix nodisplays notransforms openit \ +displaying currentwindow screen_rows screen_cols pixels_per_inch \ +cull display openwindow numspecial totalweight \ +autorounding fillin proofing tracingpens xoffset \ +chardx granularity smoothing turningcheck yoffset \ +chardy hppp tracingedges vppp extra_beginfig \ +extra_endfig mpxbreak endinput message delimiters \ +turningnumber errmessage readstring scantokens end \ +outer inner write to readfrom \ +withprescript withpostscript top bot lft \ +rt ulft urt llft lrt \ +redpart greenpart bluepart cyanpart magentapart \ +yellowpart blackpart prescriptpart postscriptpart rgbcolor \ +cmykcolor colormodel graypart greypart greycolor \ +graycolor dashpart penpart stroked filled \ +textual clipped bounded pathpart expandafter \ +minute hour outputformat outputtemplate filenametemplate \ +fontmapfile fontmapline fontpart fontsize glyph \ +restoreclipcolor troffmode runscript maketext keywordclass.metapost.shortcuts=\ .. ... -- --- \ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex 7340a4cec..7f39be6ea 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex 62fd20727..90a033beb 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex 9fb2817ae..67f49ef4a 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex 72b1c39dc..88e21c5f7 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex 73393d45d..eec48601a 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex 9a36c2f80..4e1817460 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex 197cfc3fb..599542102 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf diff --git a/doc/context/sources/general/fonts/fonts/fonts-mkiv.tex b/doc/context/sources/general/fonts/fonts/fonts-mkiv.tex index 43da5870f..c5283ad41 100644 --- a/doc/context/sources/general/fonts/fonts/fonts-mkiv.tex +++ b/doc/context/sources/general/fonts/fonts/fonts-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. % \definefontfeature[default][default][globalkern=true] % diff --git a/doc/context/sources/general/magazines/magazines/mag-0000-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-0000-mkiv.tex index 7702bfbbc..c24d4c4ad 100644 --- a/doc/context/sources/general/magazines/magazines/mag-0000-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-0000-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01] diff --git a/doc/context/sources/general/magazines/magazines/mag-0002-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-0002-mkiv.tex index 45ca4c6c6..cbc49ac82 100644 --- a/doc/context/sources/general/magazines/magazines/mag-0002-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-0002-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01] diff --git a/doc/context/sources/general/magazines/magazines/mag-0006-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-0006-mkiv.tex index 080127ac1..8baa5e003 100644 --- a/doc/context/sources/general/magazines/magazines/mag-0006-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-0006-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02] diff --git a/doc/context/sources/general/magazines/magazines/mag-0007-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-0007-mkiv.tex index bf2fbb826..885d3cb14 100644 --- a/doc/context/sources/general/magazines/magazines/mag-0007-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-0007-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02,visual] diff --git a/doc/context/sources/general/magazines/magazines/mag-0010-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-0010-mkiv.tex index eb5e2638b..65c20180c 100644 --- a/doc/context/sources/general/magazines/magazines/mag-0010-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-0010-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02] diff --git a/doc/context/sources/general/magazines/magazines/mag-1101-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-1101-mkiv.tex index c6baa7617..f56dbfe39 100644 --- a/doc/context/sources/general/magazines/magazines/mag-1101-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-1101-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02,job-01] diff --git a/doc/context/sources/general/magazines/magazines/mag-1102-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-1102-mkiv.tex index a63aca94c..ad9dcc5f9 100644 --- a/doc/context/sources/general/magazines/magazines/mag-1102-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-1102-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02] diff --git a/doc/context/sources/general/magazines/magazines/mag-1103-mkiv.tex b/doc/context/sources/general/magazines/magazines/mag-1103-mkiv.tex index 868535081..90a5f0848 100644 --- a/doc/context/sources/general/magazines/magazines/mag-1103-mkiv.tex +++ b/doc/context/sources/general/magazines/magazines/mag-1103-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[mag-01,abr-02] diff --git a/doc/context/sources/general/manuals/about/about.tex b/doc/context/sources/general/manuals/about/about.tex index 96a1bea6d..65e5fde2c 100644 --- a/doc/context/sources/general/manuals/about/about.tex +++ b/doc/context/sources/general/manuals/about/about.tex @@ -11,8 +11,9 @@ % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. % -% comment : Some chapters have been published in TugBoat, the NTG Maps, the ConTeXt Group -% journal or otherwise. Thanks to the editors for corrections. +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment about-environment diff --git a/doc/context/sources/general/manuals/charts/charts-mkiv.tex b/doc/context/sources/general/manuals/charts/charts-mkiv.tex index dbf6ef6c8..2081b872b 100644 --- a/doc/context/sources/general/manuals/charts/charts-mkiv.tex +++ b/doc/context/sources/general/manuals/charts/charts-mkiv.tex @@ -1,5 +1,3 @@ -% interface=en engine=luatex language=uk - % author : Hans Hagen % copyright : PRAGMA ADE & ConTeXt Development Team % license : Creative Commons Attribution ShareAlike 4.0 International @@ -12,8 +10,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. - -% somewhat general (derived from mcommon.tex) +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[abr-02] diff --git a/doc/context/sources/general/manuals/colors/colors-mkiv.tex b/doc/context/sources/general/manuals/colors/colors-mkiv.tex index 064758ba3..a39ff0f37 100644 --- a/doc/context/sources/general/manuals/colors/colors-mkiv.tex +++ b/doc/context/sources/general/manuals/colors/colors-mkiv.tex @@ -1,5 +1,3 @@ -% language=uk - % author : Hans Hagen % copyright : PRAGMA ADE & ConTeXt Development Team % license : Creative Commons Attribution ShareAlike 4.0 International @@ -12,6 +10,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. % \nopdfcompression diff --git a/doc/context/sources/general/manuals/columnsets/columnsets.tex b/doc/context/sources/general/manuals/columnsets/columnsets.tex index 7d68872ef..0cb95229d 100644 --- a/doc/context/sources/general/manuals/columnsets/columnsets.tex +++ b/doc/context/sources/general/manuals/columnsets/columnsets.tex @@ -1,6 +1,19 @@ -% engine=luatex +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution % -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \dontcomplain diff --git a/doc/context/sources/general/manuals/epub/epub-mkiv.tex b/doc/context/sources/general/manuals/epub/epub-mkiv.tex index 6fc4ed9d4..2eea58b9e 100644 --- a/doc/context/sources/general/manuals/epub/epub-mkiv.tex +++ b/doc/context/sources/general/manuals/epub/epub-mkiv.tex @@ -1,5 +1,22 @@ % language=uk +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + % todo: % % metadata diff --git a/doc/context/sources/general/manuals/hybrid/hybrid.tex b/doc/context/sources/general/manuals/hybrid/hybrid.tex index f2f05ecc9..e15d7c31c 100644 --- a/doc/context/sources/general/manuals/hybrid/hybrid.tex +++ b/doc/context/sources/general/manuals/hybrid/hybrid.tex @@ -11,8 +11,9 @@ % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. % -% comment : Some chapters have been published in TugBoat, the NTG Maps, the ConTeXt Group -% journal or otherwise. Thanks to the editors for corrections. +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment hybrid-environment diff --git a/doc/context/sources/general/manuals/languages/languages-mkiv.tex b/doc/context/sources/general/manuals/languages/languages-mkiv.tex index 98ca84814..a65c6d532 100644 --- a/doc/context/sources/general/manuals/languages/languages-mkiv.tex +++ b/doc/context/sources/general/manuals/languages/languages-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \enablemode[simple] % ,oversized diff --git a/doc/context/sources/general/manuals/lua/lua-mkiv.tex b/doc/context/sources/general/manuals/lua/lua-mkiv.tex index 40e885eac..25a3d1786 100644 --- a/doc/context/sources/general/manuals/lua/lua-mkiv.tex +++ b/doc/context/sources/general/manuals/lua/lua-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/manuals/luatex/luatex.tex b/doc/context/sources/general/manuals/luatex/luatex.tex index 90484aa7e..39315dd6c 100644 --- a/doc/context/sources/general/manuals/luatex/luatex.tex +++ b/doc/context/sources/general/manuals/luatex/luatex.tex @@ -1,5 +1,22 @@ % macros=mkvi +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + % \tex vs \type vs \syntax vs. \luatex % \em \it \/ diff --git a/doc/context/sources/general/manuals/math/math-mkiv.tex b/doc/context/sources/general/manuals/math/math-mkiv.tex index 291a99c9e..f36b1032d 100644 --- a/doc/context/sources/general/manuals/math/math-mkiv.tex +++ b/doc/context/sources/general/manuals/math/math-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment math-layout diff --git a/doc/context/sources/general/manuals/mk/mk.tex b/doc/context/sources/general/manuals/mk/mk.tex index e376d5031..430a19892 100644 --- a/doc/context/sources/general/manuals/mk/mk.tex +++ b/doc/context/sources/general/manuals/mk/mk.tex @@ -11,8 +11,9 @@ % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. % -% comment : Some chapters have been published in TugBoat, the NTG Maps, the ConTeXt Group -% journal or otherwise. Thanks to the editors for corrections. +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment mk-environment diff --git a/doc/context/sources/general/manuals/readme/mreadme.tex b/doc/context/sources/general/manuals/readme/mreadme.tex index 32c1684d9..950f4a64c 100644 --- a/doc/context/sources/general/manuals/readme/mreadme.tex +++ b/doc/context/sources/general/manuals/readme/mreadme.tex @@ -1,4 +1,4 @@ -% interface=en engine=luatex language=uk +% interface=en language=uk % author : Hans Hagen % copyright : PRAGMA ADE & ConTeXt Development Team @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment mcommon diff --git a/doc/context/sources/general/manuals/rules/rules-mkiv.tex b/doc/context/sources/general/manuals/rules/rules-mkiv.tex index 5b207e335..536a37aea 100644 --- a/doc/context/sources/general/manuals/rules/rules-mkiv.tex +++ b/doc/context/sources/general/manuals/rules/rules-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \setupbodyfont [dejavu,10pt] diff --git a/doc/context/sources/general/manuals/spacing/spacing-mkiv.tex b/doc/context/sources/general/manuals/spacing/spacing-mkiv.tex index 4261a3884..375f4e2a8 100644 --- a/doc/context/sources/general/manuals/spacing/spacing-mkiv.tex +++ b/doc/context/sources/general/manuals/spacing/spacing-mkiv.tex @@ -1,3 +1,20 @@ +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + \environment spacing-style \startdocument diff --git a/doc/context/sources/general/manuals/spreadsheets/spreadsheets-mkiv.tex b/doc/context/sources/general/manuals/spreadsheets/spreadsheets-mkiv.tex index 4dfd133ad..c5c99e97d 100644 --- a/doc/context/sources/general/manuals/spreadsheets/spreadsheets-mkiv.tex +++ b/doc/context/sources/general/manuals/spreadsheets/spreadsheets-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[spreadsheet] \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/manuals/sql/sql-mkiv.tex b/doc/context/sources/general/manuals/sql/sql-mkiv.tex index 95af57e11..dabb0a34f 100644 --- a/doc/context/sources/general/manuals/sql/sql-mkiv.tex +++ b/doc/context/sources/general/manuals/sql/sql-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/manuals/steps/steps-mkiv.tex b/doc/context/sources/general/manuals/steps/steps-mkiv.tex index 947f08fbb..3bbedbbcd 100644 --- a/doc/context/sources/general/manuals/steps/steps-mkiv.tex +++ b/doc/context/sources/general/manuals/steps/steps-mkiv.tex @@ -1,3 +1,20 @@ +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + \environment manuals-xml-environment.tex \useMPlibrary [ove] diff --git a/doc/context/sources/general/manuals/still/still.tex b/doc/context/sources/general/manuals/still/still.tex index 5fe279672..d7a7ff447 100644 --- a/doc/context/sources/general/manuals/still/still.tex +++ b/doc/context/sources/general/manuals/still/still.tex @@ -11,8 +11,9 @@ % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. % -% comment : Some chapters have been published in TugBoat, the NTG Maps, the ConTeXt Group -% journal or otherwise. Thanks to the editors for corrections. +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment still-environment diff --git a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex index c66b8f7a3..7360c73fa 100644 --- a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex +++ b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/manuals/templates/templates-mkiv.tex b/doc/context/sources/general/manuals/templates/templates-mkiv.tex index 01f2c429e..07dd041c3 100644 --- a/doc/context/sources/general/manuals/templates/templates-mkiv.tex +++ b/doc/context/sources/general/manuals/templates/templates-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/manuals/tiptrick/tiptrick.tex b/doc/context/sources/general/manuals/tiptrick/tiptrick.tex index 54a785134..03af8e806 100644 --- a/doc/context/sources/general/manuals/tiptrick/tiptrick.tex +++ b/doc/context/sources/general/manuals/tiptrick/tiptrick.tex @@ -1,6 +1,19 @@ -% interface=en +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution % -% author: Hans Hagen - Pragma ADE - www.pragma-ade.com +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \setupbodyfont [dejavu] diff --git a/doc/context/sources/general/manuals/tools/tools-mkiv.tex b/doc/context/sources/general/manuals/tools/tools-mkiv.tex index 2ac1e15f4..481426756 100644 --- a/doc/context/sources/general/manuals/tools/tools-mkiv.tex +++ b/doc/context/sources/general/manuals/tools/tools-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[abr-02] diff --git a/doc/context/sources/general/manuals/units/units-mkiv.tex b/doc/context/sources/general/manuals/units/units-mkiv.tex index 0d91c67df..ba4f12787 100644 --- a/doc/context/sources/general/manuals/units/units-mkiv.tex +++ b/doc/context/sources/general/manuals/units/units-mkiv.tex @@ -1,5 +1,22 @@ % language=uk +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + \usemodule[art-01,abr-02,physics-units] \definecolor[red] [darkred] diff --git a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex index 3820e04fa..c742b94e1 100644 --- a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex +++ b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex @@ -1,3 +1,20 @@ +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + \setupbackend[export=yes] \environment workflows-style diff --git a/doc/context/sources/general/manuals/xml/xml-mkiv.tex b/doc/context/sources/general/manuals/xml/xml-mkiv.tex index caeff0ceb..3c189daf3 100644 --- a/doc/context/sources/general/manuals/xml/xml-mkiv.tex +++ b/doc/context/sources/general/manuals/xml/xml-mkiv.tex @@ -1,5 +1,22 @@ % language=uk +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + % to be checked: % % \Ux in index diff --git a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex index a41282622..d4316b479 100644 --- a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex +++ b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex @@ -12,6 +12,10 @@ % with existing functionality and we cannot be held responsible for that. Many of % the manuals contain characteristic graphics and personal notes or examples that % make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \usemodule[art-01,abr-02] diff --git a/doc/context/sources/general/mathml/mathml/mmlexamp.tex b/doc/context/sources/general/mathml/mathml/mmlexamp.tex index 0f488b61c..0beb211ad 100644 --- a/doc/context/sources/general/mathml/mathml/mmlexamp.tex +++ b/doc/context/sources/general/mathml/mathml/mmlexamp.tex @@ -1,4 +1,21 @@ -% engine=luatex language=uk +% language=uk + +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. \environment envexamp diff --git a/doc/context/sources/general/mathml/mathml/mmlprime.tex b/doc/context/sources/general/mathml/mathml/mmlprime.tex index a336c6c41..fdcb6aaf5 100644 --- a/doc/context/sources/general/mathml/mathml/mmlprime.tex +++ b/doc/context/sources/general/mathml/mathml/mmlprime.tex @@ -1,5 +1,22 @@ % language=uk +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. +% +% comment : Some chapters might have been published in TugBoat, the NTG Maps, the ConTeXt +% Group journal or otherwise. Thanks to the editors for corrections. Also thanks +% to users for testing, feedback and corrections. + % \setupbackend[export=yes] \usemodule[abr-02,mathml,math-coverage,asciimath] diff --git a/metapost/context/base/mpiv/mp-page.mpiv b/metapost/context/base/mpiv/mp-page.mpiv index fd5485dd3..f32990677 100644 --- a/metapost/context/base/mpiv/mp-page.mpiv +++ b/metapost/context/base/mpiv/mp-page.mpiv @@ -300,6 +300,14 @@ vardef InnerEdgeDistance = if not OnRightPage : lua.mp.RightEdgeDistance () e vardef OuterSpaceWidth = if not OnRightPage : lua.mp.BackSpace () else : lua.mp.CutSpace () fi enddef ; vardef InnerSpaceWidth = if not OnRightPage : lua.mp.CutSpace () else : lua.mp.BackSpace () fi enddef ; +% indices + +vardef OuterMargin = if not OnRightPage : LeftMargin else : RightMargin fi enddef ; +vardef InnerMargin = if not OnRightPage : RightMargin else : LeftMargin fi enddef ; + +vardef OuterEdge = if not OnRightPage : LeftEdge else : RightEdge fi enddef ; +vardef InnerEdge = if not OnRightPage : Rightedge else : LeftEdge fi enddef ; + % vardef CurrentLayout = lua.mp.CurrentLayout () enddef ; vardef OverlayWidth = lua.mp.OverlayWidth () enddef ; diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv index ba137c1e9..68bc0a9c7 100644 --- a/metapost/context/base/mpiv/mp-tool.mpiv +++ b/metapost/context/base/mpiv/mp-tool.mpiv @@ -34,6 +34,10 @@ prologues := 1 ; warningcheck := 0 ; mpprocset := 1 ; +%D Handy: + +def nothing = enddef ; + %D Namespace handling: % let exclamationmark = ! ; @@ -107,22 +111,25 @@ enddef ; %D Variables def dispose suffix s = - begingroup ; - save ss ; - if numeric s : numeric ss - elseif boolean s : boolean ss - elseif pair s : pair ss - elseif path s : path ss - elseif picture s : picture ss - elseif string s : string ss - elseif transform s : transform ss - elseif color s : color ss - elseif rgbcolor s : rgbcolor ss - elseif cmykcolor s : cmykcolor ss - else s : numeric ss + if known s : + begingroup ; + save ss ; + if numeric s : numeric ss + elseif boolean s : boolean ss + elseif pair s : pair ss + elseif path s : path ss + elseif picture s : picture ss + elseif string s : string ss + elseif transform s : transform ss + elseif color s : color ss + elseif rgbcolor s : rgbcolor ss + elseif cmykcolor s : cmykcolor ss + elseif pen s : pen ss + else s : numeric ss + fi ; + s := ss ; + endgroup ; fi ; - s := ss ; - endgroup ; enddef ; %D Colors: @@ -1779,9 +1786,7 @@ enddef ; %D To be documented. -path freesquare ; - -freesquare := ( +path freesquare ; freesquare := ( (-1,0) -- (-1,-1) -- (0,-1) -- (+1,-1) -- (+1,0) -- (+1,+1) -- (0,+1) -- (-1,+1) -- cycle ) scaled .5 ; @@ -3243,8 +3248,8 @@ newinternal crossingscale ; crossingscale := 20 ; % primary, secondary or tertiary? always hard to decide but primary makes sense -vardef infotext(expr txt, ysize) = - textext("\infofont" & if numeric txt : decimal fi txt) ysized ysize +vardef infotext@#(expr txt, ysize) = + textext@#("\infofont " & if numeric txt : decimal fi txt) ysized ysize enddef ; primarydef p crossingunder q = @@ -3355,14 +3360,68 @@ enddef ; %D Also handy: -vardef circularpath(expr n) = +vardef circularpath primary n = reverse (for i=0 step 2/n until 8-2/n+2eps: point i of fullcircle .. endfor cycle) rotated 90 enddef ; -vardef squarepath(expr n) = +vardef squarepath primary n = for i=0 step 1/n until 4-1/n + 2eps: point i of fullsquare -- endfor cycle enddef ; -vardef linearpath(expr n) = +vardef linearpath primary n = origin for i=1/n step 1/n until 1-1/n + 2eps: -- point i of (origin--(1,0)) endfor enddef ; + +%D A nice tracing helper: + +color pensilcolor ; pensilcolor := .5red ; +newinternal pensilstep ; pensilstep := 1/25 ; + +vardef pensilled(expr p, q) = + image ( + draw p withcolor pensilcolor withpen q ; + for i = 0 step pensilstep until length(p) + eps: + draw point i of p withcolor white withtransparency (1,.5) withpen q ; + endfor ; + ) +enddef ; + +%D Easy to forget but handy for manuals: + +vardef tolist(suffix l)(text t) = + save n ; n := 1 ; + for p = t : + if numeric p : + n := p ; + dispose(l[n]) + elseif pair p : + l[n] := p ; + n := n + 1 ; + elseif path p : + for i=0 step 1 until length(p) : + l[n] := point i of p ; + n := n + 1 ; + endfor ; + else : + % ignore + fi ; + endfor ; + forever : + exitif unknown l[n] ; + dispose(l[n]) + n := n + 1 ; + endfor ; +enddef ; + +vardef topath(suffix p)(text t) = + save i ; i := if known p[1] : 2 ; p[1] elseif known p[0] : 1 ; p[0] else : 0 ; origin fi + forever : + exitif unknown p[i] ; + t p[i] + hide(i := i + 1) + endfor +enddef ; + +vardef tocycle(suffix p)(text t) = + topath(p,t) t cycle +enddef ; diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 64462979d..d995f06c7 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.11.24 12:05} +\newcontextversion{2016.11.28 13:30} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index c7d81e7b0..11f36726e 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2016.11.24 12:05} +\edef\contextversion{2016.11.28 13:30} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index f58ae0d1a..3f2c6f62d 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.11.24 12:05} +\newcontextversion{2016.11.28 13:30} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 8459165bf..ba9036a15 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.11.24 12:05} +\edef\contextversion{2016.11.28 13:30} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/lpdf-wid.lua b/tex/context/base/mkiv/lpdf-wid.lua index 6b0024a51..fceae49cb 100644 --- a/tex/context/base/mkiv/lpdf-wid.lua +++ b/tex/context/base/mkiv/lpdf-wid.lua @@ -33,6 +33,7 @@ local v_hidden = variables.hidden local v_auto = variables.auto local v_embed = variables.embed local v_max = variables.max +local v_yes = variables.yes local pdfconstant = lpdf.constant local pdfdictionary = lpdf.dictionary @@ -381,7 +382,7 @@ function codeinjections.attachmentid(filename) -- not used in context return filestreams[filename] end -local nofcomments, usepopupcomments, stripleading = 0, false, true +local nofcomments, usepopupcomments = 0, false local defaultattributes = { ["xmlns"] = "http://www.w3.org/1999/xhtml", @@ -415,10 +416,12 @@ end function nodeinjections.comment(specification) -- brrr: seems to be done twice nofcomments = nofcomments + 1 - local text = stripstring(specification.data or "") - if stripleading then + local text = specification.data or "" + if specification.space ~= v_yes then + text = stripstring(text) text = gsub(text,"[\n\r] *","\n") end + text = gsub(text,"\r","\n") local name, appearance = analyzesymbol(specification.symbol,comment_symbols) local tag = specification.tag or "" -- this is somewhat messy as recent local title = specification.title or "" -- versions of acrobat see the title diff --git a/tex/context/base/mkiv/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv index d57a0b955..d8693f697 100644 --- a/tex/context/base/mkiv/math-ali.mkiv +++ b/tex/context/base/mkiv/math-ali.mkiv @@ -767,8 +767,10 @@ \def\math_matrix_stop {\crcr - \mathstrut\crcr - \noalign{\kern-\baselineskip}% + % \ifgridsnapping \else + \mathstrut\crcr + \noalign{\vskip-\baselineskip}% + % \fi \egroup \popmacro\math_matrix_NC \egroup @@ -1297,7 +1299,7 @@ \def\strc_math_number_right_overflow_outside {\vpack\bgroup \strc_math_flush_box_framed_fit_inline - \hskip\zeropoint % nicely breaks the line with out introducing funny vertical spacing ... why o why +% \hskip\zeropoint % nicely breaks the line without introducing funny vertical spacing ... why o why \hpack to \displaywidth\bgroup \hss \math_box_llapped_math_no @@ -1310,7 +1312,7 @@ \math_box_rlapped_math_no \hss \egroup - \hskip\zeropoint % nicely breaks the line with out introducing funny vertical spacing ... why o why + \hskip\zeropoint % nicely breaks the line without introducing funny vertical spacing ... why o why \strc_math_flush_box_framed_fit_inline \egroup} @@ -1481,6 +1483,11 @@ \unexpanded\def\strc_math_box_stop {\stopforceddisplaymath \egroup + % % not needed, attribute driven + % \ifgridsnapping + % \snaptogrid[\v!math]\vbox + % \fi + % \bgroup % check number \d_strc_math_number_width\wd\b_strc_formulas_number % @@ -1533,6 +1540,7 @@ \else \strc_math_flush_box \fi + % \egroup \egroup} \defineinnermathhandler\v!left {\strc_math_box_start\plusone }{\strc_math_box_stop} diff --git a/tex/context/base/mkiv/meta-imp-txt.mkiv b/tex/context/base/mkiv/meta-imp-txt.mkiv index 1ce847f67..c6ecc6f03 100644 --- a/tex/context/base/mkiv/meta-imp-txt.mkiv +++ b/tex/context/base/mkiv/meta-imp-txt.mkiv @@ -130,6 +130,7 @@ \unexpanded\def\getshapetext % option: unvbox {\vbox\bgroup \forgetall + \dontcomplain \setbox\scratchbox\vbox to \parheight {\expanded{\switchtobodyfont[\@@shbodyfont]}% evt strutheight en \splittopskip\strutheight % lineheight opslaan diff --git a/tex/context/base/mkiv/mlib-pdf.lua b/tex/context/base/mkiv/mlib-pdf.lua index 5989b5b55..4d1756c43 100644 --- a/tex/context/base/mkiv/mlib-pdf.lua +++ b/tex/context/base/mkiv/mlib-pdf.lua @@ -31,6 +31,7 @@ local pen_info = mplib.pen_info local object_fields = mplib.fields local save_table = false +local force_stroke = false metapost = metapost or { } local metapost = metapost @@ -68,6 +69,10 @@ directives.register("metapost.savetable",function(v) end end) +trackers.register("metapost.forcestroke",function(v) + force_stroke = v +end) + local pdfliteral = function(pdfcode) local literal = copy_node(mpsliteral) literal.data = pdfcode @@ -560,7 +565,9 @@ function metapost.flush(result,flusher,askedfig) else flushnormalpath(path,result,open) end - if objecttype == "fill" then + if force_stroke then + result[#result+1] = open and "S" or "h S" + elseif objecttype == "fill" then result[#result+1] = evenodd and "h f*" or "h f" -- f* = eo elseif objecttype == "outline" then if both then @@ -597,7 +604,9 @@ function metapost.flush(result,flusher,askedfig) else flushnormalpath(path,result,open) end - if objecttype == "fill" then + if force_stroke then + result[#result+1] = open and "S" or "h S" + elseif objecttype == "fill" then result[#result+1] = evenodd and "h f*" or "h f" -- f* = eo elseif objecttype == "outline" then result[#result+1] = open and "S" or "h S" diff --git a/tex/context/base/mkiv/mlib-run.lua b/tex/context/base/mkiv/mlib-run.lua index 10adb7709..0ef80892a 100644 --- a/tex/context/base/mkiv/mlib-run.lua +++ b/tex/context/base/mkiv/mlib-run.lua @@ -466,67 +466,12 @@ function metapost.process(mpx, data, trialrun, flusher, multipass, isextrapass, -- table.insert(data,2,"") for i=1,#data do process(data[i],i) --- local d = data[i] --- -- d = string.gsub(d,"\r","") --- if d then --- if trace_graphics then --- tra.inp:write(formatters["\n%% begin snippet %s\n"](i)) --- tra.inp:write(d) --- tra.inp:write(formatters["\n%% end snippet %s\n"](i)) --- end --- starttiming(metapost.exectime) --- result = mpx:execute(d) -- some day we wil use a coroutine with textexts --- stoptiming(metapost.exectime) --- if trace_graphics and result then --- local str = result.log or result.error --- if str and str ~= "" then --- tra.log:write(str) --- end --- end --- if not metapost.reporterror(result) then --- if metapost.showlog then --- local str = result.term ~= "" and result.term or "no terminal output" --- if not emptystring(str) then --- metapost.lastlog = metapost.lastlog .. "\n" .. str --- report_metapost("log: %s",str) --- end --- end --- if result.fig then --- converted = metapost.convert(result, trialrun, flusher, multipass, askedfig) --- end --- end --- else --- report_metapost("error: invalid graphic component %s",i) --- end end else if trace_tracingall then data = "tracingall;" .. data end process(data) --- starttiming(metapost.exectime) --- result = mpx:execute(data) --- stoptiming(metapost.exectime) --- if trace_graphics and result then --- local str = result.log or result.error --- if str and str ~= "" then --- tra.log:write(str) --- end --- end --- -- todo: error message --- if not result then --- report_metapost("error: no result object returned") --- elseif result.status > 0 then --- report_metapost("error: %s",(result.term or "no-term") .. "\n" .. (result.error or "no-error")) --- else --- if metapost.showlog then --- metapost.lastlog = metapost.lastlog .. "\n" .. result.term --- report_metapost("info: %s",result.term or "no-term") --- end --- if result.fig then --- converted = metapost.convert(result, trialrun, flusher, multipass, askedfig) --- end --- end end if trace_graphics then local banner = "\n% end graphic\n\n" diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index b04b7aae3..df127eb5c 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -19,11 +19,7 @@ return { "crossingscale", "crossingoption", }, commands = { - "loadmodule", - -- - "dispose", - -- - "transparency", + "loadmodule", "dispose", "nothing", "transparency", "tolist", "topath", "tocycle", -- "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", @@ -130,7 +126,7 @@ return { "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", -- - "undashed", + "undashed", "pencilled", -- "decorated", "redecorated", "undecorated", -- diff --git a/tex/context/base/mkiv/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua index fb8ed3489..1d7252c29 100644 --- a/tex/context/base/mkiv/mult-mps.lua +++ b/tex/context/base/mkiv/mult-mps.lua @@ -12,7 +12,7 @@ return { "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", - "false", "nullpicture", "pencircle", "true", + "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "length", "llcorner", @@ -33,6 +33,7 @@ return { "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", + "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", diff --git a/tex/context/base/mkiv/scrn-wid.lua b/tex/context/base/mkiv/scrn-wid.lua index b9855546e..3ce904349 100644 --- a/tex/context/base/mkiv/scrn-wid.lua +++ b/tex/context/base/mkiv/scrn-wid.lua @@ -192,6 +192,7 @@ implement { { "symbol" }, { "buffer" }, { "layer" }, + { "space" }, } } } diff --git a/tex/context/base/mkiv/scrn-wid.mkvi b/tex/context/base/mkiv/scrn-wid.mkvi index f4679684c..f19da57f7 100644 --- a/tex/context/base/mkiv/scrn-wid.mkvi +++ b/tex/context/base/mkiv/scrn-wid.mkvi @@ -378,6 +378,7 @@ \c!depth=\v!fit, \c!nx=40, \c!ny=10, + \c!buffer=\v!comment, \c!location=\v!high] \appendtoks @@ -473,8 +474,9 @@ transparencyvalue \numexpr\thetransparencyattribute{\commentparameter\c!color}\relax option {\commentparameter\c!option}% % todo symbol {\commentparameter\c!symbol}% - buffer {\v!comment}% + buffer {\commentparameter\c!buffer}% {\v!comment}% layer {\commentparameter\c!textlayer}% + space {\commentparameter\c!space}% \relax \wd\b_scrn_comment_link\currentcommentwidth \ht\b_scrn_comment_link\currentcommentheight diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv index f9d1dd656..58486c177 100644 --- a/tex/context/base/mkiv/spac-ver.mkiv +++ b/tex/context/base/mkiv/spac-ver.mkiv @@ -1474,7 +1474,6 @@ \attribute \snapvboxattribute\attribute\snapmethodattribute \fi} - \unexpanded\def\definegridsnapping {\dodoubleargument\spac_grids_define} @@ -1524,6 +1523,7 @@ \definegridsnapping[\v!strict] [\v!maxdepth:0.8,\v!maxheight:0.8,\v!strut] \definegridsnapping[\v!tolerant] [\v!maxdepth:1.2,\v!maxheight:1.2,\v!strut] +\definegridsnapping[\v!math] [\v!maxdepth:1.05,\v!maxheight:1.05,\v!strut] % experimental, maybe 1.1 \definegridsnapping[\v!top] [\v!minheight,\v!maxdepth,\v!strut] \definegridsnapping[\v!bottom] [\v!maxheight,\v!mindepth,\v!strut] diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 49f91f277..a452c1190 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 14a32cdd0..0695b4d0f 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv index 0062948a5..52ab811b0 100644 --- a/tex/context/base/mkiv/strc-mat.mkiv +++ b/tex/context/base/mkiv/strc-mat.mkiv @@ -33,7 +33,7 @@ %\c!margin=, %\c!align=, %\c!separator=, - %\c!grid=, + \c!grid=\v!math, \c!location=\v!right, \c!left=(, \c!right=), @@ -625,8 +625,12 @@ \def\strc_math_obey_depth {\ifvmode\ifdim\prevdepth<\zeropoint\else\ifdim\prevdepth<\strutdp % maybe add a tracing option here - \kern\dimexpr\strutdp-\prevdepth\relax - \prevdepth\strutdp + \ifgridsnapping + \directvspacing\v!depth + \else + \kern\dimexpr\strutdp-\prevdepth\relax + \prevdepth\strutdp + \fi \fi\fi\fi} \setvalue{\??mathdisplayspacemodel\v!before:3}% @@ -646,7 +650,7 @@ \fi\fi} \setvalue{\??mathdisplayspacemodel\v!after:3}% - {\prevdepth\strutdp + {\prevdepth\strutdp % \directvspacing\v!depth \ifx\p_spaceafter\v!none % nothing \else\ifx\p_spaceafter\empty diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 9fb2817ae..67f49ef4a 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 8ded8acd6..afdf58c3b 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/modules/mkiv/s-present-organic.mkiv b/tex/context/modules/mkiv/s-present-organic.mkiv index f45a5f53e..657b786f2 100644 --- a/tex/context/modules/mkiv/s-present-organic.mkiv +++ b/tex/context/modules/mkiv/s-present-organic.mkiv @@ -174,8 +174,8 @@ seed := uniformdeviate 100 ; if alternative > 10 : - superness := .85 + ((\realfolio-1)/\lastpage) * .15 ; - squeezeness := 12pt - ((\realfolio-1)/\lastpage) * 10pt ; + superness := .85 + ((\realfolio-1)/max(\lastpage,1)) * .15 ; + squeezeness := 12pt - ((\realfolio-1)/max(\lastpage,1)) * 10pt ; else : superness := .90 ; squeezeness := 12pt ; diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f41935acc..d2c032c5b 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 11/24/16 12:05:11 +-- merge date : 11/28/16 13:30:27 do -- begin closure to overcome local limits and interference |