2015-05-03 21:53:00

author: Context Git Mirror Bot <phg42.2a@gmail.com> 2015-05-03 22:15:05 +0200
committer: Context Git Mirror Bot <phg42.2a@gmail.com> 2015-05-03 22:15:05 +0200
commit: 5f9befc0fd0b4b14d74862c8d3f577569b436cda (patch)
tree: be901810b37c84c35558558934738696cde2531a
parent: 66f36353ebae5235cc3bfe5f75b375e175857748 (diff)
download: context-5f9befc0fd0b4b14d74862c8d3f577569b436cda.tar.gz
24 files changed, 852 insertions, 64 deletions
diff --git a/doc/context/documents/general/manuals/workflows-mkiv.pdf b/doc/context/documents/general/manuals/workflows-mkiv.pdf
index 828fb86cb..5f0fe8771 100644
--- a/doc/context/documents/general/manuals/workflows-mkiv.pdf
+++ b/doc/context/documents/general/manuals/workflows-mkiv.pdf
diff --git a/doc/context/sources/general/manuals/workflows/workflows-graphics.tex b/doc/context/sources/general/manuals/workflows/workflows-graphics.tex
index dc3c6e106..55a8ad701 100644
--- a/doc/context/sources/general/manuals/workflows/workflows-graphics.tex
+++ b/doc/context/sources/general/manuals/workflows/workflows-graphics.tex
@@ -72,7 +72,7 @@ used graphic    > used    : t:/sources/cow.pdf
 system          > graphics > stop names
 \stoptyping
 
-You can also information to the file itself:
+You can also add information to the file itself:
 
 \starttyping
 \usemodule[s-figures-names]
diff --git a/doc/context/sources/general/manuals/workflows/workflows-introduction.tex b/doc/context/sources/general/manuals/workflows/workflows-introduction.tex
index 298158a63..a88640b27 100644
--- a/doc/context/sources/general/manuals/workflows/workflows-introduction.tex
+++ b/doc/context/sources/general/manuals/workflows/workflows-introduction.tex
@@ -20,8 +20,6 @@ complete or extensive, it's just a goodie.
 \currentdate[month,year]
 \stoplines
 
-\stopsubject
-
 \stopchapter
 
 \stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
index 919b5cc74..3820e04fa 100644
--- a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
+++ b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
@@ -1,3 +1,5 @@
+\setupbackend[export=yes]
+
 \environment workflows-style
 
 \startdocument
diff --git a/doc/context/sources/general/manuals/workflows/workflows-style.tex b/doc/context/sources/general/manuals/workflows/workflows-style.tex
index 9d46aaad8..f29129fcd 100644
--- a/doc/context/sources/general/manuals/workflows/workflows-style.tex
+++ b/doc/context/sources/general/manuals/workflows/workflows-style.tex
@@ -1,7 +1,7 @@
 \startenvironment workflows-style
 
 \usemodule
-  [abr-04]
+  [abr-03]
 
 \setupbodyfont
   [bookman,11pt]
diff --git a/tex/context/base/attr-col.lua b/tex/context/base/attr-col.lua
index 28eda5ca9..b5fac9c2d 100644
--- a/tex/context/base/attr-col.lua
+++ b/tex/context/base/attr-col.lua
@@ -127,15 +127,25 @@ local models = {
 }
 
 local function rgbtocmyk(r,g,b) -- we could reduce
-    return 1-r, 1-g, 1-b, 0
+    if not r then
+        return 0, 0, 0
+    else
+        return 1-r, 1-g, 1-b, 0
+    end
 end
 
 local function cmyktorgb(c,m,y,k)
-    return 1.0 - min(1.0,c+k), 1.0 - min(1.0,m+k), 1.0 - min(1.0,y+k)
+    if not c then
+        return 0, 0, 0, 1
+    else
+        return 1.0 - min(1.0,c+k), 1.0 - min(1.0,m+k), 1.0 - min(1.0,y+k)
+    end
 end
 
 local function rgbtogray(r,g,b)
-    if colors.weightgray then
+    if not r then
+        return 0
+    elseif colors.weightgray then
         return .30*r + .59*g + .11*b
     else
         return r/3 + g/3 + b/3
diff --git a/tex/context/base/char-cjk.lua b/tex/context/base/char-cjk.lua
index 3d7de1423..30f618896 100644
--- a/tex/context/base/char-cjk.lua
+++ b/tex/context/base/char-cjk.lua
@@ -9,7 +9,7 @@ if not modules then modules = { } end modules ['char-cjk'] = {
 local setmetatable = setmetatable
 local insert = table.insert
 local floor = math.floor
-local format = string.format
+local formatters = string.formatters
 local utfchar = utf.char
 
 local ranges   = characters.ranges
@@ -85,8 +85,7 @@ local tail_consonants = { [0] =
 --         local lead_consonant = floor( index / NCount)
 --         local medial_vowel   = floor((index % NCount) / TCount)
 --         local tail_consonant =        index % TCount
---         return format(
---             "HANGUL SYLLABLE %s%s%s",
+--         return formatters["HANGUL SYLLABLE %s%s%s"](
 --             lead_consonants[lead_consonant],
 --             medial_vowels  [medial_vowel  ],
 --             tail_consonants[tail_consonant]
@@ -100,8 +99,7 @@ local function description(unicode)
         local lead_consonant = floor( index / (21 * 28))
         local medial_vowel   = floor((index % (21 * 28)) / 28)
         local tail_consonant =        index % 28
-        return format(
-            "HANGUL SYLLABLE %s%s%s",
+        return formatters["HANGUL SYLLABLE %s%s%s"](
             lead_consonants[lead_consonant],
             medial_vowels  [medial_vowel  ],
             tail_consonants[tail_consonant]
@@ -363,3 +361,5 @@ insert(ranges, hangul_syllable_range)
 insert(ranges, cjk_ideograph_range)
 insert(ranges, cjk_ideograph_extension_a_range)
 insert(ranges, cjk_ideograph_extension_b_range)
+
+-- Japanese
diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index f6986e76d..90ac4609d 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -2399,8 +2399,8 @@ characters.data={
   description="LATIN SMALL LETTER SHARP S",
   direction="l",
   linebreak="al",
-  uccode={ 0x53, 0x53 },
   shcode={ 0x73, 0x73 },
+  uccode={ 0x53, 0x53 },
   unicodeslot=0xDF,
  },
  {
@@ -66888,9 +66888,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="topaccent",
-  mathname="overbracket",
   mathextensible="h",
   mathfiller="overbracketfill",
+  mathname="overbracket",
   unicodeslot=0x23B4,
  },
  [0x23B5]={
@@ -66899,9 +66899,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="botaccent",
-  mathname="underbracket",
   mathextensible="h",
   mathfiller="underbracketfill",
+  mathname="underbracket",
   unicodeslot=0x23B5,
  },
  [0x23B6]={
@@ -67176,9 +67176,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="topaccent",
-  mathname="overparent",
   mathextensible="h",
   mathfiller="overparentfill",
+  mathname="overparent",
   unicodeslot=0x23DC,
  },
  [0x23DD]={
@@ -67187,9 +67187,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="botaccent",
-  mathname="underparent",
   mathextensible="h",
   mathfiller="underparentfill",
+  mathname="underparent",
   unicodeslot=0x23DD,
  },
  [0x23DE]={
@@ -67198,9 +67198,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="topaccent",
-  mathname="overbrace",
   mathextensible="h",
   mathfiller="overbracefill",
+  mathname="overbrace",
   unicodeslot=0x23DE,
  },
  [0x23DF]={
@@ -67209,9 +67209,9 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="botaccent",
-  mathname="underbrace",
   mathextensible="h",
   mathfiller="underbracefill",
+  mathname="underbrace",
   unicodeslot=0x23DF,
  },
  [0x23E0]={
@@ -90281,8 +90281,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL A",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3042,
+  sound="unvoiced",
   unicodeslot=0x3041,
  },
  [0x3042]={
@@ -90290,8 +90293,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER A",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3042,
+  sound="unvoiced",
   unicodeslot=0x3042,
  },
  [0x3043]={
@@ -90299,8 +90305,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL I",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3044,
+  sound="unvoiced",
   unicodeslot=0x3043,
  },
  [0x3044]={
@@ -90308,8 +90317,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER I",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3044,
+  sound="unvoiced",
   unicodeslot=0x3044,
  },
  [0x3045]={
@@ -90317,8 +90329,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL U",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3046,
+  sound="unvoiced",
   unicodeslot=0x3045,
  },
  [0x3046]={
@@ -90326,8 +90341,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER U",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3046,
+  sound="unvoiced",
   unicodeslot=0x3046,
  },
  [0x3047]={
@@ -90335,8 +90353,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL E",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3048,
+  sound="unvoiced",
   unicodeslot=0x3047,
  },
  [0x3048]={
@@ -90344,8 +90365,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER E",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3048,
+  sound="unvoiced",
   unicodeslot=0x3048,
  },
  [0x3049]={
@@ -90353,8 +90377,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL O",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x304A,
+  sound="unvoiced",
   unicodeslot=0x3049,
  },
  [0x304A]={
@@ -90362,8 +90389,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER O",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304A,
+  sound="unvoiced",
   unicodeslot=0x304A,
  },
  [0x304B]={
@@ -90371,8 +90401,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER KA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304B,
+  sound="unvoiced",
   unicodeslot=0x304B,
  },
  [0x304C]={
@@ -90380,8 +90413,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER GA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304B,
+  sound="voiced",
   specials={ "char", 0x304B, 0x3099 },
   unicodeslot=0x304C,
  },
@@ -90390,8 +90426,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER KI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304D,
+  sound="unvoiced",
   unicodeslot=0x304D,
  },
  [0x304E]={
@@ -90399,8 +90438,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER GI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304D,
+  sound="voiced",
   specials={ "char", 0x304D, 0x3099 },
   unicodeslot=0x304E,
  },
@@ -90409,8 +90451,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER KU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304F,
+  sound="unvoiced",
   unicodeslot=0x304F,
  },
  [0x3050]={
@@ -90418,8 +90463,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER GU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304F,
+  sound="voiced",
   specials={ "char", 0x304F, 0x3099 },
   unicodeslot=0x3050,
  },
@@ -90428,8 +90476,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER KE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3051,
+  sound="unvoiced",
   unicodeslot=0x3051,
  },
  [0x3052]={
@@ -90437,8 +90488,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER GE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3051,
+  sound="voiced",
   specials={ "char", 0x3051, 0x3099 },
   unicodeslot=0x3052,
  },
@@ -90447,8 +90501,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER KO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3053,
+  sound="unvoiced",
   unicodeslot=0x3053,
  },
  [0x3054]={
@@ -90456,8 +90513,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER GO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3053,
+  sound="voiced",
   specials={ "char", 0x3053, 0x3099 },
   unicodeslot=0x3054,
  },
@@ -90466,8 +90526,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3055,
+  sound="unvoiced",
   unicodeslot=0x3055,
  },
  [0x3056]={
@@ -90475,8 +90538,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ZA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3055,
+  sound="voiced",
   specials={ "char", 0x3055, 0x3099 },
   unicodeslot=0x3056,
  },
@@ -90485,8 +90551,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3057,
+  sound="unvoiced",
   unicodeslot=0x3057,
  },
  [0x3058]={
@@ -90494,8 +90563,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ZI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3057,
+  sound="voiced",
   specials={ "char", 0x3057, 0x3099 },
   unicodeslot=0x3058,
  },
