beta 2012.04.10 19:46

13 files changed, 55 insertions, 19 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 4a3fa0d59..248c0107b 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.04.10 12:21}
+\newcontextversion{2012.04.10 19:46}
 
 %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 0e6848ec5..f448ff2bc 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.04.10 12:21}
+\newcontextversion{2012.04.10 19:46}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index 41b8e2428..780c1383e 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 619cdf448..65b97446a 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 d579eb512..928349049 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.04.10 12:21}
+\edef\contextversion{2012.04.10 19:46}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 12fe82995..7cfadf849 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.10 12:21}
+\edef\contextversion{2012.04.10 19:46}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/sort-lan.lua b/tex/context/base/sort-lan.lua
index 351c73e45..6a0cb8eab 100644
--- a/tex/context/base/sort-lan.lua
+++ b/tex/context/base/sort-lan.lua
@@ -8,7 +8,8 @@ if not modules then modules = { } end modules ['sort-lan'] = {
 
 -- Many vectors were supplied by Wolfgang Schuster and Philipp
 -- Gesang. However this is a quite adapted and reformatted variant
--- so it needs some checking.
+-- so it needs some checking. Other users provides tables and
+-- corrections as well.
 
 local utfchar, utfbyte  = utf.char, utf.byte
 local sorters           = sorters
@@ -875,3 +876,34 @@ definitions["kr"] = {
         "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
     }
 }
+
+-- Japanese
+
+definitions["jp"] = {
+    replacements = {
+        { "ぁ", "あ" }, { "ぃ", "い" },
+        { "ぅ", "う" }, { "ぇ", "え" },
+        { "ぉ", "お" }, { "っ", "つ" },
+        { "ゃ", "や" }, { "ゅ", "ゆ" },
+        { "ょ", "よ" },
+    },
+    entries = {
+        ["あ"] = "あ", ["い"] = "い", ["う"] = "う", ["え"] = "え", ["お"] = "お",
+        ["か"] = "か", ["き"] = "き", ["く"] = "く", ["け"] = "け", ["こ"] = "こ",
+        ["さ"] = "さ", ["し"] = "し", ["す"] = "す", ["せ"] = "せ", ["そ"] = "そ",
+        ["た"] = "た", ["ち"] = "ち", ["つ"] = "つ", ["て"] = "て", ["と"] = "と",
+        ["な"] = "な", ["に"] = "に", ["ぬ"] = "ぬ", ["ね"] = "ね", ["の"] = "の",
+        ["は"] = "は", ["ひ"] = "ひ", ["ふ"] = "ふ", ["へ"] = "へ", ["ほ"] = "ほ",
+        ["ま"] = "ま", ["み"] = "み", ["む"] = "む", ["め"] = "め", ["も"] = "も",
+        ["や"] = "や", ["ゆ"] = "ゆ", ["よ"] = "よ",
+        ["ら"] = "ら", ["り"] = "り", ["る"] = "る", ["れ"] = "れ", ["ろ"] = "ろ",
+        ["わ"] = "わ", ["ゐ"] = "ゐ", ["ゑ"] = "ゑ", ["を"] = "を", ["ん"] = "ん",
+    },
+    orders = {
+        "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ",
+        "さ", "し", "す", "せ", "そ", "た", "ち", "つ", "て", "と",
+        "な", "に", "ぬ", "ね", "の", "は", "ひ", "ふ", "へ", "ほ",
+        "ま", "み", "む", "め", "も", "や", "ゆ", "よ",
+        "ら", "り", "る", "れ", "ろ", "わ", "ゐ", "ゑ", "を", "ん",
+    }
+}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5c8819f40..71a070346 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 78da2b173..c3da827ec 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lev.mkvi b/tex/context/base/strc-lev.mkvi
index 04fd8e181..b3ec2a2d5 100644
--- a/tex/context/base/strc-lev.mkvi
+++ b/tex/context/base/strc-lev.mkvi
@@ -35,8 +35,8 @@
 
 \unexpanded\def\strc_levels_start[#category]%
   {\doifassignmentelse{#category}
-     {\ctxcommand{startautolevel("\v!default")}[#category]}
-     {\ctxcommand{startautolevel("#category")}}}
+     {\ctxcommand{startsectionlevel("\v!default")}[#category]}
+     {\ctxcommand{startsectionlevel("#category")}}}
 
 \unexpanded\def\strc_levels_start_nop[#category][#settings][#userdata]%
   {\blank
diff --git a/tex/context/base/tabl-ltb.mkiv b/tex/context/base/tabl-ltb.mkiv
index 91bca6262..542d256f2 100644
--- a/tex/context/base/tabl-ltb.mkiv
+++ b/tex/context/base/tabl-ltb.mkiv
@@ -253,7 +253,6 @@
 
 \unexpanded\def\stoplinetablecell
   {\unskip \endstrut
-   \dostopattributes
    \ifcase\linetablemode
      \endgraf
    \else
@@ -674,7 +673,7 @@
 
 \newtoks \@@linetablehead
 
-\long\unexpanded\def\startlinetablehead#1\stoplinetablehead
+\unexpanded\def\startlinetablehead#1\stoplinetablehead
   {\ifinlinetable
      \@@linetablehead\emptytoks
    \fi
@@ -721,6 +720,7 @@
    \startlinetableanalysis\readfile{#1}\donothing\donothing\stoplinetableanalysis
    \startlinetablerun     \readfile{#1}\donothing\donothing\stoplinetablerun
    \egroup}
+
 \protect \endinput
 
 \doifnotmode{demo}{\endinput}
diff --git a/tex/context/base/x-pfs-01.mkiv b/tex/context/base/x-pfs-01.mkiv
index 4019e5809..57f1f1b3d 100644
--- a/tex/context/base/x-pfs-01.mkiv
+++ b/tex/context/base/x-pfs-01.mkiv
@@ -46,15 +46,19 @@
             \NC \bf ddnsdomain \NC \xmlfirst{#1}{/ddnsdomain} \NC \NR
         \stoptabulate
 
-        \starttabulate[|T|T|T|P|]
-            \NC \rm\bf macaddress
-            \NC \rm\bf ipaddress
-            \NC \rm\bf hostname
-            \NC \rm\bf description
-            \NC \NR
-            \HL
-            \xmlfilter{#1}{/staticmap/command(xml:dhcp:network:entry)}
-        \stoptabulate
+        \xmldoif {#1} {/staticmap} {
+
+            \starttabulate[|T|T|T|P|]
+                \NC \rm\bf macaddress
+                \NC \rm\bf ipaddress
+                \NC \rm\bf hostname
+                \NC \rm\bf description
+                \NC \NR
+                \HL
+                \xmlfilter{#1}{/staticmap/command(xml:dhcp:network:entry)}
+            \stoptabulate
+
+        }
 
     \stopsubsection
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 89c7ea58e..85a03be6c 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  : 04/10/12 12:21:57
+-- merge date  : 04/10/12 19:46:21
 
 do -- begin closure to overcome local limits and interference