summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-05-11 12:15:00 +0200
committerHans Hagen <pragma@wxs.nl>2012-05-11 12:15:00 +0200
commitb25ebfbda7efe454220aef8e6ef7a5486821e0dc (patch)
tree6e92ab566e522b43ac565dba7421bb7b345a30fd /tex
parente888c1ec949100dee585a5206d76b49cbee91ac4 (diff)
downloadcontext-b25ebfbda7efe454220aef8e6ef7a5486821e0dc.tar.gz
beta 2012.05.11 12:15
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/anch-bar.mkiv8
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4075 -> 4076 bytes
-rw-r--r--tex/context/base/context-version.pngbin104928 -> 105602 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24324 -> 24333 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin178829 -> 178827 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 11 insertions, 7 deletions
diff --git a/tex/context/base/anch-bar.mkiv b/tex/context/base/anch-bar.mkiv
index 1dac46b56..97f0ba184 100644
--- a/tex/context/base/anch-bar.mkiv
+++ b/tex/context/base/anch-bar.mkiv
@@ -70,6 +70,8 @@
[\c!rulethickness=2pt,
\c!rulecolor=red,
\c!alternative=0,
+ \c!topoffset=0pt,
+ \c!bottomoffset=0pt,
\c!distance=.5\bodyfontsize]
\let\setupsidebars\setupsidebar
@@ -92,6 +94,8 @@
linewidth=\sidebarparameter\c!rulethickness,
linecolor=\sidebarparameter\c!rulecolor,
alternative=\sidebarparameter\c!alternative,
+ topoffset=\sidebarparameter\c!topoffset,
+ bottomoffset=\sidebarparameter\c!bottomoffset,
distance=\the\c_anch_sidebars_distance}}%
\stoppositionoverlay
\bpos{sidebar:\the\c_anch_sidebars_n}}
@@ -110,7 +114,8 @@
anch_sidebars_draw (
\MPp\MPbself,\MPp\MPeself,\MPy\MPbself,\MPy\MPeself,\MPh\MPbself,\MPd\MPeself,
\MPx{\textanchor},\MPy{\textanchor},\MPw{\textanchor},\MPh{\textanchor},
- \MPvar{alternative},\MPvar{distance},\MPvar{linewidth},\MPvar{linecolor}
+ \MPvar{alternative},\MPvar{distance},\MPvar{linewidth},\MPvar{linecolor},
+ \MPvar{topoffset}, \MPvar{bottomoffset}
) ;
\stopMPpositiongraphic
\MPpositiongraphic{mpos:sidebar}{}%
@@ -141,7 +146,6 @@
[\v!margin]
[\c!rulecolor=\s!black,
\c!rulethickness=\@@karulethickness,
- \c!alternative=0,
\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 ff5a95a5a..058e38475 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 10:07}
+\newcontextversion{2012.05.11 12:15}
%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 b8d2b7dad..2384043ec 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 10:07}
+\newcontextversion{2012.05.11 12:15}
%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 6be315f83..207383af2 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 07aa52736..0e491bbaf 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index e3eb44226..8ab8b944e 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 10:07}
+\edef\contextversion{2012.05.11 12:15}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 240bb76cc..1043e0fb6 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 10:07}
+\edef\contextversion{2012.05.11 12:15}
%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 8a5cb9254..be9e00f80 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 98ec8c263..98d051d4b 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e3ea8182e..70ed3fc6b 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 10:07:59
+-- merge date : 05/11/12 12:15:52
do -- begin closure to overcome local limits and interference