@@ -90504,8 +90576,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3059,
+  sound="unvoiced",
   unicodeslot=0x3059,
  },
  [0x305A]={
@@ -90513,8 +90588,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ZU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3059,
+  sound="voiced",
   specials={ "char", 0x3059, 0x3099 },
   unicodeslot=0x305A,
  },
@@ -90523,8 +90601,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305B,
+  sound="unvoiced",
   unicodeslot=0x305B,
  },
  [0x305C]={
@@ -90532,8 +90613,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ZE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305B,
+  sound="voiced",
   specials={ "char", 0x305B, 0x3099 },
   unicodeslot=0x305C,
  },
@@ -90542,8 +90626,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305D,
+  sound="unvoiced",
   unicodeslot=0x305D,
  },
  [0x305E]={
@@ -90551,8 +90638,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ZO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305D,
+  sound="voiced",
   specials={ "char", 0x305D, 0x3099 },
   unicodeslot=0x305E,
  },
@@ -90561,8 +90651,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER TA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305F,
+  sound="unvoiced",
   unicodeslot=0x305F,
  },
  [0x3060]={
@@ -90570,8 +90663,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER DA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305F,
+  sound="voiced",
   specials={ "char", 0x305F, 0x3099 },
   unicodeslot=0x3060,
  },
@@ -90580,8 +90676,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER TI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3061,
+  sound="unvoiced",
   unicodeslot=0x3061,
  },
  [0x3062]={
@@ -90589,8 +90688,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER DI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3061,
+  sound="voiced",
   specials={ "char", 0x3061, 0x3099 },
   unicodeslot=0x3062,
  },
@@ -90599,8 +90701,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL TU",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3064,
+  sound="unvoiced",
   unicodeslot=0x3063,
  },
  [0x3064]={
@@ -90608,8 +90713,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER TU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3064,
+  sound="unvoiced",
   unicodeslot=0x3064,
  },
  [0x3065]={
@@ -90617,8 +90725,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER DU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3064,
+  sound="voiced",
   specials={ "char", 0x3064, 0x3099 },
   unicodeslot=0x3065,
  },
@@ -90627,8 +90738,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER TE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3066,
+  sound="unvoiced",
   unicodeslot=0x3066,
  },
  [0x3067]={
@@ -90636,8 +90750,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER DE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3066,
+  sound="voiced",
   specials={ "char", 0x3066, 0x3099 },
   unicodeslot=0x3067,
  },
@@ -90646,8 +90763,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER TO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3068,
+  sound="unvoiced",
   unicodeslot=0x3068,
  },
  [0x3069]={
@@ -90655,8 +90775,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER DO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3068,
+  sound="voiced",
   specials={ "char", 0x3068, 0x3099 },
   unicodeslot=0x3069,
  },
@@ -90665,8 +90788,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER NA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306A,
+  sound="unvoiced",
   unicodeslot=0x306A,
  },
  [0x306B]={
@@ -90674,8 +90800,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER NI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306B,
+  sound="unvoiced",
   unicodeslot=0x306B,
  },
  [0x306C]={
@@ -90683,8 +90812,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER NU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306C,
+  sound="unvoiced",
   unicodeslot=0x306C,
  },
  [0x306D]={
@@ -90692,8 +90824,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER NE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306D,
+  sound="unvoiced",
   unicodeslot=0x306D,
  },
  [0x306E]={
@@ -90701,8 +90836,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER NO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306E,
+  sound="unvoiced",
   unicodeslot=0x306E,
  },
  [0x306F]={
@@ -90710,8 +90848,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER HA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="unvoiced",
   unicodeslot=0x306F,
  },
  [0x3070]={
@@ -90719,8 +90860,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER BA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="voiced",
   specials={ "char", 0x306F, 0x3099 },
   unicodeslot=0x3070,
  },
@@ -90729,8 +90873,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER PA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="semivoiced",
   specials={ "char", 0x306F, 0x309A },
   unicodeslot=0x3071,
  },
@@ -90739,8 +90886,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER HI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="unvoiced",
   unicodeslot=0x3072,
  },
  [0x3073]={
@@ -90748,8 +90898,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER BI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="voiced",
   specials={ "char", 0x3072, 0x3099 },
   unicodeslot=0x3073,
  },
@@ -90758,8 +90911,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER PI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="semivoiced",
   specials={ "char", 0x3072, 0x309A },
   unicodeslot=0x3074,
  },
@@ -90768,8 +90924,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER HU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="unvoiced",
   unicodeslot=0x3075,
  },
  [0x3076]={
@@ -90777,8 +90936,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER BU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="voiced",
   specials={ "char", 0x3075, 0x3099 },
   unicodeslot=0x3076,
  },
@@ -90787,8 +90949,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER PU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="semivoiced",
   specials={ "char", 0x3075, 0x309A },
   unicodeslot=0x3077,
  },
@@ -90797,8 +90962,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER HE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="unvoiced",
   unicodeslot=0x3078,
  },
  [0x3079]={
@@ -90806,8 +90974,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER BE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="voiced",
   specials={ "char", 0x3078, 0x3099 },
   unicodeslot=0x3079,
  },
@@ -90816,8 +90987,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER PE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="semivoiced",
   specials={ "char", 0x3078, 0x309A },
   unicodeslot=0x307A,
  },
@@ -90826,8 +91000,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER HO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="unvoiced",
   unicodeslot=0x307B,
  },
  [0x307C]={
@@ -90835,8 +91012,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER BO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="voiced",
   specials={ "char", 0x307B, 0x3099 },
   unicodeslot=0x307C,
  },
@@ -90845,8 +91025,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER PO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="semivoiced",
   specials={ "char", 0x307B, 0x309A },
   unicodeslot=0x307D,
  },
