summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-08-07 22:54:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-08-07 22:54:00 +0200
commitb4fc4fd964c41a39a7fedd1c1900275a58ffc74f (patch)
treebbc901afefe830bc4686df6497d6365fbbd63708
parente72282d8bebe95a17ac2834447ed0415490442aa (diff)
downloadcontext-b4fc4fd964c41a39a7fedd1c1900275a58ffc74f.tar.gz
beta 2013.08.07 22:54
-rw-r--r--tex/context/base/context-version.pdfbin4101 -> 4109 bytes
-rw-r--r--tex/context/base/spac-hor.mkiv47
-rw-r--r--tex/context/base/status-files.pdfbin24685 -> 24695 bytes
3 files changed, 42 insertions, 5 deletions
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
Binary files differ
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
Binary files differ