beta 2013.08.07 22:54

7 files changed, 46 insertions, 9 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 23c9870c7..8756b109c 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{2013.08.07 22:10}
+\newcontextversion{2013.08.07 22:54}
 
 %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 82498a60b..b65dc8de6 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c7c73cc57..c910661c5 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.08.07 22:10}
+\edef\contextversion{2013.08.07 22:54}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/spac-hor.mkiv b/tex/context/base/spac-hor.mkiv
index 2ce502fb5..bd3ef8e82 100644
--- a/tex/context/base/spac-hor.mkiv
+++ b/tex/context/base/spac-hor.mkiv
@@ -613,14 +613,51 @@
   {\begingroup
    \dodoubleempty\spac_narrower_start_named}
 
-\def\spac_narrower_start_named[#1][#2]%
-  {\edef\currentnarrower{#1}%
-   \ifsecondargument
-     \spac_narrower_start_apply{#2}%
+% \def\spac_narrower_start_named[#1][#2]%
+%   {\edef\currentnarrower{#1}%
+%    \ifsecondargument
+%      \spac_narrower_start_apply{#2}%
+%    \else
+%      \spac_narrower_start_apply{\narrowerparameter\v!default}%
+%    \fi}
+
+\def\spac_narrower_start_named
+  {\ifsecondargument
+      \expandafter\spac_narrower_start_named_two
    \else
-     \spac_narrower_start_apply{\narrowerparameter\v!default}%
+      \expandafter\spac_narrower_start_named_one
    \fi}
 
+\def\spac_narrower_start_named_one[#1]%
+  {\doifassignmentelse{#1}\spac_narrower_start_named_one_yes\spac_narrower_start_named_one_nop[#1]}
+
+\def\spac_narrower_start_named_one_yes[#1][#2]% [settings] []
+  {\setupcurrentnarrower[#1]%
+   \spac_narrower_start_apply{\narrowerparameter\v!default}}
+
+\def\spac_narrower_start_named_one_nop[#1][#2]% [tag] []
+  {\edef\currentnarrower{#1}%
+   \spac_narrower_start_apply{\narrowerparameter\v!default}}
+
+\def\spac_narrower_start_named_two[#1]%
+  {\doifassignmentelse{#1}\spac_narrower_start_named_settings_how\spac_narrower_start_named_tag_unknown[#1]}
+
+\def\spac_narrower_start_named_settings_how[#1][#2]% [settings] [how]
+  {\setupcurrentnarrower[#1]%
+   \spac_narrower_start_apply{#2}}
+
+\def\spac_narrower_start_named_tag_unknown[#1][#2]% [tag] [...]
+  {\doifassignmentelse{#2}\spac_narrower_start_named_tag_settings\spac_narrower_start_named_tag_how[#1][#2]}
+
+\def\spac_narrower_start_named_tag_settings[#1][#2]% [tag] [settings]
+  {\edef\currentnarrower{#1}%
+   \setupcurrentnarrower[#2]%
+   \spac_narrower_start_apply{\narrowerparameter\v!default}}
+
+\def\spac_narrower_start_named_tag_how[#1][#2]% [tag] [how]
+  {\edef\currentnarrower{#1}%
+   \spac_narrower_start_apply{#2}}
+
 \let\stopnarrow\spac_narrower_stop
 
 \newdimen\d_spac_effective_hsize     \def\effectivehsize    {\hsize}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2c5b3f351..d4b901c03 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 070225bd4..c80e18120 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.08.07 22:10 MKIV beta  fmt: 2013.8.7  int: english/english
+ConTeXt  ver: 2013.08.07 22:54 MKIV beta  fmt: 2013.8.7  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 5bf27b352..77e355eb2 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  : 08/07/13 22:10:50
+-- merge date  : 08/07/13 22:54:47
 
 do -- begin closure to overcome local limits and interference