@@ -90855,8 +91038,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER MA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307E,
+  sound="unvoiced",
   unicodeslot=0x307E,
  },
  [0x307F]={
@@ -90864,8 +91050,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER MI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307F,
+  sound="unvoiced",
   unicodeslot=0x307F,
  },
  [0x3080]={
@@ -90873,8 +91062,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER MU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3080,
+  sound="unvoiced",
   unicodeslot=0x3080,
  },
  [0x3081]={
@@ -90882,8 +91074,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER ME",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3081,
+  sound="unvoiced",
   unicodeslot=0x3081,
  },
  [0x3082]={
@@ -90891,8 +91086,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER MO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3082,
+  sound="unvoiced",
   unicodeslot=0x3082,
  },
  [0x3083]={
@@ -90900,8 +91098,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL YA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3084,
+  sound="unvoiced",
   unicodeslot=0x3083,
  },
  [0x3084]={
@@ -90909,8 +91110,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER YA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3084,
+  sound="unvoiced",
   unicodeslot=0x3084,
  },
  [0x3085]={
@@ -90918,8 +91122,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL YU",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3086,
+  sound="unvoiced",
   unicodeslot=0x3085,
  },
  [0x3086]={
@@ -90927,8 +91134,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER YU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3086,
+  sound="unvoiced",
   unicodeslot=0x3086,
  },
  [0x3087]={
@@ -90936,8 +91146,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL YO",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3088,
+  sound="unvoiced",
   unicodeslot=0x3087,
  },
  [0x3088]={
@@ -90945,8 +91158,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER YO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3088,
+  sound="unvoiced",
   unicodeslot=0x3088,
  },
  [0x3089]={
@@ -90954,8 +91170,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER RA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3089,
+  sound="unvoiced",
   unicodeslot=0x3089,
  },
  [0x308A]={
@@ -90963,8 +91182,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER RI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308A,
+  sound="unvoiced",
   unicodeslot=0x308A,
  },
  [0x308B]={
@@ -90972,8 +91194,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER RU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308B,
+  sound="unvoiced",
   unicodeslot=0x308B,
  },
  [0x308C]={
@@ -90981,8 +91206,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER RE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308C,
+  sound="unvoiced",
   unicodeslot=0x308C,
  },
  [0x308D]={
@@ -90990,8 +91218,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER RO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308D,
+  sound="unvoiced",
   unicodeslot=0x308D,
  },
  [0x308E]={
@@ -90999,8 +91230,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL WA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x308F,
+  sound="unvoiced",
   unicodeslot=0x308E,
  },
  [0x308F]={
@@ -91008,8 +91242,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER WA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308F,
+  sound="unvoiced",
   unicodeslot=0x308F,
  },
  [0x3090]={
@@ -91017,8 +91254,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER WI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3090,
+  sound="unvoiced",
   unicodeslot=0x3090,
  },
  [0x3091]={
@@ -91026,8 +91266,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER WE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3091,
+  sound="unvoiced",
   unicodeslot=0x3091,
  },
  [0x3092]={
@@ -91035,8 +91278,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER WO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3092,
+  sound="unvoiced",
   unicodeslot=0x3092,
  },
  [0x3093]={
@@ -91044,8 +91290,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER N",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3093,
+  sound="unvoiced",
   unicodeslot=0x3093,
  },
  [0x3094]={
@@ -91053,8 +91302,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER VU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3046,
+  sound="voiced",
   specials={ "char", 0x3046, 0x3099 },
   unicodeslot=0x3094,
  },
@@ -91062,16 +91314,22 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL KA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x304B,
+  sound="unvoiced",
   unicodeslot=0x3095,
  },
  [0x3096]={
   category="lo",
   cjkwd="w",
   description="HIRAGANA LETTER SMALL KE",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3051,
+  sound="unvoiced",
   unicodeslot=0x3096,
  },
  [0x3099]={
@@ -91081,6 +91339,7 @@ characters.data={
   description="COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK",
   direction="nsm",
   linebreak="cm",
+  sound="voiced",
   unicodeslot=0x3099,
  },
  [0x309A]={
@@ -91090,6 +91349,7 @@ characters.data={
   description="COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK",
   direction="nsm",
   linebreak="cm",
+  sound="semivoiced",
   unicodeslot=0x309A,
  },
  [0x309B]={
@@ -91099,6 +91359,7 @@ characters.data={
   description="KATAKANA-HIRAGANA VOICED SOUND MARK",
   direction="on",
   linebreak="ns",
+  sound="voiced",
   specials={ "compat", 0x20, 0x3099 },
   unicodeslot=0x309B,
  },
@@ -91109,6 +91370,7 @@ characters.data={
   description="KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK",
   direction="on",
   linebreak="ns",
+  sound="semivoiced",
   specials={ "compat", 0x20, 0x309A },
   unicodeslot=0x309C,
  },
@@ -91117,8 +91379,11 @@ characters.data={
   category="lm",
   cjkwd="w",
   description="HIRAGANA ITERATION MARK",
+  detail="im",
   direction="l",
   linebreak="ns",
+  shcode=0x309D,
+  sound="unvoiced",
   unicodeslot=0x309D,
  },
  [0x309E]={
@@ -91126,8 +91391,11 @@ characters.data={
   category="lm",
   cjkwd="w",
   description="HIRAGANA VOICED ITERATION MARK",
+  detail="im",
   direction="l",
   linebreak="ns",
+  shcode=0x309D,
+  sound="voiced",
   specials={ "char", 0x309D, 0x3099 },
   unicodeslot=0x309E,
  },
@@ -91153,8 +91421,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL A",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3042,
+  sound="unvoiced",
   unicodeslot=0x30A1,
  },
  [0x30A2]={
@@ -91162,8 +91433,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER A",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3042,
+  sound="unvoiced",
   unicodeslot=0x30A2,
  },
  [0x30A3]={
@@ -91171,8 +91445,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL I",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3044,
+  sound="unvoiced",
   unicodeslot=0x30A3,
  },
  [0x30A4]={
@@ -91180,8 +91457,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER I",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3044,
+  sound="unvoiced",
   unicodeslot=0x30A4,
  },
  [0x30A5]={
@@ -91189,8 +91469,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL U",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3046,
+  sound="unvoiced",
   unicodeslot=0x30A5,
  },
  [0x30A6]={
@@ -91198,8 +91481,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER U",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3046,
+  sound="unvoiced",
   unicodeslot=0x30A6,
  },
  [0x30A7]={
@@ -91207,8 +91493,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL E",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3048,
+  sound="unvoiced",
   unicodeslot=0x30A7,
  },
  [0x30A8]={
@@ -91216,8 +91505,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER E",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3048,
+  sound="unvoiced",
   unicodeslot=0x30A8,
  },
  [0x30A9]={
@@ -91225,8 +91517,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL O",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x304A,
+  sound="unvoiced",
   unicodeslot=0x30A9,
  },
  [0x30AA]={
@@ -91234,8 +91529,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER O",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304A,
+  sound="unvoiced",
   unicodeslot=0x30AA,
  },
  [0x30AB]={
@@ -91243,8 +91541,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER KA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304B,
+  sound="unvoiced",
   unicodeslot=0x30AB,
  },
  [0x30AC]={
@@ -91252,8 +91553,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER GA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304B,
+  sound="voiced",
   specials={ "char", 0x30AB, 0x3099 },
   unicodeslot=0x30AC,
  },
@@ -91262,8 +91566,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER KI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304D,
+  sound="unvoiced",
   unicodeslot=0x30AD,
  },
  [0x30AE]={
@@ -91271,8 +91578,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER GI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304D,
+  sound="voiced",
   specials={ "char", 0x30AD, 0x3099 },
   unicodeslot=0x30AE,
  },
@@ -91281,8 +91591,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER KU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304F,
+  sound="unvoiced",
   unicodeslot=0x30AF,
  },
  [0x30B0]={
@@ -91290,8 +91603,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER GU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x304F,
+  sound="voiced",
   specials={ "char", 0x30AF, 0x3099 },
   unicodeslot=0x30B0,
  },
@@ -91300,8 +91616,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER KE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3051,
+  sound="unvoiced",
   unicodeslot=0x30B1,
  },
  [0x30B2]={
@@ -91309,8 +91628,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER GE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3051,
+  sound="voiced",
   specials={ "char", 0x30B1, 0x3099 },
   unicodeslot=0x30B2,
  },
@@ -91319,8 +91641,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER KO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3053,
+  sound="unvoiced",
   unicodeslot=0x30B3,
  },
  [0x30B4]={
@@ -91328,8 +91653,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER GO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3053,
+  sound="voiced",
   specials={ "char", 0x30B3, 0x3099 },
   unicodeslot=0x30B4,
  },
@@ -91338,8 +91666,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3055,
+  sound="unvoiced",
   unicodeslot=0x30B5,
  },
  [0x30B6]={
@@ -91347,8 +91678,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ZA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3055,
+  sound="voiced",
   specials={ "char", 0x30B5, 0x3099 },
   unicodeslot=0x30B6,
  },
@@ -91357,8 +91691,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3057,
+  sound="unvoiced",
   unicodeslot=0x30B7,
  },
  [0x30B8]={
@@ -91366,8 +91703,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ZI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3057,
+  sound="voiced",
   specials={ "char", 0x30B7, 0x3099 },
   unicodeslot=0x30B8,
  },
@@ -91376,8 +91716,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3059,
+  sound="unvoiced",
   unicodeslot=0x30B9,
  },
  [0x30BA]={
@@ -91385,8 +91728,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ZU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3059,
+  sound="voiced",
   specials={ "char", 0x30B9, 0x3099 },
   unicodeslot=0x30BA,
  },
@@ -91395,8 +91741,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305B,
+  sound="unvoiced",
   unicodeslot=0x30BB,
  },
  [0x30BC]={
@@ -91404,8 +91753,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ZE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305B,
+  sound="voiced",
   specials={ "char", 0x30BB, 0x3099 },
   unicodeslot=0x30BC,
  },
