18 files changed, 44 insertions, 45 deletions
diff --git a/metapost/context/base/mp-grap.mpiv b/metapost/context/base/mp-grap.mpiv
index 68d95c9eb..757413a1c 100644
--- a/metapost/context/base/mp-grap.mpiv
+++ b/metapost/context/base/mp-grap.mpiv
@@ -60,8 +60,8 @@ vardef escaped_format(expr s) =
 enddef ;
 
 vardef dofmt_@#(expr f, x) =
-  % textext("\MPgraphformat{" & escaped_format(f) & "}{" & (if string x : x else: decimal x fi) & "}")
-    textext(mfun_format_number(escaped_format(f),x))
+    textext("\MPgraphformat{" & escaped_format(f) & "}{" & (if string x : x else: decimal x fi) & "}")
+  % textext(mfun_format_number(escaped_format(f),x))
 enddef ;
 
 % We redefine autogrid from graph.mp adding the possibility of differing X and Y
@@ -115,7 +115,9 @@ enddef ;
 % dynamic version:
 
 vardef grap_symsize =
-    fontsize defaultfont
+  % fontsize defaultfont
+  % .8ExHeight
+    .35BodyFontSize
 enddef ;
 
 path grap_sym[] ; % (internal) symbol path
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2a2e12ba8..2c07401d8 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.10.17 22:49}
+\newcontextversion{2012.10.19 00:06}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9f3d8cbc2..e791d3ba8 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{2012.10.17 22:49}
+\newcontextversion{2012.10.19 00: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 2ed6a9aa0..5b6793083 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 57b5947fe..2df1bdb1b 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 3840c2dab..3163097b0 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.10.17 22:49}
+\edef\contextversion{2012.10.19 00:06}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 6c3701e68..3d93b64c3 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{2012.10.17 22:49}
+\edef\contextversion{2012.10.19 00:06}
 
 %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 554b33464..fedf9a077 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e588fc460..acc1ebe16 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-enu.mkvi b/tex/context/base/strc-enu.mkvi
index 6220120d2..7b3f04942 100644
--- a/tex/context/base/strc-enu.mkvi
+++ b/tex/context/base/strc-enu.mkvi
@@ -244,7 +244,9 @@
 \def\specificconstructionnumber#1{\namedconstructionparameter{#1}\s!counter}
 
 \appendtoks
-   \strc_enumerations_setup_counter\currentenumeration
+    \ifx\currentenumeration\empty \else
+        \strc_enumerations_setup_counter\currentenumeration
+    \fi
 \to \everysetupenumeration
 
 %D Initializer:
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index 12159a4fe..07013b292 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -146,7 +146,6 @@
     \let\currentfloat\currentfloatcaption
     \ifx\currentfloat\empty \else
         \strc_counter_setup_using_parameter\currentfloatcaption\floatcaptionparameter
-        \strc_counters_check_setup\currentfloatcaption
     \fi
 \to \everysetupfloatcaption
 
diff --git a/tex/context/base/strc-lab.mkiv b/tex/context/base/strc-lab.mkiv
index 0bf65608f..0039a68fd 100644
--- a/tex/context/base/strc-lab.mkiv
+++ b/tex/context/base/strc-lab.mkiv
@@ -154,7 +154,9 @@
 \to \everysetuplabelcounter
 
 \appendtoks
-   \strc_labels_setup_counter\currentlabel
+    \ifx\currentlabel\empty \else
+        \strc_labels_setup_counter\currentlabel
+    \fi
 \to \everysetuplabel
 
 % no start stop here
diff --git a/tex/context/base/strc-mat.mkiv b/tex/context/base/strc-mat.mkiv
index 2395a6412..ec4d7f643 100644
--- a/tex/context/base/strc-mat.mkiv
+++ b/tex/context/base/strc-mat.mkiv
@@ -61,7 +61,6 @@
 
 \appendtoks
     \strc_counter_setup_using_parameter\v!formula\formulaparameter
-    \strc_counters_check_setup\v!formula % yes or no
 \to \everysetupformula
 
 \setupformulas
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index 5c23d5310..0a89edf3d 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -415,7 +415,9 @@
 \to \everysetupnotecounter
 
 \appendtoks
-    \strc_notes_setup_counter\currentnotation
+    \ifx\currentnotation\empty \else
+        \strc_notes_setup_counter\currentnotation
+    \fi
 \to \everysetupnotation
 
 % so far
diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/typo-cap.mkiv
index feab6b35d..25a0ff9ee 100644
--- a/tex/context/base/typo-cap.mkiv
+++ b/tex/context/base/typo-cap.mkiv
@@ -15,6 +15,9 @@
 
 \unprotect
 
+%D Maybe we need a more clever system: either command or style mode etc. so
+%D that we can avoid the grouped mess in a simple style switch.
+
 \registerctxluafile{typo-cap}{1.001}
 
 \definesystemattribute[case][public]
@@ -146,6 +149,14 @@
 \unexpanded\def\realSmallcapped  {\groupedcommand{\sc\setcharactercasing[\v!Word   ]}{}} % one upper + font
 \unexpanded\def\realSmallCapped  {\groupedcommand{\sc\setcharactercasing[\v!Words  ]}{}} % some upper
 
