summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2014-01-24 14:17:00 +0100
committerHans Hagen <pragma@wxs.nl>2014-01-24 14:17:00 +0100
commit725c6683f9b5a9a3c86ac8e2f51d283d65a12430 (patch)
tree531175bc33d2b582e38b3ba112bece72d0094b38
parent2e53c8de743d380bdc1a4707adf274338df96508 (diff)
downloadcontext-725c6683f9b5a9a3c86ac8e2f51d283d65a12430.tar.gz
beta 2014.01.24 14:17
-rw-r--r--metapost/context/base/mp-base.mpiv11
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4113 -> 4120 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/publ-ini.mkiv79
-rw-r--r--tex/context/base/status-files.pdfbin24837 -> 24837 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin233974 -> 233976 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 49 insertions, 47 deletions
diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
index d5c7b8c21..638be4628 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mp-base.mpiv
@@ -607,7 +607,16 @@ enddef ;
% drawdot (10j,10);
% endfor ;
%
-% so ...
+% or:
+%
+%\startMPpage
+%
+% def drawdot expr z =
+% addto currentpicture contour (makepath currentpen shifted z) _op_
+% enddef;
+%
+% drawdot origin shifted (0,-3cm) withpen pencircle scaled 2cm ;
+% pickup pencircle scaled 2cm ; drawdot origin withcolor red ;
def drawdot expr p =
if pair p :
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b5cd9b9fc..0b15f297a 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{2014.01.24 10:20}
+\newcontextversion{2014.01.24 14:17}
%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/context-version.pdf b/tex/context/base/context-version.pdf
index c1a798a5a..7e39d8c19 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.mkiv b/tex/context/base/context.mkiv
index 23147890f..59304e67e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.01.24 10:20}
+\edef\contextversion{2014.01.24 14:17}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index d74e76aee..ee544ad9b 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -15,7 +15,6 @@
% todo: \v!cite => \s!cite
% todo: interface with (ml)bibtex (export -> call -> import)
% todo: check if 'all' etc are ok ... either use list or use other criterium
-% todo: maybe use description instead of list
% \definecolor[btx:field] [darkred]
% \definecolor[btx:crossref][darkblue]
@@ -45,14 +44,15 @@
\unprotect
+\def\s!btx{btx}
+\def\v!btxlist{btxlist}
+
% a dedicated construction mechanism
\installcorenamespace {btxlist}
\installcommandhandler \??btxlist {btxlist} \??btxlist
-\def\v!btxlist{btxlist}
-
\unexpanded\setvalue{\??constructioninitializer\v!btxlist}%
{\let\currentbtxlist \currentconstruction
\let\constructionparameter \btxlistparameter
@@ -79,13 +79,22 @@
\unexpanded\def\startbtxlistentry#1%
{\begingroup
- %\the\everybtxlistentry
\strc_constructions_initialize{#1}%
\csname\??constructionstarthandler\currentconstructionhandler\endcsname}
\unexpanded\def\stopbtxlistentry
{\csname\??constructionstophandler\currentconstructionhandler\endcsname}
+\unexpanded\setvalue{\??constructiontexthandler\v!btxlist}%
+ {\begingroup
+ \useconstructionstyleandcolor\c!headstyle\c!headcolor % move to \currentconstructiontext
+ \the\everyconstruction
+ \constructionparameter\c!headcommand
+ {\strut
+ \constructionparameter\c!text
+ \btx_reference_inject}%
+ \endgroup}
+
\unexpanded\def\strc_constructions_initialize#1% class instance
{\edef\currentconstruction{#1}%
\let\currentconstructionlistentry\!!zerocount
@@ -95,27 +104,23 @@
\csname\??constructioninitializer\currentconstructionhandler\endcsname}
\appendtoks
-% \ifx\currentbtxlistparent\empty
-% \defineconstruction[\currentbtxlist][\currentbtxlistparent][\s!handler=\v!btxlist,\c!level=1]%
-% \else
-% \defineconstruction[\currentbtxlist][\s!handler=\v!btxlist,\c!level=1]%
-% \fi
+ % \ifx\currentbtxlistparent\empty
+ % \defineconstruction[\currentbtxlist][\currentbtxlistparent][\s!handler=\v!btxlist,\c!level=1]%
+ % \else
+ % \defineconstruction[\currentbtxlist][\s!handler=\v!btxlist,\c!level=1]%
+ % \fi
\ifx\currentbtxlistparent\empty
- \letvalue{\??constructionmain\currentbtxlist}\currentbtx
+ \letvalue{\??constructionmain\currentbtxlist}\currentbtxlist
\else
\letvalue{\??constructionmain\currentbtxlist}\currentbtxparent
\fi
\setevalue{\??constructionlevel\currentbtxlist}{\number\btxlistparameter\c!level}%
\setevalue{\??constructionclass\currentbtxlist}{\btxlistparameter\s!handler}%
-% \settrue\c_strc_constructions_title_state
\to \everydefinebtxlist
\setupbtxlist
[\s!handler=\v!btxlist,
- \c!level=1,
-% \c!alternative=\v!left,
-% \c!distance=\emwidth]
-]
+ \c!level=1]
% here starts the bib stuff
@@ -277,7 +282,7 @@
%D Lists:
\newdimen\d_publ_number_width
-\newdimen\d_publ_number_distance
+%newdimen\d_publ_number_distance
\ifdefined\btxblock \else \newcount\btxblock \fi \btxblock\plusone
\ifdefined\btxcounter \else \newcount\btxcounter \fi
@@ -298,12 +303,6 @@
[btx]%
[\c!state=\v!start]%
-% \definedescription
-% [btx]
-% [\c!before=,
-% %\c!inbetween=,
-% \c!after=]
-
\appendtoks
\definebtxlist
[\currentbtxrendering]%
@@ -313,7 +312,7 @@
{\begingroup
\edef\currentbtxcategory{\btxfield{category}}%
\ignorespaces
- \directsetup{btx:\currentbtxalternative:\currentbtxcategory}%
+ \directsetup{\s!btx:\currentbtxalternative:\currentbtxcategory}%
\removeunwantedspaces
\endgroup}
@@ -337,7 +336,7 @@
{\begingroup
\edef\currentbtxrendering{#1}%
\setupcurrentbtxrendering[#2]%
- \edef\currentlist{btx:\currentbtxrendering}%
+ \let\currentlist\s!btx
\let\currentbtxlist\currentbtxrendering
\publ_place_list_check_criterium
\edef\currentbtxrenderingtitle{\btxrenderingparameter\c!title}%
@@ -354,7 +353,7 @@
{\begingroup
\edef\currentbtxrendering{#1}%
\setupcurrentbtxrendering[#2]%
- \edef\currentlist{btx}%
+ \let\currentlist\s!btx
\let\currentbtxlist\currentbtxrendering
\publ_place_list_check_criterium
\publ_place_list_indeed
@@ -378,7 +377,7 @@
% \determinelistcharacteristics[\currentbtxrendering]%
\edef\currentbtxalternative{\btxrenderingparameter\c!alternative}%
\edef\currentbtxdataset{\btxrenderingparameter\c!dataset}%
- \edef\currentlist{btx}%
+ \let\currentlist\s!btx
\let\currentbtxlist\currentbtxrendering
\the\everysetupbtxlistplacement
\forgetall
@@ -393,8 +392,7 @@
}}%
% next we analyze the width
\ifx\btx_reference_inject_indeed\relax
- \d_publ_number_width \zeropoint
- \d_publ_number_distance\zeropoint
+ % nothing
\else
\edef\p_width{\btxrenderingparameter\c!width}%
\ifx\p_width\v!auto
@@ -402,14 +400,9 @@
\setbox\scratchbox\vbox{\settrialtypesetting\ctxcommand{btxfetchlistentries("\currentbtxdataset")}}%
\d_publ_number_width\wd\scratchbox
\global\btxcounter\scratchcounter
- \else
- \d_publ_number_width\p_width
+ \letbtxlistparameter\c!width\d_publ_number_width
\fi
- \d_publ_number_distance\btxrenderingparameter\c!distance
\fi
- % only when authomatic
- \letbtxlistparameter\c!width \d_publ_number_width
- \letbtxlistparameter\c!distance\d_publ_number_distance
% this actually typesets them
\ctxcommand{btxflushlistentries("\currentbtxdataset","\btxrenderingparameter\c!sorttype")}%
\stoppacked
@@ -437,19 +430,14 @@
\endgroup}
\unexpanded\def\publ_place_list_entry
- {%\dontleavehmode
- %\begstrut
- \global\advance\btxcounter\plusone
+ {\global\advance\btxcounter\plusone
\ifconditional\c_publ_place_register
\publ_place_list_entry_register
\fi
- \edef\currentlist {btx}%
-% \let\currentbtxlist\currentbtxrendering
- \let\currentconstructiontext\btx_reference_inject
+ \let\currentlist\s!btx
\startbtxlistentry\currentbtxrendering
\btx_entry_inject
- \stopbtxlistentry
- }%\endstrut}
+ \stopbtxlistentry}
\unexpanded\def\btxchecklistentry#1% called at the lua end
{\begingroup
@@ -777,7 +765,12 @@
\def\currentbtxindex{0}
\unexpanded\def\btxlistvariant#1%
- {\ctxcommand{btxlistvariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1","\currentbtxindex")}} % some can go
+ {\begingroup
+ \edef\currentbtxlistvariant{#1}%
+ \btxlistvariantparameter\c!left
+ \ctxcommand{btxlistvariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1","\currentbtxindex")}% some can go
+ \btxlistvariantparameter\c!right
+ \endgroup}
%D Whatever helpers:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7fecea456..0cc6af901 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 32b02d0ce..69b99c513 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 65746de04..c9c0304e5 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 : 01/24/14 10:20:14
+-- merge date : 01/24/14 14:17:19
do -- begin closure to overcome local limits and interference