@@ -91414,8 +91766,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305D,
+  sound="unvoiced",
   unicodeslot=0x30BD,
  },
  [0x30BE]={
@@ -91423,8 +91778,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ZO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305D,
+  sound="voiced",
   specials={ "char", 0x30BD, 0x3099 },
   unicodeslot=0x30BE,
  },
@@ -91433,8 +91791,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER TA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305F,
+  sound="unvoiced",
   unicodeslot=0x30BF,
  },
  [0x30C0]={
@@ -91442,8 +91803,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER DA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x305F,
+  sound="voiced",
   specials={ "char", 0x30BF, 0x3099 },
   unicodeslot=0x30C0,
  },
@@ -91452,8 +91816,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER TI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3061,
+  sound="unvoiced",
   unicodeslot=0x30C1,
  },
  [0x30C2]={
@@ -91461,8 +91828,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER DI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3061,
+  sound="voiced",
   specials={ "char", 0x30C1, 0x3099 },
   unicodeslot=0x30C2,
  },
@@ -91471,8 +91841,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL TU",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3064,
+  sound="unvoiced",
   unicodeslot=0x30C3,
  },
  [0x30C4]={
@@ -91480,8 +91853,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER TU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3064,
+  sound="unvoiced",
   unicodeslot=0x30C4,
  },
  [0x30C5]={
@@ -91489,8 +91865,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER DU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3064,
+  sound="voiced",
   specials={ "char", 0x30C4, 0x3099 },
   unicodeslot=0x30C5,
  },
@@ -91499,8 +91878,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER TE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3066,
+  sound="unvoiced",
   unicodeslot=0x30C6,
  },
  [0x30C7]={
@@ -91508,8 +91890,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER DE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3066,
+  sound="voiced",
   specials={ "char", 0x30C6, 0x3099 },
   unicodeslot=0x30C7,
  },
@@ -91518,8 +91903,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER TO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3068,
+  sound="unvoiced",
   unicodeslot=0x30C8,
  },
  [0x30C9]={
@@ -91527,8 +91915,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER DO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3068,
+  sound="voiced",
   specials={ "char", 0x30C8, 0x3099 },
   unicodeslot=0x30C9,
  },
@@ -91537,8 +91928,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER NA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306A,
+  sound="unvoiced",
   unicodeslot=0x30CA,
  },
  [0x30CB]={
@@ -91546,8 +91940,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER NI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306B,
+  sound="unvoiced",
   unicodeslot=0x30CB,
  },
  [0x30CC]={
@@ -91555,8 +91952,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER NU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306C,
+  sound="unvoiced",
   unicodeslot=0x30CC,
  },
  [0x30CD]={
@@ -91564,8 +91964,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER NE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306D,
+  sound="unvoiced",
   unicodeslot=0x30CD,
  },
  [0x30CE]={
@@ -91573,8 +91976,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER NO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306E,
+  sound="unvoiced",
   unicodeslot=0x30CE,
  },
  [0x30CF]={
@@ -91582,8 +91988,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER HA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="unvoiced",
   unicodeslot=0x30CF,
  },
  [0x30D0]={
@@ -91591,8 +92000,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER BA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="voiced",
   specials={ "char", 0x30CF, 0x3099 },
   unicodeslot=0x30D0,
  },
@@ -91601,8 +92013,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER PA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x306F,
+  sound="semivoiced",
   specials={ "char", 0x30CF, 0x309A },
   unicodeslot=0x30D1,
  },
@@ -91611,8 +92026,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER HI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="unvoiced",
   unicodeslot=0x30D2,
  },
  [0x30D3]={
@@ -91620,8 +92038,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER BI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="voiced",
   specials={ "char", 0x30D2, 0x3099 },
   unicodeslot=0x30D3,
  },
@@ -91630,8 +92051,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER PI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3072,
+  sound="semivoiced",
   specials={ "char", 0x30D2, 0x309A },
   unicodeslot=0x30D4,
  },
@@ -91640,8 +92064,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER HU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="unvoiced",
   unicodeslot=0x30D5,
  },
  [0x30D6]={
@@ -91649,8 +92076,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER BU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="voiced",
   specials={ "char", 0x30D5, 0x3099 },
   unicodeslot=0x30D6,
  },
@@ -91659,8 +92089,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER PU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3075,
+  sound="semivoiced",
   specials={ "char", 0x30D5, 0x309A },
   unicodeslot=0x30D7,
  },
@@ -91669,8 +92102,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER HE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="unvoiced",
   unicodeslot=0x30D8,
  },
  [0x30D9]={
@@ -91678,8 +92114,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER BE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="voiced",
   specials={ "char", 0x30D8, 0x3099 },
   unicodeslot=0x30D9,
  },
@@ -91688,8 +92127,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER PE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3078,
+  sound="semivoiced",
   specials={ "char", 0x30D8, 0x309A },
   unicodeslot=0x30DA,
  },
@@ -91698,8 +92140,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER HO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="unvoiced",
   unicodeslot=0x30DB,
  },
  [0x30DC]={
@@ -91707,8 +92152,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER BO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="voiced",
   specials={ "char", 0x30DB, 0x3099 },
   unicodeslot=0x30DC,
  },
@@ -91717,8 +92165,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER PO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307B,
+  sound="semivoiced",
   specials={ "char", 0x30DB, 0x309A },
   unicodeslot=0x30DD,
  },
@@ -91727,8 +92178,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER MA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307E,
+  sound="unvoiced",
   unicodeslot=0x30DE,
  },
  [0x30DF]={
@@ -91736,8 +92190,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER MI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x307F,
+  sound="unvoiced",
   unicodeslot=0x30DF,
  },
  [0x30E0]={
@@ -91745,8 +92202,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER MU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3080,
+  sound="unvoiced",
   unicodeslot=0x30E0,
  },
  [0x30E1]={
@@ -91754,8 +92214,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER ME",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3081,
+  sound="unvoiced",
   unicodeslot=0x30E1,
  },
  [0x30E2]={
@@ -91763,8 +92226,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER MO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3082,
+  sound="unvoiced",
   unicodeslot=0x30E2,
  },
  [0x30E3]={
@@ -91772,8 +92238,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL YA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3084,
+  sound="unvoiced",
   unicodeslot=0x30E3,
  },
  [0x30E4]={
@@ -91781,8 +92250,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER YA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3084,
+  sound="unvoiced",
   unicodeslot=0x30E4,
  },
  [0x30E5]={
@@ -91790,8 +92262,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL YU",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3086,
+  sound="unvoiced",
   unicodeslot=0x30E5,
  },
  [0x30E6]={
@@ -91799,8 +92274,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER YU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3086,
+  sound="unvoiced",
   unicodeslot=0x30E6,
  },
  [0x30E7]={
@@ -91808,8 +92286,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL YO",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3088,
+  sound="unvoiced",
   unicodeslot=0x30E7,
  },
  [0x30E8]={
@@ -91817,8 +92298,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER YO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3088,
+  sound="unvoiced",
   unicodeslot=0x30E8,
  },
  [0x30E9]={
@@ -91826,8 +92310,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER RA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3089,
+  sound="unvoiced",
   unicodeslot=0x30E9,
  },
  [0x30EA]={
@@ -91835,8 +92322,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER RI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308A,
+  sound="unvoiced",
   unicodeslot=0x30EA,
  },
  [0x30EB]={
@@ -91844,8 +92334,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER RU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308B,
+  sound="unvoiced",
   unicodeslot=0x30EB,
  },
  [0x30EC]={
@@ -91853,8 +92346,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER RE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308C,
+  sound="unvoiced",
   unicodeslot=0x30EC,
  },
  [0x30ED]={
@@ -91862,8 +92358,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER RO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308D,
+  sound="unvoiced",
   unicodeslot=0x30ED,
  },
  [0x30EE]={
@@ -91871,8 +92370,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL WA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x308F,
+  sound="unvoiced",
   unicodeslot=0x30EE,
  },
  [0x30EF]={
@@ -91880,8 +92382,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER WA",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x308F,
+  sound="unvoiced",
   unicodeslot=0x30EF,
  },
  [0x30F0]={
@@ -91889,8 +92394,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER WI",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3090,
+  sound="unvoiced",
   unicodeslot=0x30F0,
  },
  [0x30F1]={
@@ -91898,8 +92406,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER WE",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3091,
+  sound="unvoiced",
   unicodeslot=0x30F1,
  },
  [0x30F2]={
@@ -91907,8 +92418,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER WO",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3092,
+  sound="unvoiced",
   unicodeslot=0x30F2,
  },
  [0x30F3]={
@@ -91916,8 +92430,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER N",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3093,
+  sound="unvoiced",
   unicodeslot=0x30F3,
  },
  [0x30F4]={
@@ -91925,8 +92442,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER VU",
+  detail="bl",
   direction="l",
   linebreak="id",
+  shcode=0x3046,
+  sound="voiced",
   specials={ "char", 0x30A6, 0x3099 },
   unicodeslot=0x30F4,
  },