+\unexpanded\def\font_style_pseudosmallcapped{\setcharactercasing   [\v!WORD   ]\signalcharacter\tx} % all upper
+\unexpanded\def\font_style_pseudoSmallcapped{\setcharactercasing   [\v!capital]\signalcharacter\tx} % one upper + font
+\unexpanded\def\font_style_pseudoSmallCapped{\setcharactercasing   [\v!Capital]\signalcharacter\tx} % some upper + font
+
+\unexpanded\def\font_style_realsmallcapped  {\sc\setcharactercasing[\v!WORD   ]} % all lower
+\unexpanded\def\font_style_realSmallcapped  {\sc\setcharactercasing[\v!Word   ]} % one upper + font
+\unexpanded\def\font_style_realSmallCapped  {\sc\setcharactercasing[\v!Words  ]} % some upper
+
 \unexpanded\def\typo_capitals_smallcaps
   {\ifconditional\c_typo_capitals_pseudo
      \expandafter\firstoftwoarguments
@@ -157,6 +168,10 @@
 \unexpanded\def\Smallcapped{\typo_capitals_smallcaps\pseudoSmallcapped\realSmallcapped}
 \unexpanded\def\SmallCapped{\typo_capitals_smallcaps\pseudoSmallCapped\realSmallCapped}
 
+\unexpanded\def\font_style_smallcapped{\typo_capitals_smallcaps\font_style_pseudosmallcapped\font_style_realsmallcapped}
+\unexpanded\def\font_style_Smallcapped{\typo_capitals_smallcaps\font_style_pseudoSmallcapped\font_style_realSmallcapped}
+\unexpanded\def\font_style_SmallCapped{\typo_capitals_smallcaps\font_style_pseudoSmallCapped\font_style_realSmallCapped}
+
 \unexpanded\def\autocap{\ifmmode\expandafter\normalcap\else\expandafter\smallcapped\fi}
 
 \appendtoks
@@ -171,6 +186,10 @@
 \let\normalWORD       \WORD
 \let\normalword       \word
 
+\let\font_style_normalsmallcapped\font_style_smallcapped
+\let\font_style_normalWORD       \WORD
+\let\font_style_normalword       \word
+
 %D As suggested by WS:
 
 \unexpanded\def\notsmallcapped{\groupedcommand{\setcharactercasing[\v!word]\signalcharacter}{}}
@@ -191,10 +210,10 @@
 
 \appendtoks
     \doifelse{\directcapitalsparameter\c!title}\v!yes
-      {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalsmallcapped]%
-       \definealternativestyle[\v!smallcaps][\sc               ][\sc               ]}
-      {\definealternativestyle[\v!capital  ][\normalsmallcapped][\normalWORD       ]%
-       \definealternativestyle[\v!smallcaps][\sc               ][\normalWORD       ]}%
+      {\definealternativestyle[\v!capital  ][\font_style_normalsmallcapped][\font_style_normalsmallcapped]%
+       \definealternativestyle[\v!smallcaps][\sc][\sc]}
+      {\definealternativestyle[\v!capital  ][\font_style_normalsmallcapped][\font_style_normalWORD]%
+       \definealternativestyle[\v!smallcaps][\sc][\font_style_normalWORD]}%
     \doifelse{\directcapitalsparameter\s!sc}\v!yes
       \userealcaps
       \usepseudocaps
diff --git a/tex/context/base/util-sql-users.lua b/tex/context/base/util-sql-users.lua
index 81324afcf..8147f532d 100644
--- a/tex/context/base/util-sql-users.lua
+++ b/tex/context/base/util-sql-users.lua
@@ -97,7 +97,7 @@ registergroup("guest")
 users.groupnames   = groupnames
 users.groupnumbers = groupnumbers
 
--- -- password 'test':
+-- password 'test':
 --
 -- INSERT insert into users (`name`,`password`,`group`,`enabled`) values ('...','MD5:098F6BCD4621D373CADE4E832627B4F6',1,1) ;
 
@@ -156,32 +156,6 @@ local template =[[
     ;
 ]]
 
--- function users.valid(db,username,password)
---
---     local data = db.execute {
---         template  = template,
---         converter = converter,
---         variables = {
---             basename = db.basename,
---             fields   = fields,
---             name     = username,
---             password = encryptpassword(password),
---         },
---     }
---
---     local data = data and data[1]
---
---     if not data then
---         return false, "unknown"
---     elseif not data.enabled then
---         return false, "disabled"
---     else
---         data.password = nil
---         return data, "okay"
---     end
---
--- end
-
 local template =[[
     SELECT
         %fields%
diff --git a/tex/context/base/util-sql.lua b/tex/context/base/util-sql.lua
index e2edf0ffe..70c7d4be6 100644
--- a/tex/context/base/util-sql.lua
+++ b/tex/context/base/util-sql.lua
@@ -373,7 +373,7 @@ end
 sql.tokens = {
     length = 42, -- but in practice we will reserve some 50 characters
     new    = function()
-        return format("%s-%x05",osuuid(),random(0xFFFFF)) -- 36 + 1 + 5 = 42
+        return format("%s-%x06",osuuid(),random(0xFFFFF)) -- 36 + 1 + 6 = 42
     end,
 }
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1d14a9990..777defd88 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  : 10/17/12 22:49:16
+-- merge date  : 10/19/12 00:06:05
 
 do -- begin closure to overcome local limits and interference