1 files changed, 276 insertions, 276 deletions

diff --git a/src/features/ccmp.fea b/src/features/ccmp.fea
index 3f8bccbe0..371b11bc3 100644
--- a/src/features/ccmp.fea
+++ b/src/features/ccmp.fea
@@ -1,19 +1,19 @@
 @CCMP_ACC = [
-  gravecomb acutecomb tildecomb brevetildecomb.cn brevehookcomb.cn
+  gravecomb acutecomb tildecomb brevetildecomb.cn brevecomb_hookabovecomb
   breveacutecomb.cn circumflextildecomb.cn circumflexhookcomb.cn
   circumflexgravecomb.cn circumflexacutecomb.cn brevegravecomb.cn
   macroncomb dieresismacroncomb.uc dieresisacutecomb.uc
   dieresiscaroncomb.uc dieresisgravecomb.uc dotmacroncomb.uc
-  tildeacutecomb.uc macrongravecomb.cn macronacutecomb.cn
+  tildeacutecomb.uc macrongravecomb.cn macronacutecomb
   macrondieresiscomb.cn acutedotcomb.cn carondot.lc carondot.uc
-  tildemacroncomb.cn tildedieresiscomb.cn circumflexnosp overscorenosp
-  brevenosp dotnosp dieresisnosp hookabove ringnosp acutedblnosp caroncmb
-  linevertnosp linevertdblnosp dblgravecmb candrabindunosp breveinvnosp
-  commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb
-  anglesupnosp hornnosp xsupnosp tildevertsupnosp overscoredblnosp
-  graveleftnosp acuterightnosp perispomenigreekcmb koroniscmb
-  diaeresistonosnosp uni0346 uni034A uni034B uni034C arrowheadrightabovecomb uni0351
-  uni0352 uni0357 uni0358 uni035B uni1DC0 uni1DC1 uni1DC3 uni1DC4
+  tildemacroncomb.cn tildedieresiscomb.uc circumflexcomb overscorecomb
+  brevecomb dotaccentcomb dieresiscomb hookabovecomb ringcomb acutedblcomb caroncomb
+  linevertcomb linevertdblcomb dblgravecmb candrabinducomb breveinvcomb
+  commaturnsupcomb commaabovecmb commasuprevcomb commaaboverightcmb
+  anglesupcomb horncomb xsupcomb tildevertsupcomb overscoredblcomb
+  graveleftcomb acuterightcomb perispomenigreekcmb koroniscmb
+  diaeresistonoscomb uni0346 uni034A uni034B uni034C arrowheadrightabovecomb uni0351
+  uni0352 uni0357 uni0358 uni035B uni1DC0 uni1DC1 uni1DC3
   uni1DC5 uni1DC6 uni1DC7 uni1DC8 uni1DC9 uni1DCB uni1DCC uni1DCD
   uni1DCE uni1DD1 uni1DD2 uni1DD3 uni1DD4 uni1DD5 uni1DD6 uni1DD7
   uni1DD8 uni1DD9 uni1DDA uni1DDB uni1DDC uni1DDD uni1DDE uni1DDF
@@ -50,125 +50,125 @@ lookup ccmp02 {
 } ccmp02;
 
 lookup ccmp03 {
-  sub d caroncmb by dcaron;
-  sub l caroncmb by lcaron;
-  sub t caroncmb by tcaron;
+  sub d caroncomb by dcaron;
+  sub l caroncomb by lcaron;
+  sub t caroncomb by tcaron;
 
   sub A gravecomb by Agrave;
   sub A acutecomb by Aacute;
-  sub A circumflexnosp by Acircumflex;
+  sub A circumflexcomb by Acircumflex;
   sub A tildecomb by Atilde;
-  sub A dieresisnosp by Adieresis;
-  sub A ringnosp by Aring;
+  sub A dieresiscomb by Adieresis;
+  sub A ringcomb by Aring;
   sub A ringacute.uc by Aringacute;
-  sub Aogonek ringnosp by Aringogonek;
-  sub C cedillanosp by Ccedilla;
+  sub Aogonek ringcomb by Aringogonek;
+  sub C cedillacomb by Ccedilla;
   sub E gravecomb by Egrave;
   sub E acutecomb by Eacute;
-  sub E circumflexnosp by Ecircumflex;
-  sub E dieresisnosp by Edieresis;
+  sub E circumflexcomb by Ecircumflex;
+  sub E dieresiscomb by Edieresis;
   sub I gravecomb by Igrave;
   sub I acutecomb by Iacute;
-  sub I circumflexnosp by Icircumflex;
-  sub I dieresisnosp by Idieresis;
+  sub I circumflexcomb by Icircumflex;
+  sub I dieresiscomb by Idieresis;
   sub N tildecomb by Ntilde;
   sub O gravecomb by Ograve;
   sub O acutecomb by Oacute;
-  sub O circumflexnosp by Ocircumflex;
+  sub O circumflexcomb by Ocircumflex;
   sub O tildecomb by Otilde;
-  sub O dieresisnosp by Odieresis;
+  sub O dieresiscomb by Odieresis;
   sub U gravecomb by Ugrave;
   sub U acutecomb by Uacute;
-  sub U circumflexnosp by Ucircumflex;
-  sub U dieresisnosp by Udieresis;
+  sub U circumflexcomb by Ucircumflex;
+  sub U dieresiscomb by Udieresis;
   sub Y acutecomb by Yacute;
-  sub Y ogoneknosp by Yogonek;
+  sub Y ogonekcomb by Yogonek;
   sub a gravecomb by agrave;
   sub a acutecomb by aacute;
-  sub a circumflexnosp by acircumflex;
+  sub a circumflexcomb by acircumflex;
   sub a tildecomb by atilde;
-  sub a dieresisnosp by adieresis;
-  sub a ringnosp by aring;
+  sub a dieresiscomb by adieresis;
+  sub a ringcomb by aring;
   sub a ringacute.lc by aringacute;
-  sub c cedillanosp by ccedilla;
+  sub c cedillacomb by ccedilla;
   sub C slashlongcomb by Cstroke;
   sub c slashlongcomb by cstroke;
   sub e gravecomb by egrave;
   sub e acutecomb by eacute;
-  sub e circumflexnosp by ecircumflex;
-  sub e dieresisnosp by edieresis;
+  sub e circumflexcomb by ecircumflex;
+  sub e dieresiscomb by edieresis;
   sub idotless gravecomb by igrave;
   sub idotless acutecomb by iacute;
-  sub idotless circumflexnosp by icircumflex;
-  sub idotless dieresisnosp by idieresis;
+  sub idotless circumflexcomb by icircumflex;
+  sub idotless dieresiscomb by idieresis;
   sub n tildecomb by ntilde;
   sub o gravecomb by ograve;
   sub o acutecomb by oacute;
-  sub o circumflexnosp by ocircumflex;
+  sub o circumflexcomb by ocircumflex;
   sub o tildecomb by otilde;
-  sub o dieresisnosp by odieresis;
+  sub o dieresiscomb by odieresis;
   sub u gravecomb by ugrave;
   sub u acutecomb by uacute;
-  sub u circumflexnosp by ucircumflex;
-  sub u dieresisnosp by udieresis;
+  sub u circumflexcomb by ucircumflex;
+  sub u dieresiscomb by udieresis;
   sub y acutecomb by yacute;
-  sub y ogoneknosp by yogonek;
-  sub y dieresisnosp by ydieresis;
+  sub y ogonekcomb by yogonek;
+  sub y dieresiscomb by ydieresis;
   sub A macroncomb by Amacron;
   sub a macroncomb by amacron;
-  sub A brevenosp by Abreve;
-  sub a brevenosp by abreve;
-  sub A ogoneknosp by Aogonek;
-  sub a ogoneknosp by aogonek;
-  sub aogonek ringnosp by aringogonek;
+  sub A brevecomb by Abreve;
+  sub a brevecomb by abreve;
+  sub A ogonekcomb by Aogonek;
+  sub a ogonekcomb by aogonek;
+  sub aogonek ringcomb by aringogonek;
   sub C acutecomb by Cacute;
   sub c acutecomb by cacute;
-  sub C circumflexnosp by Ccircumflex;
-  sub c circumflexnosp by ccircumflex;
-  sub C dotnosp by Cdotaccent;
-  sub c dotnosp by cdotaccent;
-  sub C caroncmb by Ccaron;
-  sub c caroncmb by ccaron;
-  sub D caroncmb by Dcaron;
+  sub C circumflexcomb by Ccircumflex;
+  sub c circumflexcomb by ccircumflex;
+  sub C dotaccentcomb by Cdotaccent;
+  sub c dotaccentcomb by cdotaccent;
+  sub C caroncomb by Ccaron;
+  sub c caroncomb by ccaron;
+  sub D caroncomb by Dcaron;
   sub E macroncomb by Emacron;
   sub e macroncomb by emacron;
-  sub E brevenosp by Ebreve;
-  sub e brevenosp by ebreve;
-  sub E dotnosp by Edotaccent;
-  sub e dotnosp by edotaccent;
-  sub E ogoneknosp by Eogonek;
-  sub e ogoneknosp by eogonek;
-  sub E caroncmb by Ecaron;
-  sub e caroncmb by ecaron;
-  sub G circumflexnosp by Gcircumflex;
-  sub g circumflexnosp by gcircumflex;
-  sub G brevenosp by Gbreve;
-  sub g brevenosp by gbreve;
-  sub G dotnosp by Gdotaccent;
-  sub g dotnosp by gdotaccent;
+  sub E brevecomb by Ebreve;
+  sub e brevecomb by ebreve;
+  sub E dotaccentcomb by Edotaccent;
+  sub e dotaccentcomb by edotaccent;
+  sub E ogonekcomb by Eogonek;
+  sub e ogonekcomb by eogonek;
+  sub E caroncomb by Ecaron;
+  sub e caroncomb by ecaron;
+  sub G circumflexcomb by Gcircumflex;
+  sub g circumflexcomb by gcircumflex;
+  sub G brevecomb by Gbreve;
+  sub g brevecomb by gbreve;
+  sub G dotaccentcomb by Gdotaccent;
+  sub g dotaccentcomb by gdotaccent;
   sub G commaaccent by Gcommaaccent;
   sub g commaaccentrotate.cn by gcommaaccent;
-  sub H circumflexnosp by Hcircumflex;
-  sub h circumflexnosp by hcircumflex;
+  sub H circumflexcomb by Hcircumflex;
+  sub h circumflexcomb by hcircumflex;
   sub I tildecomb by Itilde;
   sub idotless tildecomb by itilde;
   sub I macroncomb by Imacron;
   sub idotless macroncomb by imacron;
-  sub I brevenosp by Ibreve;
-  sub idotless brevenosp by ibreve;
-  sub I ogoneknosp by Iogonek;
-  sub i ogoneknosp by iogonek;
-  sub I dotnosp by Idotaccent;
-  sub J circumflexnosp by Jcircumflex;
-  sub jdotless circumflexnosp by jcircumflex;
+  sub I brevecomb by Ibreve;
+  sub idotless brevecomb by ibreve;
+  sub I ogonekcomb by Iogonek;
+  sub i ogonekcomb by iogonek;
+  sub I dotaccentcomb by Idotaccent;
+  sub J circumflexcomb by Jcircumflex;
+  sub jdotless circumflexcomb by jcircumflex;
   sub K commaaccent by Kcommaaccent;
   sub k commaaccent by kcommaaccent;
   sub L acutecomb by Lacute;
   sub l acutecomb by lacute;
   sub L commaaccent by Lcommaaccent;
   sub l commaaccent by lcommaaccent;
-  sub L dotnosp by Ldot;
-  sub l dotnosp by ldot;
+  sub L dotaccentcomb by Ldot;
+  sub l dotaccentcomb by ldot;
   sub L slashlongcomb by Lslash;
   sub l slashlongcomb by lslash;
   sub l.ss02 slashlongcomb by lslash.ss02;
@@ -176,327 +176,327 @@ lookup ccmp03 {
   sub n acutecomb by nacute;
   sub N commaaccent by Ncommaaccent;
   sub n commaaccent by ncommaaccent;
-  sub N caroncmb by Ncaron;
-  sub n caroncmb by ncaron;
+  sub N caroncomb by Ncaron;
+  sub n caroncomb by ncaron;
   sub O macroncomb by Omacron;
   sub o macroncomb by omacron;
-  sub O brevenosp by Obreve;
-  sub o brevenosp by obreve;
-  sub O acutedblnosp by Ohungarumlaut;
-  sub o acutedblnosp by ohungarumlaut;
+  sub O brevecomb by Obreve;
+  sub o brevecomb by obreve;
+  sub O acutedblcomb by Ohungarumlaut;
+  sub o acutedblcomb by ohungarumlaut;
   sub O slashlongcomb by Oslash;
   sub o slashlongcomb by oslash;
   sub R acutecomb by Racute;
   sub r acutecomb by racute;
   sub R commaaccent by Rcommaaccent;
   sub r commaaccent by rcommaaccent;
-  sub R caroncmb by Rcaron;
-  sub r caroncmb by rcaron;
+  sub R caroncomb by Rcaron;
+  sub r caroncomb by rcaron;
   sub S acutecomb by Sacute;
   sub s acutecomb by sacute;
-  sub S circumflexnosp by Scircumflex;
-  sub s circumflexnosp by scircumflex;
-  sub S cedillanosp by Scedilla;
-  sub s cedillanosp by scedilla;
+  sub S circumflexcomb by Scircumflex;
+  sub s circumflexcomb by scircumflex;
+  sub S cedillacomb by Scedilla;
+  sub s cedillacomb by scedilla;
   sub S commaaccent by Scommaaccent;
   sub s commaaccent by scommaaccent;
-  sub S caroncmb by Scaron;
-  sub s caroncmb by scaron;
+  sub S caroncomb by Scaron;
+  sub s caroncomb by scaron;
   sub T commaaccent by uni021A;
   sub t commaaccent by tcommaaccent;
-  sub T cedillanosp by Tcommaaccent;
-  sub t cedillanosp by tcedilla;
-  sub T caroncmb by Tcaron;
+  sub T cedillacomb by Tcommaaccent;
+  sub t cedillacomb by tcedilla;
+  sub T caroncomb by Tcaron;
   sub U tildecomb by Utilde;
   sub u tildecomb by utilde;
   sub U macroncomb by Umacron;
   sub u macroncomb by umacron;
-  sub U brevenosp by Ubreve;
-  sub u brevenosp by ubreve;
-  sub U ringnosp by Uring;
-  sub u ringnosp by uring;
-  sub U acutedblnosp by Uhungarumlaut;
-  sub u acutedblnosp by uhungarumlaut;
-  sub U ogoneknosp by Uogonek;
-  sub u ogoneknosp by uogonek;
-  sub W circumflexnosp by Wcircumflex;
-  sub w circumflexnosp by wcircumflex;
-  sub Y circumflexnosp by Ycircumflex;
-  sub y circumflexnosp by ycircumflex;
-  sub Y dieresisnosp by Ydieresis;
+  sub U brevecomb by Ubreve;
+  sub u brevecomb by ubreve;
+  sub U ringcomb by Uring;
+  sub u ringcomb by uring;
+  sub U acutedblcomb by Uhungarumlaut;
+  sub u acutedblcomb by uhungarumlaut;
+  sub U ogonekcomb by Uogonek;
+  sub u ogonekcomb by uogonek;
+  sub W circumflexcomb by Wcircumflex;
+  sub w circumflexcomb by wcircumflex;
+  sub Y circumflexcomb by Ycircumflex;
+  sub y circumflexcomb by ycircumflex;
+  sub Y dieresiscomb by Ydieresis;
   sub Z acutecomb by Zacute;
   sub z acutecomb by zacute;
-  sub Z dotnosp by Zdotaccent;
-  sub z dotnosp by zdotaccent;
-  sub Z caroncmb by Zcaron;
-  sub z caroncmb by zcaron;
+  sub Z dotaccentcomb by Zdotaccent;
+  sub z dotaccentcomb by zdotaccent;
+  sub Z caroncomb by Zcaron;
+  sub z caroncomb by zcaron;
   sub AE acutecomb by AEacute;
   sub ae acutecomb by aeacute;
   sub Oslash acutecomb by Oslashacute;
   sub oslash acutecomb by oslashacute;
-  #sub z caroncmb by zcaron;
+  #sub z caroncomb by zcaron;
   sub W gravecomb by Wgrave;
   sub w gravecomb by wgrave;
   sub W acutecomb by Wacute;
   sub w acutecomb by wacute;
-  sub W dieresisnosp by Wdieresis;
-  sub w dieresisnosp by wdieresis;
+  sub W dieresiscomb by Wdieresis;
+  sub w dieresiscomb by wdieresis;
   sub Y gravecomb by Ygrave;
   sub y gravecomb by ygrave;
-  sub jdotless caroncmb by jcaron;
+  sub jdotless caroncomb by jcaron;
   sub A dotbelow by Adotbelow;
   sub a dotbelow by adotbelow;
-  sub A hookabove by Ahookabove;
-  sub a hookabove by ahookabove;
+  sub A hookabovecomb by Ahookabove;
+  sub a hookabovecomb by ahookabove;
   #sub A circumflexacutecomb.cn by uni1EA4;
-  sub A circumflexnosp acutecomb by Acircumflexacute;
+  sub A circumflexcomb acutecomb by Acircumflexacute;
   sub a circumflexacutecomb.cn by acircumflexacute;
   #sub A circumflexgravecomb.cn by uni1EA6;
-  sub A circumflexnosp gravecomb by Acircumflexgrave;
+  sub A circumflexcomb gravecomb by Acircumflexgrave;
   sub a circumflexgravecomb.cn by acircumflexgrave;
   #sub A circumflexhookcomb.cn by uni1EA8;
-  sub A circumflexnosp hookabove by Acircumflexhookabove;
+  sub A circumflexcomb hookabovecomb by Acircumflexhookabove;
   sub a circumflexhookcomb.cn by acircumflexhookabove;
   #sub A circumflextildecomb.cn by uni1EAA;
-  sub A circumflexnosp tildecomb by Acircumflextilde;
+  sub A circumflexcomb tildecomb by Acircumflextilde;
   sub a circumflextildecomb.cn by acircumflextilde;
   #sub A breveacutecomb.cn by uni1EAE;
-  sub A brevenosp acutecomb by Abreveacute;
+  sub A brevecomb acutecomb by Abreveacute;
   sub a breveacutecomb.cn by abreveacute;
   #sub A brevegravecomb.cn by uni1EB0;
-  sub A brevenosp gravecomb by Abrevegrave;
+  sub A brevecomb gravecomb by Abrevegrave;
   sub a brevegravecomb.cn by abrevegrave;
-  #sub A brevehookcomb.cn by uni1EB2;
-  sub A brevenosp hookabove by Abrevehookabove;
-  sub a brevehookcomb.cn by abrevehookabove;
+  #sub A brevecomb_hookabovecomb by uni1EB2;
+  sub A brevecomb hookabovecomb by Abrevehookabove;
+  sub a brevecomb_hookabovecomb by abrevehookabove;
   sub A brevetildecomb.cn by Abrevetilde;
   sub a brevetildecomb.cn by abrevetilde;
   sub E dotbelow by Edotbelow;
   sub e dotbelow by edotbelow;
-  sub E hookabove by Ehookabove;
-  sub e hookabove by ehookabove;
+  sub E hookabovecomb by Ehookabove;
+  sub e hookabovecomb by ehookabove;
   sub E tildecomb by Etilde;
   sub e tildecomb by etilde;
   #sub E circumflexacutecomb.cn by uni1EBE;
-  sub E circumflexnosp acutecomb by Ecircumflexacute;
+  sub E circumflexcomb acutecomb by Ecircumflexacute;
   sub e circumflexacutecomb.cn by ecircumflexacute;
   #sub E circumflexgravecomb.cn by uni1EC0;
-  sub E circumflexnosp gravecomb by Ecircumflexgrave;
+  sub E circumflexcomb gravecomb by Ecircumflexgrave;
   sub e circumflexgravecomb.cn by ecircumflexgrave;
   #sub E circumflexhookcomb.cn by uni1EC2;
-  sub E circumflexnosp hookabove by Ecircumflexhookabove;
+  sub E circumflexcomb hookabovecomb by Ecircumflexhookabove;
   sub e circumflexhookcomb.cn by ecircumflexhookabove;
   #sub E circumflextildecomb.cn by uni1EC4;
-  sub E circumflexnosp tildecomb by Ecircumflextilde;
+  sub E circumflexcomb tildecomb by Ecircumflextilde;
   sub e circumflextildecomb.cn by ecircumflextilde;
-  sub I hookabove by Ihookabove;
-  sub idotless hookabove by ihookabove;
+  sub I hookabovecomb by Ihookabove;
+  sub idotless hookabovecomb by ihookabove;
   sub I dotbelow by Idotbelow;
   sub i dotbelow by idotbelow;
   sub O dotbelow by Odotbelow;
   sub o dotbelow by odotbelow;
-  sub O hookabove by Ohookabove;
-  sub o hookabove by ohookabove;
+  sub O hookabovecomb by Ohookabove;
+  sub o hookabovecomb by ohookabove;
   #sub O circumflexacutecomb.cn by uni1ED0;
-  sub O circumflexnosp acutecomb by Ocircumflexacute;
+  sub O circumflexcomb acutecomb by Ocircumflexacute;
   sub o circumflexacutecomb.cn by ocircumflexacute;
   #sub O circumflexgravecomb.cn by uni1ED2;
-  sub O circumflexnosp gravecomb by Ocircumflexgrave;
+  sub O circumflexcomb gravecomb by Ocircumflexgrave;
   sub o circumflexgravecomb.cn by ocircumflexgrave;
   #sub O circumflexhookcomb.cn by uni1ED4;
-  sub O circumflexnosp hookabove by Ocircumflexhookabove;
+  sub O circumflexcomb hookabovecomb by Ocircumflexhookabove;
   sub o circumflexhookcomb.cn by ocircumflexhookabove;
   #sub O circumflextildecomb.cn by uni1ED6;
-  sub O circumflexnosp tildecomb by Ocircumflextilde;
+  sub O circumflexcomb tildecomb by Ocircumflextilde;
   sub o circumflextildecomb.cn by ocircumflextilde;
   sub Ohorn acutecomb by Ohornacute;
   sub ohorn acutecomb by ohornacute;
   sub Ohorn gravecomb by Ohorngrave;
   sub ohorn gravecomb by ohorngrave;
-  sub Ohorn hookabove by Ohornhookabove;
-  sub ohorn hookabove by ohornhookabove;
+  sub Ohorn hookabovecomb by Ohornhookabove;
+  sub ohorn hookabovecomb by ohornhookabove;
   sub Ohorn tildecomb by Ohorntilde;
   sub ohorn tildecomb by ohorntilde;
   sub Ohorn dotbelow by Ohorndotbelow;
   sub ohorn dotbelow by ohorndotbelow;
   sub U dotbelow by Udotbelow;
   sub u dotbelow by udotbelow;
-  sub U hookabove by Uhookabove;
-  sub u hookabove by uhookabove;
+  sub U hookabovecomb by Uhookabove;
+  sub u hookabovecomb by uhookabove;
   sub Uhorn acutecomb by Uhornacute;
   sub uhorn acutecomb by uhornacute;
   sub Uhorn gravecomb by Uhorngrave;
   sub uhorn gravecomb by uhorngrave;
-  sub Uhorn hookabove by Uhornhookabove;
-  sub uhorn hookabove by uhornhookabove;
+  sub Uhorn hookabovecomb by Uhornhookabove;
+  sub uhorn hookabovecomb by uhornhookabove;
   sub Uhorn tildecomb by Uhorntilde;
   sub uhorn tildecomb by uhorntilde;
   sub Uhorn dotbelow by Uhorndotbelow;
   sub uhorn dotbelow by uhorndotbelow;
   sub Y dotbelow by Ydotbelow;
   sub y dotbelow by ydotbelow;
-  sub Y hookabove by Yhookabove;
-  sub y hookabove by yhookabove;
+  sub Y hookabovecomb by Yhookabove;
+  sub y hookabovecomb by yhookabove;
   sub Y tildecomb by Ytilde;
   sub y tildecomb by ytilde;
-  sub A caroncmb by Acaron;
-  sub a caroncmb by acaron;
-  sub I caroncmb by Icaron;
-  sub idotless caroncmb by icaron;
-  sub O caroncmb by Ocaron;
-  sub o caroncmb by ocaron;
-  sub U caroncmb by Ucaron;
-  sub u caroncmb by ucaron;
+  sub A caroncomb by Acaron;
+  sub a caroncomb by acaron;
+  sub I caroncomb by Icaron;
+  sub idotless caroncomb by icaron;
+  sub O caroncomb by Ocaron;
+  sub o caroncomb by ocaron;
+  sub U caroncomb by Ucaron;
+  sub u caroncomb by ucaron;
   #sub U dieresismacroncomb.uc by uni01D5;
-  sub U dieresisnosp macroncomb by Udieresismacron;
+  sub U dieresiscomb macroncomb by Udieresismacron;
   sub u dieresismacroncomb.uc by udieresismacron;
   #sub U dieresisacutecomb.uc by uni01D7;
-  sub U dieresisnosp acutecomb by Udieresisacute;
+  sub U dieresiscomb acutecomb by Udieresisacute;
   sub u dieresisacutecomb.uc by udieresisacute;
   #sub U dieresiscaroncomb.uc by uni01D9;
-  sub U dieresisnosp caroncmb by Udieresiscaron;
+  sub U dieresiscomb caroncomb by Udieresiscaron;
   sub u dieresiscaroncomb.uc by udieresiscaron;
   #sub U dieresisgravecomb.uc by uni01DB;
-  sub U dieresisnosp gravecomb by Udieresisgrave;
+  sub U dieresiscomb gravecomb by Udieresisgrave;
   sub u dieresisgravecomb.uc by udieresisgrave;
   #sub A dieresismacroncomb.uc by uni01DE;
-  sub A dieresisnosp macroncomb by Adieresismacron;
+  sub A dieresiscomb macroncomb by Adieresismacron;
   sub a dieresismacroncomb.uc by adieresismacron;
   #sub A dotmacroncomb.uc by uni01E0;
-  sub A dotnosp macroncomb by Adotmacron;
+  sub A dotaccentcomb macroncomb by Adotmacron;
   sub a dotmacroncomb.uc by adotmacron;
   sub AE macroncomb by AEmacron;
   sub ae macroncomb by aemacron;
-  sub G caroncmb by Gcaron;
-  sub g caroncmb by gcaron;
-  sub K caroncmb by Kcaron;
-  sub k caroncmb by kcaron;
-  sub O ogoneknosp by Oogonek;
-  sub o ogoneknosp by oogonek;
+  sub G caroncomb by Gcaron;
+  sub g caroncomb by gcaron;
+  sub K caroncomb by Kcaron;
+  sub k caroncomb by kcaron;
+  sub O ogonekcomb by Oogonek;
+  sub o ogonekcomb by oogonek;
   sub G acutecomb by Gacute;
   sub g acutecomb by gacute;
   sub N gravecomb by uni01F8;
   sub n gravecomb by uni01F9;
   sub A dblgravecmb by Adblgrave;
   sub a dblgravecmb by adblgrave;
-  sub A breveinvnosp by Ainvertedbreve;
-  sub a breveinvnosp by ainvertedbreve;
+  sub A breveinvcomb by Ainvertedbreve;
+  sub a breveinvcomb by ainvertedbreve;
   sub E dblgravecmb by Edblgrave;
   sub e dblgravecmb by edblgrave;
-  sub E breveinvnosp by Einvertedbreve;
-  sub e breveinvnosp by einvertedbreve;
+  sub E breveinvcomb by Einvertedbreve;
+  sub e breveinvcomb by einvertedbreve;
   sub I dblgravecmb by Idblgrave;
   sub idotless dblgravecmb by idblgrave;
-  sub I breveinvnosp by Iinvertedbreve;
-  sub idotless breveinvnosp by iinvertedbreve;
+  sub I breveinvcomb by Iinvertedbreve;
+  sub idotless breveinvcomb by iinvertedbreve;
   sub O dblgravecmb by Odblgrave;
   sub o dblgravecmb by odblgrave;
-  sub O breveinvnosp by Oinvertedbreve;
-  sub o breveinvnosp by oinvertedbreve;
+  sub O breveinvcomb by Oinvertedbreve;
+  sub o breveinvcomb by oinvertedbreve;
   sub R dblgravecmb by Rdblgrave;
   sub r dblgravecmb by rdblgrave;
-  sub R breveinvnosp by Rinvertedbreve;
-  sub r breveinvnosp by rinvertedbreve;
+  sub R breveinvcomb by Rinvertedbreve;
+  sub r breveinvcomb by rinvertedbreve;
   sub U dblgravecmb by Udblgrave;
   sub u dblgravecmb by udblgrave;
-  sub U breveinvnosp by Uinvertedbreve;
-  sub u breveinvnosp by uinvertedbreve;
-  sub H caroncmb by uni021E;
-  sub h caroncmb by uni021F;
-  sub A dotnosp by uni0226;
-  sub a dotnosp by uni0227;
-  sub E cedillanosp by uni0228;
-  sub e cedillanosp by uni0229;
+  sub U breveinvcomb by Uinvertedbreve;
+  sub u breveinvcomb by uinvertedbreve;
+  sub H caroncomb by uni021E;
+  sub h caroncomb by uni021F;
+  sub A dotaccentcomb by uni0226;
+  sub a dotaccentcomb by uni0227;
+  sub E cedillacomb by uni0228;
+  sub e cedillacomb by uni0229;
   #sub O dieresismacroncomb.uc by uni022A;
-  sub O dieresisnosp macroncomb by uni022A;
+  sub O dieresiscomb macroncomb by uni022A;
   sub o dieresismacroncomb.uc by uni022B;
   #sub O tildemacroncomb.cn by uni022C;
   sub O tildecomb macroncomb by uni022C;
   sub o tildemacroncomb.cn by uni022D;
-  sub O dotnosp by uni022E;
-  sub o dotnosp by uni022F;
+  sub O dotaccentcomb by uni022E;
+  sub o dotaccentcomb by uni022F;
   #sub O dotmacroncomb.uc by uni0230;
-  sub O dotnosp macroncomb by uni0230;
+  sub O dotaccentcomb macroncomb by uni0230;
   sub o dotmacroncomb.uc by uni0231;
   sub Y macroncomb by uni0232;
   sub y macroncomb by uni0233;
   sub Upsilonhooksymbol acutecomb by Upsilonacutehooksymbolgreek;
-  sub Upsilonhooksymbol dieresisnosp by Upsilondieresishooksymbolgreek;
-  sub B dotnosp by Bdotaccent;
-  sub b dotnosp by bdotaccent;
+  sub Upsilonhooksymbol dieresiscomb by Upsilondieresishooksymbolgreek;
+  sub B dotaccentcomb by Bdotaccent;
+  sub b dotaccentcomb by bdotaccent;
   sub B dotbelow by Bdotbelow;
   sub b dotbelow by bdotbelow;
-  sub B macronsubnosp by Blinebelow;
-  sub b macronsubnosp by blinebelow;
-  sub D dotnosp by Ddotaccent;
-  sub d dotnosp by ddotaccent;
+  sub B macronsubcomb by Blinebelow;
+  sub b macronsubcomb by blinebelow;
+  sub D dotaccentcomb by Ddotaccent;
+  sub d dotaccentcomb by ddotaccent;
   sub D dotbelow by Ddotbelow;
   sub d dotbelow by ddotbelow;
-  sub D macronsubnosp by Dlinebelow;
-  sub d macronsubnosp by dlinebelow;
+  sub D macronsubcomb by Dlinebelow;
+  sub d macronsubcomb by dlinebelow;
   sub D commaaccent by Dcedilla;
   sub d commaaccent by dcedilla;
-  sub D circumflexsubnosp by Dcircumflexbelow;
-  sub d circumflexsubnosp by dcircumflexbelow;
+  sub D circumflexsubcomb by Dcircumflexbelow;
+  sub d circumflexsubcomb by dcircumflexbelow;
   #sub E macrongravecomb.cn by uni1E14;
   sub E macroncomb gravecomb by Emacrongrave;
   sub e macrongravecomb.cn by emacrongrave;
   #sub E macronacutecomb.cn by uni1E16;
   sub E macroncomb acutecomb by Emacronacute;
   sub e macronacutecomb.cn by emacronacute;
-  sub E circumflexsubnosp by Ecircumflexbelow;
-  sub e circumflexsubnosp by ecircumflexbelow;
-  sub E tildesubnosp by Etildebelow;
-  sub e tildesubnosp by etildebelow;
-  sub F dotnosp by Fdotaccent;
-  sub f dotnosp by fdotaccent;
+  sub E circumflexsubcomb by Ecircumflexbelow;
+  sub e circumflexsubcomb by ecircumflexbelow;
+  sub E tildesubcomb by Etildebelow;
+  sub e tildesubcomb by etildebelow;
+  sub F dotaccentcomb by Fdotaccent;
+  sub f dotaccentcomb by fdotaccent;
   sub G macroncomb by Gmacron;
   sub g macroncomb by gmacron;
-  sub H dotnosp by Hdotaccent;
-  sub h dotnosp by hdotaccent;
+  sub H dotaccentcomb by Hdotaccent;
+  sub h dotaccentcomb by hdotaccent;
   sub H dotbelow by Hdotbelow;
   sub h dotbelow by hdotbelow;
-  sub H dieresisnosp by Hdieresis;
-  sub h dieresisnosp by hdieresis;
-  sub H brevesubnosp by Hbrevebelow;
-  sub h brevesubnosp by hbrevebelow;
-  sub I tildesubnosp by Itildebelow;
-  sub i tildesubnosp by itildebelow;
+  sub H dieresiscomb by Hdieresis;
+  sub h dieresiscomb by hdieresis;
+  sub H brevesubcomb by Hbrevebelow;
+  sub h brevesubcomb by hbrevebelow;
+  sub I tildesubcomb by Itildebelow;
+  sub i tildesubcomb by itildebelow;
   #sub I dieresisacutecomb.uc by Idieresisacute;
-  sub I dieresisnosp acutecomb by Idieresisacute;
+  sub I dieresiscomb acutecomb by Idieresisacute;
   sub idotless dieresisacutecomb.uc by idieresisacute;
   sub K acutecomb by Kacute;
   sub k acutecomb by kacute;
   sub K dotbelow by Kdotbelow;
   sub k dotbelow by kdotbelow;
-  sub K macronsubnosp by Klinebelow;
-  sub k macronsubnosp by klinebelow;
+  sub K macronsubcomb by Klinebelow;
+  sub k macronsubcomb by klinebelow;
   sub L dotbelow by Ldotbelow;
   sub l dotbelow by ldotbelow;
-  sub L macronsubnosp by Llinebelow;
-  sub l macronsubnosp by llinebelow;
-  sub L circumflexsubnosp by Lcircumflexbelow;
-  sub l circumflexsubnosp by lcircumflexbelow;
+  sub L macronsubcomb by Llinebelow;
+  sub l macronsubcomb by llinebelow;
+  sub L circumflexsubcomb by Lcircumflexbelow;
+  sub l circumflexsubcomb by lcircumflexbelow;
   sub M acutecomb by Macute;
   sub m acutecomb by macute;
-  sub M dotnosp by Mdotaccent;
-  sub m dotnosp by mdotaccent;
+  sub M dotaccentcomb by Mdotaccent;
+  sub m dotaccentcomb by mdotaccent;
   sub M dotbelow by Mdotbelow;
   sub m dotbelow by mdotbelow;
-  sub N dotnosp by Ndotaccent;
-  sub n dotnosp by ndotaccent;
+  sub N dotaccentcomb by Ndotaccent;
+  sub n dotaccentcomb by ndotaccent;
   sub N dotbelow by Ndotbelow;
   sub n dotbelow by ndotbelow;
-  sub N macronsubnosp by Nlinebelow;
-  sub n macronsubnosp by nlinebelow;
-  sub N circumflexsubnosp by Ncircumflexbelow;
-  sub n circumflexsubnosp by ncircumflexbelow;
+  sub N macronsubcomb by Nlinebelow;
+  sub n macronsubcomb by nlinebelow;
+  sub N circumflexsubcomb by Ncircumflexbelow;
+  sub n circumflexsubcomb by ncircumflexbelow;
   #sub O tildeacutecomb.uc by uni1E4C;
   sub O tildecomb acutecomb by Otildeacute;
   sub o tildeacutecomb.uc by otildeacute;
-  #sub O tildedieresiscomb.cn by uni1E4E;
-  sub O tildecomb dieresisnosp by Otildedieresis;
-  sub o tildedieresiscomb.cn by otildedieresis;
+  #sub O tildedieresiscomb.uc by uni1E4E;
+  sub O tildecomb dieresiscomb by Otildedieresis;
+  sub o tildedieresiscomb.uc by otildedieresis;
   #sub O macrongravecomb.cn by uni1E50;
   sub O macroncomb gravecomb by Omacrongrave;
   sub o macrongravecomb.cn by omacrongrave;
@@ -505,71 +505,71 @@ lookup ccmp03 {
   sub o macronacutecomb.cn by omacronacute;
   sub P acutecomb by Pacute;
   sub p acutecomb by pacute;
-  sub P dotnosp by Pdotaccent;
-  sub p dotnosp by pdotaccent;
-  sub R dotnosp by Rdotaccent;
-  sub r dotnosp by rdotaccent;
+  sub P dotaccentcomb by Pdotaccent;
+  sub p dotaccentcomb by pdotaccent;
+  sub R dotaccentcomb by Rdotaccent;
+  sub r dotaccentcomb by rdotaccent;
   sub R dotbelow by Rdotbelow;
   sub r dotbelow by rdotbelow;
-  sub R macronsubnosp by Rlinebelow;
-  sub r macronsubnosp by rlinebelow;
-  sub S dotnosp by Sdotaccent;
-  sub s dotnosp by sdotaccent;
+  sub R macronsubcomb by Rlinebelow;
+  sub r macronsubcomb by rlinebelow;
+  sub S dotaccentcomb by Sdotaccent;
+  sub s dotaccentcomb by sdotaccent;
   sub S dotbelow by Sdotbelow;
   sub s dotbelow by sdotbelow;
   #sub S acutedotcomb.cn by uni1E64;
-  sub S acutecomb dotnosp by Sacutedotaccent;
+  sub S acutecomb dotaccentcomb by Sacutedotaccent;
   sub s acutedotcomb.cn by sacutedotaccent;
   sub S carondot.uc by Scarondotaccent;
-  sub S caroncmb dotnosp by Scarondotaccent;
+  sub S caroncomb dotaccentcomb by Scarondotaccent;
   sub s carondot.lc by scarondotaccent;
-  sub T dotnosp by Tdotaccent;
-  sub t dotnosp by tdotaccent;
+  sub T dotaccentcomb by Tdotaccent;
+  sub t dotaccentcomb by tdotaccent;
   sub T dotbelow by Tdotbelow;
   sub t dotbelow by tdotbelow;
-  sub T macronsubnosp by Tlinebelow;
-  sub t macronsubnosp by tlinebelow;
-  sub T circumflexsubnosp by Tcircumflexbelow;
-  sub t circumflexsubnosp by tcircumflexbelow;
-  sub U dotdblsubnosp by Udieresisbelow;
-  sub u dotdblsubnosp by udieresisbelow;
-  sub U tildesubnosp by Utildebelow;
-  sub u tildesubnosp by utildebelow;
-  sub U circumflexsubnosp by Ucircumflexbelow;
-  sub u circumflexsubnosp by ucircumflexbelow;
+  sub T macronsubcomb by Tlinebelow;
+  sub t macronsubcomb by tlinebelow;
+  sub T circumflexsubcomb by Tcircumflexbelow;
+  sub t circumflexsubcomb by tcircumflexbelow;
+  sub U dotdblsubcomb by Udieresisbelow;
+  sub u dotdblsubcomb by udieresisbelow;
+  sub U tildesubcomb by Utildebelow;
+  sub u tildesubcomb by utildebelow;
+  sub U circumflexsubcomb by Ucircumflexbelow;
+  sub u circumflexsubcomb by ucircumflexbelow;
   #sub U tildeacutecomb.uc by uni1E78;
   sub U tildecomb acutecomb by Utildeacute;
   sub u tildeacutecomb.uc by utildeacute;
   #sub U macrondieresiscomb.cn by uni1E7A;
-  sub U macroncomb dieresisnosp by Umacrondieresis;
+  sub U macroncomb dieresiscomb by Umacrondieresis;
   sub u macrondieresiscomb.cn by umacrondieresis;
   sub V tildecomb by Vtilde;
   sub v tildecomb by vtilde;
   sub V dotbelow by Vdotbelow;
   sub v dotbelow by vdotbelow;
-  sub W dotnosp by Wdotaccent;
-  sub w dotnosp by wdotaccent;
+  sub W dotaccentcomb by Wdotaccent;
+  sub w dotaccentcomb by wdotaccent;
   sub W dotbelow by Wdotbelow;
   sub w dotbelow by wdotbelow;
-  sub X dotnosp by Xdotaccent;
-  sub x dotnosp by xdotaccent;
-  sub X dieresisnosp by Xdieresis;
-  sub x dieresisnosp by xdieresis;
-  sub Y dotnosp by Ydotaccent;
-  sub y dotnosp by ydotaccent;
-  sub Z circumflexnosp by Zcircumflex;
-  sub z circumflexnosp by zcircumflex;
+  sub X dotaccentcomb by Xdotaccent;
+  sub x dotaccentcomb by xdotaccent;
+  sub X dieresiscomb by Xdieresis;
+  sub x dieresiscomb by xdieresis;
+  sub Y dotaccentcomb by Ydotaccent;
+  sub y dotaccentcomb by ydotaccent;
+  sub Z circumflexcomb by Zcircumflex;
+  sub z circumflexcomb by zcircumflex;
   sub Z dotbelow by Zdotbelow;
   sub z dotbelow by zdotbelow;
-  sub Z macronsubnosp by Zlinebelow;
-  sub z macronsubnosp by zlinebelow;
-  sub h macronsubnosp by hlinebelow;
-  sub t dieresisnosp by tdieresis;
-  sub w ringnosp by wring;
-  sub y ringnosp by yring;
-  sub longs dotnosp by slongdotaccent;
-  sub A ringsubnosp by Aringbelow;
-  sub a ringsubnosp by aringbelow;
+  sub Z macronsubcomb by Zlinebelow;
+  sub z macronsubcomb by zlinebelow;
+  sub h macronsubcomb by hlinebelow;
+  sub t dieresiscomb by tdieresis;
+  sub w ringcomb by wring;
+  sub y ringcomb by yring;
+  sub longs dotaccentcomb by slongdotaccent;
+  sub A ringsubcomb by Aringbelow;
+  sub a ringsubcomb by aringbelow;
   sub zero slashlongcomb by zero.slash;
   sub zero.tf slashlongcomb by zero.tf.slash;
 } ccmp03;