@@ -91935,8 +92455,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL KA",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x304B,
+  sound="unvoiced",
   unicodeslot=0x30F5,
  },
  [0x30F6]={
@@ -91944,8 +92467,11 @@ characters.data={
   category="lo",
   cjkwd="w",
   description="KATAKANA LETTER SMALL KE",
+  detail="sl",
   direction="l",
   linebreak="cj",
+  shcode=0x3051,
+  sound="unvoiced",
   unicodeslot=0x30F6,
  },
  [0x30F7]={
@@ -91955,6 +92481,8 @@ characters.data={
   description="KATAKANA LETTER VA",
   direction="l",
   linebreak="id",
+  shcode=0x308F,
+  sound="voiced",
   specials={ "char", 0x30EF, 0x3099 },
   unicodeslot=0x30F7,
  },
@@ -91965,6 +92493,8 @@ characters.data={
   description="KATAKANA LETTER VI",
   direction="l",
   linebreak="id",
+  shcode=0x3090,
+  sound="voiced",
   specials={ "char", 0x30F0, 0x3099 },
   unicodeslot=0x30F8,
  },
@@ -91975,6 +92505,8 @@ characters.data={
   description="KATAKANA LETTER VE",
   direction="l",
   linebreak="id",
+  shcode=0x3091,
+  sound="voiced",
   specials={ "char", 0x30F1, 0x3099 },
   unicodeslot=0x30F9,
  },
@@ -91985,6 +92517,8 @@ characters.data={
   description="KATAKANA LETTER VO",
   direction="l",
   linebreak="id",
+  shcode=0x3092,
+  sound="voiced",
   specials={ "char", 0x30F2, 0x3099 },
   unicodeslot=0x30FA,
  },
@@ -92002,8 +92536,11 @@ characters.data={
   category="lm",
   cjkwd="w",
   description="KATAKANA-HIRAGANA PROLONGED SOUND MARK",
+  detail="pm",
   direction="l",
   linebreak="cj",
+  shcode=0x30FC,
+  sound="unvoiced",
   unicodeslot=0x30FC,
  },
  [0x30FD]={
@@ -92011,8 +92548,11 @@ characters.data={
   category="lm",
   cjkwd="w",
   description="KATAKANA ITERATION MARK",
+  detail="im",
   direction="l",
   linebreak="ns",
+  shcode=0x309D,
+  sound="unvoiced",
   unicodeslot=0x30FD,
  },
  [0x30FE]={
@@ -92020,8 +92560,11 @@ characters.data={
   category="lm",
   cjkwd="w",
   description="KATAKANA VOICED ITERATION MARK",
+  detail="im",
   direction="l",
   linebreak="ns",
+  shcode=0x309D,
+  sound="voiced",
   specials={ "char", 0x30FD, 0x3099 },
   unicodeslot=0x30FE,
  },
@@ -93991,6 +94534,8 @@ characters.data={
   description="KATAKANA LETTER SMALL KU",
   direction="l",
   linebreak="cj",
+  shcode=0x304F,
+  sound="unvoiced",
   unicodeslot=0x31F0,
  },
  [0x31F1]={
@@ -93999,6 +94544,8 @@ characters.data={
   description="KATAKANA LETTER SMALL SI",
   direction="l",
   linebreak="cj",
+  shcode=0x3057,
+  sound="unvoiced",
   unicodeslot=0x31F1,
  },
  [0x31F2]={
@@ -94007,6 +94554,8 @@ characters.data={
   description="KATAKANA LETTER SMALL SU",
   direction="l",
   linebreak="cj",
+  shcode=0x3059,
+  sound="unvoiced",
   unicodeslot=0x31F2,
  },
  [0x31F3]={
@@ -94015,6 +94564,8 @@ characters.data={
   description="KATAKANA LETTER SMALL TO",
   direction="l",
   linebreak="cj",
+  shcode=0x3068,
+  sound="unvoiced",
   unicodeslot=0x31F3,
  },
  [0x31F4]={
@@ -94023,6 +94574,8 @@ characters.data={
   description="KATAKANA LETTER SMALL NU",
   direction="l",
   linebreak="cj",
+  shcode=0x306C,
+  sound="unvoiced",
   unicodeslot=0x31F4,
  },
  [0x31F5]={
@@ -94031,6 +94584,8 @@ characters.data={
   description="KATAKANA LETTER SMALL HA",
   direction="l",
   linebreak="cj",
+  shcode=0x306F,
+  sound="unvoiced",
   unicodeslot=0x31F5,
  },
  [0x31F6]={
@@ -94039,6 +94594,8 @@ characters.data={
   description="KATAKANA LETTER SMALL HI",
   direction="l",
   linebreak="cj",
+  shcode=0x3072,
+  sound="unvoiced",
   unicodeslot=0x31F6,
  },
  [0x31F7]={
@@ -94047,6 +94604,8 @@ characters.data={
   description="KATAKANA LETTER SMALL HU",
   direction="l",
   linebreak="cj",
+  shcode=0x3075,
+  sound="unvoiced",
   unicodeslot=0x31F7,
  },
  [0x31F8]={
@@ -94055,6 +94614,8 @@ characters.data={
   description="KATAKANA LETTER SMALL HE",
   direction="l",
   linebreak="cj",
+  shcode=0x3078,
+  sound="unvoiced",
   unicodeslot=0x31F8,
  },
  [0x31F9]={
@@ -94063,6 +94624,8 @@ characters.data={
   description="KATAKANA LETTER SMALL HO",
   direction="l",
   linebreak="cj",
+  shcode=0x307B,
+  sound="unvoiced",
   unicodeslot=0x31F9,
  },
  [0x31FA]={
@@ -94071,6 +94634,8 @@ characters.data={
   description="KATAKANA LETTER SMALL MU",
   direction="l",
   linebreak="cj",
+  shcode=0x3080,
+  sound="unvoiced",
   unicodeslot=0x31FA,
  },
  [0x31FB]={
@@ -94079,6 +94644,8 @@ characters.data={
   description="KATAKANA LETTER SMALL RA",
   direction="l",
   linebreak="cj",
+  shcode=0x3089,
+  sound="unvoiced",
   unicodeslot=0x31FB,
  },
  [0x31FC]={
@@ -94087,6 +94654,7 @@ characters.data={
   description="KATAKANA LETTER SMALL RI",
   direction="l",
   linebreak="cj",
+  sound="unvoiced",
   unicodeslot=0x31FC,
  },
  [0x31FD]={
@@ -94095,6 +94663,8 @@ characters.data={
   description="KATAKANA LETTER SMALL RU",
   direction="l",
   linebreak="cj",
+  shcode=0x308B,
+  sound="unvoiced",
   unicodeslot=0x31FD,
  },
  [0x31FE]={
@@ -94103,6 +94673,8 @@ characters.data={
   description="KATAKANA LETTER SMALL RE",
   direction="l",
   linebreak="cj",
+  shcode=0x308C,
+  sound="unvoiced",
   unicodeslot=0x31FE,
  },
  [0x31FF]={
@@ -94111,6 +94683,8 @@ characters.data={
   description="KATAKANA LETTER SMALL RO",
   direction="l",
   linebreak="cj",
+  shcode=0x308D,
+  sound="unvoiced",
   unicodeslot=0x31FF,
  },
  [0x3200]={
@@ -133444,6 +134018,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER WO",
   direction="l",
   linebreak="al",
+  shcode=0x3092,
   specials={ "narrow", 0x30F2 },
   unicodeslot=0xFF66,
  },
@@ -133504,6 +134079,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SMALL YA",
   direction="l",
   linebreak="cj",
+  shcode=0x3084,
   specials={ "narrow", 0x30E3 },
   unicodeslot=0xFF6C,
  },
@@ -133514,6 +134090,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SMALL YU",
   direction="l",
   linebreak="cj",
+  shcode=0x3086,
   specials={ "narrow", 0x30E5 },
   unicodeslot=0xFF6D,
  },
@@ -133524,6 +134101,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SMALL YO",
   direction="l",
   linebreak="cj",
+  shcode=0x3088,
   specials={ "narrow", 0x30E7 },
   unicodeslot=0xFF6E,
  },
@@ -133534,6 +134112,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SMALL TU",
   direction="l",
   linebreak="cj",
+  shcode=0x3064,
   specials={ "narrow", 0x30C3 },
   unicodeslot=0xFF6F,
  },
@@ -133554,6 +134133,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER A",
   direction="l",
   linebreak="al",
+  shcode=0x3042,
   specials={ "narrow", 0x30A2 },
   unicodeslot=0xFF71,
  },
@@ -133564,6 +134144,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER I",
   direction="l",
   linebreak="al",
+  shcode=0x3044,
   specials={ "narrow", 0x30A4 },
   unicodeslot=0xFF72,
  },
@@ -133574,6 +134155,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER U",
   direction="l",
   linebreak="al",
+  shcode=0x3046,
   specials={ "narrow", 0x30A6 },
   unicodeslot=0xFF73,
  },
@@ -133584,6 +134166,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER E",
   direction="l",
   linebreak="al",
+  shcode=0x3048,
   specials={ "narrow", 0x30A8 },
   unicodeslot=0xFF74,
  },
@@ -133594,6 +134177,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER O",
   direction="l",
   linebreak="al",
+  shcode=0x304A,
   specials={ "narrow", 0x30AA },
   unicodeslot=0xFF75,
  },
@@ -133604,6 +134188,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER KA",
   direction="l",
   linebreak="al",
+  shcode=0x304B,
   specials={ "narrow", 0x30AB },
   unicodeslot=0xFF76,
  },
@@ -133614,6 +134199,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER KI",
   direction="l",
   linebreak="al",
+  shcode=0x304D,
   specials={ "narrow", 0x30AD },
   unicodeslot=0xFF77,
  },
@@ -133624,6 +134210,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER KU",
   direction="l",
   linebreak="al",
+  shcode=0x304F,
   specials={ "narrow", 0x30AF },
   unicodeslot=0xFF78,
  },
@@ -133634,6 +134221,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER KE",
   direction="l",
   linebreak="al",
+  shcode=0x3051,
   specials={ "narrow", 0x30B1 },
   unicodeslot=0xFF79,
  },
@@ -133644,6 +134232,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER KO",
   direction="l",
   linebreak="al",
+  shcode=0x3053,
   specials={ "narrow", 0x30B3 },
   unicodeslot=0xFF7A,
  },
@@ -133654,6 +134243,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SA",
   direction="l",
   linebreak="al",
+  shcode=0x3055,
   specials={ "narrow", 0x30B5 },
   unicodeslot=0xFF7B,
  },
@@ -133664,6 +134254,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SI",
   direction="l",
   linebreak="al",
+  shcode=0x3057,
   specials={ "narrow", 0x30B7 },
   unicodeslot=0xFF7C,
  },
@@ -133674,6 +134265,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SU",
   direction="l",
   linebreak="al",
+  shcode=0x3059,
   specials={ "narrow", 0x30B9 },
   unicodeslot=0xFF7D,
  },
@@ -133684,6 +134276,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SE",
   direction="l",
   linebreak="al",
+  shcode=0x305B,
   specials={ "narrow", 0x30BB },
   unicodeslot=0xFF7E,
  },
@@ -133694,6 +134287,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER SO",
   direction="l",
   linebreak="al",
+  shcode=0x305D,
   specials={ "narrow", 0x30BD },
   unicodeslot=0xFF7F,
  },
