summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context-version.pdfbin4253 -> 4249 bytes
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/font-afm.lua9
-rw-r--r--tex/context/base/mkiv/mult-def.lua3
-rw-r--r--tex/context/base/mkiv/mult-ini.lua17
-rw-r--r--tex/context/base/mkiv/mult-ini.mkiv1
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin9125 -> 9126 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin267932 -> 267905 bytes
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin795945 -> 819870 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60794 -> 60792 bytes
-rw-r--r--tex/context/modules/mkiv/x-setups-basics.mkiv169
-rw-r--r--tex/context/modules/mkiv/x-setups-overview.mkiv6
-rw-r--r--tex/context/modules/mkiv/x-setups.mkiv28
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua7
15 files changed, 154 insertions, 90 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index daf462b45..d381b5c2b 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index caa9c31df..4dc765daa 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.04.21 19:35}
+\newcontextversion{2016.04.22 09:10}
%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 9f4ef2327..83e7b46b1 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.04.21 19:35}
+\edef\contextversion{2016.04.22 09:10}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-afm.lua b/tex/context/base/mkiv/font-afm.lua
index 3dedf12e1..700330408 100644
--- a/tex/context/base/mkiv/font-afm.lua
+++ b/tex/context/base/mkiv/font-afm.lua
@@ -56,7 +56,7 @@ local pfb = constructors.newhandler("pfb")
local afmfeatures = constructors.newfeatures("afm")
local registerafmfeature = afmfeatures.register
-afm.version = 1.500 -- incrementing this number one up will force a re-cache
+afm.version = 1.501 -- incrementing this number one up will force a re-cache
afm.cache = containers.define("fonts", "afm", afm.version, true)
afm.autoprefixed = true -- this will become false some day (catches texnansi-blabla.*)
@@ -547,9 +547,10 @@ local uparser = fonts.mappings.makenameparser()
unify = function(data, filename)
local unicodevector = fonts.encodings.agl.unicodes -- loaded runtime in context
- local unicodes, names = { }, { }
- local private = constructors.privateoffset
- local descriptions = data.descriptions
+ local unicodes = { }
+ local names = { }
+ local private = constructors.privateoffset
+ local descriptions = data.descriptions
for name, blob in next, data.characters do
local code = unicodevector[name] -- or characters.name_to_unicode[name]
if not code then
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index 0d0c30c30..5dbfed038 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -17641,8 +17641,7 @@ return {
["nl"]="xmlsetup",
["ro"]="xmlsetup",
},
- ["cd:sign-s"] = { en = "[-+]" },
- ["cd:sign-l"] = { en = "[-+]" },
+ ["cd:sign"] = { en = "[-+]" },
["cd:csname-s"] = { en = "\\..." },
["cd:csname-l"] = { en = "\\..." },
["cd:noargument-s"] = { en = "\\..." },
diff --git a/tex/context/base/mkiv/mult-ini.lua b/tex/context/base/mkiv/mult-ini.lua
index 409c735b7..76517f37e 100644
--- a/tex/context/base/mkiv/mult-ini.lua
+++ b/tex/context/base/mkiv/mult-ini.lua
@@ -412,14 +412,23 @@ implement {
arguments = "string",
}
-implement {
- name = "getsetupstring",
- actions = function(s)
+local function gss(s)
contextsprint(vrbcatcodes,getsetupstring(s))
- end,
+ end
+
+implement { -- will b eoverloaded
+ name = "getsetupstring",
+ actions = gss,
arguments = "string",
}
+implement {
+ name = "rawsetupstring",
+ actions = gss,
+ arguments = "string",
+}
+
+
local function showassignerror(namespace,key,line)
local ns, instance = match(namespace,"^(%d+)[^%a]+(%a*)")
if ns then
diff --git a/tex/context/base/mkiv/mult-ini.mkiv b/tex/context/base/mkiv/mult-ini.mkiv
index 8ed147c63..d7dc31ec1 100644
--- a/tex/context/base/mkiv/mult-ini.mkiv
+++ b/tex/context/base/mkiv/mult-ini.mkiv
@@ -393,6 +393,7 @@
\unexpanded\def\displaymessage#1{\blank\inlinemessage{#1}\blank}
\let\getsetupstring\clf_getsetupstring
+\let\rawsetupstring\clf_rawsetupstring
%D \macros
%D {ifshowwarnings, ifshowmessages}
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index f5692f2c4..e82c04d33 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 65ec9e7c7..81020316e 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index e2ed2a303..1618b88cb 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 0a5e89416..2ad52535e 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/context/modules/mkiv/x-setups-basics.mkiv b/tex/context/modules/mkiv/x-setups-basics.mkiv
index 39547591c..283067fcb 100644
--- a/tex/context/modules/mkiv/x-setups-basics.mkiv
+++ b/tex/context/modules/mkiv/x-setups-basics.mkiv
@@ -239,6 +239,13 @@
arguments = "string",
}
+ interfaces.implement {
+ name = "rawsetupstring",
+ actions = { getsetupstring, context },
+ overload = true,
+ arguments = "string",
+ }
+
\stopluacode
% <?xml version="1.0" encoding="UTF-8"?>
@@ -434,16 +441,17 @@
\stopxmlsetups
\startxmlsetups xml:setups:typeset:raw
- \tttf
\nohyphens
\veryraggedright
\global\c_cmd_current_argument\zerocount
\global\c_cmd_maximum_argument\xmlfilter{#1}{/arguments/*/s_count()}\relax
\xmlsetup{#1}{xml:setups:make:prepare}
+ \ttbf
\directsetup{xml:setups:make:start}
\xmldoif{#1}{/arguments} {
\settrue\c_cmd_doing_line
\bgroup
+ \tttf
\global\c_cmd_current_argument\zerocount
\ignorespaces
\xmlfilter{#1}{/arguments/text()}
@@ -465,6 +473,20 @@
}
\stopxmlsetups
+\startxmlsetups xml:setups:instance
+ \xmlatt{#1}{value}\enspace
+\stopxmlsetups
+
+\startxmlsetups xml:setups:typeset:instances
+ \xmldoif{#1}{/instances} {
+ \godown[.75\lineheight]
+ {\ttbf instances:}
+ \enspace
+ \xmlfilter{#1}{/instances/constant/command(xml:setups:instance)}
+ \removeunwantedspaces
+ }
+\stopxmlsetups
+
\startxmlsetups xml:setups:typeset:yes
\glet\m_cmd_current_file\empty
\ifcase\c_cmd_kind
@@ -478,6 +500,8 @@
\xmlsetup{#1}{xml:setups:typeset:raw}
\endgraf
\xmlsetup{#1}{xml:setups:typeset:detail}
+ \endgraf
+ \xmlsetup{#1}{xml:setups:typeset:instances}
\getvalue{\e!stop setuptext}
\fi
\glet\m_cmd_current_file\empty
@@ -529,66 +553,65 @@
\ignorespaces
\stopxmlsetups
-\startxmlsetups xml:setups:content \showSETUPcomponent{#1}{content} \stopxmlsetups
-\startxmlsetups xml:setups:displaymath \showSETUPcomponent{#1}{displaymath}\stopxmlsetups
-\startxmlsetups xml:setups:index \showSETUPcomponent{#1}{index} \stopxmlsetups
-\startxmlsetups xml:setups:math \showSETUPcomponent{#1}{math} \stopxmlsetups
-\startxmlsetups xml:setups:nothing \showSETUPcomponent{#1}{nothing} \stopxmlsetups
-\startxmlsetups xml:setups:file \showSETUPcomponent{#1}{file} \stopxmlsetups
-\startxmlsetups xml:setups:position \showSETUPcomponent{#1}{position} \stopxmlsetups
-\startxmlsetups xml:setups:reference \showSETUPcomponent{#1}{reference} \stopxmlsetups
-\startxmlsetups xml:setups:csname \showSETUPcomponent{#1}{csname} \stopxmlsetups
-\startxmlsetups xml:setups:destination \showSETUPcomponent{#1}{destination}\stopxmlsetups
-\startxmlsetups xml:setups:triplet \showSETUPcomponent{#1}{triplet} \stopxmlsetups
-\startxmlsetups xml:setups:word \showSETUPcomponent{#1}{word} \stopxmlsetups
-\startxmlsetups xml:setups:template \showSETUPcomponent{#1}{template} \stopxmlsetups
-\startxmlsetups xml:setups:angles \showSETUPcomponent{#1}{angles} \stopxmlsetups
-\startxmlsetups xml:setups:apply \showSETUPcomponent{#1}{apply} \stopxmlsetups
-\startxmlsetups xml:setups:twowords \showSETUPcomponent{#1}{twowords} \stopxmlsetups
-\startxmlsetups xml:setups:threewords \showSETUPcomponent{#1}{threewords} \stopxmlsetups
-\startxmlsetups xml:setups:text \showSETUPcomponent{#1}{text} \stopxmlsetups
+\startxmlsetups xml:setups:content \show_setup_component{#1}{content} \stopxmlsetups
+\startxmlsetups xml:setups:displaymath \show_setup_component{#1}{displaymath}\stopxmlsetups
+\startxmlsetups xml:setups:index \show_setup_component{#1}{index} \stopxmlsetups
+\startxmlsetups xml:setups:math \show_setup_component{#1}{math} \stopxmlsetups
+\startxmlsetups xml:setups:nothing \show_setup_component{#1}{nothing} \stopxmlsetups
+\startxmlsetups xml:setups:file \show_setup_component{#1}{file} \stopxmlsetups
+\startxmlsetups xml:setups:position \show_setup_component{#1}{position} \stopxmlsetups
+\startxmlsetups xml:setups:reference \show_setup_component{#1}{reference} \stopxmlsetups
+\startxmlsetups xml:setups:csname \show_setup_component{#1}{csname} \stopxmlsetups
+\startxmlsetups xml:setups:destination \show_setup_component{#1}{destination}\stopxmlsetups
+\startxmlsetups xml:setups:triplet \show_setup_component{#1}{triplet} \stopxmlsetups
+\startxmlsetups xml:setups:word \show_setup_component{#1}{word} \stopxmlsetups
+\startxmlsetups xml:setups:template \show_setup_component{#1}{template} \stopxmlsetups
+\startxmlsetups xml:setups:angles \show_setup_component{#1}{angles} \stopxmlsetups
+\startxmlsetups xml:setups:apply \show_setup_component{#1}{apply} \stopxmlsetups
+\startxmlsetups xml:setups:twowords \show_setup_component{#1}{twowords} \stopxmlsetups
+\startxmlsetups xml:setups:threewords \show_setup_component{#1}{threewords} \stopxmlsetups
+\startxmlsetups xml:setups:text \show_setup_component{#1}{text} \stopxmlsetups
% todo: cd:par => \par
% todo: cd:sep => \\
-\unexpanded\def\showSETUPcomponent#1#2%
+\unexpanded\def\show_setup_component#1#2%
{\ifconditional\c_cmd_doing_line
- \getvalue{showSETUP#2}{#1}%
+ \getvalue{show_setup_#2}{#1}%
\else
\simpleSETUPargument{#2}%
\fi}
%D This is the second pass; here we generate the table.
-\unexpanded\def\startfirstSETUPcolumn#1%
+\unexpanded\def\cmd_column_one_start
{\bgroup
\scratchdimen2\emwidth
\advance\leftskip \scratchdimen
- \noindent\llap{\hbox to \scratchdimen{#1\hss}}}
+ \noindent\llap{\hbox to \scratchdimen{\show_setup_number\hss}}%
+ \strut}
-\unexpanded\def\stopfirstSETUPcolumn
+\unexpanded\def\cmd_column_one_stop
{\endgraf
\egroup}
-\unexpanded\def\startsecondSETUPcolumn#1#2%
+\unexpanded\def\cmd_column_two_start#1#2%
{\bgroup
\scratchdimen2.5\emwidth
\advance\hangindent\dimexpr\d_cmd_current_width+\scratchdimen\relax
- \noindent \hbox to \hangindent{#1\hss\hbox to \scratchdimen{\hss#2\hss}}}
+ \noindent \hbox to \hangindent{#1\hss\hbox to \scratchdimen{\hss#2\hss}}%
+ \strut}
-\unexpanded\def\stopsecondSETUPcolumn
+\unexpanded\def\cmd_column_two_stop
{\endgraf
\egroup}
-\unexpanded\def\secondSETUPcolumn#1#2%
- {\startsecondSETUPcolumn{#1}{#2}\stopsecondSETUPcolumn}
-
\startxmlsetups xml:setups:assignments
\ifconditional\c_cmd_doing_line
\ifcase\c_cmd_kind
- \expandafter\showSETUPline
+ \expandafter\show_setup_line
\else
- \expandafter\showSETUP
+ \expandafter\show_setup_any
\fi{#1}{assignment\xmlattdef{#1}{delimiters}{brackets}}
\else
\global\d_cmd_current_width\zeropoint
@@ -597,15 +620,15 @@
\xmlall{#1}{/(parameter|resolve)}
\egroup
\global\d_cmd_current_width\themaxboxwidth\scratchbox\relax
- \startfirstSETUPcolumn{\showSETUPnumber}%
+ \cmd_column_one_start
\ignorespaces
\xmldoifelse {#1} {/(parameter|inherit|resolve)} {
\xmlflush{#1}
} {
\unknown
}
- \stopfirstSETUPcolumn
- \blank[\v!halfline]
+ \cmd_column_one_stop
+ \godown[.75\lineheight]
\ignorespaces
\fi
\stopxmlsetups
@@ -613,16 +636,16 @@
\startxmlsetups xml:setups:keywords
\ifconditional\c_cmd_doing_line
\ifcase\c_cmd_kind
- \expandafter\showSETUPline
+ \expandafter\show_setup_line
\else
- \expandafter\showSETUP
+ \expandafter\show_setup_any
\fi{#1}{\xmlattdef{#1}{delimiters}{brackets}}
\else
- \startfirstSETUPcolumn{\showSETUPnumber}%
+ \cmd_column_one_start
\ignorespaces
\xmlflush{#1}
- \stopfirstSETUPcolumn
- \blank[\v!halfline]
+ \cmd_column_one_stop
+ \godown[.75\lineheight]
\ignorespaces
\fi
\stopxmlsetups
@@ -631,7 +654,7 @@
\ifconditional\c_cmd_measuring
\getsetupstring{\xmlatt{#1}{name}}\par
\else
- \startsecondSETUPcolumn{\getsetupstring{\xmlatt{#1}{name}}}{=}
+ \cmd_column_two_start{\getsetupstring{\xmlatt{#1}{name}}}{=}
\ignorespaces
\xmlflush{#1}
\doifmode{interface:setup:defaults} {
@@ -648,7 +671,7 @@
\endgroup
\fi
}
- \stopsecondSETUPcolumn
+ \cmd_column_two_stop
\fi
\ignorespaces
\stopxmlsetups
@@ -691,25 +714,25 @@
\stopxmlsetups
\startxmlsetups xml:setups:inherit
- \secondSETUPcolumn {
- \cmd_text_value{\getsetupstring{cd:inherits}}
+% \cmd_column_two_start{}{}
+ \rawsetupstring{cd:inherits}:
\enspace
\letterbackslash
\xmlatt{#1}{name}
- } {}
+% \cmd_column_two_stop
\ignorespaces
\stopxmlsetups
\unexpanded\def\simpleSETUPargument#1%
- {\startfirstSETUPcolumn{\showSETUPnumber}%
+ {\cmd_column_one_start
\cmd_internal_value{#1}%
- \stopfirstSETUPcolumn
- \blank[\v!halfline]
+ \cmd_column_one_stop
+ \godown[.75\lineheight]
\ignorespaces}
%D Auxiliary.
-\unexpanded\def\showSETUP#1#2%
+\unexpanded\def\show_setup_any#1#2%
{\bgroup
\global\advance\c_cmd_current_argument\plusone
\setbox0=\hbox
@@ -743,12 +766,12 @@
\egroup
\ignorespaces}
-\unexpanded\def\showSETUPline#1#2%
+\unexpanded\def\show_setup_line#1#2%
{\kern.5\emwidth
\getsetupstring{cd:#2-s}%
\ignorespaces}
-\unexpanded\def\showSETUPnumber
+\unexpanded\def\show_setup_number
{\global\advance\c_cmd_current_argument\plusone
\hbox to 2\emwidth
{\ifcase\c_cmd_maximum_argument \relax
@@ -766,26 +789,26 @@
% arguments
-\unexpanded\def\showSETUPdisplaymath#1{\showSETUP {#1}{displaymath}}
-\unexpanded\def\showSETUPindex #1{\showSETUP {#1}{index}}
-\unexpanded\def\showSETUPmath #1{\showSETUP {#1}{math}}
-\unexpanded\def\showSETUPnothing #1{\showSETUP {#1}{nothing}}
-\unexpanded\def\showSETUPfile #1{\showSETUP {#1}{file}}
-\unexpanded\def\showSETUPposition #1{\showSETUP {#1}{position}}
-\unexpanded\def\showSETUPtemplate #1{\showSETUP {#1}{template}}
-\unexpanded\def\showSETUPangles #1{\showSETUP {#1}{angle}}
-\unexpanded\def\showSETUPreference #1{\showSETUP {#1}{reference}}
-\unexpanded\def\showSETUPapply #1{\showSETUP {#1}{apply}}
-\unexpanded\def\showSETUPtwowords #1{\showSETUP {#1}{twowords}}
-\unexpanded\def\showSETUPthreewords #1{\showSETUP {#1}{threewords}}
-\unexpanded\def\showSETUPcsname #1{\showSETUP {#1}{noargument}}
-\unexpanded\def\showSETUPdestination#1{\showSETUP {#1}{destination}}
-\unexpanded\def\showSETUPtriplet #1{\showSETUP {#1}{triplet}}
-\unexpanded\def\showSETUPword #1{\showSETUP {#1}{word}}
-\unexpanded\def\showSETUPcontent #1{\showSETUP {#1}{content}}
-\unexpanded\def\showSETUPtext #1{\showSETUP {#1}{textual}}
-\unexpanded\def\showSETUPto #1{\showSETUPline{#1}{to}}
-\unexpanded\def\showSETUPmacro #1{\showSETUP {#1}{macro}}
+\unexpanded\def\show_setup_displaymath#1{\show_setup_any {#1}{displaymath}}
+\unexpanded\def\show_setup_index #1{\show_setup_any {#1}{index}}
+\unexpanded\def\show_setup_math #1{\show_setup_any {#1}{math}}
+\unexpanded\def\show_setup_nothing #1{\show_setup_any {#1}{nothing}}
+\unexpanded\def\show_setup_file #1{\show_setup_any {#1}{file}}
+\unexpanded\def\show_setup_position #1{\show_setup_any {#1}{position}}
+\unexpanded\def\show_setup_template #1{\show_setup_any {#1}{template}}
+\unexpanded\def\show_setup_angles #1{\show_setup_any {#1}{angle}}
+\unexpanded\def\show_setup_reference #1{\show_setup_any {#1}{reference}}
+\unexpanded\def\show_setup_apply #1{\show_setup_any {#1}{apply}}
+\unexpanded\def\show_setup_twowords #1{\show_setup_any {#1}{twowords}}
+\unexpanded\def\show_setup_threewords #1{\show_setup_any {#1}{threewords}}
+\unexpanded\def\show_setup_csname #1{\show_setup_any {#1}{noargument}}
+\unexpanded\def\show_setup_destination#1{\show_setup_any {#1}{destination}}
+\unexpanded\def\show_setup_triplet #1{\show_setup_any {#1}{triplet}}
+\unexpanded\def\show_setup_word #1{\show_setup_any {#1}{word}}
+\unexpanded\def\show_setup_content #1{\show_setup_any {#1}{content}}
+\unexpanded\def\show_setup_text #1{\show_setup_any {#1}{textual}}
+\unexpanded\def\show_setup_to #1{\show_setup_line{#1}{to}}
+\unexpanded\def\show_setup_macro #1{\show_setup_any {#1}{macro}}
% A prelude to a rewrite and some more:
@@ -827,7 +850,7 @@
\stopxmlsetups
\startxmlsetups xml:setups:parameters:values
- \blank[big]
+ \blank[\v!big]
\expanded {
\parametercommand {
\currentsetupparametercommand
@@ -839,7 +862,7 @@
\fi
}
}
- \blank[big,samepage]
+ \blank[\v!big,\v!samepage]
\starttabulate[|l|p|]
\xmlall
{#1}
diff --git a/tex/context/modules/mkiv/x-setups-overview.mkiv b/tex/context/modules/mkiv/x-setups-overview.mkiv
index 35ded7a86..a0d0aa1b8 100644
--- a/tex/context/modules/mkiv/x-setups-overview.mkiv
+++ b/tex/context/modules/mkiv/x-setups-overview.mkiv
@@ -127,13 +127,15 @@
\setuplayout
[\c!backspace=2cm,
\c!topspace=1.5cm,
+ \c!bottomspace=0.5cm,
\c!header=0cm,
- \c!footer=0cm,
+ \c!footer=1cm,
\c!width=\v!middle,
\c!height=\v!middle]
\setuppagenumbering
- [\c!alternative=\v!doublesided]
+ [\c!location=\v!footer,
+ \c!alternative=\v!doublesided]
\setupsetup
[\c!criterium=\v!all]
diff --git a/tex/context/modules/mkiv/x-setups.mkiv b/tex/context/modules/mkiv/x-setups.mkiv
new file mode 100644
index 000000000..0de32b278
--- /dev/null
+++ b/tex/context/modules/mkiv/x-setups.mkiv
@@ -0,0 +1,28 @@
+%D \module
+%D [ file=setups,
+%D version=2016.04.05,
+%D title=\CONTEXT\ Setup Definitions,
+%D subtitle=Main loader,
+%D author={Hans Hagen & Wolfgang Schuster},
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\usemodule[setups-basics]
+
+\loadsetups[i-context]
+
+\continueifinputfile{x-setups.mkiv}
+
+\starttext
+
+test \blank[small] test
+
+\showsetup[framed]
+
+\showsetup[setupframed]
+
+\stoptext
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 22692b566..09a24b922 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 : 04/21/16 19:35:29
+-- merge date : 04/22/16 09:10:04
do -- begin closure to overcome local limits and interference
@@ -7002,7 +7002,7 @@ local afm=constructors.newhandler("afm")
local pfb=constructors.newhandler("pfb")
local afmfeatures=constructors.newfeatures("afm")
local registerafmfeature=afmfeatures.register
-afm.version=1.500
+afm.version=1.501
afm.cache=containers.define("fonts","afm",afm.version,true)
afm.autoprefixed=true
afm.helpdata={}
@@ -7367,7 +7367,8 @@ end
local uparser=fonts.mappings.makenameparser()
unify=function(data,filename)
local unicodevector=fonts.encodings.agl.unicodes
- local unicodes,names={},{}
+ local unicodes={}
+ local names={}
local private=constructors.privateoffset
local descriptions=data.descriptions
for name,blob in next,data.characters do
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 16:56:05 +0000