From 8d448442950011295b60f1ea7385887e043388e9 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 11 May 2012 14:40:13 +0300 Subject: beta 2012.05.11 13:19 --- metapost/context/base/mp-apos.mpiv | 5 +++-- tex/context/base/anch-bar.mkiv | 5 ++--- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4076 -> 4077 bytes tex/context/base/context-version.png | Bin 105602 -> 105837 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24333 -> 24332 bytes tex/context/base/status-lua.pdf | Bin 178827 -> 178832 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) diff --git a/metapost/context/base/mp-apos.mpiv b/metapost/context/base/mp-apos.mpiv index 34dd57576..fad185b78 100644 --- a/metapost/context/base/mp-apos.mpiv +++ b/metapost/context/base/mp-apos.mpiv @@ -68,6 +68,7 @@ enddef ; def anch_sidebars_draw (expr p_b_self, p_e_self, y_b_self, y_e_self, h_b_self, d_e_self, x, y, w, h, alternative, distance, linewidth, linecolor, topoffset, bottomoffset) = + % beware, we anchor at (x,y) begingroup ; if alternative = 1 : interim linecap := rounded ; @@ -88,8 +89,8 @@ def anch_sidebars_draw (expr p_b_self, p_e_self, y_b_self, y_e_self, h_b_self, d a := (-distance,h) ; b := (-distance,0) ; fi ; - a := (xpart a, min(ypart a + topoffset, y+h)) ; - b := (xpart b, max(ypart b - bottomoffset,y )) ; + a := (xpart a, min(ypart a + topoffset, h)) ; + b := (xpart b, max(ypart b - bottomoffset,0)) ; draw a -- b if alternative = 1 : diff --git a/tex/context/base/anch-bar.mkiv b/tex/context/base/anch-bar.mkiv index 97f0ba184..9f9770fb6 100644 --- a/tex/context/base/anch-bar.mkiv +++ b/tex/context/base/anch-bar.mkiv @@ -68,7 +68,7 @@ \setupsidebar [\c!rulethickness=2pt, - \c!rulecolor=red, + \c!rulecolor=\s!black, \c!alternative=0, \c!topoffset=0pt, \c!bottomoffset=0pt, @@ -144,8 +144,7 @@ \definesidebar [\v!margin] - [\c!rulecolor=\s!black, - \c!rulethickness=\@@karulethickness, + [\c!rulethickness=\@@karulethickness, \c!distance=\dimexpr\leftmargindistance-\@@karulethickness/2\relax] \definecomplexorsimple\startmarginrule diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 058e38475..8797cb81e 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.11 12:15} +\newcontextversion{2012.05.11 13:19} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 2384043ec..3296f06da 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.11 12:15} +\newcontextversion{2012.05.11 13:19} %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/context-version.pdf b/tex/context/base/context-version.pdf index 207383af2..73ddb663a 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 0e491bbaf..76b308b51 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 8ab8b944e..a327be3e5 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.11 12:15} +\edef\contextversion{2012.05.11 13:19} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 1043e0fb6..9c1146866 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.11 12:15} +\edef\contextversion{2012.05.11 13:19} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index be9e00f80..4cb9e63b8 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 98d051d4b..5c252820b 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 70ed3fc6b..b1d15c50d 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/11/12 12:15:52 +-- merge date : 05/11/12 13:19:54 do -- begin closure to overcome local limits and interference -- cgit v1.2.3