@@ -133704,6 +134298,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER TA",
   direction="l",
   linebreak="al",
+  shcode=0x305F,
   specials={ "narrow", 0x30BF },
   unicodeslot=0xFF80,
  },
@@ -133714,6 +134309,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER TI",
   direction="l",
   linebreak="al",
+  shcode=0x3061,
   specials={ "narrow", 0x30C1 },
   unicodeslot=0xFF81,
  },
@@ -133724,6 +134320,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER TU",
   direction="l",
   linebreak="al",
+  shcode=0x3064,
   specials={ "narrow", 0x30C4 },
   unicodeslot=0xFF82,
  },
@@ -133734,6 +134331,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER TE",
   direction="l",
   linebreak="al",
+  shcode=0x3066,
   specials={ "narrow", 0x30C6 },
   unicodeslot=0xFF83,
  },
@@ -133744,6 +134342,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER TO",
   direction="l",
   linebreak="al",
+  shcode=0x3068,
   specials={ "narrow", 0x30C8 },
   unicodeslot=0xFF84,
  },
@@ -133754,6 +134353,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER NA",
   direction="l",
   linebreak="al",
+  shcode=0x306A,
   specials={ "narrow", 0x30CA },
   unicodeslot=0xFF85,
  },
@@ -133764,6 +134364,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER NI",
   direction="l",
   linebreak="al",
+  shcode=0x306B,
   specials={ "narrow", 0x30CB },
   unicodeslot=0xFF86,
  },
@@ -133774,6 +134375,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER NU",
   direction="l",
   linebreak="al",
+  shcode=0x306C,
   specials={ "narrow", 0x30CC },
   unicodeslot=0xFF87,
  },
@@ -133784,6 +134386,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER NE",
   direction="l",
   linebreak="al",
+  shcode=0x306D,
   specials={ "narrow", 0x30CD },
   unicodeslot=0xFF88,
  },
@@ -133794,6 +134397,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER NO",
   direction="l",
   linebreak="al",
+  shcode=0x306E,
   specials={ "narrow", 0x30CE },
   unicodeslot=0xFF89,
  },
@@ -133804,6 +134408,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER HA",
   direction="l",
   linebreak="al",
+  shcode=0x306F,
   specials={ "narrow", 0x30CF },
   unicodeslot=0xFF8A,
  },
@@ -133814,6 +134419,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER HI",
   direction="l",
   linebreak="al",
+  shcode=0x3072,
   specials={ "narrow", 0x30D2 },
   unicodeslot=0xFF8B,
  },
@@ -133824,6 +134430,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER HU",
   direction="l",
   linebreak="al",
+  shcode=0x3075,
   specials={ "narrow", 0x30D5 },
   unicodeslot=0xFF8C,
  },
@@ -133834,6 +134441,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER HE",
   direction="l",
   linebreak="al",
+  shcode=0x3078,
   specials={ "narrow", 0x30D8 },
   unicodeslot=0xFF8D,
  },
@@ -133844,6 +134452,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER HO",
   direction="l",
   linebreak="al",
+  shcode=0x307B,
   specials={ "narrow", 0x30DB },
   unicodeslot=0xFF8E,
  },
@@ -133854,6 +134463,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER MA",
   direction="l",
   linebreak="al",
+  shcode=0x307E,
   specials={ "narrow", 0x30DE },
   unicodeslot=0xFF8F,
  },
@@ -133864,6 +134474,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER MI",
   direction="l",
   linebreak="al",
+  shcode=0x307F,
   specials={ "narrow", 0x30DF },
   unicodeslot=0xFF90,
  },
@@ -133874,6 +134485,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER MU",
   direction="l",
   linebreak="al",
+  shcode=0x3080,
   specials={ "narrow", 0x30E0 },
   unicodeslot=0xFF91,
  },
@@ -133884,6 +134496,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER ME",
   direction="l",
   linebreak="al",
+  shcode=0x3081,
   specials={ "narrow", 0x30E1 },
   unicodeslot=0xFF92,
  },
@@ -133894,6 +134507,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER MO",
   direction="l",
   linebreak="al",
+  shcode=0x3082,
   specials={ "narrow", 0x30E2 },
   unicodeslot=0xFF93,
  },
@@ -133904,6 +134518,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER YA",
   direction="l",
   linebreak="al",
+  shcode=0x3084,
   specials={ "narrow", 0x30E4 },
   unicodeslot=0xFF94,
  },
@@ -133914,6 +134529,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER YU",
   direction="l",
   linebreak="al",
+  shcode=0x3086,
   specials={ "narrow", 0x30E6 },
   unicodeslot=0xFF95,
  },
@@ -133924,6 +134540,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER YO",
   direction="l",
   linebreak="al",
+  shcode=0x3088,
   specials={ "narrow", 0x30E8 },
   unicodeslot=0xFF96,
  },
@@ -133934,6 +134551,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER RA",
   direction="l",
   linebreak="al",
+  shcode=0x3089,
   specials={ "narrow", 0x30E9 },
   unicodeslot=0xFF97,
  },
@@ -133944,6 +134562,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER RI",
   direction="l",
   linebreak="al",
+  shcode=0x308A,
   specials={ "narrow", 0x30EA },
   unicodeslot=0xFF98,
  },
@@ -133954,6 +134573,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER RU",
   direction="l",
   linebreak="al",
+  shcode=0x308B,
   specials={ "narrow", 0x30EB },
   unicodeslot=0xFF99,
  },
@@ -133964,6 +134584,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER RE",
   direction="l",
   linebreak="al",
+  shcode=0x308C,
   specials={ "narrow", 0x30EC },
   unicodeslot=0xFF9A,
  },
@@ -133974,6 +134595,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER RO",
   direction="l",
   linebreak="al",
+  shcode=0x308D,
   specials={ "narrow", 0x30ED },
   unicodeslot=0xFF9B,
  },
@@ -133984,6 +134606,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER WA",
   direction="l",
   linebreak="al",
+  shcode=0x308F,
   specials={ "narrow", 0x30EF },
   unicodeslot=0xFF9C,
  },
@@ -133994,6 +134617,7 @@ characters.data={
   description="HALFWIDTH KATAKANA LETTER N",
   direction="l",
   linebreak="al",
+  shcode=0x3093,
   specials={ "narrow", 0x30F3 },
   unicodeslot=0xFF9D,
  },
diff --git a/tex/context/base/char-ini.lua b/tex/context/base/char-ini.lua
index a1dd911f2..c6192cc9b 100644
--- a/tex/context/base/char-ini.lua
+++ b/tex/context/base/char-ini.lua
@@ -546,7 +546,17 @@ local categorytags = allocate {
     cn = "Other Not Assigned",
 }
 
+local detailtags = allocate {
+    sl = "small letter",
+    bl = "big letter",
+    im = "iteration mark",
+    pm = "prolonged sound mark"
+}
+
 characters.categorytags = categorytags
