beta 2013.09.18 10:06

10 files changed, 47 insertions, 22 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fbba84639..074c7b778 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.09.18 01:14}
+\newcontextversion{2013.09.18 10:06}
 
 %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 9dd6a9c43..55a71b6ac 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 c998bbebc..fcf1b85e3 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.09.18 01:14}
+\edef\contextversion{2013.09.18 10:06}
 \edef\contextkind   {beta}
 
 %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 30c35288f..ff9b9f988 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 6790a5988..771f67ad7 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.09.18 01:14 MKIV beta  fmt: 2013.9.18  int: english/english
+ConTeXt  ver: 2013.09.18 10:06 MKIV beta  fmt: 2013.9.18  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/strc-itm.mkvi
index 356c4bb15..6d8745b19 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -1444,6 +1444,19 @@
 
 \fi
 
+\relaxvalueifundefined \v!item
+\relaxvalueifundefined \v!sub
+\relaxvalueifundefined \v!sym
+\relaxvalueifundefined \v!ran
+\relaxvalueifundefined \v!head
+\relaxvalueifundefined \v!its
+\relaxvalueifundefined \v!mar
+\relaxvalueifundefined \v!txt
+\relaxvalueifundefined {\e!start\v!item}
+\relaxvalueifundefined {\e!stop \v!item}
+\relaxvalueifundefined {\e!start\v!head}
+\relaxvalueifundefined {\e!stop \v!head}
+
 %D A nice example of a plugin:
 %D
 %D \startbuffer
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index 190d463ab..fdf8fb7f4 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -625,10 +625,16 @@
         \dontleavehmode % in case there is no strut, else side effects with llap
         \ifconditional\headshownumber
             \llap {
+                \signalrightpage
                 \hbox {
                     \hfill
                     \headnumbercontent
-                    \hskip\dimexpr\d_strc_rendering_local_leftoffset+\doifoddpageelse\leftmargindistance\rightmargindistance\relax
+                    \doifrightpageelse{
+                        \scratchdistance\leftmargindistance
+                    } {
+                        \scratchdistance\rightmargindistance
+                    }
+                    \hskip\dimexpr\d_strc_rendering_local_leftoffset+\scratchdistance\relax
                 }
             }
         \fi
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 79560892b..5cb6ff8b2 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -2892,13 +2892,18 @@
 %D
 %D Trivial:
 
-\def\letempty             #1{\let#1\empty}
-\def\globalletempty#1{\global\let#1\empty}
+\unexpanded\def\letempty             #1{\let#1\empty}
+\unexpanded\def\globalletempty#1{\global\let#1\empty}
 
-\def\letvalueempty        #1{\expandafter\let\csname#1\endcsname\empty}
-\def\letgvalueempty#1{\global\expandafter\let\csname#1\endcsname\empty}
-\def\letvaluerelax        #1{\expandafter\let\csname#1\endcsname\relax}
-\def\letgvalurelax #1{\global\expandafter\let\csname#1\endcsname\relax}
+\unexpanded\def\letvalueempty        #1{\expandafter\let\csname#1\endcsname\empty}
+\unexpanded\def\letgvalueempty#1{\global\expandafter\let\csname#1\endcsname\empty}
+\unexpanded\def\letvaluerelax        #1{\expandafter\let\csname#1\endcsname\relax}
+\unexpanded\def\letgvalurelax #1{\global\expandafter\let\csname#1\endcsname\relax}
+
+\unexpanded\def\relaxvalueifundefined#1%
+  {\ifcsname#1\endcsname \else
+     \expandafter\let\csname#1\endcsname\relax
+   \fi}
 
 %D \macros
 %D   {wait}
diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/typo-cap.mkiv
index 0910d78c1..c4458129f 100644
--- a/tex/context/base/typo-cap.mkiv
+++ b/tex/context/base/typo-cap.mkiv
@@ -36,13 +36,14 @@
 
 %D Beware, these are not really defines (yet).
 
-\definecapitals[\v!WORD   ] % all upper
-\definecapitals[\v!capital] % one upper + font
-\definecapitals[\v!Capital] % some upper + font
-\definecapitals[\v!mixed  ] % UpperCase
-\definecapitals[\v!WORD   ] % all lower
-\definecapitals[\v!Word   ] % one upper + font
-\definecapitals[\v!Words  ] % some upper
+\definecapitals[\v!WORD]            % all upper
+\definecapitals[\v!capital]         % one upper + font
+\definecapitals[\v!Capital]         % some upper + font
+\definecapitals[\v!mixed]           % UpperCase
+\definecapitals[\v!WORD]            % all lower
+\definecapitals[\v!Word]            % one upper + font
+\definecapitals[\v!Words]           % some upper
+\definecapitals[\v!word][\c!style=] % nothing
 
 %D \macros
 %D   {Word, Words, WORD, WORDS}
@@ -185,6 +186,8 @@
 \unexpanded\def\realSmallcapped  {\groupedcommand{\typo_capitals_set_real\v!Word   }\donothing} % one upper + font
 \unexpanded\def\realSmallCapped  {\groupedcommand{\typo_capitals_set_real\v!Words  }\donothing} % some upper
 
+\unexpanded\def\notsmallcapped   {\groupedcommand{\typo_capitals_set_fake\v!word   }\donothing}
+
 \unexpanded\def\font_style_pseudosmallcapped{\typo_capitals_set_fake\v!WORD   } % all upper
 \unexpanded\def\font_style_pseudoSmallcapped{\typo_capitals_set_fake\v!capital} % one upper + font
 \unexpanded\def\font_style_pseudoSmallCapped{\typo_capitals_set_fake\v!Capital} % some upper + font
@@ -194,6 +197,8 @@
 \unexpanded\def\font_style_realSmallcapped  {\typo_capitals_set_real\v!Word   } % one upper + font
 \unexpanded\def\font_style_realSmallCapped  {\typo_capitals_set_real\v!Words  } % some upper
 
+\unexpanded\def\font_style_notsmallcapped   {\typo_capitals_set_fake\v!word   }
+
 \unexpanded\def\typo_capitals_smallcaps
   {\ifconditional\c_typo_capitals_pseudo
      \expandafter\firstoftwoarguments
@@ -229,10 +234,6 @@
 \let\font_style_normalWORD       \WORD
 \let\font_style_normalword       \word
 
-%D As suggested by WS:
-
-\unexpanded\def\notsmallcapped{\groupedcommand{\setcharactercasing[\v!word]\signalcharacter}{}}
-
 %D Further tweaks
 
 \let\normalsmallcapped\smallcapped
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fbdd27929..9e311c6b8 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  : 09/18/13 01:14:45
+-- merge date  : 09/18/13 10:06:34
 
 do -- begin closure to overcome local limits and interference