+characters.detailtags   = detailtags
+
+-- sounds : voiced unvoiced semivoiced
 
 --~ special   : cf (softhyphen) zs (emspace)
 --~ characters: ll lm lo lt lu mn nl no pc pd pe pf pi po ps sc sk sm so
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b7cfa2512..a99a6cfe7 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{2015.05.01 18:45}
+\newcontextversion{2015.05.03 21:46}
 
 %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 41901556d..ff40a9d94 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 8528545c0..a707bbeda 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.05.01 18:45}
+\edef\contextversion{2015.05.03 21:46}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/publ-imp-cite.mkvi b/tex/context/base/publ-imp-cite.mkvi
index a84beddd7..6b09eaf01 100644
--- a/tex/context/base/publ-imp-cite.mkvi
+++ b/tex/context/base/publ-imp-cite.mkvi
@@ -165,6 +165,8 @@
     \currentbtxrighttext
 \stopsetups
 
+% somehow related to keywords:
+
 \startsetups btx:cite:listelement
     \texdefinition{\s!btx:\s!cite:concat}
     \currentbtxlefttext
diff --git a/tex/context/base/publ-imp-default.mkvi b/tex/context/base/publ-imp-default.mkvi
index 099daa41f..e51955c70 100644
--- a/tex/context/base/publ-imp-default.mkvi
+++ b/tex/context/base/publ-imp-default.mkvi
@@ -24,7 +24,8 @@
 
 \definebtxrendering
   [\s!default]
-  [\c!specification=\s!default]
+  [\c!specification=\s!default,
+   \c!sorttype=\v!default]
 
 \definebtx
   [\s!default]
@@ -124,17 +125,13 @@
    \c!inbetween={,\space}]
 
 \definebtx
-  [\s!default:\s!cite:authorref]
-  [\s!default:\s!cite:authornum]
-
-\definebtx
   [\s!default:\s!cite:authoryears]
   [\s!default:\s!cite:author]
 
 \definebtx
   [\s!default:\s!cite:author:num] % todo
   [\s!default:\s!cite:authornum]
-  [\c!left={[},
+  [\c!left={\space[},
    \c!right={]}]
 
 \definebtx
@@ -147,8 +144,8 @@
   [\s!default:\s!cite:author:years] % todo
   [\s!default:\s!cite:authoryears]
   [\c!inbetween=,
-   \c!left=(,
-   \c!right=)]
+   \c!left={\space(},
+   \c!right={)}]
 
 \definebtx
   [\s!default:\s!cite:year]
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 6afaf4335..30d0c8908 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -2673,7 +2673,7 @@ do
             data.sortkey  = tonumber(text) or text
         end
 
-        local function getter(first,last,_,specification)
+        local function getter(first,last,tag,specification)
             return simplegetter(first,last,"num",specification)
         end
 
@@ -2685,6 +2685,8 @@ do
             })
         end
 
+        citevariants.textnum = citevariants.num -- should not be needed
+
     end
 
     -- year
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 120116e0a..7270b5f4d 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -1005,7 +1005,7 @@
   {\begingroup
    \edef\currentbtxfield{#2}%
    \setbtxparameterset\s!list\currentbtxfield
-   %let\currentbtxlistvariant\currentbtxfield
+% \let\currentbtxlistvariant\currentbtxfield
    \clf_btxauthor
         {\currentbtxdataset}%
         {\currentbtxtag}%
@@ -1288,11 +1288,10 @@
 
 %D Compatibility:
 
-\let\cite          \btxcitation
-\let\citation      \btxcitation
-\let\nocite        \btxnocitation
-\let\nocitation    \btxnocitation
-%let\usepublication\btxnocitation
+\let\cite      \btxcitation
+\let\citation  \btxcitation
+\let\nocite    \btxnocitation
+\let\nocitation\btxnocitation
 
 %D Setup helpers, beware, we need to wrap this .. now we need to know
 %D how setups are implemented.
@@ -1664,7 +1663,7 @@
    \c!continue=\v!no,
    \c!method=\v!global,
  % \c!setups=btx:\btxrenderingparameter\c!alternative:initialize, % not the same usage as cite !
- % \c!sorttype=authoryear,
+   \c!sorttype=\v!default,
    \c!criterium=\v!text,
    \c!refcommand=authoryears,  % todo
    \c!numbering=\v!yes,
@@ -1686,6 +1685,7 @@
    \c!inbetween=\space,
    \c!range=\endash,   % separator:range?
    \c!compress=\v!yes, % was no?
+   \c!authorconversion=normal,
    \c!sorttype=normal, % normal, reverse or none
    \c!etallimit=3,
    \c!etaldisplay=\btxparameter\c!etallimit,
diff --git a/tex/context/base/publ-sor.lua b/tex/context/base/publ-sor.lua
index 7d1ab8342..c442e3953 100644
--- a/tex/context/base/publ-sor.lua
+++ b/tex/context/base/publ-sor.lua
@@ -126,6 +126,7 @@ local function sortsequence(dataset,list,sorttype)
     if not sequence and type(sorttype) == "string" then
         local list = toarray(sorttype)
         if #list > 0 then
+            local indexdone = false
             sequence = { }
             for i=1,#list do
                 local entry   = toarray(list[i])
@@ -137,6 +138,16 @@ local function sortsequence(dataset,list,sorttype)
                     default = default == s_default and c_default or default or c_default,
                     unknown = unknown == s_unknown and c_unknown or unknown or c_unknown,
                 }
+                if field == "index" then
+                    indexdone = true
+                end
+            end
+            if not indexdone then
+                sequence[#sequence+1] = {
+                    field   = "index",
+                    default = 0,
+                    unknown = 0,
+                }
             end
         end
         if trace_sorters then
@@ -238,15 +249,13 @@ local sorters = {
         end
         sort(list,compare)
     end,
-    [v_reference] = function(dataset,rendering,list) -- order
+    [v_reference] = function(dataset,rendering,list) -- tag
         local function compare(a,b)
-            local aa = a and a[1]
-            local bb = b and b[1]
-            return aa < bb
+            return a[1] < b[1]
         end
         sort(list,compare)
     end,
-    [v_dataset] = function(dataset,rendering,list) -- index
+    [v_dataset] = function(dataset,rendering,list) -- dataset index
         local function compare(a,b)
             local aa = a and a[6]
             local bb = b and b[6]
@@ -258,21 +267,18 @@ local sorters = {
         end
         sort(list,compare)
     end,
-    [v_default] = function(dataset,rendering,list,sorttype) -- experimental
-        if sorttype == "" or sorttype == v_default then
+    [v_default] = function(dataset,rendering,list,sorttype)
+        if sorttype == "" or sorttype == v_default then -- listorder
             local function compare(a,b)
-                local aa = a and a[3] or 0
-                local bb = b and b[3] or 0
-                if aa == bb then
-                    return a[1] < b[1]
-                else
-                    return aa < bb
-                end
+                return a[2] <  b[2]
             end
             sort(list,compare)
         else
-            local valid = sortsequence(dataset,list,sorttype)
+            local valid = sortsequence(dataset,list,sorttype) -- field order
             if valid and #valid > 0 then
+                -- hm, we have a complication here because a sortsequence doesn't know if there's a field
+                -- so there is no real catch possible here .., anyway, we add a index as last entry when no
+                -- one is set so that should be good enough (needs testing)
                 for i=1,#valid do
                     local v = valid[i]
                     valid[i] = list[v.index]
diff --git a/tex/context/base/s-fnt-24.mkiv b/tex/context/base/s-fnt-24.mkiv
index 2c0022e5c..2e6b9a591 100644
--- a/tex/context/base/s-fnt-24.mkiv
+++ b/tex/context/base/s-fnt-24.mkiv
@@ -56,7 +56,7 @@ function fonts.analyzers.cjktest(first,second)
 end
 \stopluacode
 
-\def\ShowCombinationsKorean
+\unexpanded\def\ShowCombinationsKorean
   {\dodoubleempty\doShowCombinationsKorean}
 
 \def\doShowCombinationsKorean[#1][#2]%
@@ -68,7 +68,7 @@ end
    \disabletrackers[cjk.analyzing]
    \stoppacked}
 
-\def\ShowCombinationsChinese
+\unexpanded\def\ShowCombinationsChinese
   {\dodoubleempty\doShowCombinationsChinese}
 
 \def\doShowCombinationsChinese[#1][#2]%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 19e711540..d407b8236 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 937a176a9..66d311434 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/syst-aux.lua b/tex/context/base/syst-aux.lua
index a880bace3..fff9bbb4c 100644
--- a/tex/context/base/syst-aux.lua
+++ b/tex/context/base/syst-aux.lua
@@ -184,13 +184,13 @@ implement { name = "upper", arguments = "string", actions = { utf.upper,    cont
 implement { name = "lower", arguments = "string", actions = { utf.lower,    context } }
 implement { name = "strip", arguments = "string", actions = { string.strip, context } } -- or utf.strip
 
--- implement {
---     name      = "converteddimen",
---     arguments = { "dimen", "string" },
---     actions   = function(dimen,unit)
---         context(todimen(dimen,unit or "pt","%0.5f")) -- no unit appended (%F)
---     end
--- }
+implement {
+    name      = "converteddimen",
+    arguments = { "dimen", "string" },
+    actions   = function(dimen,unit)
+        context(number.todimen(dimen,unit or "pt","%0.5f")) -- no unit appended (%F)
+    end
+}
 
 -- where, not really the best spot for this:
 
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 308ed5a3b..bd9b1630e 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -7123,9 +7123,9 @@
 
 \def\getsubstring#1#2#3{\clf_getsubstring{#3}{#1}{#2}}
 
-%D Other dimensions than pt:
+%D Other dimensions than pt (used in mb-mp)
 
-% \def\converteddimen#1#2{\clf_converteddimen\dimexpr#1\relax{#2}}
+\def\converteddimen#1#2{\clf_converteddimen\dimexpr#1\relax{#2}}
 
 %D Maybe (looks ugly):
 %D
diff --git a/tex/context/base/type-imp-ipaex.mkiv b/tex/context/base/type-imp-ipaex.mkiv
new file mode 100644
index 000000000..b11f96878
--- /dev/null
+++ b/tex/context/base/type-imp-ipaex.mkiv
@@ -0,0 +1,137 @@
+%D \module
+%D   [       file=type-imp-ipaex,
+%D        version=2015.05.01,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=IPAex,
+%D         author=Yusuke KUROKI \& Hans HAGEN,
+%D           date=\currentdate,
+%D      copyright=Yusuke KUROKI \& Hans HAGEN]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% usage: \setupbodyfont[ipaex,10pt]
+
+\loadtypescriptfile[texgyre]
+\loadtypescriptfile[xits]
+
+\definefontfeature
+  [jp-default]
+  [script=default,lang=japanese]
+
+\definefontfeature
+  [jp-latin-default]
+  [jp-default]
+
+\definefontfeature
+  [jp-latin-slanted]
+  [jp-latin-default]
+  [slant=.2]
+
+\definefontfeature
+  [jp-latin-slanted-mono]
+  [slant=.2]
+
+\definefontfeature
+  [jp-latin-smallcaps]
+  [jp-latin-default]
+  [smcp=yes]
+
+\definefontfeature
+  [jp-latin-smallcaps-mono]
+  [cmcp=yes]
+
+\definefontfallback[jp-serif]           [texgyrepagella-regular*jp-latin-default]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifbold]       [texgyrepagella-bold*jp-latin-default]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifitalic]     [texgyrepagella-italic*jp-latin-default]       [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifbolditalic] [texgyrepagella-bolditalic*jp-latin-default]   [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifslanted]    [texgyrepagella-regular*jp-latin-slanted]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifboldslanted][texgyrepagella-bold*jp-latin-slanted]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-serifcaps]       [texgyrepagella-regular*jp-latin-smallcaps]    [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sans]            [texgyreheros-regular*jp-latin-default]        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansbold]        [texgyreheros-bold*jp-latin-default]           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansitalic]      [texgyreheros-italic*jp-latin-default]         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansbolditalic]  [texgyreheros-bolditalic*jp-latin-default]     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansslanted]     [texgyreheros-regular*jp-latin-slanted]        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sansboldslanted] [texgyreheros-bold*jp-latin-slanted]           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-sanscaps]        [texgyreheros-regular*jp-latin-smallcaps]      [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-mono]            [texgyrecursor-regular]                        [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monobold]        [texgyrecursor-bold]                           [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoitalic]      [texgyrecursor-italic]                         [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monobolditalic]  [texgyrecursor-bolditalic]                     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoslanted]     [texgyrecursor-regular*jp-latin-slanted-mono]  [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monoboldslanted] [texgyrecursor-bold*jp-latin-slanted-mono]     [0x0000-0x0400][force=yes,rscale=1.0406]
+\definefontfallback[jp-monocaps]        [texgyrecursor-regular*jp-latin-smallcaps-mono][0x0000-0x0400][force=yes,rscale=1.0406]
+
+\starttypescriptcollection[ipaex]
+    \starttypescript [\s!serif] [ipaexm]
+        \definefontsynonym [ipaexm]           [\s!file:ipaexm][\s!features=jp-default,\s!fallbacks=jp-serif]
+        \definefontsynonym [ipaexmbold]       [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifbold]
+        \definefontsynonym [ipaexmitalic]     [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifitalic]
+        \definefontsynonym [ipaexmbolditalic] [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifbolditalic]
+        \definefontsynonym [ipaexmslanted]    [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifslanted]
+        \definefontsynonym [ipaexmboldslanted][\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-serifboldslanted]
+        \definefontsynonym [ipaexmcaps]       [\s!file:ipaexm][\s!features=jp-default,\s!fallbacks=jp-serifcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [ipaexg]
+        \definefontsynonym[ipaexg]             [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sans]
+        \definefontsynonym[ipaexgbold]         [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansbold]
+        \definefontsynonym[ipaexgitalic]       [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansitalic]
+        \definefontsynonym[ipaexgbolditalic]   [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansbolditalic]
+        \definefontsynonym[ipaexgslanted]      [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansslanted]
+        \definefontsynonym[ipaexgboldslanted]  [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sansboldslanted]
+        \definefontsynonym[ipaexgcaps]         [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-sanscaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [ipaexgmono]
+        \definefontsynonym[ipaexgmono]              [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-mono]
+        \definefontsynonym[ipaexgmonobold]          [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-monobold]
+        \definefontsynonym[ipaexgmonoitalic]        [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoitalic]
+        \definefontsynonym[ipaexgmonobolditalic]    [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monobolditalic]
+        \definefontsynonym[ipaexgmonoslanted]       [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoslanted]
+        \definefontsynonym[ipaexgmonoboldslanted]   [\s!file:ipaexg][\s!features=jp-slanted,\s!fallbacks=jp-monoboldslanted]
+        \definefontsynonym[ipaexgmonocaps]          [\s!file:ipaexg][\s!features=jp-default,\s!fallbacks=jp-monocaps]
+    \stoptypescript
+    
+    \starttypescript [\s!serif] [ipaexm] [\s!name]
+        \definefontsynonym[\s!Serif]           [ipaexm]
+        \definefontsynonym[\s!SerifBold]       [ipaexmbold]
+        \definefontsynonym[\s!SerifItalic]     [ipaexmitalic]
+        \definefontsynonym[\s!SerifBoldItalic] [ipaexmbolditalic]
+        \definefontsynonym[\s!SerifSlanted]    [ipaexmslanted]
+        \definefontsynonym[\s!SerifBoldSlanted][ipaexmboldslanted]
+        \definefontsynonym[\s!SerifCaps]       [ipaexmcaps]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [ipaexg] [\s!name]
+        \definefontsynonym[\s!Sans]            [ipaexg]
+        \definefontsynonym[\s!SansBold]        [ipaexgbold]
+        \definefontsynonym[\s!SansItalic]      [ipaexgitalic]
+        \definefontsynonym[\s!SansBoldItalic]  [ipaexgbolditalic]
+        \definefontsynonym[\s!SansSlanted]     [ipaexgslanted]
+        \definefontsynonym[\s!SansBoldSlanted] [ipaexgboldslanted]
+        \definefontsynonym[\s!SansCaps]        [ipaexgcaps]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [ipaexgmono] [\s!name]
+        \definefontsynonym[\s!Mono]            [ipaexgmono]
+        \definefontsynonym[\s!MonoBold]        [ipaexgmonobold]
+        \definefontsynonym[\s!MonoItalic]      [ipaexgmonoitalic]
+        \definefontsynonym[\s!MonoBoldItalic]  [ipaexgmonobolditalic]
+        \definefontsynonym[\s!MonoSlanted]     [ipaexgmonoslanted]
+        \definefontsynonym[\s!MonoBoldSlanted] [ipaexgmonoboldslanted]
+        \definefontsynonym[\s!MonoCaps]        [ipaexgmonocaps]
+    \stoptypescript
+
+    % xits might get replaced with a pagella once we have it
+
+    \starttypescript[ipaex]
+        \definetypeface [ipaex] [\s!rm] [\s!serif] [ipaexm]
+        \definetypeface [ipaex] [\s!ss] [\s!sans]  [ipaexg]
+        \definetypeface [ipaex] [\s!tt] [\s!mono]  [ipaexgmono]
+        \definetypeface [ipaex] [\s!mm] [\s!math]  [xits]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fba5742b5..eabed7cb8 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  : 05/01/15 18:45:14
+-- merge date  : 05/03/15 21:46:51
 
 do -- begin closure to overcome local limits and interference
author	Context Git Mirror Bot <phg42.2a@gmail.com>	2015-05-03 22:15:05 +0200
committer	Context Git Mirror Bot <phg42.2a@gmail.com>	2015-05-03 22:15:05 +0200
commit	5f9befc0fd0b4b14d74862c8d3f577569b436cda (patch)
tree	be901810b37c84c35558558934738696cde2531a
parent	66f36353ebae5235cc3bfe5f75b375e175857748 (diff)
download	context-5f9befc0fd0b4b14d74862c8d3f577569b436cda.tar.gz