texlive[63669] Master/texmf-dist: \hy at numberline, tex4ht r1156;

commits+karl at tug.org commits+karl at tug.org
Mon Jun 20 23:46:09 CEST 2022


Revision: 63669
          http://tug.org/svn/texlive?view=revision&revision=63669
Author:   karl
Date:     2022-06-20 23:46:09 +0200 (Mon, 20 Jun 2022)
Log Message:
-----------
\hy at numberline, tex4ht r1156; pdfpages support, tex4ht r1157

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1156
    http://tug.org/svn/texlive?view=revision&revision=1157

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-cjk-utf8.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/generic/tex4ht/pdfpages.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-06-20 21:09:35 UTC (rev 63668)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-06-20 21:46:09 UTC (rev 63669)
@@ -1,3 +1,10 @@
+2022-06-20  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (pdfpages.4ht): added support for the Pdfpages
+	package.
+
+	* tex4ht-4ht.tex (hyperref-hooks.4ht): declare \Hy at numberline.
+
 2022-06-17  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-jats.tex (jats.4ht): basic \maketitle support.

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex	2022-06-20 21:09:35 UTC (rev 63668)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex	2022-06-20 21:46:09 UTC (rev 63669)
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1149 2022-06-14 15:04:29Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1157 2022-06-20 13:49:01Z michal_h21 $
 % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
 % Read by tex4ht-cond4ht.
 %
@@ -191,6 +191,7 @@
 \AddFile{7}{epsfig}
 \AddFile{4}{graphics}
 \AddFile{4}{graphicx}
+\AddFile{9}{pdfpages}
 \AddFile{9}{svg}
 \AddFile{9}{endfloat}
 \AddFile{9}{mfpic}

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-06-20 21:09:35 UTC (rev 63668)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-06-20 21:46:09 UTC (rev 63669)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1149 2022-06-14 15:04:29Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1157 2022-06-20 13:49:01Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -5226,6 +5226,7 @@
 \def\hyper at anchor#1{\hyper at anchorstart{#1}\hyper at anchorend}
 >>>
 
+
 \<config hyperref\><<<
 \def\hyper at linkurl#1#2{%
   \leavevmode  \begingroup    \hyper at chars
@@ -5380,6 +5381,7 @@
 \:AtEndOfPackage{%
 |<load nameref in hyperref hooks|>
 |<define autoref captions|>
+|<define Hy at numberline|>
 }
 >>> \AddFile{9}{hyperref-hooks}
 
@@ -5432,7 +5434,13 @@
 \providecommand*\pageautorefname{page}
 >>>
 
+Some packages redefine the following command, which is declared in various Hyperref drivers,
+but not with TeX4ht. User will then get an error:
 
+\<define Hy at numberline\><<<
+\def\Hy at numberline#1{#1 }
+>>>
+
 \<nameref moved from old hyperref\><<<
 \def\tht:label#1{%
   \@bsphack
@@ -26751,6 +26759,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%
 \SubSection{graphbox}
+%%%%%%%%%%%%%%%%%%%%%%%
 
 Graphbox redefines \`'\Gin at setfile'  to make some manipulations with the
 graphics box. We want to revert it, because it fatally breaks TeX4ht, and 
@@ -26768,8 +26777,36 @@
   \let\Gin at setfile\old at box@Gin at setfile
 }
 >>> \AddFile{9}{graphbox-hooks}
+
 %%%%%%%%%%%%%%%%%%%%%%%
+\SubSection{pdfpages}
+\<pdfpages.4ht\><<<
+% pdfpages.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+|<pdfpages configurations|>
+\Hinput{pdfpages} 
+\endinput
+>>> \AddFile{9}{pdfpages}
 
+TeX4ht supports inclusion of PDF thanks to Graphicx package, we just need 
+to make it compatible with Pdfpages.
+
+\<pdfpages configurations\><<<
+\define at key{Gin}{page}[]{\edef\Gin at page{#1}}
+
+\def\AM at findfile#1{%
+  \AM at findfile@i{#1}{pdf}%
+  \AM at findfile@ii{#1}%
+}
+\catcode`\:=12
+\renewcommand\AM at output[1]{%
+  \@for\@pages:=\AM at pagestemp\do{\includegraphics[page=\@pages]{\AM at currentdocname}}
+}
+\catcode`\:=11
+>>>
+
+
 %%%%%%%%%%%%%%%%%%%%%%%
 \Section{svg}
 %%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-cjk-utf8.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-cjk-utf8.tex	2022-06-20 21:09:35 UTC (rev 63668)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-cjk-utf8.tex	2022-06-20 21:46:09 UTC (rev 63669)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-fonts-cjk-utf8.tex 680 2020-03-16 17:42:41Z karl $
+% $Id: tex4ht-fonts-cjk-utf8.tex 1148 2022-06-13 20:58:49Z michal_h21 $
 % tex   tex4ht-fonts-cjk-utf8
 % or    ht tex tex4ht-fonts-cjk-utf8   
 %
@@ -302,7 +302,7 @@
 
 
 
-Implementation for Unicode.sfd at utf8song*. Aliases are probably 
+Implementation for Unicode.sfd at unisong*. Aliases are probably 
 neeed for the following ones:
 utf8bsmi,
 utf8cyberb,
@@ -334,10 +334,10 @@
 
 
 
-\<utf8songa0\><<<
-utf8songa0 0 255
+\<unisonga0\><<<
+unisonga0 0 255
 '&#xA000;' ''   0 `<gversion 0`>
-'&#xA001;' ''   1 % utf8songa0.htf (unicode)                    `version %
+'&#xA001;' ''   1 % unisonga0.htf (unicode)                    `version %
 '&#xA002;' ''   2 `<gversion 2`>
 '&#xA003;' ''   3 `<gversion 3`>
 '&#xA004;' ''   4 `<gversion 4`>
@@ -592,17 +592,17 @@
 '&#xA0FD;' '' 253
 '&#xA0FE;' '' 254
 '&#xA0FF;' '' 255
-utf8songa0 0 255
+unisonga0 0 255
 >>>
 
-\AddFont{utf8songa0}{unicode/cjk/utf8/utf8songa0}
+\AddFont{unisonga0}{unicode/cjk/utf8/unisonga0}
 
 
 
-\<utf8songa1\><<<
-utf8songa1 0 255
+\<unisonga1\><<<
+unisonga1 0 255
 '&#xA100;' ''   0 `<gversion 0`>
-'&#xA101;' ''   1 % utf8songa1.htf (unicode)                    `version %
+'&#xA101;' ''   1 % unisonga1.htf (unicode)                    `version %
 '&#xA102;' ''   2 `<gversion 2`>
 '&#xA103;' ''   3 `<gversion 3`>
 '&#xA104;' ''   4 `<gversion 4`>
@@ -857,17 +857,17 @@
 '&#xA1FD;' '' 253
 '&#xA1FE;' '' 254
 '&#xA1FF;' '' 255
-utf8songa1 0 255
+unisonga1 0 255
 >>>
 
-\AddFont{utf8songa1}{unicode/cjk/utf8/utf8songa1}
+\AddFont{unisonga1}{unicode/cjk/utf8/unisonga1}
 
 
 
-\<utf8songa2\><<<
-utf8songa2 0 255
+\<unisonga2\><<<
+unisonga2 0 255
 '&#xA200;' ''   0 `<gversion 0`>
-'&#xA201;' ''   1 % utf8songa2.htf (unicode)                    `version %
+'&#xA201;' ''   1 % unisonga2.htf (unicode)                    `version %
 '&#xA202;' ''   2 `<gversion 2`>
 '&#xA203;' ''   3 `<gversion 3`>
 '&#xA204;' ''   4 `<gversion 4`>
@@ -1122,17 +1122,17 @@
 '&#xA2FD;' '' 253
 '&#xA2FE;' '' 254
 '&#xA2FF;' '' 255
-utf8songa2 0 255
+unisonga2 0 255
 >>>
 
-\AddFont{utf8songa2}{unicode/cjk/utf8/utf8songa2}
+\AddFont{unisonga2}{unicode/cjk/utf8/unisonga2}
 
 
 
-\<utf8songa3\><<<
-utf8songa3 0 255
+\<unisonga3\><<<
+unisonga3 0 255
 '&#xA300;' ''   0 `<gversion 0`>
-'&#xA301;' ''   1 % utf8songa3.htf (unicode)                    `version %
+'&#xA301;' ''   1 % unisonga3.htf (unicode)                    `version %
 '&#xA302;' ''   2 `<gversion 2`>
 '&#xA303;' ''   3 `<gversion 3`>
 '&#xA304;' ''   4 `<gversion 4`>
@@ -1387,17 +1387,17 @@
 '&#xA3FD;' '' 253
 '&#xA3FE;' '' 254
 '&#xA3FF;' '' 255
-utf8songa3 0 255
+unisonga3 0 255
 >>>
 
-\AddFont{utf8songa3}{unicode/cjk/utf8/utf8songa3}
+\AddFont{unisonga3}{unicode/cjk/utf8/unisonga3}
 
 
 
-\<utf8songa4\><<<
-utf8songa4 0 255
+\<unisonga4\><<<
+unisonga4 0 255
 '&#xA400;' ''   0 `<gversion 0`>
-'&#xA401;' ''   1 % utf8songa4.htf (unicode)                    `version %
+'&#xA401;' ''   1 % unisonga4.htf (unicode)                    `version %
 '&#xA402;' ''   2 `<gversion 2`>
 '&#xA403;' ''   3 `<gversion 3`>
 '&#xA404;' ''   4 `<gversion 4`>
@@ -1652,17 +1652,17 @@
 '&#xA4FD;' '' 253
 '&#xA4FE;' '' 254
 '&#xA4FF;' '' 255
-utf8songa4 0 255
+unisonga4 0 255
 >>>
 
-\AddFont{utf8songa4}{unicode/cjk/utf8/utf8songa4}
+\AddFont{unisonga4}{unicode/cjk/utf8/unisonga4}
 
 
 
-\<utf8songa5\><<<
-utf8songa5 0 255
+\<unisonga5\><<<
+unisonga5 0 255
 '&#xA500;' ''   0 `<gversion 0`>
-'&#xA501;' ''   1 % utf8songa5.htf (unicode)                    `version %
+'&#xA501;' ''   1 % unisonga5.htf (unicode)                    `version %
 '&#xA502;' ''   2 `<gversion 2`>
 '&#xA503;' ''   3 `<gversion 3`>
 '&#xA504;' ''   4 `<gversion 4`>
@@ -1917,17 +1917,17 @@
 '&#xA5FD;' '' 253
 '&#xA5FE;' '' 254
 '&#xA5FF;' '' 255
-utf8songa5 0 255
+unisonga5 0 255
 >>>
 
-\AddFont{utf8songa5}{unicode/cjk/utf8/utf8songa5}
+\AddFont{unisonga5}{unicode/cjk/utf8/unisonga5}
 
 
 
-\<utf8songa6\><<<
-utf8songa6 0 255
+\<unisonga6\><<<
+unisonga6 0 255
 '&#xA600;' ''   0 `<gversion 0`>
-'&#xA601;' ''   1 % utf8songa6.htf (unicode)                    `version %
+'&#xA601;' ''   1 % unisonga6.htf (unicode)                    `version %
 '&#xA602;' ''   2 `<gversion 2`>
 '&#xA603;' ''   3 `<gversion 3`>
 '&#xA604;' ''   4 `<gversion 4`>
@@ -2182,17 +2182,17 @@
 '&#xA6FD;' '' 253
 '&#xA6FE;' '' 254
 '&#xA6FF;' '' 255
-utf8songa6 0 255
+unisonga6 0 255
 >>>
 
-\AddFont{utf8songa6}{unicode/cjk/utf8/utf8songa6}
+\AddFont{unisonga6}{unicode/cjk/utf8/unisonga6}
 
 
 
-\<utf8songa7\><<<
-utf8songa7 0 255
+\<unisonga7\><<<
+unisonga7 0 255
 '&#xA700;' ''   0 `<gversion 0`>
-'&#xA701;' ''   1 % utf8songa7.htf (unicode)                    `version %
+'&#xA701;' ''   1 % unisonga7.htf (unicode)                    `version %
 '&#xA702;' ''   2 `<gversion 2`>
 '&#xA703;' ''   3 `<gversion 3`>
 '&#xA704;' ''   4 `<gversion 4`>
@@ -2447,17 +2447,17 @@
 '&#xA7FD;' '' 253
 '&#xA7FE;' '' 254
 '&#xA7FF;' '' 255
-utf8songa7 0 255
+unisonga7 0 255
 >>>
 
-\AddFont{utf8songa7}{unicode/cjk/utf8/utf8songa7}
+\AddFont{unisonga7}{unicode/cjk/utf8/unisonga7}
 
 
 
-\<utf8songa8\><<<
-utf8songa8 0 255
+\<unisonga8\><<<
+unisonga8 0 255
 '&#xA800;' ''   0 `<gversion 0`>
-'&#xA801;' ''   1 % utf8songa8.htf (unicode)                    `version %
+'&#xA801;' ''   1 % unisonga8.htf (unicode)                    `version %
 '&#xA802;' ''   2 `<gversion 2`>
 '&#xA803;' ''   3 `<gversion 3`>
 '&#xA804;' ''   4 `<gversion 4`>
@@ -2712,17 +2712,17 @@
 '&#xA8FD;' '' 253
 '&#xA8FE;' '' 254
 '&#xA8FF;' '' 255
-utf8songa8 0 255
+unisonga8 0 255
 >>>
 
-\AddFont{utf8songa8}{unicode/cjk/utf8/utf8songa8}
+\AddFont{unisonga8}{unicode/cjk/utf8/unisonga8}
 
 
 
-\<utf8songa9\><<<
-utf8songa9 0 255
+\<unisonga9\><<<
+unisonga9 0 255
 '&#xA900;' ''   0 `<gversion 0`>
-'&#xA901;' ''   1 % utf8songa9.htf (unicode)                    `version %
+'&#xA901;' ''   1 % unisonga9.htf (unicode)                    `version %
 '&#xA902;' ''   2 `<gversion 2`>
 '&#xA903;' ''   3 `<gversion 3`>
 '&#xA904;' ''   4 `<gversion 4`>
@@ -2977,17 +2977,17 @@
 '&#xA9FD;' '' 253
 '&#xA9FE;' '' 254
 '&#xA9FF;' '' 255
-utf8songa9 0 255
+unisonga9 0 255
 >>>
 
-\AddFont{utf8songa9}{unicode/cjk/utf8/utf8songa9}
+\AddFont{unisonga9}{unicode/cjk/utf8/unisonga9}
 
 
 
-\<utf8songb0\><<<
-utf8songb0 0 255
+\<unisongb0\><<<
+unisongb0 0 255
 '&#xB000;' ''   0 `<gversion 0`>
-'&#xB001;' ''   1 % utf8songb0.htf (unicode)                    `version %
+'&#xB001;' ''   1 % unisongb0.htf (unicode)                    `version %
 '&#xB002;' ''   2 `<gversion 2`>
 '&#xB003;' ''   3 `<gversion 3`>
 '&#xB004;' ''   4 `<gversion 4`>
@@ -3242,17 +3242,17 @@
 '&#xB0FD;' '' 253
 '&#xB0FE;' '' 254
 '&#xB0FF;' '' 255
-utf8songb0 0 255
+unisongb0 0 255
 >>>
 
-\AddFont{utf8songb0}{unicode/cjk/utf8/utf8songb0}
+\AddFont{unisongb0}{unicode/cjk/utf8/unisongb0}
 
 
 
-\<utf8songb1\><<<
-utf8songb1 0 255
+\<unisongb1\><<<
+unisongb1 0 255
 '&#xB100;' ''   0 `<gversion 0`>
-'&#xB101;' ''   1 % utf8songb1.htf (unicode)                    `version %
+'&#xB101;' ''   1 % unisongb1.htf (unicode)                    `version %
 '&#xB102;' ''   2 `<gversion 2`>
 '&#xB103;' ''   3 `<gversion 3`>
 '&#xB104;' ''   4 `<gversion 4`>
@@ -3507,17 +3507,17 @@
 '&#xB1FD;' '' 253
 '&#xB1FE;' '' 254
 '&#xB1FF;' '' 255
-utf8songb1 0 255
+unisongb1 0 255
 >>>
 
-\AddFont{utf8songb1}{unicode/cjk/utf8/utf8songb1}
+\AddFont{unisongb1}{unicode/cjk/utf8/unisongb1}
 
 
 
-\<utf8songb2\><<<
-utf8songb2 0 255
+\<unisongb2\><<<
+unisongb2 0 255
 '&#xB200;' ''   0 `<gversion 0`>
-'&#xB201;' ''   1 % utf8songb2.htf (unicode)                    `version %
+'&#xB201;' ''   1 % unisongb2.htf (unicode)                    `version %
 '&#xB202;' ''   2 `<gversion 2`>
 '&#xB203;' ''   3 `<gversion 3`>
 '&#xB204;' ''   4 `<gversion 4`>
@@ -3772,17 +3772,17 @@
 '&#xB2FD;' '' 253
 '&#xB2FE;' '' 254
 '&#xB2FF;' '' 255
-utf8songb2 0 255
+unisongb2 0 255
 >>>
 
-\AddFont{utf8songb2}{unicode/cjk/utf8/utf8songb2}
+\AddFont{unisongb2}{unicode/cjk/utf8/unisongb2}
 
 
 
-\<utf8songb3\><<<
-utf8songb3 0 255
+\<unisongb3\><<<
+unisongb3 0 255
 '&#xB300;' ''   0 `<gversion 0`>
-'&#xB301;' ''   1 % utf8songb3.htf (unicode)                    `version %
+'&#xB301;' ''   1 % unisongb3.htf (unicode)                    `version %
 '&#xB302;' ''   2 `<gversion 2`>
 '&#xB303;' ''   3 `<gversion 3`>
 '&#xB304;' ''   4 `<gversion 4`>
@@ -4037,17 +4037,17 @@
 '&#xB3FD;' '' 253
 '&#xB3FE;' '' 254
 '&#xB3FF;' '' 255
-utf8songb3 0 255
+unisongb3 0 255
 >>>
 
-\AddFont{utf8songb3}{unicode/cjk/utf8/utf8songb3}
+\AddFont{unisongb3}{unicode/cjk/utf8/unisongb3}
 
 
 
-\<utf8songb4\><<<
-utf8songb4 0 255
+\<unisongb4\><<<
+unisongb4 0 255
 '&#xB400;' ''   0 `<gversion 0`>
-'&#xB401;' ''   1 % utf8songb4.htf (unicode)                    `version %
+'&#xB401;' ''   1 % unisongb4.htf (unicode)                    `version %
 '&#xB402;' ''   2 `<gversion 2`>
 '&#xB403;' ''   3 `<gversion 3`>
 '&#xB404;' ''   4 `<gversion 4`>
@@ -4302,17 +4302,17 @@
 '&#xB4FD;' '' 253
 '&#xB4FE;' '' 254
 '&#xB4FF;' '' 255
-utf8songb4 0 255
+unisongb4 0 255
 >>>
 
-\AddFont{utf8songb4}{unicode/cjk/utf8/utf8songb4}
+\AddFont{unisongb4}{unicode/cjk/utf8/unisongb4}
 
 
 
-\<utf8songb5\><<<
-utf8songb5 0 255
+\<unisongb5\><<<
+unisongb5 0 255
 '&#xB500;' ''   0 `<gversion 0`>
-'&#xB501;' ''   1 % utf8songb5.htf (unicode)                    `version %
+'&#xB501;' ''   1 % unisongb5.htf (unicode)                    `version %
 '&#xB502;' ''   2 `<gversion 2`>
 '&#xB503;' ''   3 `<gversion 3`>
 '&#xB504;' ''   4 `<gversion 4`>
@@ -4567,17 +4567,17 @@
 '&#xB5FD;' '' 253
 '&#xB5FE;' '' 254
 '&#xB5FF;' '' 255
-utf8songb5 0 255
+unisongb5 0 255
 >>>
 
-\AddFont{utf8songb5}{unicode/cjk/utf8/utf8songb5}
+\AddFont{unisongb5}{unicode/cjk/utf8/unisongb5}
 
 
 
-\<utf8songb6\><<<
-utf8songb6 0 255
+\<unisongb6\><<<
+unisongb6 0 255
 '&#xB600;' ''   0 `<gversion 0`>
-'&#xB601;' ''   1 % utf8songb6.htf (unicode)                    `version %
+'&#xB601;' ''   1 % unisongb6.htf (unicode)                    `version %
 '&#xB602;' ''   2 `<gversion 2`>
 '&#xB603;' ''   3 `<gversion 3`>
 '&#xB604;' ''   4 `<gversion 4`>
@@ -4832,17 +4832,17 @@
 '&#xB6FD;' '' 253
 '&#xB6FE;' '' 254
 '&#xB6FF;' '' 255
-utf8songb6 0 255
+unisongb6 0 255
 >>>
 
-\AddFont{utf8songb6}{unicode/cjk/utf8/utf8songb6}
+\AddFont{unisongb6}{unicode/cjk/utf8/unisongb6}
 
 
 
-\<utf8songb7\><<<
-utf8songb7 0 255
+\<unisongb7\><<<
+unisongb7 0 255
 '&#xB700;' ''   0 `<gversion 0`>
-'&#xB701;' ''   1 % utf8songb7.htf (unicode)                    `version %
+'&#xB701;' ''   1 % unisongb7.htf (unicode)                    `version %
 '&#xB702;' ''   2 `<gversion 2`>
 '&#xB703;' ''   3 `<gversion 3`>
 '&#xB704;' ''   4 `<gversion 4`>
@@ -5097,17 +5097,17 @@
 '&#xB7FD;' '' 253
 '&#xB7FE;' '' 254
 '&#xB7FF;' '' 255
-utf8songb7 0 255
+unisongb7 0 255
 >>>
 
-\AddFont{utf8songb7}{unicode/cjk/utf8/utf8songb7}
+\AddFont{unisongb7}{unicode/cjk/utf8/unisongb7}
 
 
 
-\<utf8songb8\><<<
-utf8songb8 0 255
+\<unisongb8\><<<
+unisongb8 0 255
 '&#xB800;' ''   0 `<gversion 0`>
-'&#xB801;' ''   1 % utf8songb8.htf (unicode)                    `version %
+'&#xB801;' ''   1 % unisongb8.htf (unicode)                    `version %
 '&#xB802;' ''   2 `<gversion 2`>
 '&#xB803;' ''   3 `<gversion 3`>
 '&#xB804;' ''   4 `<gversion 4`>
@@ -5362,17 +5362,17 @@
 '&#xB8FD;' '' 253
 '&#xB8FE;' '' 254
 '&#xB8FF;' '' 255
-utf8songb8 0 255
+unisongb8 0 255
 >>>
 
-\AddFont{utf8songb8}{unicode/cjk/utf8/utf8songb8}
+\AddFont{unisongb8}{unicode/cjk/utf8/unisongb8}
 
 
 
-\<utf8songb9\><<<
-utf8songb9 0 255
+\<unisongb9\><<<
+unisongb9 0 255
 '&#xB900;' ''   0 `<gversion 0`>
-'&#xB901;' ''   1 % utf8songb9.htf (unicode)                    `version %
+'&#xB901;' ''   1 % unisongb9.htf (unicode)                    `version %
 '&#xB902;' ''   2 `<gversion 2`>
 '&#xB903;' ''   3 `<gversion 3`>
 '&#xB904;' ''   4 `<gversion 4`>
@@ -5627,17 +5627,17 @@
 '&#xB9FD;' '' 253
 '&#xB9FE;' '' 254
 '&#xB9FF;' '' 255
-utf8songb9 0 255
+unisongb9 0 255
 >>>
 
-\AddFont{utf8songb9}{unicode/cjk/utf8/utf8songb9}
+\AddFont{unisongb9}{unicode/cjk/utf8/unisongb9}
 
 
 
-\<utf8songc0\><<<
-utf8songc0 0 255
+\<unisongc0\><<<
+unisongc0 0 255
 '&#xC000;' ''   0 `<gversion 0`>
-'&#xC001;' ''   1 % utf8songc0.htf (unicode)                    `version %
+'&#xC001;' ''   1 % unisongc0.htf (unicode)                    `version %
 '&#xC002;' ''   2 `<gversion 2`>
 '&#xC003;' ''   3 `<gversion 3`>
 '&#xC004;' ''   4 `<gversion 4`>
@@ -5892,17 +5892,17 @@
 '&#xC0FD;' '' 253
 '&#xC0FE;' '' 254
 '&#xC0FF;' '' 255
-utf8songc0 0 255
+unisongc0 0 255
 >>>
 
-\AddFont{utf8songc0}{unicode/cjk/utf8/utf8songc0}
+\AddFont{unisongc0}{unicode/cjk/utf8/unisongc0}
 
 
 
-\<utf8songc1\><<<
-utf8songc1 0 255
+\<unisongc1\><<<
+unisongc1 0 255
 '&#xC100;' ''   0 `<gversion 0`>
-'&#xC101;' ''   1 % utf8songc1.htf (unicode)                    `version %
+'&#xC101;' ''   1 % unisongc1.htf (unicode)                    `version %
 '&#xC102;' ''   2 `<gversion 2`>
 '&#xC103;' ''   3 `<gversion 3`>
 '&#xC104;' ''   4 `<gversion 4`>
@@ -6157,17 +6157,17 @@
 '&#xC1FD;' '' 253
 '&#xC1FE;' '' 254
 '&#xC1FF;' '' 255
-utf8songc1 0 255
+unisongc1 0 255
 >>>
 
-\AddFont{utf8songc1}{unicode/cjk/utf8/utf8songc1}
+\AddFont{unisongc1}{unicode/cjk/utf8/unisongc1}
 
 
 
-\<utf8songc2\><<<
-utf8songc2 0 255
+\<unisongc2\><<<
+unisongc2 0 255
 '&#xC200;' ''   0 `<gversion 0`>
-'&#xC201;' ''   1 % utf8songc2.htf (unicode)                    `version %
+'&#xC201;' ''   1 % unisongc2.htf (unicode)                    `version %
 '&#xC202;' ''   2 `<gversion 2`>
 '&#xC203;' ''   3 `<gversion 3`>
 '&#xC204;' ''   4 `<gversion 4`>
@@ -6422,17 +6422,17 @@
 '&#xC2FD;' '' 253
 '&#xC2FE;' '' 254
 '&#xC2FF;' '' 255
-utf8songc2 0 255
+unisongc2 0 255
 >>>
 
-\AddFont{utf8songc2}{unicode/cjk/utf8/utf8songc2}
+\AddFont{unisongc2}{unicode/cjk/utf8/unisongc2}
 
 
 
-\<utf8songc3\><<<
-utf8songc3 0 255
+\<unisongc3\><<<
+unisongc3 0 255
 '&#xC300;' ''   0 `<gversion 0`>
-'&#xC301;' ''   1 % utf8songc3.htf (unicode)                    `version %
+'&#xC301;' ''   1 % unisongc3.htf (unicode)                    `version %
 '&#xC302;' ''   2 `<gversion 2`>
 '&#xC303;' ''   3 `<gversion 3`>
 '&#xC304;' ''   4 `<gversion 4`>
@@ -6687,17 +6687,17 @@
 '&#xC3FD;' '' 253
 '&#xC3FE;' '' 254
 '&#xC3FF;' '' 255
-utf8songc3 0 255
+unisongc3 0 255
 >>>
 
-\AddFont{utf8songc3}{unicode/cjk/utf8/utf8songc3}
+\AddFont{unisongc3}{unicode/cjk/utf8/unisongc3}
 
 
 
-\<utf8songc4\><<<
-utf8songc4 0 255
+\<unisongc4\><<<
+unisongc4 0 255
 '&#xC400;' ''   0 `<gversion 0`>
-'&#xC401;' ''   1 % utf8songc4.htf (unicode)                    `version %
+'&#xC401;' ''   1 % unisongc4.htf (unicode)                    `version %
 '&#xC402;' ''   2 `<gversion 2`>
 '&#xC403;' ''   3 `<gversion 3`>
 '&#xC404;' ''   4 `<gversion 4`>
@@ -6952,17 +6952,17 @@
 '&#xC4FD;' '' 253
 '&#xC4FE;' '' 254
 '&#xC4FF;' '' 255
-utf8songc4 0 255
+unisongc4 0 255
 >>>
 
-\AddFont{utf8songc4}{unicode/cjk/utf8/utf8songc4}
+\AddFont{unisongc4}{unicode/cjk/utf8/unisongc4}
 
 
 
-\<utf8songc5\><<<
-utf8songc5 0 255
+\<unisongc5\><<<
+unisongc5 0 255
 '&#xC500;' ''   0 `<gversion 0`>
-'&#xC501;' ''   1 % utf8songc5.htf (unicode)                    `version %
+'&#xC501;' ''   1 % unisongc5.htf (unicode)                    `version %
 '&#xC502;' ''   2 `<gversion 2`>
 '&#xC503;' ''   3 `<gversion 3`>
 '&#xC504;' ''   4 `<gversion 4`>
@@ -7217,17 +7217,17 @@
 '&#xC5FD;' '' 253
 '&#xC5FE;' '' 254
 '&#xC5FF;' '' 255
-utf8songc5 0 255
+unisongc5 0 255
 >>>
 
-\AddFont{utf8songc5}{unicode/cjk/utf8/utf8songc5}
+\AddFont{unisongc5}{unicode/cjk/utf8/unisongc5}
 
 
 
-\<utf8songc6\><<<
-utf8songc6 0 255
+\<unisongc6\><<<
+unisongc6 0 255
 '&#xC600;' ''   0 `<gversion 0`>
-'&#xC601;' ''   1 % utf8songc6.htf (unicode)                    `version %
+'&#xC601;' ''   1 % unisongc6.htf (unicode)                    `version %
 '&#xC602;' ''   2 `<gversion 2`>
 '&#xC603;' ''   3 `<gversion 3`>
 '&#xC604;' ''   4 `<gversion 4`>
@@ -7482,17 +7482,17 @@
 '&#xC6FD;' '' 253
 '&#xC6FE;' '' 254
 '&#xC6FF;' '' 255
-utf8songc6 0 255
+unisongc6 0 255
 >>>
 
-\AddFont{utf8songc6}{unicode/cjk/utf8/utf8songc6}
+\AddFont{unisongc6}{unicode/cjk/utf8/unisongc6}
 
 
 
-\<utf8songc7\><<<
-utf8songc7 0 255
+\<unisongc7\><<<
+unisongc7 0 255
 '&#xC700;' ''   0 `<gversion 0`>
-'&#xC701;' ''   1 % utf8songc7.htf (unicode)                    `version %
+'&#xC701;' ''   1 % unisongc7.htf (unicode)                    `version %
 '&#xC702;' ''   2 `<gversion 2`>
 '&#xC703;' ''   3 `<gversion 3`>
 '&#xC704;' ''   4 `<gversion 4`>
@@ -7747,17 +7747,17 @@
 '&#xC7FD;' '' 253
 '&#xC7FE;' '' 254
 '&#xC7FF;' '' 255
-utf8songc7 0 255
+unisongc7 0 255
 >>>
 
-\AddFont{utf8songc7}{unicode/cjk/utf8/utf8songc7}
+\AddFont{unisongc7}{unicode/cjk/utf8/unisongc7}
 
 
 
-\<utf8songc8\><<<
-utf8songc8 0 255
+\<unisongc8\><<<
+unisongc8 0 255
 '&#xC800;' ''   0 `<gversion 0`>
-'&#xC801;' ''   1 % utf8songc8.htf (unicode)                    `version %
+'&#xC801;' ''   1 % unisongc8.htf (unicode)                    `version %
 '&#xC802;' ''   2 `<gversion 2`>
 '&#xC803;' ''   3 `<gversion 3`>
 '&#xC804;' ''   4 `<gversion 4`>
@@ -8012,17 +8012,17 @@
 '&#xC8FD;' '' 253
 '&#xC8FE;' '' 254
 '&#xC8FF;' '' 255
-utf8songc8 0 255
+unisongc8 0 255
 >>>
 
-\AddFont{utf8songc8}{unicode/cjk/utf8/utf8songc8}
+\AddFont{unisongc8}{unicode/cjk/utf8/unisongc8}
 
 
 
-\<utf8songc9\><<<
-utf8songc9 0 255
+\<unisongc9\><<<
+unisongc9 0 255
 '&#xC900;' ''   0 `<gversion 0`>
-'&#xC901;' ''   1 % utf8songc9.htf (unicode)                    `version %
+'&#xC901;' ''   1 % unisongc9.htf (unicode)                    `version %
 '&#xC902;' ''   2 `<gversion 2`>
 '&#xC903;' ''   3 `<gversion 3`>
 '&#xC904;' ''   4 `<gversion 4`>
@@ -8277,17 +8277,17 @@
 '&#xC9FD;' '' 253
 '&#xC9FE;' '' 254
 '&#xC9FF;' '' 255
-utf8songc9 0 255
+unisongc9 0 255
 >>>
 
-\AddFont{utf8songc9}{unicode/cjk/utf8/utf8songc9}
+\AddFont{unisongc9}{unicode/cjk/utf8/unisongc9}
 
 
 
-\<utf8songd0\><<<
-utf8songd0 0 255
+\<unisongd0\><<<
+unisongd0 0 255
 '&#xD000;' ''   0 `<gversion 0`>
-'&#xD001;' ''   1 % utf8songd0.htf (unicode)                    `version %
+'&#xD001;' ''   1 % unisongd0.htf (unicode)                    `version %
 '&#xD002;' ''   2 `<gversion 2`>
 '&#xD003;' ''   3 `<gversion 3`>
 '&#xD004;' ''   4 `<gversion 4`>
@@ -8542,17 +8542,17 @@
 '&#xD0FD;' '' 253
 '&#xD0FE;' '' 254
 '&#xD0FF;' '' 255
-utf8songd0 0 255
+unisongd0 0 255
 >>>
 
-\AddFont{utf8songd0}{unicode/cjk/utf8/utf8songd0}
+\AddFont{unisongd0}{unicode/cjk/utf8/unisongd0}
 
 
 
-\<utf8songd1\><<<
-utf8songd1 0 255
+\<unisongd1\><<<
+unisongd1 0 255
 '&#xD100;' ''   0 `<gversion 0`>
-'&#xD101;' ''   1 % utf8songd1.htf (unicode)                    `version %
+'&#xD101;' ''   1 % unisongd1.htf (unicode)                    `version %
 '&#xD102;' ''   2 `<gversion 2`>
 '&#xD103;' ''   3 `<gversion 3`>
 '&#xD104;' ''   4 `<gversion 4`>
@@ -8807,17 +8807,17 @@
 '&#xD1FD;' '' 253
 '&#xD1FE;' '' 254
 '&#xD1FF;' '' 255
-utf8songd1 0 255
+unisongd1 0 255
 >>>
 
-\AddFont{utf8songd1}{unicode/cjk/utf8/utf8songd1}
+\AddFont{unisongd1}{unicode/cjk/utf8/unisongd1}
 
 
 
-\<utf8songd2\><<<
-utf8songd2 0 255
+\<unisongd2\><<<
+unisongd2 0 255
 '&#xD200;' ''   0 `<gversion 0`>
-'&#xD201;' ''   1 % utf8songd2.htf (unicode)                    `version %
+'&#xD201;' ''   1 % unisongd2.htf (unicode)                    `version %
 '&#xD202;' ''   2 `<gversion 2`>
 '&#xD203;' ''   3 `<gversion 3`>
 '&#xD204;' ''   4 `<gversion 4`>
@@ -9072,17 +9072,17 @@
 '&#xD2FD;' '' 253
 '&#xD2FE;' '' 254
 '&#xD2FF;' '' 255
-utf8songd2 0 255
+unisongd2 0 255
 >>>
 
-\AddFont{utf8songd2}{unicode/cjk/utf8/utf8songd2}
+\AddFont{unisongd2}{unicode/cjk/utf8/unisongd2}
 
 
 
-\<utf8songd3\><<<
-utf8songd3 0 255
+\<unisongd3\><<<
+unisongd3 0 255
 '&#xD300;' ''   0 `<gversion 0`>
-'&#xD301;' ''   1 % utf8songd3.htf (unicode)                    `version %
+'&#xD301;' ''   1 % unisongd3.htf (unicode)                    `version %
 '&#xD302;' ''   2 `<gversion 2`>
 '&#xD303;' ''   3 `<gversion 3`>
 '&#xD304;' ''   4 `<gversion 4`>
@@ -9337,17 +9337,17 @@
 '&#xD3FD;' '' 253
 '&#xD3FE;' '' 254
 '&#xD3FF;' '' 255
-utf8songd3 0 255
+unisongd3 0 255
 >>>
 
-\AddFont{utf8songd3}{unicode/cjk/utf8/utf8songd3}
+\AddFont{unisongd3}{unicode/cjk/utf8/unisongd3}
 
 
 
-\<utf8songd4\><<<
-utf8songd4 0 255
+\<unisongd4\><<<
+unisongd4 0 255
 '&#xD400;' ''   0 `<gversion 0`>
-'&#xD401;' ''   1 % utf8songd4.htf (unicode)                    `version %
+'&#xD401;' ''   1 % unisongd4.htf (unicode)                    `version %
 '&#xD402;' ''   2 `<gversion 2`>
 '&#xD403;' ''   3 `<gversion 3`>
 '&#xD404;' ''   4 `<gversion 4`>
@@ -9602,17 +9602,17 @@
 '&#xD4FD;' '' 253
 '&#xD4FE;' '' 254
 '&#xD4FF;' '' 255
-utf8songd4 0 255
+unisongd4 0 255
 >>>
 
-\AddFont{utf8songd4}{unicode/cjk/utf8/utf8songd4}
+\AddFont{unisongd4}{unicode/cjk/utf8/unisongd4}
 
 
 
-\<utf8songd5\><<<
-utf8songd5 0 255
+\<unisongd5\><<<
+unisongd5 0 255
 '&#xD500;' ''   0 `<gversion 0`>
-'&#xD501;' ''   1 % utf8songd5.htf (unicode)                    `version %
+'&#xD501;' ''   1 % unisongd5.htf (unicode)                    `version %
 '&#xD502;' ''   2 `<gversion 2`>
 '&#xD503;' ''   3 `<gversion 3`>
 '&#xD504;' ''   4 `<gversion 4`>
@@ -9867,17 +9867,17 @@
 '&#xD5FD;' '' 253
 '&#xD5FE;' '' 254
 '&#xD5FF;' '' 255
-utf8songd5 0 255
+unisongd5 0 255
 >>>
 
-\AddFont{utf8songd5}{unicode/cjk/utf8/utf8songd5}
+\AddFont{unisongd5}{unicode/cjk/utf8/unisongd5}
 
 
 
-\<utf8songd6\><<<
-utf8songd6 0 255
+\<unisongd6\><<<
+unisongd6 0 255
 '&#xD600;' ''   0 `<gversion 0`>
-'&#xD601;' ''   1 % utf8songd6.htf (unicode)                    `version %
+'&#xD601;' ''   1 % unisongd6.htf (unicode)                    `version %
 '&#xD602;' ''   2 `<gversion 2`>
 '&#xD603;' ''   3 `<gversion 3`>
 '&#xD604;' ''   4 `<gversion 4`>
@@ -10132,17 +10132,17 @@
 '&#xD6FD;' '' 253
 '&#xD6FE;' '' 254
 '&#xD6FF;' '' 255
-utf8songd6 0 255
+unisongd6 0 255
 >>>
 
-\AddFont{utf8songd6}{unicode/cjk/utf8/utf8songd6}
+\AddFont{unisongd6}{unicode/cjk/utf8/unisongd6}
 
 
 
-\<utf8songd7\><<<
-utf8songd7 0 255
+\<unisongd7\><<<
+unisongd7 0 255
 '&#xD700;' ''   0 `<gversion 0`>
-'&#xD701;' ''   1 % utf8songd7.htf (unicode)                    `version %
+'&#xD701;' ''   1 % unisongd7.htf (unicode)                    `version %
 '&#xD702;' ''   2 `<gversion 2`>
 '&#xD703;' ''   3 `<gversion 3`>
 '&#xD704;' ''   4 `<gversion 4`>
@@ -10397,17 +10397,17 @@
 '&#xD7FD;' '' 253
 '&#xD7FE;' '' 254
 '&#xD7FF;' '' 255
-utf8songd7 0 255
+unisongd7 0 255
 >>>
 
-\AddFont{utf8songd7}{unicode/cjk/utf8/utf8songd7}
+\AddFont{unisongd7}{unicode/cjk/utf8/unisongd7}
 
 
 
-\<utf8songe0\><<<
-utf8songe0 0 255
+\<unisonge0\><<<
+unisonge0 0 255
 '&#xE000;' ''   0 `<gversion 0`>
-'&#xE001;' ''   1 % utf8songe0.htf (unicode)                    `version %
+'&#xE001;' ''   1 % unisonge0.htf (unicode)                    `version %
 '&#xE002;' ''   2 `<gversion 2`>
 '&#xE003;' ''   3 `<gversion 3`>
 '&#xE004;' ''   4 `<gversion 4`>
@@ -10662,17 +10662,17 @@
 '&#xE0FD;' '' 253
 '&#xE0FE;' '' 254
 '&#xE0FF;' '' 255
-utf8songe0 0 255
+unisonge0 0 255
 >>>
 
-\AddFont{utf8songe0}{unicode/cjk/utf8/utf8songe0}
+\AddFont{unisonge0}{unicode/cjk/utf8/unisonge0}
 
 
 
-\<utf8songe1\><<<
-utf8songe1 0 255
+\<unisonge1\><<<
+unisonge1 0 255
 '&#xE100;' ''   0 `<gversion 0`>
-'&#xE101;' ''   1 % utf8songe1.htf (unicode)                    `version %
+'&#xE101;' ''   1 % unisonge1.htf (unicode)                    `version %
 '&#xE102;' ''   2 `<gversion 2`>
 '&#xE103;' ''   3 `<gversion 3`>
 '&#xE104;' ''   4 `<gversion 4`>
@@ -10927,17 +10927,17 @@
 '&#xE1FD;' '' 253
 '&#xE1FE;' '' 254
 '&#xE1FF;' '' 255
-utf8songe1 0 255
+unisonge1 0 255
 >>>
 
-\AddFont{utf8songe1}{unicode/cjk/utf8/utf8songe1}
+\AddFont{unisonge1}{unicode/cjk/utf8/unisonge1}
 
 
 
-\<utf8songe2\><<<
-utf8songe2 0 255
+\<unisonge2\><<<
+unisonge2 0 255
 '&#xE200;' ''   0 `<gversion 0`>
-'&#xE201;' ''   1 % utf8songe2.htf (unicode)                    `version %
+'&#xE201;' ''   1 % unisonge2.htf (unicode)                    `version %
 '&#xE202;' ''   2 `<gversion 2`>
 '&#xE203;' ''   3 `<gversion 3`>
 '&#xE204;' ''   4 `<gversion 4`>
@@ -11192,17 +11192,17 @@
 '&#xE2FD;' '' 253
 '&#xE2FE;' '' 254
 '&#xE2FF;' '' 255
-utf8songe2 0 255
+unisonge2 0 255
 >>>
 
-\AddFont{utf8songe2}{unicode/cjk/utf8/utf8songe2}
+\AddFont{unisonge2}{unicode/cjk/utf8/unisonge2}
 
 
 
-\<utf8songe3\><<<
-utf8songe3 0 255
+\<unisonge3\><<<
+unisonge3 0 255
 '&#xE300;' ''   0 `<gversion 0`>
-'&#xE301;' ''   1 % utf8songe3.htf (unicode)                    `version %
+'&#xE301;' ''   1 % unisonge3.htf (unicode)                    `version %
 '&#xE302;' ''   2 `<gversion 2`>
 '&#xE303;' ''   3 `<gversion 3`>
 '&#xE304;' ''   4 `<gversion 4`>
@@ -11457,17 +11457,17 @@
 '&#xE3FD;' '' 253
 '&#xE3FE;' '' 254
 '&#xE3FF;' '' 255
-utf8songe3 0 255
+unisonge3 0 255
 >>>
 
-\AddFont{utf8songe3}{unicode/cjk/utf8/utf8songe3}
+\AddFont{unisonge3}{unicode/cjk/utf8/unisonge3}
 
 
 
-\<utf8songe4\><<<
-utf8songe4 0 255
+\<unisonge4\><<<
+unisonge4 0 255
 '&#xE400;' ''   0 `<gversion 0`>
-'&#xe401;' ''   1 % utf8songe4.htf (unicode)                    `version %
+'&#xe401;' ''   1 % unisonge4.htf (unicode)                    `version %
 '&#xe402;' ''   2 `<gversion 2`>
 '&#xe403;' ''   3 `<gversion 3`>
 '&#xe404;' ''   4 `<gversion 4`>
@@ -11722,17 +11722,17 @@
 '&#xe4fd;' '' 253
 '&#xe4fe;' '' 254
 '&#xe4ff;' '' 255
-utf8songe4 0 255
+unisonge4 0 255
 >>>
 
-\AddFont{utf8songe4}{unicode/cjk/utf8/utf8songe4}
+\AddFont{unisonge4}{unicode/cjk/utf8/unisonge4}
 
 
 
-\<utf8songe5\><<<
-utf8songe5 0 255
+\<unisonge5\><<<
+unisonge5 0 255
 '&#xe500;' ''   0 `<gversion 0`>
-'&#xe501;' ''   1 % utf8songe5.htf (unicode)                    `version %
+'&#xe501;' ''   1 % unisonge5.htf (unicode)                    `version %
 '&#xe502;' ''   2 `<gversion 2`>
 '&#xe503;' ''   3 `<gversion 3`>
 '&#xe504;' ''   4 `<gversion 4`>
@@ -11987,17 +11987,17 @@
 '&#xe5fd;' '' 253
 '&#xe5fe;' '' 254
 '&#xe5ff;' '' 255
-utf8songe5 0 255
+unisonge5 0 255
 >>>
 
-\AddFont{utf8songe5}{unicode/cjk/utf8/utf8songe5}
+\AddFont{unisonge5}{unicode/cjk/utf8/unisonge5}
 
 
 
-\<utf8songaa\><<<
-utf8songaa 0 255
+\<unisongaa\><<<
+unisongaa 0 255
 '&#xaa00;' ''   0 `<gversion 0`>
-'&#xaa01;' ''   1 % utf8songaa.htf (unicode)                    `version %
+'&#xaa01;' ''   1 % unisongaa.htf (unicode)                    `version %
 '&#xaa02;' ''   2 `<gversion 2`>
 '&#xaa03;' ''   3 `<gversion 3`>
 '&#xaa04;' ''   4 `<gversion 4`>
@@ -12252,17 +12252,17 @@
 '&#xaafd;' '' 253
 '&#xaafe;' '' 254
 '&#xaaff;' '' 255
-utf8songaa 0 255
+unisongaa 0 255
 >>>
 
-\AddFont{utf8songaa}{unicode/cjk/utf8/utf8songaa}
+\AddFont{unisongaa}{unicode/cjk/utf8/unisongaa}
 
 
 
-\<utf8songe6\><<<
-utf8songe6 0 255
+\<unisonge6\><<<
+unisonge6 0 255
 '&#xe600;' ''   0 `<gversion 0`>
-'&#xe601;' ''   1 % utf8songe6.htf (unicode)                    `version %
+'&#xe601;' ''   1 % unisonge6.htf (unicode)                    `version %
 '&#xe602;' ''   2 `<gversion 2`>
 '&#xe603;' ''   3 `<gversion 3`>
 '&#xe604;' ''   4 `<gversion 4`>
@@ -12517,17 +12517,17 @@
 '&#xe6fd;' '' 253
 '&#xe6fe;' '' 254
 '&#xe6ff;' '' 255
-utf8songe6 0 255
+unisonge6 0 255
 >>>
 
-\AddFont{utf8songe6}{unicode/cjk/utf8/utf8songe6}
+\AddFont{unisonge6}{unicode/cjk/utf8/unisonge6}
 
 
 
-\<utf8songab\><<<
-utf8songab 0 255
+\<unisongab\><<<
+unisongab 0 255
 '&#xab00;' ''   0 `<gversion 0`>
-'&#xab01;' ''   1 % utf8songab.htf (unicode)                    `version %
+'&#xab01;' ''   1 % unisongab.htf (unicode)                    `version %
 '&#xab02;' ''   2 `<gversion 2`>
 '&#xab03;' ''   3 `<gversion 3`>
 '&#xab04;' ''   4 `<gversion 4`>
@@ -12782,17 +12782,17 @@
 '&#xabfd;' '' 253
 '&#xabfe;' '' 254
 '&#xabff;' '' 255
-utf8songab 0 255
+unisongab 0 255
 >>>
 
-\AddFont{utf8songab}{unicode/cjk/utf8/utf8songab}
+\AddFont{unisongab}{unicode/cjk/utf8/unisongab}
 
 
 
-\<utf8songe7\><<<
-utf8songe7 0 255
+\<unisonge7\><<<
+unisonge7 0 255
 '&#xe700;' ''   0 `<gversion 0`>
-'&#xe701;' ''   1 % utf8songe7.htf (unicode)                    `version %
+'&#xe701;' ''   1 % unisonge7.htf (unicode)                    `version %
 '&#xe702;' ''   2 `<gversion 2`>
 '&#xe703;' ''   3 `<gversion 3`>
 '&#xe704;' ''   4 `<gversion 4`>
@@ -13047,17 +13047,17 @@
 '&#xe7fd;' '' 253
 '&#xe7fe;' '' 254
 '&#xe7ff;' '' 255
-utf8songe7 0 255
+unisonge7 0 255
 >>>
 
-\AddFont{utf8songe7}{unicode/cjk/utf8/utf8songe7}
+\AddFont{unisonge7}{unicode/cjk/utf8/unisonge7}
 
 
 
-\<utf8songac\><<<
-utf8songac 0 255
+\<unisongac\><<<
+unisongac 0 255
 '&#xac00;' ''   0 `<gversion 0`>
-'&#xac01;' ''   1 % utf8songac.htf (unicode)                    `version %
+'&#xac01;' ''   1 % unisongac.htf (unicode)                    `version %
 '&#xac02;' ''   2 `<gversion 2`>
 '&#xac03;' ''   3 `<gversion 3`>
 '&#xac04;' ''   4 `<gversion 4`>
@@ -13312,17 +13312,17 @@
 '&#xacfd;' '' 253
 '&#xacfe;' '' 254
 '&#xacff;' '' 255
-utf8songac 0 255
+unisongac 0 255
 >>>
 
-\AddFont{utf8songac}{unicode/cjk/utf8/utf8songac}
+\AddFont{unisongac}{unicode/cjk/utf8/unisongac}
 
 
 
-\<utf8songe8\><<<
-utf8songe8 0 255
+\<unisonge8\><<<
+unisonge8 0 255
 '&#xe800;' ''   0 `<gversion 0`>
-'&#xe801;' ''   1 % utf8songe8.htf (unicode)                    `version %
+'&#xe801;' ''   1 % unisonge8.htf (unicode)                    `version %
 '&#xe802;' ''   2 `<gversion 2`>
 '&#xe803;' ''   3 `<gversion 3`>
 '&#xe804;' ''   4 `<gversion 4`>
@@ -13577,17 +13577,17 @@
 '&#xe8fd;' '' 253
 '&#xe8fe;' '' 254
 '&#xe8ff;' '' 255
-utf8songe8 0 255
+unisonge8 0 255
 >>>
 
-\AddFont{utf8songe8}{unicode/cjk/utf8/utf8songe8}
+\AddFont{unisonge8}{unicode/cjk/utf8/unisonge8}
 
 
 
-\<utf8songad\><<<
-utf8songad 0 255
+\<unisongad\><<<
+unisongad 0 255
 '&#xad00;' ''   0 `<gversion 0`>
-'&#xad01;' ''   1 % utf8songad.htf (unicode)                    `version %
+'&#xad01;' ''   1 % unisongad.htf (unicode)                    `version %
 '&#xad02;' ''   2 `<gversion 2`>
 '&#xad03;' ''   3 `<gversion 3`>
 '&#xad04;' ''   4 `<gversion 4`>
@@ -13842,17 +13842,17 @@
 '&#xadfd;' '' 253
 '&#xadfe;' '' 254
 '&#xadff;' '' 255
-utf8songad 0 255
+unisongad 0 255
 >>>
 
-\AddFont{utf8songad}{unicode/cjk/utf8/utf8songad}
+\AddFont{unisongad}{unicode/cjk/utf8/unisongad}
 
 
 
-\<utf8songe9\><<<
-utf8songe9 0 255
+\<unisonge9\><<<
+unisonge9 0 255
 '&#xe900;' ''   0 `<gversion 0`>
-'&#xe901;' ''   1 % utf8songe9.htf (unicode)                    `version %
+'&#xe901;' ''   1 % unisonge9.htf (unicode)                    `version %
 '&#xe902;' ''   2 `<gversion 2`>
 '&#xe903;' ''   3 `<gversion 3`>
 '&#xe904;' ''   4 `<gversion 4`>
@@ -14107,17 +14107,17 @@
 '&#xe9fd;' '' 253
 '&#xe9fe;' '' 254
 '&#xe9ff;' '' 255
-utf8songe9 0 255
+unisonge9 0 255
 >>>
 
-\AddFont{utf8songe9}{unicode/cjk/utf8/utf8songe9}
+\AddFont{unisonge9}{unicode/cjk/utf8/unisonge9}
 
 
 
-\<utf8songae\><<<
-utf8songae 0 255
+\<unisongae\><<<
+unisongae 0 255
 '&#xae00;' ''   0 `<gversion 0`>
-'&#xae01;' ''   1 % utf8songae.htf (unicode)                    `version %
+'&#xae01;' ''   1 % unisongae.htf (unicode)                    `version %
 '&#xae02;' ''   2 `<gversion 2`>
 '&#xae03;' ''   3 `<gversion 3`>
 '&#xae04;' ''   4 `<gversion 4`>
@@ -14372,17 +14372,17 @@
 '&#xaefd;' '' 253
 '&#xaefe;' '' 254
 '&#xaeff;' '' 255
-utf8songae 0 255
+unisongae 0 255
 >>>
 
-\AddFont{utf8songae}{unicode/cjk/utf8/utf8songae}
+\AddFont{unisongae}{unicode/cjk/utf8/unisongae}
 
 
 
-\<utf8songaf\><<<
-utf8songaf 0 255
+\<unisongaf\><<<
+unisongaf 0 255
 '&#xaf00;' ''   0 `<gversion 0`>
-'&#xaf01;' ''   1 % utf8songaf.htf (unicode)                    `version %
+'&#xaf01;' ''   1 % unisongaf.htf (unicode)                    `version %
 '&#xaf02;' ''   2 `<gversion 2`>
 '&#xaf03;' ''   3 `<gversion 3`>
 '&#xaf04;' ''   4 `<gversion 4`>
@@ -14637,17 +14637,17 @@
 '&#xaffd;' '' 253
 '&#xaffe;' '' 254
 '&#xafff;' '' 255
-utf8songaf 0 255
+unisongaf 0 255
 >>>
 
-\AddFont{utf8songaf}{unicode/cjk/utf8/utf8songaf}
+\AddFont{unisongaf}{unicode/cjk/utf8/unisongaf}
 
 
 
-\<utf8songf0\><<<
-utf8songf0 0 255
+\<unisongf0\><<<
+unisongf0 0 255
 '&#xf000;' ''   0 `<gversion 0`>
-'&#xf001;' ''   1 % utf8songf0.htf (unicode)                    `version %
+'&#xf001;' ''   1 % unisongf0.htf (unicode)                    `version %
 '&#xf002;' ''   2 `<gversion 2`>
 '&#xf003;' ''   3 `<gversion 3`>
 '&#xf004;' ''   4 `<gversion 4`>
@@ -14902,17 +14902,17 @@
 '&#xf0fd;' '' 253
 '&#xf0fe;' '' 254
 '&#xf0ff;' '' 255
-utf8songf0 0 255
+unisongf0 0 255
 >>>
 
-\AddFont{utf8songf0}{unicode/cjk/utf8/utf8songf0}
+\AddFont{unisongf0}{unicode/cjk/utf8/unisongf0}
 
 
 
-\<utf8songf1\><<<
-utf8songf1 0 255
+\<unisongf1\><<<
+unisongf1 0 255
 '&#xf100;' ''   0 `<gversion 0`>
-'&#xf101;' ''   1 % utf8songf1.htf (unicode)                    `version %
+'&#xf101;' ''   1 % unisongf1.htf (unicode)                    `version %
 '&#xf102;' ''   2 `<gversion 2`>
 '&#xf103;' ''   3 `<gversion 3`>
 '&#xf104;' ''   4 `<gversion 4`>
@@ -15167,17 +15167,17 @@
 '&#xf1fd;' '' 253
 '&#xf1fe;' '' 254
 '&#xf1ff;' '' 255
-utf8songf1 0 255
+unisongf1 0 255
 >>>
 
-\AddFont{utf8songf1}{unicode/cjk/utf8/utf8songf1}
+\AddFont{unisongf1}{unicode/cjk/utf8/unisongf1}
 
 
 
-\<utf8songf2\><<<
-utf8songf2 0 255
+\<unisongf2\><<<
+unisongf2 0 255
 '&#xf200;' ''   0 `<gversion 0`>
-'&#xf201;' ''   1 % utf8songf2.htf (unicode)                    `version %
+'&#xf201;' ''   1 % unisongf2.htf (unicode)                    `version %
 '&#xf202;' ''   2 `<gversion 2`>
 '&#xf203;' ''   3 `<gversion 3`>
 '&#xf204;' ''   4 `<gversion 4`>
@@ -15432,17 +15432,17 @@
 '&#xf2fd;' '' 253
 '&#xf2fe;' '' 254
 '&#xf2ff;' '' 255
-utf8songf2 0 255
+unisongf2 0 255
 >>>
 
-\AddFont{utf8songf2}{unicode/cjk/utf8/utf8songf2}
+\AddFont{unisongf2}{unicode/cjk/utf8/unisongf2}
 
 
 
-\<utf8songf3\><<<
-utf8songf3 0 255
+\<unisongf3\><<<
+unisongf3 0 255
 '&#xf300;' ''   0 `<gversion 0`>
-'&#xf301;' ''   1 % utf8songf3.htf (unicode)                    `version %
+'&#xf301;' ''   1 % unisongf3.htf (unicode)                    `version %
 '&#xf302;' ''   2 `<gversion 2`>
 '&#xf303;' ''   3 `<gversion 3`>
 '&#xf304;' ''   4 `<gversion 4`>
@@ -15697,17 +15697,17 @@
 '&#xf3fd;' '' 253
 '&#xf3fe;' '' 254
 '&#xf3ff;' '' 255
-utf8songf3 0 255
+unisongf3 0 255
 >>>
 
-\AddFont{utf8songf3}{unicode/cjk/utf8/utf8songf3}
+\AddFont{unisongf3}{unicode/cjk/utf8/unisongf3}
 
 
 
-\<utf8songf4\><<<
-utf8songf4 0 255
+\<unisongf4\><<<
+unisongf4 0 255
 '&#xf400;' ''   0 `<gversion 0`>
-'&#xf401;' ''   1 % utf8songf4.htf (unicode)                    `version %
+'&#xf401;' ''   1 % unisongf4.htf (unicode)                    `version %
 '&#xf402;' ''   2 `<gversion 2`>
 '&#xf403;' ''   3 `<gversion 3`>
 '&#xf404;' ''   4 `<gversion 4`>
@@ -15962,17 +15962,17 @@
 '&#xf4fd;' '' 253
 '&#xf4fe;' '' 254
 '&#xf4ff;' '' 255
-utf8songf4 0 255
+unisongf4 0 255
 >>>
 
-\AddFont{utf8songf4}{unicode/cjk/utf8/utf8songf4}
+\AddFont{unisongf4}{unicode/cjk/utf8/unisongf4}
 
 
 
-\<utf8songf5\><<<
-utf8songf5 0 255
+\<unisongf5\><<<
+unisongf5 0 255
 '&#xf500;' ''   0 `<gversion 0`>
-'&#xf501;' ''   1 % utf8songf5.htf (unicode)                    `version %
+'&#xf501;' ''   1 % unisongf5.htf (unicode)                    `version %
 '&#xf502;' ''   2 `<gversion 2`>
 '&#xf503;' ''   3 `<gversion 3`>
 '&#xf504;' ''   4 `<gversion 4`>
@@ -16227,17 +16227,17 @@
 '&#xf5fd;' '' 253
 '&#xf5fe;' '' 254
 '&#xf5ff;' '' 255
-utf8songf5 0 255
+unisongf5 0 255
 >>>
 
-\AddFont{utf8songf5}{unicode/cjk/utf8/utf8songf5}
+\AddFont{unisongf5}{unicode/cjk/utf8/unisongf5}
 
 
 
-\<utf8songba\><<<
-utf8songba 0 255
+\<unisongba\><<<
+unisongba 0 255
 '&#xba00;' ''   0 `<gversion 0`>
-'&#xba01;' ''   1 % utf8songba.htf (unicode)                    `version %
+'&#xba01;' ''   1 % unisongba.htf (unicode)                    `version %
 '&#xba02;' ''   2 `<gversion 2`>
 '&#xba03;' ''   3 `<gversion 3`>
 '&#xba04;' ''   4 `<gversion 4`>
@@ -16492,17 +16492,17 @@
 '&#xbafd;' '' 253
 '&#xbafe;' '' 254
 '&#xbaff;' '' 255
-utf8songba 0 255
+unisongba 0 255
 >>>
 
-\AddFont{utf8songba}{unicode/cjk/utf8/utf8songba}
+\AddFont{unisongba}{unicode/cjk/utf8/unisongba}
 
 
 
-\<utf8songf6\><<<
-utf8songf6 0 255
+\<unisongf6\><<<
+unisongf6 0 255
 '&#xf600;' ''   0 `<gversion 0`>
-'&#xf601;' ''   1 % utf8songf6.htf (unicode)                    `version %
+'&#xf601;' ''   1 % unisongf6.htf (unicode)                    `version %
 '&#xf602;' ''   2 `<gversion 2`>
 '&#xf603;' ''   3 `<gversion 3`>
 '&#xf604;' ''   4 `<gversion 4`>
@@ -16757,17 +16757,17 @@
 '&#xf6fd;' '' 253
 '&#xf6fe;' '' 254
 '&#xf6ff;' '' 255
-utf8songf6 0 255
+unisongf6 0 255
 >>>
 
-\AddFont{utf8songf6}{unicode/cjk/utf8/utf8songf6}
+\AddFont{unisongf6}{unicode/cjk/utf8/unisongf6}
 
 
 
-\<utf8songbb\><<<
-utf8songbb 0 255
+\<unisongbb\><<<
+unisongbb 0 255
 '&#xbb00;' ''   0 `<gversion 0`>
-'&#xbb01;' ''   1 % utf8songbb.htf (unicode)                    `version %
+'&#xbb01;' ''   1 % unisongbb.htf (unicode)                    `version %
 '&#xbb02;' ''   2 `<gversion 2`>
 '&#xbb03;' ''   3 `<gversion 3`>
 '&#xbb04;' ''   4 `<gversion 4`>
@@ -17022,17 +17022,17 @@
 '&#xbbfd;' '' 253
 '&#xbbfe;' '' 254
 '&#xbbff;' '' 255
-utf8songbb 0 255
+unisongbb 0 255
 >>>
 
-\AddFont{utf8songbb}{unicode/cjk/utf8/utf8songbb}
+\AddFont{unisongbb}{unicode/cjk/utf8/unisongbb}
 
 
 
-\<utf8songf7\><<<
-utf8songf7 0 255
+\<unisongf7\><<<
+unisongf7 0 255
 '&#xf700;' ''   0 `<gversion 0`>
-'&#xf701;' ''   1 % utf8songf7.htf (unicode)                    `version %
+'&#xf701;' ''   1 % unisongf7.htf (unicode)                    `version %
 '&#xf702;' ''   2 `<gversion 2`>
 '&#xf703;' ''   3 `<gversion 3`>
 '&#xf704;' ''   4 `<gversion 4`>
@@ -17287,17 +17287,17 @@
 '&#xf7fd;' '' 253
 '&#xf7fe;' '' 254
 '&#xf7ff;' '' 255
-utf8songf7 0 255
+unisongf7 0 255
 >>>
 
-\AddFont{utf8songf7}{unicode/cjk/utf8/utf8songf7}
+\AddFont{unisongf7}{unicode/cjk/utf8/unisongf7}
 
 
 
-\<utf8songbc\><<<
-utf8songbc 0 255
+\<unisongbc\><<<
+unisongbc 0 255
 '&#xbc00;' ''   0 `<gversion 0`>
-'&#xbc01;' ''   1 % utf8songbc.htf (unicode)                    `version %
+'&#xbc01;' ''   1 % unisongbc.htf (unicode)                    `version %
 '&#xbc02;' ''   2 `<gversion 2`>
 '&#xbc03;' ''   3 `<gversion 3`>
 '&#xbc04;' ''   4 `<gversion 4`>
@@ -17552,17 +17552,17 @@
 '&#xbcfd;' '' 253
 '&#xbcfe;' '' 254
 '&#xbcff;' '' 255
-utf8songbc 0 255
+unisongbc 0 255
 >>>
 
-\AddFont{utf8songbc}{unicode/cjk/utf8/utf8songbc}
+\AddFont{unisongbc}{unicode/cjk/utf8/unisongbc}
 
 
 
-\<utf8songf8\><<<
-utf8songf8 0 255
+\<unisongf8\><<<
+unisongf8 0 255
 '&#xf800;' ''   0 `<gversion 0`>
-'&#xf801;' ''   1 % utf8songf8.htf (unicode)                    `version %
+'&#xf801;' ''   1 % unisongf8.htf (unicode)                    `version %
 '&#xf802;' ''   2 `<gversion 2`>
 '&#xf803;' ''   3 `<gversion 3`>
 '&#xf804;' ''   4 `<gversion 4`>
@@ -17817,17 +17817,17 @@
 '&#xf8fd;' '' 253
 '&#xf8fe;' '' 254
 '&#xf8ff;' '' 255
-utf8songf8 0 255
+unisongf8 0 255
 >>>
 
-\AddFont{utf8songf8}{unicode/cjk/utf8/utf8songf8}
+\AddFont{unisongf8}{unicode/cjk/utf8/unisongf8}
 
 
 
-\<utf8songbd\><<<
-utf8songbd 0 255
+\<unisongbd\><<<
+unisongbd 0 255
 '&#xbd00;' ''   0 `<gversion 0`>
-'&#xbd01;' ''   1 % utf8songbd.htf (unicode)                    `version %
+'&#xbd01;' ''   1 % unisongbd.htf (unicode)                    `version %
 '&#xbd02;' ''   2 `<gversion 2`>
 '&#xbd03;' ''   3 `<gversion 3`>
 '&#xbd04;' ''   4 `<gversion 4`>
@@ -18082,17 +18082,17 @@
 '&#xbdfd;' '' 253
 '&#xbdfe;' '' 254
 '&#xbdff;' '' 255
-utf8songbd 0 255
+unisongbd 0 255
 >>>
 
-\AddFont{utf8songbd}{unicode/cjk/utf8/utf8songbd}
+\AddFont{unisongbd}{unicode/cjk/utf8/unisongbd}
 
 
 
-\<utf8songf9\><<<
-utf8songf9 0 255
+\<unisongf9\><<<
+unisongf9 0 255
 '&#xf900;' ''   0 `<gversion 0`>
-'&#xf901;' ''   1 % utf8songf9.htf (unicode)                    `version %
+'&#xf901;' ''   1 % unisongf9.htf (unicode)                    `version %
 '&#xf902;' ''   2 `<gversion 2`>
 '&#xf903;' ''   3 `<gversion 3`>
 '&#xf904;' ''   4 `<gversion 4`>
@@ -18347,17 +18347,17 @@
 '&#xf9fd;' '' 253
 '&#xf9fe;' '' 254
 '&#xf9ff;' '' 255
-utf8songf9 0 255
+unisongf9 0 255
 >>>
 
-\AddFont{utf8songf9}{unicode/cjk/utf8/utf8songf9}
+\AddFont{unisongf9}{unicode/cjk/utf8/unisongf9}
 
 
 
-\<utf8songbe\><<<
-utf8songbe 0 255
+\<unisongbe\><<<
+unisongbe 0 255
 '&#xbe00;' ''   0 `<gversion 0`>
-'&#xbe01;' ''   1 % utf8songbe.htf (unicode)                    `version %
+'&#xbe01;' ''   1 % unisongbe.htf (unicode)                    `version %
 '&#xbe02;' ''   2 `<gversion 2`>
 '&#xbe03;' ''   3 `<gversion 3`>
 '&#xbe04;' ''   4 `<gversion 4`>
@@ -18612,17 +18612,17 @@
 '&#xbefd;' '' 253
 '&#xbefe;' '' 254
 '&#xbeff;' '' 255
-utf8songbe 0 255
+unisongbe 0 255
 >>>
 
-\AddFont{utf8songbe}{unicode/cjk/utf8/utf8songbe}
+\AddFont{unisongbe}{unicode/cjk/utf8/unisongbe}
 
 
 
-\<utf8songbf\><<<
-utf8songbf 0 255
+\<unisongbf\><<<
+unisongbf 0 255
 '&#xbf00;' ''   0 `<gversion 0`>
-'&#xbf01;' ''   1 % utf8songbf.htf (unicode)                    `version %
+'&#xbf01;' ''   1 % unisongbf.htf (unicode)                    `version %
 '&#xbf02;' ''   2 `<gversion 2`>
 '&#xbf03;' ''   3 `<gversion 3`>
 '&#xbf04;' ''   4 `<gversion 4`>
@@ -18877,17 +18877,17 @@
 '&#xbffd;' '' 253
 '&#xbffe;' '' 254
 '&#xbfff;' '' 255
-utf8songbf 0 255
+unisongbf 0 255
 >>>
 
-\AddFont{utf8songbf}{unicode/cjk/utf8/utf8songbf}
+\AddFont{unisongbf}{unicode/cjk/utf8/unisongbf}
 
 
 
-\<utf8songca\><<<
-utf8songca 0 255
+\<unisongca\><<<
+unisongca 0 255
 '&#xca00;' ''   0 `<gversion 0`>
-'&#xca01;' ''   1 % utf8songca.htf (unicode)                    `version %
+'&#xca01;' ''   1 % unisongca.htf (unicode)                    `version %
 '&#xca02;' ''   2 `<gversion 2`>
 '&#xca03;' ''   3 `<gversion 3`>
 '&#xca04;' ''   4 `<gversion 4`>
@@ -19142,17 +19142,17 @@
 '&#xcafd;' '' 253
 '&#xcafe;' '' 254
 '&#xcaff;' '' 255
-utf8songca 0 255
+unisongca 0 255
 >>>
 
-\AddFont{utf8songca}{unicode/cjk/utf8/utf8songca}
+\AddFont{unisongca}{unicode/cjk/utf8/unisongca}
 
 
 
-\<utf8songcb\><<<
-utf8songcb 0 255
+\<unisongcb\><<<
+unisongcb 0 255
 '&#xcb00;' ''   0 `<gversion 0`>
-'&#xcb01;' ''   1 % utf8songcb.htf (unicode)                    `version %
+'&#xcb01;' ''   1 % unisongcb.htf (unicode)                    `version %
 '&#xcb02;' ''   2 `<gversion 2`>
 '&#xcb03;' ''   3 `<gversion 3`>
 '&#xcb04;' ''   4 `<gversion 4`>
@@ -19407,17 +19407,17 @@
 '&#xcbfd;' '' 253
 '&#xcbfe;' '' 254
 '&#xcbff;' '' 255
-utf8songcb 0 255
+unisongcb 0 255
 >>>
 
-\AddFont{utf8songcb}{unicode/cjk/utf8/utf8songcb}
+\AddFont{unisongcb}{unicode/cjk/utf8/unisongcb}
 
 
 
-\<utf8songcc\><<<
-utf8songcc 0 255
+\<unisongcc\><<<
+unisongcc 0 255
 '&#xcc00;' ''   0 `<gversion 0`>
-'&#xcc01;' ''   1 % utf8songcc.htf (unicode)                    `version %
+'&#xcc01;' ''   1 % unisongcc.htf (unicode)                    `version %
 '&#xcc02;' ''   2 `<gversion 2`>
 '&#xcc03;' ''   3 `<gversion 3`>
 '&#xcc04;' ''   4 `<gversion 4`>
@@ -19672,17 +19672,17 @@
 '&#xccfd;' '' 253
 '&#xccfe;' '' 254
 '&#xccff;' '' 255
-utf8songcc 0 255
+unisongcc 0 255
 >>>
 
-\AddFont{utf8songcc}{unicode/cjk/utf8/utf8songcc}
+\AddFont{unisongcc}{unicode/cjk/utf8/unisongcc}
 
 
 
-\<utf8songcd\><<<
-utf8songcd 0 255
+\<unisongcd\><<<
+unisongcd 0 255
 '&#xcd00;' ''   0 `<gversion 0`>
-'&#xcd01;' ''   1 % utf8songcd.htf (unicode)                    `version %
+'&#xcd01;' ''   1 % unisongcd.htf (unicode)                    `version %
 '&#xcd02;' ''   2 `<gversion 2`>
 '&#xcd03;' ''   3 `<gversion 3`>
 '&#xcd04;' ''   4 `<gversion 4`>
@@ -19937,17 +19937,17 @@
 '&#xcdfd;' '' 253
 '&#xcdfe;' '' 254
 '&#xcdff;' '' 255
-utf8songcd 0 255
+unisongcd 0 255
 >>>
 
-\AddFont{utf8songcd}{unicode/cjk/utf8/utf8songcd}
+\AddFont{unisongcd}{unicode/cjk/utf8/unisongcd}
 
 
 
-\<utf8songce\><<<
-utf8songce 0 255
+\<unisongce\><<<
+unisongce 0 255
 '&#xce00;' ''   0 `<gversion 0`>
-'&#xce01;' ''   1 % utf8songce.htf (unicode)                    `version %
+'&#xce01;' ''   1 % unisongce.htf (unicode)                    `version %
 '&#xce02;' ''   2 `<gversion 2`>
 '&#xce03;' ''   3 `<gversion 3`>
 '&#xce04;' ''   4 `<gversion 4`>
@@ -20202,17 +20202,17 @@
 '&#xcefd;' '' 253
 '&#xcefe;' '' 254
 '&#xceff;' '' 255
-utf8songce 0 255
+unisongce 0 255
 >>>
 
-\AddFont{utf8songce}{unicode/cjk/utf8/utf8songce}
+\AddFont{unisongce}{unicode/cjk/utf8/unisongce}
 
 
 
-\<utf8songcf\><<<
-utf8songcf 0 255
+\<unisongcf\><<<
+unisongcf 0 255
 '&#xcf00;' ''   0 `<gversion 0`>
-'&#xcf01;' ''   1 % utf8songcf.htf (unicode)                    `version %
+'&#xcf01;' ''   1 % unisongcf.htf (unicode)                    `version %
 '&#xcf02;' ''   2 `<gversion 2`>
 '&#xcf03;' ''   3 `<gversion 3`>
 '&#xcf04;' ''   4 `<gversion 4`>
@@ -20467,17 +20467,17 @@
 '&#xcffd;' '' 253
 '&#xcffe;' '' 254
 '&#xcfff;' '' 255
-utf8songcf 0 255
+unisongcf 0 255
 >>>
 
-\AddFont{utf8songcf}{unicode/cjk/utf8/utf8songcf}
+\AddFont{unisongcf}{unicode/cjk/utf8/unisongcf}
 
 
 
-\<utf8songdc\><<<
-utf8songdc 0 255
+\<unisongdc\><<<
+unisongdc 0 255
 '&#xdc00;' ''   0 `<gversion 0`>
-'&#xdc01;' ''   1 % utf8songdc.htf (unicode)                    `version %
+'&#xdc01;' ''   1 % unisongdc.htf (unicode)                    `version %
 '&#xdc02;' ''   2 `<gversion 2`>
 '&#xdc03;' ''   3 `<gversion 3`>
 '&#xdc04;' ''   4 `<gversion 4`>
@@ -20732,17 +20732,17 @@
 '&#xdcfd;' '' 253
 '&#xdcfe;' '' 254
 '&#xdcff;' '' 255
-utf8songdc 0 255
+unisongdc 0 255
 >>>
 
-\AddFont{utf8songdc}{unicode/cjk/utf8/utf8songdc}
+\AddFont{unisongdc}{unicode/cjk/utf8/unisongdc}
 
 
 
-\<utf8songdd\><<<
-utf8songdd 0 255
+\<unisongdd\><<<
+unisongdd 0 255
 '&#xdd00;' ''   0 `<gversion 0`>
-'&#xdd01;' ''   1 % utf8songdd.htf (unicode)                    `version %
+'&#xdd01;' ''   1 % unisongdd.htf (unicode)                    `version %
 '&#xdd02;' ''   2 `<gversion 2`>
 '&#xdd03;' ''   3 `<gversion 3`>
 '&#xdd04;' ''   4 `<gversion 4`>
@@ -20997,17 +20997,17 @@
 '&#xddfd;' '' 253
 '&#xddfe;' '' 254
 '&#xddff;' '' 255
-utf8songdd 0 255
+unisongdd 0 255
 >>>
 
-\AddFont{utf8songdd}{unicode/cjk/utf8/utf8songdd}
+\AddFont{unisongdd}{unicode/cjk/utf8/unisongdd}
 
 
 
-\<utf8songde\><<<
-utf8songde 0 255
+\<unisongde\><<<
+unisongde 0 255
 '&#xde00;' ''   0 `<gversion 0`>
-'&#xde01;' ''   1 % utf8songde.htf (unicode)                    `version %
+'&#xde01;' ''   1 % unisongde.htf (unicode)                    `version %
 '&#xde02;' ''   2 `<gversion 2`>
 '&#xde03;' ''   3 `<gversion 3`>
 '&#xde04;' ''   4 `<gversion 4`>
@@ -21262,17 +21262,17 @@
 '&#xdefd;' '' 253
 '&#xdefe;' '' 254
 '&#xdeff;' '' 255
-utf8songde 0 255
+unisongde 0 255
 >>>
 
-\AddFont{utf8songde}{unicode/cjk/utf8/utf8songde}
+\AddFont{unisongde}{unicode/cjk/utf8/unisongde}
 
 
 
-\<utf8songdf\><<<
-utf8songdf 0 255
+\<unisongdf\><<<
+unisongdf 0 255
 '&#xdf00;' ''   0 `<gversion 0`>
-'&#xdf01;' ''   1 % utf8songdf.htf (unicode)                    `version %
+'&#xdf01;' ''   1 % unisongdf.htf (unicode)                    `version %
 '&#xdf02;' ''   2 `<gversion 2`>
 '&#xdf03;' ''   3 `<gversion 3`>
 '&#xdf04;' ''   4 `<gversion 4`>
@@ -21527,17 +21527,17 @@
 '&#xdffd;' '' 253
 '&#xdffe;' '' 254
 '&#xdfff;' '' 255
-utf8songdf 0 255
+unisongdf 0 255
 >>>
 
-\AddFont{utf8songdf}{unicode/cjk/utf8/utf8songdf}
+\AddFont{unisongdf}{unicode/cjk/utf8/unisongdf}
 
 
 
-\<utf8songea\><<<
-utf8songea 0 255
+\<unisongea\><<<
+unisongea 0 255
 '&#xea00;' ''   0 `<gversion 0`>
-'&#xea01;' ''   1 % utf8songea.htf (unicode)                    `version %
+'&#xea01;' ''   1 % unisongea.htf (unicode)                    `version %
 '&#xea02;' ''   2 `<gversion 2`>
 '&#xea03;' ''   3 `<gversion 3`>
 '&#xea04;' ''   4 `<gversion 4`>
@@ -21792,17 +21792,17 @@
 '&#xeafd;' '' 253
 '&#xeafe;' '' 254
 '&#xeaff;' '' 255
-utf8songea 0 255
+unisongea 0 255
 >>>
 
-\AddFont{utf8songea}{unicode/cjk/utf8/utf8songea}
+\AddFont{unisongea}{unicode/cjk/utf8/unisongea}
 
 
 
-\<utf8songeb\><<<
-utf8songeb 0 255
+\<unisongeb\><<<
+unisongeb 0 255
 '&#xeb00;' ''   0 `<gversion 0`>
-'&#xeb01;' ''   1 % utf8songeb.htf (unicode)                    `version %
+'&#xeb01;' ''   1 % unisongeb.htf (unicode)                    `version %
 '&#xeb02;' ''   2 `<gversion 2`>
 '&#xeb03;' ''   3 `<gversion 3`>
 '&#xeb04;' ''   4 `<gversion 4`>
@@ -22057,17 +22057,17 @@
 '&#xebfd;' '' 253
 '&#xebfe;' '' 254
 '&#xebff;' '' 255
-utf8songeb 0 255
+unisongeb 0 255
 >>>
 
-\AddFont{utf8songeb}{unicode/cjk/utf8/utf8songeb}
+\AddFont{unisongeb}{unicode/cjk/utf8/unisongeb}
 
 
 
-\<utf8songec\><<<
-utf8songec 0 255
+\<unisongec\><<<
+unisongec 0 255
 '&#xec00;' ''   0 `<gversion 0`>
-'&#xec01;' ''   1 % utf8songec.htf (unicode)                    `version %
+'&#xec01;' ''   1 % unisongec.htf (unicode)                    `version %
 '&#xec02;' ''   2 `<gversion 2`>
 '&#xec03;' ''   3 `<gversion 3`>
 '&#xec04;' ''   4 `<gversion 4`>
@@ -22322,17 +22322,17 @@
 '&#xecfd;' '' 253
 '&#xecfe;' '' 254
 '&#xecff;' '' 255
-utf8songec 0 255
+unisongec 0 255
 >>>
 
-\AddFont{utf8songec}{unicode/cjk/utf8/utf8songec}
+\AddFont{unisongec}{unicode/cjk/utf8/unisongec}
 
 
 
-\<utf8songed\><<<
-utf8songed 0 255
+\<unisonged\><<<
+unisonged 0 255
 '&#xed00;' ''   0 `<gversion 0`>
-'&#xed01;' ''   1 % utf8songed.htf (unicode)                    `version %
+'&#xed01;' ''   1 % unisonged.htf (unicode)                    `version %
 '&#xed02;' ''   2 `<gversion 2`>
 '&#xed03;' ''   3 `<gversion 3`>
 '&#xed04;' ''   4 `<gversion 4`>
@@ -22587,17 +22587,17 @@
 '&#xedfd;' '' 253
 '&#xedfe;' '' 254
 '&#xedff;' '' 255
-utf8songed 0 255
+unisonged 0 255
 >>>
 
-\AddFont{utf8songed}{unicode/cjk/utf8/utf8songed}
+\AddFont{unisonged}{unicode/cjk/utf8/unisonged}
 
 
 
-\<utf8songee\><<<
-utf8songee 0 255
+\<unisongee\><<<
+unisongee 0 255
 '&#xee00;' ''   0 `<gversion 0`>
-'&#xee01;' ''   1 % utf8songee.htf (unicode)                    `version %
+'&#xee01;' ''   1 % unisongee.htf (unicode)                    `version %
 '&#xee02;' ''   2 `<gversion 2`>
 '&#xee03;' ''   3 `<gversion 3`>
 '&#xee04;' ''   4 `<gversion 4`>
@@ -22852,17 +22852,17 @@
 '&#xeefd;' '' 253
 '&#xeefe;' '' 254
 '&#xeeff;' '' 255
-utf8songee 0 255
+unisongee 0 255
 >>>
 
-\AddFont{utf8songee}{unicode/cjk/utf8/utf8songee}
+\AddFont{unisongee}{unicode/cjk/utf8/unisongee}
 
 
 
-\<utf8songef\><<<
-utf8songef 0 255
+\<unisongef\><<<
+unisongef 0 255
 '&#xef00;' ''   0 `<gversion 0`>
-'&#xef01;' ''   1 % utf8songef.htf (unicode)                    `version %
+'&#xef01;' ''   1 % unisongef.htf (unicode)                    `version %
 '&#xef02;' ''   2 `<gversion 2`>
 '&#xef03;' ''   3 `<gversion 3`>
 '&#xef04;' ''   4 `<gversion 4`>
@@ -23117,17 +23117,17 @@
 '&#xeffd;' '' 253
 '&#xeffe;' '' 254
 '&#xefff;' '' 255
-utf8songef 0 255
+unisongef 0 255
 >>>
 
-\AddFont{utf8songef}{unicode/cjk/utf8/utf8songef}
+\AddFont{unisongef}{unicode/cjk/utf8/unisongef}
 
 
 
-\<utf8songfa\><<<
-utf8songfa 0 255
+\<unisongfa\><<<
+unisongfa 0 255
 '&#xfa00;' ''   0 `<gversion 0`>
-'&#xfa01;' ''   1 % utf8songfa.htf (unicode)                    `version %
+'&#xfa01;' ''   1 % unisongfa.htf (unicode)                    `version %
 '&#xfa02;' ''   2 `<gversion 2`>
 '&#xfa03;' ''   3 `<gversion 3`>
 '&#xfa04;' ''   4 `<gversion 4`>
@@ -23382,17 +23382,17 @@
 '&#xfafd;' '' 253
 '&#xfafe;' '' 254
 '&#xfaff;' '' 255
-utf8songfa 0 255
+unisongfa 0 255
 >>>
 
-\AddFont{utf8songfa}{unicode/cjk/utf8/utf8songfa}
+\AddFont{unisongfa}{unicode/cjk/utf8/unisongfa}
 
 
 
-\<utf8songfb\><<<
-utf8songfb 0 255
+\<unisongfb\><<<
+unisongfb 0 255
 '&#xfb00;' ''   0 `<gversion 0`>
-'&#xfb01;' ''   1 % utf8songfb.htf (unicode)                    `version %
+'&#xfb01;' ''   1 % unisongfb.htf (unicode)                    `version %
 '&#xfb02;' ''   2 `<gversion 2`>
 '&#xfb03;' ''   3 `<gversion 3`>
 '&#xfb04;' ''   4 `<gversion 4`>
@@ -23647,17 +23647,17 @@
 '&#xfbfd;' '' 253
 '&#xfbfe;' '' 254
 '&#xfbff;' '' 255
-utf8songfb 0 255
+unisongfb 0 255
 >>>
 
-\AddFont{utf8songfb}{unicode/cjk/utf8/utf8songfb}
+\AddFont{unisongfb}{unicode/cjk/utf8/unisongfb}
 
 
 
-\<utf8songfc\><<<
-utf8songfc 0 255
+\<unisongfc\><<<
+unisongfc 0 255
 '&#xfc00;' ''   0 `<gversion 0`>
-'&#xfc01;' ''   1 % utf8songfc.htf (unicode)                    `version %
+'&#xfc01;' ''   1 % unisongfc.htf (unicode)                    `version %
 '&#xfc02;' ''   2 `<gversion 2`>
 '&#xfc03;' ''   3 `<gversion 3`>
 '&#xfc04;' ''   4 `<gversion 4`>
@@ -23912,17 +23912,17 @@
 '&#xfcfd;' '' 253
 '&#xfcfe;' '' 254
 '&#xfcff;' '' 255
-utf8songfc 0 255
+unisongfc 0 255
 >>>
 
-\AddFont{utf8songfc}{unicode/cjk/utf8/utf8songfc}
+\AddFont{unisongfc}{unicode/cjk/utf8/unisongfc}
 
 
 
-\<utf8songfd\><<<
-utf8songfd 0 255
+\<unisongfd\><<<
+unisongfd 0 255
 '&#xfd00;' ''   0 `<gversion 0`>
-'&#xfd01;' ''   1 % utf8songfd.htf (unicode)                    `version %
+'&#xfd01;' ''   1 % unisongfd.htf (unicode)                    `version %
 '&#xfd02;' ''   2 `<gversion 2`>
 '&#xfd03;' ''   3 `<gversion 3`>
 '&#xfd04;' ''   4 `<gversion 4`>
@@ -24177,17 +24177,17 @@
 '&#xfdfd;' '' 253
 '&#xfdfe;' '' 254
 '&#xfdff;' '' 255
-utf8songfd 0 255
+unisongfd 0 255
 >>>
 
-\AddFont{utf8songfd}{unicode/cjk/utf8/utf8songfd}
+\AddFont{unisongfd}{unicode/cjk/utf8/unisongfd}
 
 
 
-\<utf8songfe\><<<
-utf8songfe 0 255
+\<unisongfe\><<<
+unisongfe 0 255
 '&#xfe00;' ''   0 `<gversion 0`>
-'&#xfe01;' ''   1 % utf8songfe.htf (unicode)                    `version %
+'&#xfe01;' ''   1 % unisongfe.htf (unicode)                    `version %
 '&#xfe02;' ''   2 `<gversion 2`>
 '&#xfe03;' ''   3 `<gversion 3`>
 '&#xfe04;' ''   4 `<gversion 4`>
@@ -24442,17 +24442,17 @@
 '&#xfefd;' '' 253
 '&#xfefe;' '' 254
 '&#xfeff;' '' 255
-utf8songfe 0 255
+unisongfe 0 255
 >>>
 
-\AddFont{utf8songfe}{unicode/cjk/utf8/utf8songfe}
+\AddFont{unisongfe}{unicode/cjk/utf8/unisongfe}
 
 
 
-\<utf8songff\><<<
-utf8songff 0 255
+\<unisongff\><<<
+unisongff 0 255
 '&#xff00;' ''   0 `<gversion 0`>
-'&#xff01;' ''   1 % utf8songff.htf (unicode)                    `version %
+'&#xff01;' ''   1 % unisongff.htf (unicode)                    `version %
 '&#xff02;' ''   2 `<gversion 2`>
 '&#xff03;' ''   3 `<gversion 3`>
 '&#xff04;' ''   4 `<gversion 4`>
@@ -24707,17 +24707,17 @@
 '&#xfffd;' '' 253
 '&#xfffe;' '' 254
 '&#xffff;' '' 255
-utf8songff 0 255
+unisongff 0 255
 >>>
 
-\AddFont{utf8songff}{unicode/cjk/utf8/utf8songff}
+\AddFont{unisongff}{unicode/cjk/utf8/unisongff}
 
 
 
-\<utf8song01\><<<
-utf8song01 0 255
+\<unisong01\><<<
+unisong01 0 255
 '&#x0100;' ''   0 `<gversion 0`>
-'&#x0101;' ''   1 % utf8song01.htf (unicode)                    `version %
+'&#x0101;' ''   1 % unisong01.htf (unicode)                    `version %
 '&#x0102;' ''   2 `<gversion 2`>
 '&#x0103;' ''   3 `<gversion 3`>
 '&#x0104;' ''   4 `<gversion 4`>
@@ -24972,17 +24972,17 @@
 '&#x01fd;' '' 253
 '&#x01fe;' '' 254
 '&#x01ff;' '' 255
-utf8song01 0 255
+unisong01 0 255
 >>>
 
-\AddFont{utf8song01}{unicode/cjk/utf8/utf8song01}
+\AddFont{unisong01}{unicode/cjk/utf8/unisong01}
 
 
 
-\<utf8song02\><<<
-utf8song02 0 255
+\<unisong02\><<<
+unisong02 0 255
 '&#x0200;' ''   0 `<gversion 0`>
-'&#x0201;' ''   1 % utf8song02.htf (unicode)                    `version %
+'&#x0201;' ''   1 % unisong02.htf (unicode)                    `version %
 '&#x0202;' ''   2 `<gversion 2`>
 '&#x0203;' ''   3 `<gversion 3`>
 '&#x0204;' ''   4 `<gversion 4`>
@@ -25237,17 +25237,17 @@
 '&#x02fd;' '' 253
 '&#x02fe;' '' 254
 '&#x02ff;' '' 255
-utf8song02 0 255
+unisong02 0 255
 >>>
 
-\AddFont{utf8song02}{unicode/cjk/utf8/utf8song02}
+\AddFont{unisong02}{unicode/cjk/utf8/unisong02}
 
 
 
-\<utf8song03\><<<
-utf8song03 0 255
+\<unisong03\><<<
+unisong03 0 255
 '&#x0300;' ''   0 `<gversion 0`>
-'&#x0301;' ''   1 % utf8song03.htf (unicode)                    `version %
+'&#x0301;' ''   1 % unisong03.htf (unicode)                    `version %
 '&#x0302;' ''   2 `<gversion 2`>
 '&#x0303;' ''   3 `<gversion 3`>
 '&#x0304;' ''   4 `<gversion 4`>
@@ -25502,17 +25502,17 @@
 '&#x03fd;' '' 253
 '&#x03fe;' '' 254
 '&#x03ff;' '' 255
-utf8song03 0 255
+unisong03 0 255
 >>>
 
-\AddFont{utf8song03}{unicode/cjk/utf8/utf8song03}
+\AddFont{unisong03}{unicode/cjk/utf8/unisong03}
 
 
 
-\<utf8song04\><<<
-utf8song04 0 255
+\<unisong04\><<<
+unisong04 0 255
 '&#x0400;' ''   0 `<gversion 0`>
-'&#x0401;' ''   1 % utf8song04.htf (unicode)                    `version %
+'&#x0401;' ''   1 % unisong04.htf (unicode)                    `version %
 '&#x0402;' ''   2 `<gversion 2`>
 '&#x0403;' ''   3 `<gversion 3`>
 '&#x0404;' ''   4 `<gversion 4`>
@@ -25767,17 +25767,17 @@
 '&#x04fd;' '' 253
 '&#x04fe;' '' 254
 '&#x04ff;' '' 255
-utf8song04 0 255
+unisong04 0 255
 >>>
 
-\AddFont{utf8song04}{unicode/cjk/utf8/utf8song04}
+\AddFont{unisong04}{unicode/cjk/utf8/unisong04}
 
 
 
-\<utf8song05\><<<
-utf8song05 0 255
+\<unisong05\><<<
+unisong05 0 255
 '&#x0500;' ''   0 `<gversion 0`>
-'&#x0501;' ''   1 % utf8song05.htf (unicode)                    `version %
+'&#x0501;' ''   1 % unisong05.htf (unicode)                    `version %
 '&#x0502;' ''   2 `<gversion 2`>
 '&#x0503;' ''   3 `<gversion 3`>
 '&#x0504;' ''   4 `<gversion 4`>
@@ -26032,17 +26032,17 @@
 '&#x05fd;' '' 253
 '&#x05fe;' '' 254
 '&#x05ff;' '' 255
-utf8song05 0 255
+unisong05 0 255
 >>>
 
-\AddFont{utf8song05}{unicode/cjk/utf8/utf8song05}
+\AddFont{unisong05}{unicode/cjk/utf8/unisong05}
 
 
 
-\<utf8song06\><<<
-utf8song06 0 255
+\<unisong06\><<<
+unisong06 0 255
 '&#x0600;' ''   0 `<gversion 0`>
-'&#x0601;' ''   1 % utf8song06.htf (unicode)                    `version %
+'&#x0601;' ''   1 % unisong06.htf (unicode)                    `version %
 '&#x0602;' ''   2 `<gversion 2`>
 '&#x0603;' ''   3 `<gversion 3`>
 '&#x0604;' ''   4 `<gversion 4`>
@@ -26297,17 +26297,17 @@
 '&#x06fd;' '' 253
 '&#x06fe;' '' 254
 '&#x06ff;' '' 255
-utf8song06 0 255
+unisong06 0 255
 >>>
 
-\AddFont{utf8song06}{unicode/cjk/utf8/utf8song06}
+\AddFont{unisong06}{unicode/cjk/utf8/unisong06}
 
 
 
-\<utf8song07\><<<
-utf8song07 0 255
+\<unisong07\><<<
+unisong07 0 255
 '&#x0700;' ''   0 `<gversion 0`>
-'&#x0701;' ''   1 % utf8song07.htf (unicode)                    `version %
+'&#x0701;' ''   1 % unisong07.htf (unicode)                    `version %
 '&#x0702;' ''   2 `<gversion 2`>
 '&#x0703;' ''   3 `<gversion 3`>
 '&#x0704;' ''   4 `<gversion 4`>
@@ -26562,17 +26562,17 @@
 '&#x07fd;' '' 253
 '&#x07fe;' '' 254
 '&#x07ff;' '' 255
-utf8song07 0 255
+unisong07 0 255
 >>>
 
-\AddFont{utf8song07}{unicode/cjk/utf8/utf8song07}
+\AddFont{unisong07}{unicode/cjk/utf8/unisong07}
 
 
 
-\<utf8song08\><<<
-utf8song08 0 255
+\<unisong08\><<<
+unisong08 0 255
 '&#x0800;' ''   0 `<gversion 0`>
-'&#x0801;' ''   1 % utf8song08.htf (unicode)                    `version %
+'&#x0801;' ''   1 % unisong08.htf (unicode)                    `version %
 '&#x0802;' ''   2 `<gversion 2`>
 '&#x0803;' ''   3 `<gversion 3`>
 '&#x0804;' ''   4 `<gversion 4`>
@@ -26827,17 +26827,17 @@
 '&#x08fd;' '' 253
 '&#x08fe;' '' 254
 '&#x08ff;' '' 255
-utf8song08 0 255
+unisong08 0 255
 >>>
 
-\AddFont{utf8song08}{unicode/cjk/utf8/utf8song08}
+\AddFont{unisong08}{unicode/cjk/utf8/unisong08}
 
 
 
-\<utf8song09\><<<
-utf8song09 0 255
+\<unisong09\><<<
+unisong09 0 255
 '&#x0900;' ''   0 `<gversion 0`>
-'&#x0901;' ''   1 % utf8song09.htf (unicode)                    `version %
+'&#x0901;' ''   1 % unisong09.htf (unicode)                    `version %
 '&#x0902;' ''   2 `<gversion 2`>
 '&#x0903;' ''   3 `<gversion 3`>
 '&#x0904;' ''   4 `<gversion 4`>
@@ -27092,17 +27092,17 @@
 '&#x09fd;' '' 253
 '&#x09fe;' '' 254
 '&#x09ff;' '' 255
-utf8song09 0 255
+unisong09 0 255
 >>>
 
-\AddFont{utf8song09}{unicode/cjk/utf8/utf8song09}
+\AddFont{unisong09}{unicode/cjk/utf8/unisong09}
 
 
 
-\<utf8song10\><<<
-utf8song10 0 255
+\<unisong10\><<<
+unisong10 0 255
 '&#x1000;' ''   0 `<gversion 0`>
-'&#x1001;' ''   1 % utf8song10.htf (unicode)                    `version %
+'&#x1001;' ''   1 % unisong10.htf (unicode)                    `version %
 '&#x1002;' ''   2 `<gversion 2`>
 '&#x1003;' ''   3 `<gversion 3`>
 '&#x1004;' ''   4 `<gversion 4`>
@@ -27357,17 +27357,17 @@
 '&#x10fd;' '' 253
 '&#x10fe;' '' 254
 '&#x10ff;' '' 255
-utf8song10 0 255
+unisong10 0 255
 >>>
 
-\AddFont{utf8song10}{unicode/cjk/utf8/utf8song10}
+\AddFont{unisong10}{unicode/cjk/utf8/unisong10}
 
 
 
-\<utf8song11\><<<
-utf8song11 0 255
+\<unisong11\><<<
+unisong11 0 255
 '&#x1100;' ''   0 `<gversion 0`>
-'&#x1101;' ''   1 % utf8song11.htf (unicode)                    `version %
+'&#x1101;' ''   1 % unisong11.htf (unicode)                    `version %
 '&#x1102;' ''   2 `<gversion 2`>
 '&#x1103;' ''   3 `<gversion 3`>
 '&#x1104;' ''   4 `<gversion 4`>
@@ -27622,17 +27622,17 @@
 '&#x11fd;' '' 253
 '&#x11fe;' '' 254
 '&#x11ff;' '' 255
-utf8song11 0 255
+unisong11 0 255
 >>>
 
-\AddFont{utf8song11}{unicode/cjk/utf8/utf8song11}
+\AddFont{unisong11}{unicode/cjk/utf8/unisong11}
 
 
 
-\<utf8song12\><<<
-utf8song12 0 255
+\<unisong12\><<<
+unisong12 0 255
 '&#x1200;' ''   0 `<gversion 0`>
-'&#x1201;' ''   1 % utf8song12.htf (unicode)                    `version %
+'&#x1201;' ''   1 % unisong12.htf (unicode)                    `version %
 '&#x1202;' ''   2 `<gversion 2`>
 '&#x1203;' ''   3 `<gversion 3`>
 '&#x1204;' ''   4 `<gversion 4`>
@@ -27887,17 +27887,17 @@
 '&#x12fd;' '' 253
 '&#x12fe;' '' 254
 '&#x12ff;' '' 255
-utf8song12 0 255
+unisong12 0 255
 >>>
 
-\AddFont{utf8song12}{unicode/cjk/utf8/utf8song12}
+\AddFont{unisong12}{unicode/cjk/utf8/unisong12}
 
 
 
-\<utf8song13\><<<
-utf8song13 0 255
+\<unisong13\><<<
+unisong13 0 255
 '&#x1300;' ''   0 `<gversion 0`>
-'&#x1301;' ''   1 % utf8song13.htf (unicode)                    `version %
+'&#x1301;' ''   1 % unisong13.htf (unicode)                    `version %
 '&#x1302;' ''   2 `<gversion 2`>
 '&#x1303;' ''   3 `<gversion 3`>
 '&#x1304;' ''   4 `<gversion 4`>
@@ -28152,17 +28152,17 @@
 '&#x13fd;' '' 253
 '&#x13fe;' '' 254
 '&#x13ff;' '' 255
-utf8song13 0 255
+unisong13 0 255
 >>>
 
-\AddFont{utf8song13}{unicode/cjk/utf8/utf8song13}
+\AddFont{unisong13}{unicode/cjk/utf8/unisong13}
 
 
 
-\<utf8song14\><<<
-utf8song14 0 255
+\<unisong14\><<<
+unisong14 0 255
 '&#x1400;' ''   0 `<gversion 0`>
-'&#x1401;' ''   1 % utf8song14.htf (unicode)                    `version %
+'&#x1401;' ''   1 % unisong14.htf (unicode)                    `version %
 '&#x1402;' ''   2 `<gversion 2`>
 '&#x1403;' ''   3 `<gversion 3`>
 '&#x1404;' ''   4 `<gversion 4`>
@@ -28417,17 +28417,17 @@
 '&#x14fd;' '' 253
 '&#x14fe;' '' 254
 '&#x14ff;' '' 255
-utf8song14 0 255
+unisong14 0 255
 >>>
 
-\AddFont{utf8song14}{unicode/cjk/utf8/utf8song14}
+\AddFont{unisong14}{unicode/cjk/utf8/unisong14}
 
 
 
-\<utf8song15\><<<
-utf8song15 0 255
+\<unisong15\><<<
+unisong15 0 255
 '&#x1500;' ''   0 `<gversion 0`>
-'&#x1501;' ''   1 % utf8song15.htf (unicode)                    `version %
+'&#x1501;' ''   1 % unisong15.htf (unicode)                    `version %
 '&#x1502;' ''   2 `<gversion 2`>
 '&#x1503;' ''   3 `<gversion 3`>
 '&#x1504;' ''   4 `<gversion 4`>
@@ -28682,17 +28682,17 @@
 '&#x15fd;' '' 253
 '&#x15fe;' '' 254
 '&#x15ff;' '' 255
-utf8song15 0 255
+unisong15 0 255
 >>>
 
-\AddFont{utf8song15}{unicode/cjk/utf8/utf8song15}
+\AddFont{unisong15}{unicode/cjk/utf8/unisong15}
 
 
 
-\<utf8song16\><<<
-utf8song16 0 255
+\<unisong16\><<<
+unisong16 0 255
 '&#x1600;' ''   0 `<gversion 0`>
-'&#x1601;' ''   1 % utf8song16.htf (unicode)                    `version %
+'&#x1601;' ''   1 % unisong16.htf (unicode)                    `version %
 '&#x1602;' ''   2 `<gversion 2`>
 '&#x1603;' ''   3 `<gversion 3`>
 '&#x1604;' ''   4 `<gversion 4`>
@@ -28947,17 +28947,17 @@
 '&#x16fd;' '' 253
 '&#x16fe;' '' 254
 '&#x16ff;' '' 255
-utf8song16 0 255
+unisong16 0 255
 >>>
 
-\AddFont{utf8song16}{unicode/cjk/utf8/utf8song16}
+\AddFont{unisong16}{unicode/cjk/utf8/unisong16}
 
 
 
-\<utf8song17\><<<
-utf8song17 0 255
+\<unisong17\><<<
+unisong17 0 255
 '&#x1700;' ''   0 `<gversion 0`>
-'&#x1701;' ''   1 % utf8song17.htf (unicode)                    `version %
+'&#x1701;' ''   1 % unisong17.htf (unicode)                    `version %
 '&#x1702;' ''   2 `<gversion 2`>
 '&#x1703;' ''   3 `<gversion 3`>
 '&#x1704;' ''   4 `<gversion 4`>
@@ -29212,17 +29212,17 @@
 '&#x17fd;' '' 253
 '&#x17fe;' '' 254
 '&#x17ff;' '' 255
-utf8song17 0 255
+unisong17 0 255
 >>>
 
-\AddFont{utf8song17}{unicode/cjk/utf8/utf8song17}
+\AddFont{unisong17}{unicode/cjk/utf8/unisong17}
 
 
 
-\<utf8song18\><<<
-utf8song18 0 255
+\<unisong18\><<<
+unisong18 0 255
 '&#x1800;' ''   0 `<gversion 0`>
-'&#x1801;' ''   1 % utf8song18.htf (unicode)                    `version %
+'&#x1801;' ''   1 % unisong18.htf (unicode)                    `version %
 '&#x1802;' ''   2 `<gversion 2`>
 '&#x1803;' ''   3 `<gversion 3`>
 '&#x1804;' ''   4 `<gversion 4`>
@@ -29477,17 +29477,17 @@
 '&#x18fd;' '' 253
 '&#x18fe;' '' 254
 '&#x18ff;' '' 255
-utf8song18 0 255
+unisong18 0 255
 >>>
 
-\AddFont{utf8song18}{unicode/cjk/utf8/utf8song18}
+\AddFont{unisong18}{unicode/cjk/utf8/unisong18}
 
 
 
-\<utf8song19\><<<
-utf8song19 0 255
+\<unisong19\><<<
+unisong19 0 255
 '&#x1900;' ''   0 `<gversion 0`>
-'&#x1901;' ''   1 % utf8song19.htf (unicode)                    `version %
+'&#x1901;' ''   1 % unisong19.htf (unicode)                    `version %
 '&#x1902;' ''   2 `<gversion 2`>
 '&#x1903;' ''   3 `<gversion 3`>
 '&#x1904;' ''   4 `<gversion 4`>
@@ -29742,17 +29742,17 @@
 '&#x19fd;' '' 253
 '&#x19fe;' '' 254
 '&#x19ff;' '' 255
-utf8song19 0 255
+unisong19 0 255
 >>>
 
-\AddFont{utf8song19}{unicode/cjk/utf8/utf8song19}
+\AddFont{unisong19}{unicode/cjk/utf8/unisong19}
 
 
 
-\<utf8song20\><<<
-utf8song20 0 255
+\<unisong20\><<<
+unisong20 0 255
 '&#x2000;' ''   0 `<gversion 0`>
-'&#x2001;' ''   1 % utf8song20.htf (unicode)                    `version %
+'&#x2001;' ''   1 % unisong20.htf (unicode)                    `version %
 '&#x2002;' ''   2 `<gversion 2`>
 '&#x2003;' ''   3 `<gversion 3`>
 '&#x2004;' ''   4 `<gversion 4`>
@@ -30007,17 +30007,17 @@
 '&#x20fd;' '' 253
 '&#x20fe;' '' 254
 '&#x20ff;' '' 255
-utf8song20 0 255
+unisong20 0 255
 >>>
 
-\AddFont{utf8song20}{unicode/cjk/utf8/utf8song20}
+\AddFont{unisong20}{unicode/cjk/utf8/unisong20}
 
 
 
-\<utf8song21\><<<
-utf8song21 0 255
+\<unisong21\><<<
+unisong21 0 255
 '&#x2100;' ''   0 `<gversion 0`>
-'&#x2101;' ''   1 % utf8song21.htf (unicode)                    `version %
+'&#x2101;' ''   1 % unisong21.htf (unicode)                    `version %
 '&#x2102;' ''   2 `<gversion 2`>
 '&#x2103;' ''   3 `<gversion 3`>
 '&#x2104;' ''   4 `<gversion 4`>
@@ -30272,17 +30272,17 @@
 '&#x21fd;' '' 253
 '&#x21fe;' '' 254
 '&#x21ff;' '' 255
-utf8song21 0 255
+unisong21 0 255
 >>>
 
-\AddFont{utf8song21}{unicode/cjk/utf8/utf8song21}
+\AddFont{unisong21}{unicode/cjk/utf8/unisong21}
 
 
 
-\<utf8song22\><<<
-utf8song22 0 255
+\<unisong22\><<<
+unisong22 0 255
 '&#x2200;' ''   0 `<gversion 0`>
-'&#x2201;' ''   1 % utf8song22.htf (unicode)                    `version %
+'&#x2201;' ''   1 % unisong22.htf (unicode)                    `version %
 '&#x2202;' ''   2 `<gversion 2`>
 '&#x2203;' ''   3 `<gversion 3`>
 '&#x2204;' ''   4 `<gversion 4`>
@@ -30537,17 +30537,17 @@
 '&#x22fd;' '' 253
 '&#x22fe;' '' 254
 '&#x22ff;' '' 255
-utf8song22 0 255
+unisong22 0 255
 >>>
 
-\AddFont{utf8song22}{unicode/cjk/utf8/utf8song22}
+\AddFont{unisong22}{unicode/cjk/utf8/unisong22}
 
 
 
-\<utf8song23\><<<
-utf8song23 0 255
+\<unisong23\><<<
+unisong23 0 255
 '&#x2300;' ''   0 `<gversion 0`>
-'&#x2301;' ''   1 % utf8song23.htf (unicode)                    `version %
+'&#x2301;' ''   1 % unisong23.htf (unicode)                    `version %
 '&#x2302;' ''   2 `<gversion 2`>
 '&#x2303;' ''   3 `<gversion 3`>
 '&#x2304;' ''   4 `<gversion 4`>
@@ -30802,17 +30802,17 @@
 '&#x23fd;' '' 253
 '&#x23fe;' '' 254
 '&#x23ff;' '' 255
-utf8song23 0 255
+unisong23 0 255
 >>>
 
-\AddFont{utf8song23}{unicode/cjk/utf8/utf8song23}
+\AddFont{unisong23}{unicode/cjk/utf8/unisong23}
 
 
 
-\<utf8song24\><<<
-utf8song24 0 255
+\<unisong24\><<<
+unisong24 0 255
 '&#x2400;' ''   0 `<gversion 0`>
-'&#x2401;' ''   1 % utf8song24.htf (unicode)                    `version %
+'&#x2401;' ''   1 % unisong24.htf (unicode)                    `version %
 '&#x2402;' ''   2 `<gversion 2`>
 '&#x2403;' ''   3 `<gversion 3`>
 '&#x2404;' ''   4 `<gversion 4`>
@@ -31067,17 +31067,17 @@
 '&#x24fd;' '' 253
 '&#x24fe;' '' 254
 '&#x24ff;' '' 255
-utf8song24 0 255
+unisong24 0 255
 >>>
 
-\AddFont{utf8song24}{unicode/cjk/utf8/utf8song24}
+\AddFont{unisong24}{unicode/cjk/utf8/unisong24}
 
 
 
-\<utf8song25\><<<
-utf8song25 0 255
+\<unisong25\><<<
+unisong25 0 255
 '&#x2500;' ''   0 `<gversion 0`>
-'&#x2501;' ''   1 % utf8song25.htf (unicode)                    `version %
+'&#x2501;' ''   1 % unisong25.htf (unicode)                    `version %
 '&#x2502;' ''   2 `<gversion 2`>
 '&#x2503;' ''   3 `<gversion 3`>
 '&#x2504;' ''   4 `<gversion 4`>
@@ -31332,17 +31332,17 @@
 '&#x25fd;' '' 253
 '&#x25fe;' '' 254
 '&#x25ff;' '' 255
-utf8song25 0 255
+unisong25 0 255
 >>>
 
-\AddFont{utf8song25}{unicode/cjk/utf8/utf8song25}
+\AddFont{unisong25}{unicode/cjk/utf8/unisong25}
 
 
 
-\<utf8song26\><<<
-utf8song26 0 255
+\<unisong26\><<<
+unisong26 0 255
 '&#x2600;' ''   0 `<gversion 0`>
-'&#x2601;' ''   1 % utf8song26.htf (unicode)                    `version %
+'&#x2601;' ''   1 % unisong26.htf (unicode)                    `version %
 '&#x2602;' ''   2 `<gversion 2`>
 '&#x2603;' ''   3 `<gversion 3`>
 '&#x2604;' ''   4 `<gversion 4`>
@@ -31597,17 +31597,17 @@
 '&#x26fd;' '' 253
 '&#x26fe;' '' 254
 '&#x26ff;' '' 255
-utf8song26 0 255
+unisong26 0 255
 >>>
 
-\AddFont{utf8song26}{unicode/cjk/utf8/utf8song26}
+\AddFont{unisong26}{unicode/cjk/utf8/unisong26}
 
 
 
-\<utf8song27\><<<
-utf8song27 0 255
+\<unisong27\><<<
+unisong27 0 255
 '&#x2700;' ''   0 `<gversion 0`>
-'&#x2701;' ''   1 % utf8song27.htf (unicode)                    `version %
+'&#x2701;' ''   1 % unisong27.htf (unicode)                    `version %
 '&#x2702;' ''   2 `<gversion 2`>
 '&#x2703;' ''   3 `<gversion 3`>
 '&#x2704;' ''   4 `<gversion 4`>
@@ -31862,17 +31862,17 @@
 '&#x27fd;' '' 253
 '&#x27fe;' '' 254
 '&#x27ff;' '' 255
-utf8song27 0 255
+unisong27 0 255
 >>>
 
-\AddFont{utf8song27}{unicode/cjk/utf8/utf8song27}
+\AddFont{unisong27}{unicode/cjk/utf8/unisong27}
 
 
 
-\<utf8song28\><<<
-utf8song28 0 255
+\<unisong28\><<<
+unisong28 0 255
 '&#x2800;' ''   0 `<gversion 0`>
-'&#x2801;' ''   1 % utf8song28.htf (unicode)                    `version %
+'&#x2801;' ''   1 % unisong28.htf (unicode)                    `version %
 '&#x2802;' ''   2 `<gversion 2`>
 '&#x2803;' ''   3 `<gversion 3`>
 '&#x2804;' ''   4 `<gversion 4`>
@@ -32127,17 +32127,17 @@
 '&#x28fd;' '' 253
 '&#x28fe;' '' 254
 '&#x28ff;' '' 255
-utf8song28 0 255
+unisong28 0 255
 >>>
 
-\AddFont{utf8song28}{unicode/cjk/utf8/utf8song28}
+\AddFont{unisong28}{unicode/cjk/utf8/unisong28}
 
 
 
-\<utf8song29\><<<
-utf8song29 0 255
+\<unisong29\><<<
+unisong29 0 255
 '&#x2900;' ''   0 `<gversion 0`>
-'&#x2901;' ''   1 % utf8song29.htf (unicode)                    `version %
+'&#x2901;' ''   1 % unisong29.htf (unicode)                    `version %
 '&#x2902;' ''   2 `<gversion 2`>
 '&#x2903;' ''   3 `<gversion 3`>
 '&#x2904;' ''   4 `<gversion 4`>
@@ -32392,17 +32392,17 @@
 '&#x29fd;' '' 253
 '&#x29fe;' '' 254
 '&#x29ff;' '' 255
-utf8song29 0 255
+unisong29 0 255
 >>>
 
-\AddFont{utf8song29}{unicode/cjk/utf8/utf8song29}
+\AddFont{unisong29}{unicode/cjk/utf8/unisong29}
 
 
 
-\<utf8song30\><<<
-utf8song30 0 255
+\<unisong30\><<<
+unisong30 0 255
 '&#x3000;' ''   0 `<gversion 0`>
-'&#x3001;' ''   1 % utf8song30.htf (unicode)                    `version %
+'&#x3001;' ''   1 % unisong30.htf (unicode)                    `version %
 '&#x3002;' ''   2 `<gversion 2`>
 '&#x3003;' ''   3 `<gversion 3`>
 '&#x3004;' ''   4 `<gversion 4`>
@@ -32657,17 +32657,17 @@
 '&#x30fd;' '' 253
 '&#x30fe;' '' 254
 '&#x30ff;' '' 255
-utf8song30 0 255
+unisong30 0 255
 >>>
 
-\AddFont{utf8song30}{unicode/cjk/utf8/utf8song30}
+\AddFont{unisong30}{unicode/cjk/utf8/unisong30}
 
 
 
-\<utf8song31\><<<
-utf8song31 0 255
+\<unisong31\><<<
+unisong31 0 255
 '&#x3100;' ''   0 `<gversion 0`>
-'&#x3101;' ''   1 % utf8song31.htf (unicode)                    `version %
+'&#x3101;' ''   1 % unisong31.htf (unicode)                    `version %
 '&#x3102;' ''   2 `<gversion 2`>
 '&#x3103;' ''   3 `<gversion 3`>
 '&#x3104;' ''   4 `<gversion 4`>
@@ -32922,17 +32922,17 @@
 '&#x31fd;' '' 253
 '&#x31fe;' '' 254
 '&#x31ff;' '' 255
-utf8song31 0 255
+unisong31 0 255
 >>>
 
-\AddFont{utf8song31}{unicode/cjk/utf8/utf8song31}
+\AddFont{unisong31}{unicode/cjk/utf8/unisong31}
 
 
 
-\<utf8song32\><<<
-utf8song32 0 255
+\<unisong32\><<<
+unisong32 0 255
 '&#x3200;' ''   0 `<gversion 0`>
-'&#x3201;' ''   1 % utf8song32.htf (unicode)                    `version %
+'&#x3201;' ''   1 % unisong32.htf (unicode)                    `version %
 '&#x3202;' ''   2 `<gversion 2`>
 '&#x3203;' ''   3 `<gversion 3`>
 '&#x3204;' ''   4 `<gversion 4`>
@@ -33187,17 +33187,17 @@
 '&#x32fd;' '' 253
 '&#x32fe;' '' 254
 '&#x32ff;' '' 255
-utf8song32 0 255
+unisong32 0 255
 >>>
 
-\AddFont{utf8song32}{unicode/cjk/utf8/utf8song32}
+\AddFont{unisong32}{unicode/cjk/utf8/unisong32}
 
 
 
-\<utf8song33\><<<
-utf8song33 0 255
+\<unisong33\><<<
+unisong33 0 255
 '&#x3300;' ''   0 `<gversion 0`>
-'&#x3301;' ''   1 % utf8song33.htf (unicode)                    `version %
+'&#x3301;' ''   1 % unisong33.htf (unicode)                    `version %
 '&#x3302;' ''   2 `<gversion 2`>
 '&#x3303;' ''   3 `<gversion 3`>
 '&#x3304;' ''   4 `<gversion 4`>
@@ -33452,17 +33452,17 @@
 '&#x33fd;' '' 253
 '&#x33fe;' '' 254
 '&#x33ff;' '' 255
-utf8song33 0 255
+unisong33 0 255
 >>>
 
-\AddFont{utf8song33}{unicode/cjk/utf8/utf8song33}
+\AddFont{unisong33}{unicode/cjk/utf8/unisong33}
 
 
 
-\<utf8song34\><<<
-utf8song34 0 255
+\<unisong34\><<<
+unisong34 0 255
 '&#x3400;' ''   0 `<gversion 0`>
-'&#x3401;' ''   1 % utf8song34.htf (unicode)                    `version %
+'&#x3401;' ''   1 % unisong34.htf (unicode)                    `version %
 '&#x3402;' ''   2 `<gversion 2`>
 '&#x3403;' ''   3 `<gversion 3`>
 '&#x3404;' ''   4 `<gversion 4`>
@@ -33717,17 +33717,17 @@
 '&#x34fd;' '' 253
 '&#x34fe;' '' 254
 '&#x34ff;' '' 255
-utf8song34 0 255
+unisong34 0 255
 >>>
 
-\AddFont{utf8song34}{unicode/cjk/utf8/utf8song34}
+\AddFont{unisong34}{unicode/cjk/utf8/unisong34}
 
 
 
-\<utf8song35\><<<
-utf8song35 0 255
+\<unisong35\><<<
+unisong35 0 255
 '&#x3500;' ''   0 `<gversion 0`>
-'&#x3501;' ''   1 % utf8song35.htf (unicode)                    `version %
+'&#x3501;' ''   1 % unisong35.htf (unicode)                    `version %
 '&#x3502;' ''   2 `<gversion 2`>
 '&#x3503;' ''   3 `<gversion 3`>
 '&#x3504;' ''   4 `<gversion 4`>
@@ -33982,17 +33982,17 @@
 '&#x35fd;' '' 253
 '&#x35fe;' '' 254
 '&#x35ff;' '' 255
-utf8song35 0 255
+unisong35 0 255
 >>>
 
-\AddFont{utf8song35}{unicode/cjk/utf8/utf8song35}
+\AddFont{unisong35}{unicode/cjk/utf8/unisong35}
 
 
 
-\<utf8song36\><<<
-utf8song36 0 255
+\<unisong36\><<<
+unisong36 0 255
 '&#x3600;' ''   0 `<gversion 0`>
-'&#x3601;' ''   1 % utf8song36.htf (unicode)                    `version %
+'&#x3601;' ''   1 % unisong36.htf (unicode)                    `version %
 '&#x3602;' ''   2 `<gversion 2`>
 '&#x3603;' ''   3 `<gversion 3`>
 '&#x3604;' ''   4 `<gversion 4`>
@@ -34247,17 +34247,17 @@
 '&#x36fd;' '' 253
 '&#x36fe;' '' 254
 '&#x36ff;' '' 255
-utf8song36 0 255
+unisong36 0 255
 >>>
 
-\AddFont{utf8song36}{unicode/cjk/utf8/utf8song36}
+\AddFont{unisong36}{unicode/cjk/utf8/unisong36}
 
 
 
-\<utf8song37\><<<
-utf8song37 0 255
+\<unisong37\><<<
+unisong37 0 255
 '&#x3700;' ''   0 `<gversion 0`>
-'&#x3701;' ''   1 % utf8song37.htf (unicode)                    `version %
+'&#x3701;' ''   1 % unisong37.htf (unicode)                    `version %
 '&#x3702;' ''   2 `<gversion 2`>
 '&#x3703;' ''   3 `<gversion 3`>
 '&#x3704;' ''   4 `<gversion 4`>
@@ -34512,17 +34512,17 @@
 '&#x37fd;' '' 253
 '&#x37fe;' '' 254
 '&#x37ff;' '' 255
-utf8song37 0 255
+unisong37 0 255
 >>>
 
-\AddFont{utf8song37}{unicode/cjk/utf8/utf8song37}
+\AddFont{unisong37}{unicode/cjk/utf8/unisong37}
 
 
 
-\<utf8song38\><<<
-utf8song38 0 255
+\<unisong38\><<<
+unisong38 0 255
 '&#x3800;' ''   0 `<gversion 0`>
-'&#x3801;' ''   1 % utf8song38.htf (unicode)                    `version %
+'&#x3801;' ''   1 % unisong38.htf (unicode)                    `version %
 '&#x3802;' ''   2 `<gversion 2`>
 '&#x3803;' ''   3 `<gversion 3`>
 '&#x3804;' ''   4 `<gversion 4`>
@@ -34777,17 +34777,17 @@
 '&#x38fd;' '' 253
 '&#x38fe;' '' 254
 '&#x38ff;' '' 255
-utf8song38 0 255
+unisong38 0 255
 >>>
 
-\AddFont{utf8song38}{unicode/cjk/utf8/utf8song38}
+\AddFont{unisong38}{unicode/cjk/utf8/unisong38}
 
 
 
-\<utf8song39\><<<
-utf8song39 0 255
+\<unisong39\><<<
+unisong39 0 255
 '&#x3900;' ''   0 `<gversion 0`>
-'&#x3901;' ''   1 % utf8song39.htf (unicode)                    `version %
+'&#x3901;' ''   1 % unisong39.htf (unicode)                    `version %
 '&#x3902;' ''   2 `<gversion 2`>
 '&#x3903;' ''   3 `<gversion 3`>
 '&#x3904;' ''   4 `<gversion 4`>
@@ -35042,17 +35042,17 @@
 '&#x39fd;' '' 253
 '&#x39fe;' '' 254
 '&#x39ff;' '' 255
-utf8song39 0 255
+unisong39 0 255
 >>>
 
-\AddFont{utf8song39}{unicode/cjk/utf8/utf8song39}
+\AddFont{unisong39}{unicode/cjk/utf8/unisong39}
 
 
 
-\<utf8song40\><<<
-utf8song40 0 255
+\<unisong40\><<<
+unisong40 0 255
 '&#x4000;' ''   0 `<gversion 0`>
-'&#x4001;' ''   1 % utf8song40.htf (unicode)                    `version %
+'&#x4001;' ''   1 % unisong40.htf (unicode)                    `version %
 '&#x4002;' ''   2 `<gversion 2`>
 '&#x4003;' ''   3 `<gversion 3`>
 '&#x4004;' ''   4 `<gversion 4`>
@@ -35307,17 +35307,17 @@
 '&#x40fd;' '' 253
 '&#x40fe;' '' 254
 '&#x40ff;' '' 255
-utf8song40 0 255
+unisong40 0 255
 >>>
 
-\AddFont{utf8song40}{unicode/cjk/utf8/utf8song40}
+\AddFont{unisong40}{unicode/cjk/utf8/unisong40}
 
 
 
-\<utf8song41\><<<
-utf8song41 0 255
+\<unisong41\><<<
+unisong41 0 255
 '&#x4100;' ''   0 `<gversion 0`>
-'&#x4101;' ''   1 % utf8song41.htf (unicode)                    `version %
+'&#x4101;' ''   1 % unisong41.htf (unicode)                    `version %
 '&#x4102;' ''   2 `<gversion 2`>
 '&#x4103;' ''   3 `<gversion 3`>
 '&#x4104;' ''   4 `<gversion 4`>
@@ -35572,17 +35572,17 @@
 '&#x41fd;' '' 253
 '&#x41fe;' '' 254
 '&#x41ff;' '' 255
-utf8song41 0 255
+unisong41 0 255
 >>>
 
-\AddFont{utf8song41}{unicode/cjk/utf8/utf8song41}
+\AddFont{unisong41}{unicode/cjk/utf8/unisong41}
 
 
 
-\<utf8song42\><<<
-utf8song42 0 255
+\<unisong42\><<<
+unisong42 0 255
 '&#x4200;' ''   0 `<gversion 0`>
-'&#x4201;' ''   1 % utf8song42.htf (unicode)                    `version %
+'&#x4201;' ''   1 % unisong42.htf (unicode)                    `version %
 '&#x4202;' ''   2 `<gversion 2`>
 '&#x4203;' ''   3 `<gversion 3`>
 '&#x4204;' ''   4 `<gversion 4`>
@@ -35837,17 +35837,17 @@
 '&#x42fd;' '' 253
 '&#x42fe;' '' 254
 '&#x42ff;' '' 255
-utf8song42 0 255
+unisong42 0 255
 >>>
 
-\AddFont{utf8song42}{unicode/cjk/utf8/utf8song42}
+\AddFont{unisong42}{unicode/cjk/utf8/unisong42}
 
 
 
-\<utf8song43\><<<
-utf8song43 0 255
+\<unisong43\><<<
+unisong43 0 255
 '&#x4300;' ''   0 `<gversion 0`>
-'&#x4301;' ''   1 % utf8song43.htf (unicode)                    `version %
+'&#x4301;' ''   1 % unisong43.htf (unicode)                    `version %
 '&#x4302;' ''   2 `<gversion 2`>
 '&#x4303;' ''   3 `<gversion 3`>
 '&#x4304;' ''   4 `<gversion 4`>
@@ -36102,17 +36102,17 @@
 '&#x43fd;' '' 253
 '&#x43fe;' '' 254
 '&#x43ff;' '' 255
-utf8song43 0 255
+unisong43 0 255
 >>>
 
-\AddFont{utf8song43}{unicode/cjk/utf8/utf8song43}
+\AddFont{unisong43}{unicode/cjk/utf8/unisong43}
 
 
 
-\<utf8song44\><<<
-utf8song44 0 255
+\<unisong44\><<<
+unisong44 0 255
 '&#x4400;' ''   0 `<gversion 0`>
-'&#x4401;' ''   1 % utf8song44.htf (unicode)                    `version %
+'&#x4401;' ''   1 % unisong44.htf (unicode)                    `version %
 '&#x4402;' ''   2 `<gversion 2`>
 '&#x4403;' ''   3 `<gversion 3`>
 '&#x4404;' ''   4 `<gversion 4`>
@@ -36367,17 +36367,17 @@
 '&#x44fd;' '' 253
 '&#x44fe;' '' 254
 '&#x44ff;' '' 255
-utf8song44 0 255
+unisong44 0 255
 >>>
 
-\AddFont{utf8song44}{unicode/cjk/utf8/utf8song44}
+\AddFont{unisong44}{unicode/cjk/utf8/unisong44}
 
 
 
-\<utf8song45\><<<
-utf8song45 0 255
+\<unisong45\><<<
+unisong45 0 255
 '&#x4500;' ''   0 `<gversion 0`>
-'&#x4501;' ''   1 % utf8song45.htf (unicode)                    `version %
+'&#x4501;' ''   1 % unisong45.htf (unicode)                    `version %
 '&#x4502;' ''   2 `<gversion 2`>
 '&#x4503;' ''   3 `<gversion 3`>
 '&#x4504;' ''   4 `<gversion 4`>
@@ -36632,17 +36632,17 @@
 '&#x45fd;' '' 253
 '&#x45fe;' '' 254
 '&#x45ff;' '' 255
-utf8song45 0 255
+unisong45 0 255
 >>>
 
-\AddFont{utf8song45}{unicode/cjk/utf8/utf8song45}
+\AddFont{unisong45}{unicode/cjk/utf8/unisong45}
 
 
 
-\<utf8song0a\><<<
-utf8song0a 0 255
+\<unisong0a\><<<
+unisong0a 0 255
 '&#x0a00;' ''   0 `<gversion 0`>
-'&#x0a01;' ''   1 % utf8song0a.htf (unicode)                    `version %
+'&#x0a01;' ''   1 % unisong0a.htf (unicode)                    `version %
 '&#x0a02;' ''   2 `<gversion 2`>
 '&#x0a03;' ''   3 `<gversion 3`>
 '&#x0a04;' ''   4 `<gversion 4`>
@@ -36897,17 +36897,17 @@
 '&#x0afd;' '' 253
 '&#x0afe;' '' 254
 '&#x0aff;' '' 255
-utf8song0a 0 255
+unisong0a 0 255
 >>>
 
-\AddFont{utf8song0a}{unicode/cjk/utf8/utf8song0a}
+\AddFont{unisong0a}{unicode/cjk/utf8/unisong0a}
 
 
 
-\<utf8song46\><<<
-utf8song46 0 255
+\<unisong46\><<<
+unisong46 0 255
 '&#x4600;' ''   0 `<gversion 0`>
-'&#x4601;' ''   1 % utf8song46.htf (unicode)                    `version %
+'&#x4601;' ''   1 % unisong46.htf (unicode)                    `version %
 '&#x4602;' ''   2 `<gversion 2`>
 '&#x4603;' ''   3 `<gversion 3`>
 '&#x4604;' ''   4 `<gversion 4`>
@@ -37162,17 +37162,17 @@
 '&#x46fd;' '' 253
 '&#x46fe;' '' 254
 '&#x46ff;' '' 255
-utf8song46 0 255
+unisong46 0 255
 >>>
 
-\AddFont{utf8song46}{unicode/cjk/utf8/utf8song46}
+\AddFont{unisong46}{unicode/cjk/utf8/unisong46}
 
 
 
-\<utf8song0b\><<<
-utf8song0b 0 255
+\<unisong0b\><<<
+unisong0b 0 255
 '&#x0b00;' ''   0 `<gversion 0`>
-'&#x0b01;' ''   1 % utf8song0b.htf (unicode)                    `version %
+'&#x0b01;' ''   1 % unisong0b.htf (unicode)                    `version %
 '&#x0b02;' ''   2 `<gversion 2`>
 '&#x0b03;' ''   3 `<gversion 3`>
 '&#x0b04;' ''   4 `<gversion 4`>
@@ -37427,17 +37427,17 @@
 '&#x0bfd;' '' 253
 '&#x0bfe;' '' 254
 '&#x0bff;' '' 255
-utf8song0b 0 255
+unisong0b 0 255
 >>>
 
-\AddFont{utf8song0b}{unicode/cjk/utf8/utf8song0b}
+\AddFont{unisong0b}{unicode/cjk/utf8/unisong0b}
 
 
 
-\<utf8song47\><<<
-utf8song47 0 255
+\<unisong47\><<<
+unisong47 0 255
 '&#x4700;' ''   0 `<gversion 0`>
-'&#x4701;' ''   1 % utf8song47.htf (unicode)                    `version %
+'&#x4701;' ''   1 % unisong47.htf (unicode)                    `version %
 '&#x4702;' ''   2 `<gversion 2`>
 '&#x4703;' ''   3 `<gversion 3`>
 '&#x4704;' ''   4 `<gversion 4`>
@@ -37692,17 +37692,17 @@
 '&#x47fd;' '' 253
 '&#x47fe;' '' 254
 '&#x47ff;' '' 255
-utf8song47 0 255
+unisong47 0 255
 >>>
 
-\AddFont{utf8song47}{unicode/cjk/utf8/utf8song47}
+\AddFont{unisong47}{unicode/cjk/utf8/unisong47}
 
 
 
-\<utf8song0c\><<<
-utf8song0c 0 255
+\<unisong0c\><<<
+unisong0c 0 255
 '&#x0c00;' ''   0 `<gversion 0`>
-'&#x0c01;' ''   1 % utf8song0c.htf (unicode)                    `version %
+'&#x0c01;' ''   1 % unisong0c.htf (unicode)                    `version %
 '&#x0c02;' ''   2 `<gversion 2`>
 '&#x0c03;' ''   3 `<gversion 3`>
 '&#x0c04;' ''   4 `<gversion 4`>
@@ -37957,17 +37957,17 @@
 '&#x0cfd;' '' 253
 '&#x0cfe;' '' 254
 '&#x0cff;' '' 255
-utf8song0c 0 255
+unisong0c 0 255
 >>>
 
-\AddFont{utf8song0c}{unicode/cjk/utf8/utf8song0c}
+\AddFont{unisong0c}{unicode/cjk/utf8/unisong0c}
 
 
 
-\<utf8song48\><<<
-utf8song48 0 255
+\<unisong48\><<<
+unisong48 0 255
 '&#x4800;' ''   0 `<gversion 0`>
-'&#x4801;' ''   1 % utf8song48.htf (unicode)                    `version %
+'&#x4801;' ''   1 % unisong48.htf (unicode)                    `version %
 '&#x4802;' ''   2 `<gversion 2`>
 '&#x4803;' ''   3 `<gversion 3`>
 '&#x4804;' ''   4 `<gversion 4`>
@@ -38222,17 +38222,17 @@
 '&#x48fd;' '' 253
 '&#x48fe;' '' 254
 '&#x48ff;' '' 255
-utf8song48 0 255
+unisong48 0 255
 >>>
 
-\AddFont{utf8song48}{unicode/cjk/utf8/utf8song48}
+\AddFont{unisong48}{unicode/cjk/utf8/unisong48}
 
 
 
-\<utf8song0d\><<<
-utf8song0d 0 255
+\<unisong0d\><<<
+unisong0d 0 255
 '&#x0d00;' ''   0 `<gversion 0`>
-'&#x0d01;' ''   1 % utf8song0d.htf (unicode)                    `version %
+'&#x0d01;' ''   1 % unisong0d.htf (unicode)                    `version %
 '&#x0d02;' ''   2 `<gversion 2`>
 '&#x0d03;' ''   3 `<gversion 3`>
 '&#x0d04;' ''   4 `<gversion 4`>
@@ -38487,17 +38487,17 @@
 '&#x0dfd;' '' 253
 '&#x0dfe;' '' 254
 '&#x0dff;' '' 255
-utf8song0d 0 255
+unisong0d 0 255
 >>>
 
-\AddFont{utf8song0d}{unicode/cjk/utf8/utf8song0d}
+\AddFont{unisong0d}{unicode/cjk/utf8/unisong0d}
 
 
 
-\<utf8song49\><<<
-utf8song49 0 255
+\<unisong49\><<<
+unisong49 0 255
 '&#x4900;' ''   0 `<gversion 0`>
-'&#x4901;' ''   1 % utf8song49.htf (unicode)                    `version %
+'&#x4901;' ''   1 % unisong49.htf (unicode)                    `version %
 '&#x4902;' ''   2 `<gversion 2`>
 '&#x4903;' ''   3 `<gversion 3`>
 '&#x4904;' ''   4 `<gversion 4`>
@@ -38752,17 +38752,17 @@
 '&#x49fd;' '' 253
 '&#x49fe;' '' 254
 '&#x49ff;' '' 255
-utf8song49 0 255
+unisong49 0 255
 >>>
 
-\AddFont{utf8song49}{unicode/cjk/utf8/utf8song49}
+\AddFont{unisong49}{unicode/cjk/utf8/unisong49}
 
 
 
-\<utf8song0e\><<<
-utf8song0e 0 255
+\<unisong0e\><<<
+unisong0e 0 255
 '&#x0e00;' ''   0 `<gversion 0`>
-'&#x0e01;' ''   1 % utf8song0e.htf (unicode)                    `version %
+'&#x0e01;' ''   1 % unisong0e.htf (unicode)                    `version %
 '&#x0e02;' ''   2 `<gversion 2`>
 '&#x0e03;' ''   3 `<gversion 3`>
 '&#x0e04;' ''   4 `<gversion 4`>
@@ -39017,17 +39017,17 @@
 '&#x0efd;' '' 253
 '&#x0efe;' '' 254
 '&#x0eff;' '' 255
-utf8song0e 0 255
+unisong0e 0 255
 >>>
 
-\AddFont{utf8song0e}{unicode/cjk/utf8/utf8song0e}
+\AddFont{unisong0e}{unicode/cjk/utf8/unisong0e}
 
 
 
-\<utf8song0f\><<<
-utf8song0f 0 255
+\<unisong0f\><<<
+unisong0f 0 255
 '&#x0f00;' ''   0 `<gversion 0`>
-'&#x0f01;' ''   1 % utf8song0f.htf (unicode)                    `version %
+'&#x0f01;' ''   1 % unisong0f.htf (unicode)                    `version %
 '&#x0f02;' ''   2 `<gversion 2`>
 '&#x0f03;' ''   3 `<gversion 3`>
 '&#x0f04;' ''   4 `<gversion 4`>
@@ -39282,17 +39282,17 @@
 '&#x0ffd;' '' 253
 '&#x0ffe;' '' 254
 '&#x0fff;' '' 255
-utf8song0f 0 255
+unisong0f 0 255
 >>>
 
-\AddFont{utf8song0f}{unicode/cjk/utf8/utf8song0f}
+\AddFont{unisong0f}{unicode/cjk/utf8/unisong0f}
 
 
 
-\<utf8song50\><<<
-utf8song50 0 255
+\<unisong50\><<<
+unisong50 0 255
 '&#x5000;' ''   0 `<gversion 0`>
-'&#x5001;' ''   1 % utf8song50.htf (unicode)                    `version %
+'&#x5001;' ''   1 % unisong50.htf (unicode)                    `version %
 '&#x5002;' ''   2 `<gversion 2`>
 '&#x5003;' ''   3 `<gversion 3`>
 '&#x5004;' ''   4 `<gversion 4`>
@@ -39547,17 +39547,17 @@
 '&#x50fd;' '' 253
 '&#x50fe;' '' 254
 '&#x50ff;' '' 255
-utf8song50 0 255
+unisong50 0 255
 >>>
 
-\AddFont{utf8song50}{unicode/cjk/utf8/utf8song50}
+\AddFont{unisong50}{unicode/cjk/utf8/unisong50}
 
 
 
-\<utf8song51\><<<
-utf8song51 0 255
+\<unisong51\><<<
+unisong51 0 255
 '&#x5100;' ''   0 `<gversion 0`>
-'&#x5101;' ''   1 % utf8song51.htf (unicode)                    `version %
+'&#x5101;' ''   1 % unisong51.htf (unicode)                    `version %
 '&#x5102;' ''   2 `<gversion 2`>
 '&#x5103;' ''   3 `<gversion 3`>
 '&#x5104;' ''   4 `<gversion 4`>
@@ -39812,17 +39812,17 @@
 '&#x51fd;' '' 253
 '&#x51fe;' '' 254
 '&#x51ff;' '' 255
-utf8song51 0 255
+unisong51 0 255
 >>>
 
-\AddFont{utf8song51}{unicode/cjk/utf8/utf8song51}
+\AddFont{unisong51}{unicode/cjk/utf8/unisong51}
 
 
 
-\<utf8song52\><<<
-utf8song52 0 255
+\<unisong52\><<<
+unisong52 0 255
 '&#x5200;' ''   0 `<gversion 0`>
-'&#x5201;' ''   1 % utf8song52.htf (unicode)                    `version %
+'&#x5201;' ''   1 % unisong52.htf (unicode)                    `version %
 '&#x5202;' ''   2 `<gversion 2`>
 '&#x5203;' ''   3 `<gversion 3`>
 '&#x5204;' ''   4 `<gversion 4`>
@@ -40077,17 +40077,17 @@
 '&#x52fd;' '' 253
 '&#x52fe;' '' 254
 '&#x52ff;' '' 255
-utf8song52 0 255
+unisong52 0 255
 >>>
 
-\AddFont{utf8song52}{unicode/cjk/utf8/utf8song52}
+\AddFont{unisong52}{unicode/cjk/utf8/unisong52}
 
 
 
-\<utf8song53\><<<
-utf8song53 0 255
+\<unisong53\><<<
+unisong53 0 255
 '&#x5300;' ''   0 `<gversion 0`>
-'&#x5301;' ''   1 % utf8song53.htf (unicode)                    `version %
+'&#x5301;' ''   1 % unisong53.htf (unicode)                    `version %
 '&#x5302;' ''   2 `<gversion 2`>
 '&#x5303;' ''   3 `<gversion 3`>
 '&#x5304;' ''   4 `<gversion 4`>
@@ -40342,17 +40342,17 @@
 '&#x53fd;' '' 253
 '&#x53fe;' '' 254
 '&#x53ff;' '' 255
-utf8song53 0 255
+unisong53 0 255
 >>>
 
-\AddFont{utf8song53}{unicode/cjk/utf8/utf8song53}
+\AddFont{unisong53}{unicode/cjk/utf8/unisong53}
 
 
 
-\<utf8song54\><<<
-utf8song54 0 255
+\<unisong54\><<<
+unisong54 0 255
 '&#x5400;' ''   0 `<gversion 0`>
-'&#x5401;' ''   1 % utf8song54.htf (unicode)                    `version %
+'&#x5401;' ''   1 % unisong54.htf (unicode)                    `version %
 '&#x5402;' ''   2 `<gversion 2`>
 '&#x5403;' ''   3 `<gversion 3`>
 '&#x5404;' ''   4 `<gversion 4`>
@@ -40607,17 +40607,17 @@
 '&#x54fd;' '' 253
 '&#x54fe;' '' 254
 '&#x54ff;' '' 255
-utf8song54 0 255
+unisong54 0 255
 >>>
 
-\AddFont{utf8song54}{unicode/cjk/utf8/utf8song54}
+\AddFont{unisong54}{unicode/cjk/utf8/unisong54}
 
 
 
-\<utf8song55\><<<
-utf8song55 0 255
+\<unisong55\><<<
+unisong55 0 255
 '&#x5500;' ''   0 `<gversion 0`>
-'&#x5501;' ''   1 % utf8song55.htf (unicode)                    `version %
+'&#x5501;' ''   1 % unisong55.htf (unicode)                    `version %
 '&#x5502;' ''   2 `<gversion 2`>
 '&#x5503;' ''   3 `<gversion 3`>
 '&#x5504;' ''   4 `<gversion 4`>
@@ -40872,17 +40872,17 @@
 '&#x55fd;' '' 253
 '&#x55fe;' '' 254
 '&#x55ff;' '' 255
-utf8song55 0 255
+unisong55 0 255
 >>>
 
-\AddFont{utf8song55}{unicode/cjk/utf8/utf8song55}
+\AddFont{unisong55}{unicode/cjk/utf8/unisong55}
 
 
 
-\<utf8song1a\><<<
-utf8song1a 0 255
+\<unisong1a\><<<
+unisong1a 0 255
 '&#x1a00;' ''   0 `<gversion 0`>
-'&#x1a01;' ''   1 % utf8song1a.htf (unicode)                    `version %
+'&#x1a01;' ''   1 % unisong1a.htf (unicode)                    `version %
 '&#x1a02;' ''   2 `<gversion 2`>
 '&#x1a03;' ''   3 `<gversion 3`>
 '&#x1a04;' ''   4 `<gversion 4`>
@@ -41137,17 +41137,17 @@
 '&#x1afd;' '' 253
 '&#x1afe;' '' 254
 '&#x1aff;' '' 255
-utf8song1a 0 255
+unisong1a 0 255
 >>>
 
-\AddFont{utf8song1a}{unicode/cjk/utf8/utf8song1a}
+\AddFont{unisong1a}{unicode/cjk/utf8/unisong1a}
 
 
 
-\<utf8song56\><<<
-utf8song56 0 255
+\<unisong56\><<<
+unisong56 0 255
 '&#x5600;' ''   0 `<gversion 0`>
-'&#x5601;' ''   1 % utf8song56.htf (unicode)                    `version %
+'&#x5601;' ''   1 % unisong56.htf (unicode)                    `version %
 '&#x5602;' ''   2 `<gversion 2`>
 '&#x5603;' ''   3 `<gversion 3`>
 '&#x5604;' ''   4 `<gversion 4`>
@@ -41402,17 +41402,17 @@
 '&#x56fd;' '' 253
 '&#x56fe;' '' 254
 '&#x56ff;' '' 255
-utf8song56 0 255
+unisong56 0 255
 >>>
 
-\AddFont{utf8song56}{unicode/cjk/utf8/utf8song56}
+\AddFont{unisong56}{unicode/cjk/utf8/unisong56}
 
 
 
-\<utf8song1b\><<<
-utf8song1b 0 255
+\<unisong1b\><<<
+unisong1b 0 255
 '&#x1b00;' ''   0 `<gversion 0`>
-'&#x1b01;' ''   1 % utf8song1b.htf (unicode)                    `version %
+'&#x1b01;' ''   1 % unisong1b.htf (unicode)                    `version %
 '&#x1b02;' ''   2 `<gversion 2`>
 '&#x1b03;' ''   3 `<gversion 3`>
 '&#x1b04;' ''   4 `<gversion 4`>
@@ -41667,17 +41667,17 @@
 '&#x1bfd;' '' 253
 '&#x1bfe;' '' 254
 '&#x1bff;' '' 255
-utf8song1b 0 255
+unisong1b 0 255
 >>>
 
-\AddFont{utf8song1b}{unicode/cjk/utf8/utf8song1b}
+\AddFont{unisong1b}{unicode/cjk/utf8/unisong1b}
 
 
 
-\<utf8song57\><<<
-utf8song57 0 255
+\<unisong57\><<<
+unisong57 0 255
 '&#x5700;' ''   0 `<gversion 0`>
-'&#x5701;' ''   1 % utf8song57.htf (unicode)                    `version %
+'&#x5701;' ''   1 % unisong57.htf (unicode)                    `version %
 '&#x5702;' ''   2 `<gversion 2`>
 '&#x5703;' ''   3 `<gversion 3`>
 '&#x5704;' ''   4 `<gversion 4`>
@@ -41932,17 +41932,17 @@
 '&#x57fd;' '' 253
 '&#x57fe;' '' 254
 '&#x57ff;' '' 255
-utf8song57 0 255
+unisong57 0 255
 >>>
 
-\AddFont{utf8song57}{unicode/cjk/utf8/utf8song57}
+\AddFont{unisong57}{unicode/cjk/utf8/unisong57}
 
 
 
-\<utf8song1c\><<<
-utf8song1c 0 255
+\<unisong1c\><<<
+unisong1c 0 255
 '&#x1c00;' ''   0 `<gversion 0`>
-'&#x1c01;' ''   1 % utf8song1c.htf (unicode)                    `version %
+'&#x1c01;' ''   1 % unisong1c.htf (unicode)                    `version %
 '&#x1c02;' ''   2 `<gversion 2`>
 '&#x1c03;' ''   3 `<gversion 3`>
 '&#x1c04;' ''   4 `<gversion 4`>
@@ -42197,17 +42197,17 @@
 '&#x1cfd;' '' 253
 '&#x1cfe;' '' 254
 '&#x1cff;' '' 255
-utf8song1c 0 255
+unisong1c 0 255
 >>>
 
-\AddFont{utf8song1c}{unicode/cjk/utf8/utf8song1c}
+\AddFont{unisong1c}{unicode/cjk/utf8/unisong1c}
 
 
 
-\<utf8song58\><<<
-utf8song58 0 255
+\<unisong58\><<<
+unisong58 0 255
 '&#x5800;' ''   0 `<gversion 0`>
-'&#x5801;' ''   1 % utf8song58.htf (unicode)                    `version %
+'&#x5801;' ''   1 % unisong58.htf (unicode)                    `version %
 '&#x5802;' ''   2 `<gversion 2`>
 '&#x5803;' ''   3 `<gversion 3`>
 '&#x5804;' ''   4 `<gversion 4`>
@@ -42462,17 +42462,17 @@
 '&#x58fd;' '' 253
 '&#x58fe;' '' 254
 '&#x58ff;' '' 255
-utf8song58 0 255
+unisong58 0 255
 >>>
 
-\AddFont{utf8song58}{unicode/cjk/utf8/utf8song58}
+\AddFont{unisong58}{unicode/cjk/utf8/unisong58}
 
 
 
-\<utf8song1d\><<<
-utf8song1d 0 255
+\<unisong1d\><<<
+unisong1d 0 255
 '&#x1d00;' ''   0 `<gversion 0`>
-'&#x1d01;' ''   1 % utf8song1d.htf (unicode)                    `version %
+'&#x1d01;' ''   1 % unisong1d.htf (unicode)                    `version %
 '&#x1d02;' ''   2 `<gversion 2`>
 '&#x1d03;' ''   3 `<gversion 3`>
 '&#x1d04;' ''   4 `<gversion 4`>
@@ -42727,17 +42727,17 @@
 '&#x1dfd;' '' 253
 '&#x1dfe;' '' 254
 '&#x1dff;' '' 255
-utf8song1d 0 255
+unisong1d 0 255
 >>>
 
-\AddFont{utf8song1d}{unicode/cjk/utf8/utf8song1d}
+\AddFont{unisong1d}{unicode/cjk/utf8/unisong1d}
 
 
 
-\<utf8song59\><<<
-utf8song59 0 255
+\<unisong59\><<<
+unisong59 0 255
 '&#x5900;' ''   0 `<gversion 0`>
-'&#x5901;' ''   1 % utf8song59.htf (unicode)                    `version %
+'&#x5901;' ''   1 % unisong59.htf (unicode)                    `version %
 '&#x5902;' ''   2 `<gversion 2`>
 '&#x5903;' ''   3 `<gversion 3`>
 '&#x5904;' ''   4 `<gversion 4`>
@@ -42992,17 +42992,17 @@
 '&#x59fd;' '' 253
 '&#x59fe;' '' 254
 '&#x59ff;' '' 255
-utf8song59 0 255
+unisong59 0 255
 >>>
 
-\AddFont{utf8song59}{unicode/cjk/utf8/utf8song59}
+\AddFont{unisong59}{unicode/cjk/utf8/unisong59}
 
 
 
-\<utf8song1e\><<<
-utf8song1e 0 255
+\<unisong1e\><<<
+unisong1e 0 255
 '&#x1e00;' ''   0 `<gversion 0`>
-'&#x1e01;' ''   1 % utf8song1e.htf (unicode)                    `version %
+'&#x1e01;' ''   1 % unisong1e.htf (unicode)                    `version %
 '&#x1e02;' ''   2 `<gversion 2`>
 '&#x1e03;' ''   3 `<gversion 3`>
 '&#x1e04;' ''   4 `<gversion 4`>
@@ -43257,17 +43257,17 @@
 '&#x1efd;' '' 253
 '&#x1efe;' '' 254
 '&#x1eff;' '' 255
-utf8song1e 0 255
+unisong1e 0 255
 >>>
 
-\AddFont{utf8song1e}{unicode/cjk/utf8/utf8song1e}
+\AddFont{unisong1e}{unicode/cjk/utf8/unisong1e}
 
 
 
-\<utf8song1f\><<<
-utf8song1f 0 255
+\<unisong1f\><<<
+unisong1f 0 255
 '&#x1f00;' ''   0 `<gversion 0`>
-'&#x1f01;' ''   1 % utf8song1f.htf (unicode)                    `version %
+'&#x1f01;' ''   1 % unisong1f.htf (unicode)                    `version %
 '&#x1f02;' ''   2 `<gversion 2`>
 '&#x1f03;' ''   3 `<gversion 3`>
 '&#x1f04;' ''   4 `<gversion 4`>
@@ -43522,17 +43522,17 @@
 '&#x1ffd;' '' 253
 '&#x1ffe;' '' 254
 '&#x1fff;' '' 255
-utf8song1f 0 255
+unisong1f 0 255
 >>>
 
-\AddFont{utf8song1f}{unicode/cjk/utf8/utf8song1f}
+\AddFont{unisong1f}{unicode/cjk/utf8/unisong1f}
 
 
 
-\<utf8song60\><<<
-utf8song60 0 255
+\<unisong60\><<<
+unisong60 0 255
 '&#x6000;' ''   0 `<gversion 0`>
-'&#x6001;' ''   1 % utf8song60.htf (unicode)                    `version %
+'&#x6001;' ''   1 % unisong60.htf (unicode)                    `version %
 '&#x6002;' ''   2 `<gversion 2`>
 '&#x6003;' ''   3 `<gversion 3`>
 '&#x6004;' ''   4 `<gversion 4`>
@@ -43787,17 +43787,17 @@
 '&#x60fd;' '' 253
 '&#x60fe;' '' 254
 '&#x60ff;' '' 255
-utf8song60 0 255
+unisong60 0 255
 >>>
 
-\AddFont{utf8song60}{unicode/cjk/utf8/utf8song60}
+\AddFont{unisong60}{unicode/cjk/utf8/unisong60}
 
 
 
-\<utf8song61\><<<
-utf8song61 0 255
+\<unisong61\><<<
+unisong61 0 255
 '&#x6100;' ''   0 `<gversion 0`>
-'&#x6101;' ''   1 % utf8song61.htf (unicode)                    `version %
+'&#x6101;' ''   1 % unisong61.htf (unicode)                    `version %
 '&#x6102;' ''   2 `<gversion 2`>
 '&#x6103;' ''   3 `<gversion 3`>
 '&#x6104;' ''   4 `<gversion 4`>
@@ -44052,17 +44052,17 @@
 '&#x61fd;' '' 253
 '&#x61fe;' '' 254
 '&#x61ff;' '' 255
-utf8song61 0 255
+unisong61 0 255
 >>>
 
-\AddFont{utf8song61}{unicode/cjk/utf8/utf8song61}
+\AddFont{unisong61}{unicode/cjk/utf8/unisong61}
 
 
 
-\<utf8song62\><<<
-utf8song62 0 255
+\<unisong62\><<<
+unisong62 0 255
 '&#x6200;' ''   0 `<gversion 0`>
-'&#x6201;' ''   1 % utf8song62.htf (unicode)                    `version %
+'&#x6201;' ''   1 % unisong62.htf (unicode)                    `version %
 '&#x6202;' ''   2 `<gversion 2`>
 '&#x6203;' ''   3 `<gversion 3`>
 '&#x6204;' ''   4 `<gversion 4`>
@@ -44317,17 +44317,17 @@
 '&#x62fd;' '' 253
 '&#x62fe;' '' 254
 '&#x62ff;' '' 255
-utf8song62 0 255
+unisong62 0 255
 >>>
 
-\AddFont{utf8song62}{unicode/cjk/utf8/utf8song62}
+\AddFont{unisong62}{unicode/cjk/utf8/unisong62}
 
 
 
-\<utf8song63\><<<
-utf8song63 0 255
+\<unisong63\><<<
+unisong63 0 255
 '&#x6300;' ''   0 `<gversion 0`>
-'&#x6301;' ''   1 % utf8song63.htf (unicode)                    `version %
+'&#x6301;' ''   1 % unisong63.htf (unicode)                    `version %
 '&#x6302;' ''   2 `<gversion 2`>
 '&#x6303;' ''   3 `<gversion 3`>
 '&#x6304;' ''   4 `<gversion 4`>
@@ -44582,17 +44582,17 @@
 '&#x63fd;' '' 253
 '&#x63fe;' '' 254
 '&#x63ff;' '' 255
-utf8song63 0 255
+unisong63 0 255
 >>>
 
-\AddFont{utf8song63}{unicode/cjk/utf8/utf8song63}
+\AddFont{unisong63}{unicode/cjk/utf8/unisong63}
 
 
 
-\<utf8song64\><<<
-utf8song64 0 255
+\<unisong64\><<<
+unisong64 0 255
 '&#x6400;' ''   0 `<gversion 0`>
-'&#x6401;' ''   1 % utf8song64.htf (unicode)                    `version %
+'&#x6401;' ''   1 % unisong64.htf (unicode)                    `version %
 '&#x6402;' ''   2 `<gversion 2`>
 '&#x6403;' ''   3 `<gversion 3`>
 '&#x6404;' ''   4 `<gversion 4`>
@@ -44847,17 +44847,17 @@
 '&#x64fd;' '' 253
 '&#x64fe;' '' 254
 '&#x64ff;' '' 255
-utf8song64 0 255
+unisong64 0 255
 >>>
 
-\AddFont{utf8song64}{unicode/cjk/utf8/utf8song64}
+\AddFont{unisong64}{unicode/cjk/utf8/unisong64}
 
 
 
-\<utf8song65\><<<
-utf8song65 0 255
+\<unisong65\><<<
+unisong65 0 255
 '&#x6500;' ''   0 `<gversion 0`>
-'&#x6501;' ''   1 % utf8song65.htf (unicode)                    `version %
+'&#x6501;' ''   1 % unisong65.htf (unicode)                    `version %
 '&#x6502;' ''   2 `<gversion 2`>
 '&#x6503;' ''   3 `<gversion 3`>
 '&#x6504;' ''   4 `<gversion 4`>
@@ -45112,17 +45112,17 @@
 '&#x65fd;' '' 253
 '&#x65fe;' '' 254
 '&#x65ff;' '' 255
-utf8song65 0 255
+unisong65 0 255
 >>>
 
-\AddFont{utf8song65}{unicode/cjk/utf8/utf8song65}
+\AddFont{unisong65}{unicode/cjk/utf8/unisong65}
 
 
 
-\<utf8song2a\><<<
-utf8song2a 0 255
+\<unisong2a\><<<
+unisong2a 0 255
 '&#x2a00;' ''   0 `<gversion 0`>
-'&#x2a01;' ''   1 % utf8song2a.htf (unicode)                    `version %
+'&#x2a01;' ''   1 % unisong2a.htf (unicode)                    `version %
 '&#x2a02;' ''   2 `<gversion 2`>
 '&#x2a03;' ''   3 `<gversion 3`>
 '&#x2a04;' ''   4 `<gversion 4`>
@@ -45377,17 +45377,17 @@
 '&#x2afd;' '' 253
 '&#x2afe;' '' 254
 '&#x2aff;' '' 255
-utf8song2a 0 255
+unisong2a 0 255
 >>>
 
-\AddFont{utf8song2a}{unicode/cjk/utf8/utf8song2a}
+\AddFont{unisong2a}{unicode/cjk/utf8/unisong2a}
 
 
 
-\<utf8song66\><<<
-utf8song66 0 255
+\<unisong66\><<<
+unisong66 0 255
 '&#x6600;' ''   0 `<gversion 0`>
-'&#x6601;' ''   1 % utf8song66.htf (unicode)                    `version %
+'&#x6601;' ''   1 % unisong66.htf (unicode)                    `version %
 '&#x6602;' ''   2 `<gversion 2`>
 '&#x6603;' ''   3 `<gversion 3`>
 '&#x6604;' ''   4 `<gversion 4`>
@@ -45642,17 +45642,17 @@
 '&#x66fd;' '' 253
 '&#x66fe;' '' 254
 '&#x66ff;' '' 255
-utf8song66 0 255
+unisong66 0 255
 >>>
 
-\AddFont{utf8song66}{unicode/cjk/utf8/utf8song66}
+\AddFont{unisong66}{unicode/cjk/utf8/unisong66}
 
 
 
-\<utf8song2b\><<<
-utf8song2b 0 255
+\<unisong2b\><<<
+unisong2b 0 255
 '&#x2b00;' ''   0 `<gversion 0`>
-'&#x2b01;' ''   1 % utf8song2b.htf (unicode)                    `version %
+'&#x2b01;' ''   1 % unisong2b.htf (unicode)                    `version %
 '&#x2b02;' ''   2 `<gversion 2`>
 '&#x2b03;' ''   3 `<gversion 3`>
 '&#x2b04;' ''   4 `<gversion 4`>
@@ -45907,17 +45907,17 @@
 '&#x2bfd;' '' 253
 '&#x2bfe;' '' 254
 '&#x2bff;' '' 255
-utf8song2b 0 255
+unisong2b 0 255
 >>>
 
-\AddFont{utf8song2b}{unicode/cjk/utf8/utf8song2b}
+\AddFont{unisong2b}{unicode/cjk/utf8/unisong2b}
 
 
 
-\<utf8song67\><<<
-utf8song67 0 255
+\<unisong67\><<<
+unisong67 0 255
 '&#x6700;' ''   0 `<gversion 0`>
-'&#x6701;' ''   1 % utf8song67.htf (unicode)                    `version %
+'&#x6701;' ''   1 % unisong67.htf (unicode)                    `version %
 '&#x6702;' ''   2 `<gversion 2`>
 '&#x6703;' ''   3 `<gversion 3`>
 '&#x6704;' ''   4 `<gversion 4`>
@@ -46172,17 +46172,17 @@
 '&#x67fd;' '' 253
 '&#x67fe;' '' 254
 '&#x67ff;' '' 255
-utf8song67 0 255
+unisong67 0 255
 >>>
 
-\AddFont{utf8song67}{unicode/cjk/utf8/utf8song67}
+\AddFont{unisong67}{unicode/cjk/utf8/unisong67}
 
 
 
-\<utf8song2c\><<<
-utf8song2c 0 255
+\<unisong2c\><<<
+unisong2c 0 255
 '&#x2c00;' ''   0 `<gversion 0`>
-'&#x2c01;' ''   1 % utf8song2c.htf (unicode)                    `version %
+'&#x2c01;' ''   1 % unisong2c.htf (unicode)                    `version %
 '&#x2c02;' ''   2 `<gversion 2`>
 '&#x2c03;' ''   3 `<gversion 3`>
 '&#x2c04;' ''   4 `<gversion 4`>
@@ -46437,17 +46437,17 @@
 '&#x2cfd;' '' 253
 '&#x2cfe;' '' 254
 '&#x2cff;' '' 255
-utf8song2c 0 255
+unisong2c 0 255
 >>>
 
-\AddFont{utf8song2c}{unicode/cjk/utf8/utf8song2c}
+\AddFont{unisong2c}{unicode/cjk/utf8/unisong2c}
 
 
 
-\<utf8song68\><<<
-utf8song68 0 255
+\<unisong68\><<<
+unisong68 0 255
 '&#x6800;' ''   0 `<gversion 0`>
-'&#x6801;' ''   1 % utf8song68.htf (unicode)                    `version %
+'&#x6801;' ''   1 % unisong68.htf (unicode)                    `version %
 '&#x6802;' ''   2 `<gversion 2`>
 '&#x6803;' ''   3 `<gversion 3`>
 '&#x6804;' ''   4 `<gversion 4`>
@@ -46702,17 +46702,17 @@
 '&#x68fd;' '' 253
 '&#x68fe;' '' 254
 '&#x68ff;' '' 255
-utf8song68 0 255
+unisong68 0 255
 >>>
 
-\AddFont{utf8song68}{unicode/cjk/utf8/utf8song68}
+\AddFont{unisong68}{unicode/cjk/utf8/unisong68}
 
 
 
-\<utf8song2d\><<<
-utf8song2d 0 255
+\<unisong2d\><<<
+unisong2d 0 255
 '&#x2d00;' ''   0 `<gversion 0`>
-'&#x2d01;' ''   1 % utf8song2d.htf (unicode)                    `version %
+'&#x2d01;' ''   1 % unisong2d.htf (unicode)                    `version %
 '&#x2d02;' ''   2 `<gversion 2`>
 '&#x2d03;' ''   3 `<gversion 3`>
 '&#x2d04;' ''   4 `<gversion 4`>
@@ -46967,17 +46967,17 @@
 '&#x2dfd;' '' 253
 '&#x2dfe;' '' 254
 '&#x2dff;' '' 255
-utf8song2d 0 255
+unisong2d 0 255
 >>>
 
-\AddFont{utf8song2d}{unicode/cjk/utf8/utf8song2d}
+\AddFont{unisong2d}{unicode/cjk/utf8/unisong2d}
 
 
 
-\<utf8song69\><<<
-utf8song69 0 255
+\<unisong69\><<<
+unisong69 0 255
 '&#x6900;' ''   0 `<gversion 0`>
-'&#x6901;' ''   1 % utf8song69.htf (unicode)                    `version %
+'&#x6901;' ''   1 % unisong69.htf (unicode)                    `version %
 '&#x6902;' ''   2 `<gversion 2`>
 '&#x6903;' ''   3 `<gversion 3`>
 '&#x6904;' ''   4 `<gversion 4`>
@@ -47232,17 +47232,17 @@
 '&#x69fd;' '' 253
 '&#x69fe;' '' 254
 '&#x69ff;' '' 255
-utf8song69 0 255
+unisong69 0 255
 >>>
 
-\AddFont{utf8song69}{unicode/cjk/utf8/utf8song69}
+\AddFont{unisong69}{unicode/cjk/utf8/unisong69}
 
 
 
-\<utf8song2e\><<<
-utf8song2e 0 255
+\<unisong2e\><<<
+unisong2e 0 255
 '&#x2e00;' ''   0 `<gversion 0`>
-'&#x2e01;' ''   1 % utf8song2e.htf (unicode)                    `version %
+'&#x2e01;' ''   1 % unisong2e.htf (unicode)                    `version %
 '&#x2e02;' ''   2 `<gversion 2`>
 '&#x2e03;' ''   3 `<gversion 3`>
 '&#x2e04;' ''   4 `<gversion 4`>
@@ -47497,17 +47497,17 @@
 '&#x2efd;' '' 253
 '&#x2efe;' '' 254
 '&#x2eff;' '' 255
-utf8song2e 0 255
+unisong2e 0 255
 >>>
 
-\AddFont{utf8song2e}{unicode/cjk/utf8/utf8song2e}
+\AddFont{unisong2e}{unicode/cjk/utf8/unisong2e}
 
 
 
-\<utf8song2f\><<<
-utf8song2f 0 255
+\<unisong2f\><<<
+unisong2f 0 255
 '&#x2f00;' ''   0 `<gversion 0`>
-'&#x2f01;' ''   1 % utf8song2f.htf (unicode)                    `version %
+'&#x2f01;' ''   1 % unisong2f.htf (unicode)                    `version %
 '&#x2f02;' ''   2 `<gversion 2`>
 '&#x2f03;' ''   3 `<gversion 3`>
 '&#x2f04;' ''   4 `<gversion 4`>
@@ -47762,17 +47762,17 @@
 '&#x2ffd;' '' 253
 '&#x2ffe;' '' 254
 '&#x2fff;' '' 255
-utf8song2f 0 255
+unisong2f 0 255
 >>>
 
-\AddFont{utf8song2f}{unicode/cjk/utf8/utf8song2f}
+\AddFont{unisong2f}{unicode/cjk/utf8/unisong2f}
 
 
 
-\<utf8song70\><<<
-utf8song70 0 255
+\<unisong70\><<<
+unisong70 0 255
 '&#x7000;' ''   0 `<gversion 0`>
-'&#x7001;' ''   1 % utf8song70.htf (unicode)                    `version %
+'&#x7001;' ''   1 % unisong70.htf (unicode)                    `version %
 '&#x7002;' ''   2 `<gversion 2`>
 '&#x7003;' ''   3 `<gversion 3`>
 '&#x7004;' ''   4 `<gversion 4`>
@@ -48027,17 +48027,17 @@
 '&#x70fd;' '' 253
 '&#x70fe;' '' 254
 '&#x70ff;' '' 255
-utf8song70 0 255
+unisong70 0 255
 >>>
 
-\AddFont{utf8song70}{unicode/cjk/utf8/utf8song70}
+\AddFont{unisong70}{unicode/cjk/utf8/unisong70}
 
 
 
-\<utf8song71\><<<
-utf8song71 0 255
+\<unisong71\><<<
+unisong71 0 255
 '&#x7100;' ''   0 `<gversion 0`>
-'&#x7101;' ''   1 % utf8song71.htf (unicode)                    `version %
+'&#x7101;' ''   1 % unisong71.htf (unicode)                    `version %
 '&#x7102;' ''   2 `<gversion 2`>
 '&#x7103;' ''   3 `<gversion 3`>
 '&#x7104;' ''   4 `<gversion 4`>
@@ -48292,17 +48292,17 @@
 '&#x71fd;' '' 253
 '&#x71fe;' '' 254
 '&#x71ff;' '' 255
-utf8song71 0 255
+unisong71 0 255
 >>>
 
-\AddFont{utf8song71}{unicode/cjk/utf8/utf8song71}
+\AddFont{unisong71}{unicode/cjk/utf8/unisong71}
 
 
 
-\<utf8song72\><<<
-utf8song72 0 255
+\<unisong72\><<<
+unisong72 0 255
 '&#x7200;' ''   0 `<gversion 0`>
-'&#x7201;' ''   1 % utf8song72.htf (unicode)                    `version %
+'&#x7201;' ''   1 % unisong72.htf (unicode)                    `version %
 '&#x7202;' ''   2 `<gversion 2`>
 '&#x7203;' ''   3 `<gversion 3`>
 '&#x7204;' ''   4 `<gversion 4`>
@@ -48557,17 +48557,17 @@
 '&#x72fd;' '' 253
 '&#x72fe;' '' 254
 '&#x72ff;' '' 255
-utf8song72 0 255
+unisong72 0 255
 >>>
 
-\AddFont{utf8song72}{unicode/cjk/utf8/utf8song72}
+\AddFont{unisong72}{unicode/cjk/utf8/unisong72}
 
 
 
-\<utf8song73\><<<
-utf8song73 0 255
+\<unisong73\><<<
+unisong73 0 255
 '&#x7300;' ''   0 `<gversion 0`>
-'&#x7301;' ''   1 % utf8song73.htf (unicode)                    `version %
+'&#x7301;' ''   1 % unisong73.htf (unicode)                    `version %
 '&#x7302;' ''   2 `<gversion 2`>
 '&#x7303;' ''   3 `<gversion 3`>
 '&#x7304;' ''   4 `<gversion 4`>
@@ -48822,17 +48822,17 @@
 '&#x73fd;' '' 253
 '&#x73fe;' '' 254
 '&#x73ff;' '' 255
-utf8song73 0 255
+unisong73 0 255
 >>>
 
-\AddFont{utf8song73}{unicode/cjk/utf8/utf8song73}
+\AddFont{unisong73}{unicode/cjk/utf8/unisong73}
 
 
 
-\<utf8song74\><<<
-utf8song74 0 255
+\<unisong74\><<<
+unisong74 0 255
 '&#x7400;' ''   0 `<gversion 0`>
-'&#x7401;' ''   1 % utf8song74.htf (unicode)                    `version %
+'&#x7401;' ''   1 % unisong74.htf (unicode)                    `version %
 '&#x7402;' ''   2 `<gversion 2`>
 '&#x7403;' ''   3 `<gversion 3`>
 '&#x7404;' ''   4 `<gversion 4`>
@@ -49087,17 +49087,17 @@
 '&#x74fd;' '' 253
 '&#x74fe;' '' 254
 '&#x74ff;' '' 255
-utf8song74 0 255
+unisong74 0 255
 >>>
 
-\AddFont{utf8song74}{unicode/cjk/utf8/utf8song74}
+\AddFont{unisong74}{unicode/cjk/utf8/unisong74}
 
 
 
-\<utf8song75\><<<
-utf8song75 0 255
+\<unisong75\><<<
+unisong75 0 255
 '&#x7500;' ''   0 `<gversion 0`>
-'&#x7501;' ''   1 % utf8song75.htf (unicode)                    `version %
+'&#x7501;' ''   1 % unisong75.htf (unicode)                    `version %
 '&#x7502;' ''   2 `<gversion 2`>
 '&#x7503;' ''   3 `<gversion 3`>
 '&#x7504;' ''   4 `<gversion 4`>
@@ -49352,17 +49352,17 @@
 '&#x75fd;' '' 253
 '&#x75fe;' '' 254
 '&#x75ff;' '' 255
-utf8song75 0 255
+unisong75 0 255
 >>>
 
-\AddFont{utf8song75}{unicode/cjk/utf8/utf8song75}
+\AddFont{unisong75}{unicode/cjk/utf8/unisong75}
 
 
 
-\<utf8song3a\><<<
-utf8song3a 0 255
+\<unisong3a\><<<
+unisong3a 0 255
 '&#x3a00;' ''   0 `<gversion 0`>
-'&#x3a01;' ''   1 % utf8song3a.htf (unicode)                    `version %
+'&#x3a01;' ''   1 % unisong3a.htf (unicode)                    `version %
 '&#x3a02;' ''   2 `<gversion 2`>
 '&#x3a03;' ''   3 `<gversion 3`>
 '&#x3a04;' ''   4 `<gversion 4`>
@@ -49617,17 +49617,17 @@
 '&#x3afd;' '' 253
 '&#x3afe;' '' 254
 '&#x3aff;' '' 255
-utf8song3a 0 255
+unisong3a 0 255
 >>>
 
-\AddFont{utf8song3a}{unicode/cjk/utf8/utf8song3a}
+\AddFont{unisong3a}{unicode/cjk/utf8/unisong3a}
 
 
 
-\<utf8song76\><<<
-utf8song76 0 255
+\<unisong76\><<<
+unisong76 0 255
 '&#x7600;' ''   0 `<gversion 0`>
-'&#x7601;' ''   1 % utf8song76.htf (unicode)                    `version %
+'&#x7601;' ''   1 % unisong76.htf (unicode)                    `version %
 '&#x7602;' ''   2 `<gversion 2`>
 '&#x7603;' ''   3 `<gversion 3`>
 '&#x7604;' ''   4 `<gversion 4`>
@@ -49882,17 +49882,17 @@
 '&#x76fd;' '' 253
 '&#x76fe;' '' 254
 '&#x76ff;' '' 255
-utf8song76 0 255
+unisong76 0 255
 >>>
 
-\AddFont{utf8song76}{unicode/cjk/utf8/utf8song76}
+\AddFont{unisong76}{unicode/cjk/utf8/unisong76}
 
 
 
-\<utf8song3b\><<<
-utf8song3b 0 255
+\<unisong3b\><<<
+unisong3b 0 255
 '&#x3b00;' ''   0 `<gversion 0`>
-'&#x3b01;' ''   1 % utf8song3b.htf (unicode)                    `version %
+'&#x3b01;' ''   1 % unisong3b.htf (unicode)                    `version %
 '&#x3b02;' ''   2 `<gversion 2`>
 '&#x3b03;' ''   3 `<gversion 3`>
 '&#x3b04;' ''   4 `<gversion 4`>
@@ -50147,17 +50147,17 @@
 '&#x3bfd;' '' 253
 '&#x3bfe;' '' 254
 '&#x3bff;' '' 255
-utf8song3b 0 255
+unisong3b 0 255
 >>>
 
-\AddFont{utf8song3b}{unicode/cjk/utf8/utf8song3b}
+\AddFont{unisong3b}{unicode/cjk/utf8/unisong3b}
 
 
 
-\<utf8song77\><<<
-utf8song77 0 255
+\<unisong77\><<<
+unisong77 0 255
 '&#x7700;' ''   0 `<gversion 0`>
-'&#x7701;' ''   1 % utf8song77.htf (unicode)                    `version %
+'&#x7701;' ''   1 % unisong77.htf (unicode)                    `version %
 '&#x7702;' ''   2 `<gversion 2`>
 '&#x7703;' ''   3 `<gversion 3`>
 '&#x7704;' ''   4 `<gversion 4`>
@@ -50412,17 +50412,17 @@
 '&#x77fd;' '' 253
 '&#x77fe;' '' 254
 '&#x77ff;' '' 255
-utf8song77 0 255
+unisong77 0 255
 >>>
 
-\AddFont{utf8song77}{unicode/cjk/utf8/utf8song77}
+\AddFont{unisong77}{unicode/cjk/utf8/unisong77}
 
 
 
-\<utf8song3c\><<<
-utf8song3c 0 255
+\<unisong3c\><<<
+unisong3c 0 255
 '&#x3c00;' ''   0 `<gversion 0`>
-'&#x3c01;' ''   1 % utf8song3c.htf (unicode)                    `version %
+'&#x3c01;' ''   1 % unisong3c.htf (unicode)                    `version %
 '&#x3c02;' ''   2 `<gversion 2`>
 '&#x3c03;' ''   3 `<gversion 3`>
 '&#x3c04;' ''   4 `<gversion 4`>
@@ -50677,17 +50677,17 @@
 '&#x3cfd;' '' 253
 '&#x3cfe;' '' 254
 '&#x3cff;' '' 255
-utf8song3c 0 255
+unisong3c 0 255
 >>>
 
-\AddFont{utf8song3c}{unicode/cjk/utf8/utf8song3c}
+\AddFont{unisong3c}{unicode/cjk/utf8/unisong3c}
 
 
 
-\<utf8song78\><<<
-utf8song78 0 255
+\<unisong78\><<<
+unisong78 0 255
 '&#x7800;' ''   0 `<gversion 0`>
-'&#x7801;' ''   1 % utf8song78.htf (unicode)                    `version %
+'&#x7801;' ''   1 % unisong78.htf (unicode)                    `version %
 '&#x7802;' ''   2 `<gversion 2`>
 '&#x7803;' ''   3 `<gversion 3`>
 '&#x7804;' ''   4 `<gversion 4`>
@@ -50942,17 +50942,17 @@
 '&#x78fd;' '' 253
 '&#x78fe;' '' 254
 '&#x78ff;' '' 255
-utf8song78 0 255
+unisong78 0 255
 >>>
 
-\AddFont{utf8song78}{unicode/cjk/utf8/utf8song78}
+\AddFont{unisong78}{unicode/cjk/utf8/unisong78}
 
 
 
-\<utf8song3d\><<<
-utf8song3d 0 255
+\<unisong3d\><<<
+unisong3d 0 255
 '&#x3d00;' ''   0 `<gversion 0`>
-'&#x3d01;' ''   1 % utf8song3d.htf (unicode)                    `version %
+'&#x3d01;' ''   1 % unisong3d.htf (unicode)                    `version %
 '&#x3d02;' ''   2 `<gversion 2`>
 '&#x3d03;' ''   3 `<gversion 3`>
 '&#x3d04;' ''   4 `<gversion 4`>
@@ -51207,17 +51207,17 @@
 '&#x3dfd;' '' 253
 '&#x3dfe;' '' 254
 '&#x3dff;' '' 255
-utf8song3d 0 255
+unisong3d 0 255
 >>>
 
-\AddFont{utf8song3d}{unicode/cjk/utf8/utf8song3d}
+\AddFont{unisong3d}{unicode/cjk/utf8/unisong3d}
 
 
 
-\<utf8song79\><<<
-utf8song79 0 255
+\<unisong79\><<<
+unisong79 0 255
 '&#x7900;' ''   0 `<gversion 0`>
-'&#x7901;' ''   1 % utf8song79.htf (unicode)                    `version %
+'&#x7901;' ''   1 % unisong79.htf (unicode)                    `version %
 '&#x7902;' ''   2 `<gversion 2`>
 '&#x7903;' ''   3 `<gversion 3`>
 '&#x7904;' ''   4 `<gversion 4`>
@@ -51472,17 +51472,17 @@
 '&#x79fd;' '' 253
 '&#x79fe;' '' 254
 '&#x79ff;' '' 255
-utf8song79 0 255
+unisong79 0 255
 >>>
 
-\AddFont{utf8song79}{unicode/cjk/utf8/utf8song79}
+\AddFont{unisong79}{unicode/cjk/utf8/unisong79}
 
 
 
-\<utf8song3e\><<<
-utf8song3e 0 255
+\<unisong3e\><<<
+unisong3e 0 255
 '&#x3e00;' ''   0 `<gversion 0`>
-'&#x3e01;' ''   1 % utf8song3e.htf (unicode)                    `version %
+'&#x3e01;' ''   1 % unisong3e.htf (unicode)                    `version %
 '&#x3e02;' ''   2 `<gversion 2`>
 '&#x3e03;' ''   3 `<gversion 3`>
 '&#x3e04;' ''   4 `<gversion 4`>
@@ -51737,17 +51737,17 @@
 '&#x3efd;' '' 253
 '&#x3efe;' '' 254
 '&#x3eff;' '' 255
-utf8song3e 0 255
+unisong3e 0 255
 >>>
 
-\AddFont{utf8song3e}{unicode/cjk/utf8/utf8song3e}
+\AddFont{unisong3e}{unicode/cjk/utf8/unisong3e}
 
 
 
-\<utf8song3f\><<<
-utf8song3f 0 255
+\<unisong3f\><<<
+unisong3f 0 255
 '&#x3f00;' ''   0 `<gversion 0`>
-'&#x3f01;' ''   1 % utf8song3f.htf (unicode)                    `version %
+'&#x3f01;' ''   1 % unisong3f.htf (unicode)                    `version %
 '&#x3f02;' ''   2 `<gversion 2`>
 '&#x3f03;' ''   3 `<gversion 3`>
 '&#x3f04;' ''   4 `<gversion 4`>
@@ -52002,17 +52002,17 @@
 '&#x3ffd;' '' 253
 '&#x3ffe;' '' 254
 '&#x3fff;' '' 255
-utf8song3f 0 255
+unisong3f 0 255
 >>>
 
-\AddFont{utf8song3f}{unicode/cjk/utf8/utf8song3f}
+\AddFont{unisong3f}{unicode/cjk/utf8/unisong3f}
 
 
 
-\<utf8song80\><<<
-utf8song80 0 255
+\<unisong80\><<<
+unisong80 0 255
 '&#x8000;' ''   0 `<gversion 0`>
-'&#x8001;' ''   1 % utf8song80.htf (unicode)                    `version %
+'&#x8001;' ''   1 % unisong80.htf (unicode)                    `version %
 '&#x8002;' ''   2 `<gversion 2`>
 '&#x8003;' ''   3 `<gversion 3`>
 '&#x8004;' ''   4 `<gversion 4`>
@@ -52267,17 +52267,17 @@
 '&#x80fd;' '' 253
 '&#x80fe;' '' 254
 '&#x80ff;' '' 255
-utf8song80 0 255
+unisong80 0 255
 >>>
 
-\AddFont{utf8song80}{unicode/cjk/utf8/utf8song80}
+\AddFont{unisong80}{unicode/cjk/utf8/unisong80}
 
 
 
-\<utf8song81\><<<
-utf8song81 0 255
+\<unisong81\><<<
+unisong81 0 255
 '&#x8100;' ''   0 `<gversion 0`>
-'&#x8101;' ''   1 % utf8song81.htf (unicode)                    `version %
+'&#x8101;' ''   1 % unisong81.htf (unicode)                    `version %
 '&#x8102;' ''   2 `<gversion 2`>
 '&#x8103;' ''   3 `<gversion 3`>
 '&#x8104;' ''   4 `<gversion 4`>
@@ -52532,17 +52532,17 @@
 '&#x81fd;' '' 253
 '&#x81fe;' '' 254
 '&#x81ff;' '' 255
-utf8song81 0 255
+unisong81 0 255
 >>>
 
-\AddFont{utf8song81}{unicode/cjk/utf8/utf8song81}
+\AddFont{unisong81}{unicode/cjk/utf8/unisong81}
 
 
 
-\<utf8song82\><<<
-utf8song82 0 255
+\<unisong82\><<<
+unisong82 0 255
 '&#x8200;' ''   0 `<gversion 0`>
-'&#x8201;' ''   1 % utf8song82.htf (unicode)                    `version %
+'&#x8201;' ''   1 % unisong82.htf (unicode)                    `version %
 '&#x8202;' ''   2 `<gversion 2`>
 '&#x8203;' ''   3 `<gversion 3`>
 '&#x8204;' ''   4 `<gversion 4`>
@@ -52797,17 +52797,17 @@
 '&#x82fd;' '' 253
 '&#x82fe;' '' 254
 '&#x82ff;' '' 255
-utf8song82 0 255
+unisong82 0 255
 >>>
 
-\AddFont{utf8song82}{unicode/cjk/utf8/utf8song82}
+\AddFont{unisong82}{unicode/cjk/utf8/unisong82}
 
 
 
-\<utf8song83\><<<
-utf8song83 0 255
+\<unisong83\><<<
+unisong83 0 255
 '&#x8300;' ''   0 `<gversion 0`>
-'&#x8301;' ''   1 % utf8song83.htf (unicode)                    `version %
+'&#x8301;' ''   1 % unisong83.htf (unicode)                    `version %
 '&#x8302;' ''   2 `<gversion 2`>
 '&#x8303;' ''   3 `<gversion 3`>
 '&#x8304;' ''   4 `<gversion 4`>
@@ -53062,17 +53062,17 @@
 '&#x83fd;' '' 253
 '&#x83fe;' '' 254
 '&#x83ff;' '' 255
-utf8song83 0 255
+unisong83 0 255
 >>>
 
-\AddFont{utf8song83}{unicode/cjk/utf8/utf8song83}
+\AddFont{unisong83}{unicode/cjk/utf8/unisong83}
 
 
 
-\<utf8song84\><<<
-utf8song84 0 255
+\<unisong84\><<<
+unisong84 0 255
 '&#x8400;' ''   0 `<gversion 0`>
-'&#x8401;' ''   1 % utf8song84.htf (unicode)                    `version %
+'&#x8401;' ''   1 % unisong84.htf (unicode)                    `version %
 '&#x8402;' ''   2 `<gversion 2`>
 '&#x8403;' ''   3 `<gversion 3`>
 '&#x8404;' ''   4 `<gversion 4`>
@@ -53327,17 +53327,17 @@
 '&#x84fd;' '' 253
 '&#x84fe;' '' 254
 '&#x84ff;' '' 255
-utf8song84 0 255
+unisong84 0 255
 >>>
 
-\AddFont{utf8song84}{unicode/cjk/utf8/utf8song84}
+\AddFont{unisong84}{unicode/cjk/utf8/unisong84}
 
 
 
-\<utf8song85\><<<
-utf8song85 0 255
+\<unisong85\><<<
+unisong85 0 255
 '&#x8500;' ''   0 `<gversion 0`>
-'&#x8501;' ''   1 % utf8song85.htf (unicode)                    `version %
+'&#x8501;' ''   1 % unisong85.htf (unicode)                    `version %
 '&#x8502;' ''   2 `<gversion 2`>
 '&#x8503;' ''   3 `<gversion 3`>
 '&#x8504;' ''   4 `<gversion 4`>
@@ -53592,17 +53592,17 @@
 '&#x85fd;' '' 253
 '&#x85fe;' '' 254
 '&#x85ff;' '' 255
-utf8song85 0 255
+unisong85 0 255
 >>>
 
-\AddFont{utf8song85}{unicode/cjk/utf8/utf8song85}
+\AddFont{unisong85}{unicode/cjk/utf8/unisong85}
 
 
 
-\<utf8song4a\><<<
-utf8song4a 0 255
+\<unisong4a\><<<
+unisong4a 0 255
 '&#x4a00;' ''   0 `<gversion 0`>
-'&#x4a01;' ''   1 % utf8song4a.htf (unicode)                    `version %
+'&#x4a01;' ''   1 % unisong4a.htf (unicode)                    `version %
 '&#x4a02;' ''   2 `<gversion 2`>
 '&#x4a03;' ''   3 `<gversion 3`>
 '&#x4a04;' ''   4 `<gversion 4`>
@@ -53857,17 +53857,17 @@
 '&#x4afd;' '' 253
 '&#x4afe;' '' 254
 '&#x4aff;' '' 255
-utf8song4a 0 255
+unisong4a 0 255
 >>>
 
-\AddFont{utf8song4a}{unicode/cjk/utf8/utf8song4a}
+\AddFont{unisong4a}{unicode/cjk/utf8/unisong4a}
 
 
 
-\<utf8song86\><<<
-utf8song86 0 255
+\<unisong86\><<<
+unisong86 0 255
 '&#x8600;' ''   0 `<gversion 0`>
-'&#x8601;' ''   1 % utf8song86.htf (unicode)                    `version %
+'&#x8601;' ''   1 % unisong86.htf (unicode)                    `version %
 '&#x8602;' ''   2 `<gversion 2`>
 '&#x8603;' ''   3 `<gversion 3`>
 '&#x8604;' ''   4 `<gversion 4`>
@@ -54122,17 +54122,17 @@
 '&#x86fd;' '' 253
 '&#x86fe;' '' 254
 '&#x86ff;' '' 255
-utf8song86 0 255
+unisong86 0 255
 >>>
 
-\AddFont{utf8song86}{unicode/cjk/utf8/utf8song86}
+\AddFont{unisong86}{unicode/cjk/utf8/unisong86}
 
 
 
-\<utf8song4b\><<<
-utf8song4b 0 255
+\<unisong4b\><<<
+unisong4b 0 255
 '&#x4b00;' ''   0 `<gversion 0`>
-'&#x4b01;' ''   1 % utf8song4b.htf (unicode)                    `version %
+'&#x4b01;' ''   1 % unisong4b.htf (unicode)                    `version %
 '&#x4b02;' ''   2 `<gversion 2`>
 '&#x4b03;' ''   3 `<gversion 3`>
 '&#x4b04;' ''   4 `<gversion 4`>
@@ -54387,17 +54387,17 @@
 '&#x4bfd;' '' 253
 '&#x4bfe;' '' 254
 '&#x4bff;' '' 255
-utf8song4b 0 255
+unisong4b 0 255
 >>>
 
-\AddFont{utf8song4b}{unicode/cjk/utf8/utf8song4b}
+\AddFont{unisong4b}{unicode/cjk/utf8/unisong4b}
 
 
 
-\<utf8song87\><<<
-utf8song87 0 255
+\<unisong87\><<<
+unisong87 0 255
 '&#x8700;' ''   0 `<gversion 0`>
-'&#x8701;' ''   1 % utf8song87.htf (unicode)                    `version %
+'&#x8701;' ''   1 % unisong87.htf (unicode)                    `version %
 '&#x8702;' ''   2 `<gversion 2`>
 '&#x8703;' ''   3 `<gversion 3`>
 '&#x8704;' ''   4 `<gversion 4`>
@@ -54652,17 +54652,17 @@
 '&#x87fd;' '' 253
 '&#x87fe;' '' 254
 '&#x87ff;' '' 255
-utf8song87 0 255
+unisong87 0 255
 >>>
 
-\AddFont{utf8song87}{unicode/cjk/utf8/utf8song87}
+\AddFont{unisong87}{unicode/cjk/utf8/unisong87}
 
 
 
-\<utf8song4c\><<<
-utf8song4c 0 255
+\<unisong4c\><<<
+unisong4c 0 255
 '&#x4c00;' ''   0 `<gversion 0`>
-'&#x4c01;' ''   1 % utf8song4c.htf (unicode)                    `version %
+'&#x4c01;' ''   1 % unisong4c.htf (unicode)                    `version %
 '&#x4c02;' ''   2 `<gversion 2`>
 '&#x4c03;' ''   3 `<gversion 3`>
 '&#x4c04;' ''   4 `<gversion 4`>
@@ -54917,17 +54917,17 @@
 '&#x4cfd;' '' 253
 '&#x4cfe;' '' 254
 '&#x4cff;' '' 255
-utf8song4c 0 255
+unisong4c 0 255
 >>>
 
-\AddFont{utf8song4c}{unicode/cjk/utf8/utf8song4c}
+\AddFont{unisong4c}{unicode/cjk/utf8/unisong4c}
 
 
 
-\<utf8song88\><<<
-utf8song88 0 255
+\<unisong88\><<<
+unisong88 0 255
 '&#x8800;' ''   0 `<gversion 0`>
-'&#x8801;' ''   1 % utf8song88.htf (unicode)                    `version %
+'&#x8801;' ''   1 % unisong88.htf (unicode)                    `version %
 '&#x8802;' ''   2 `<gversion 2`>
 '&#x8803;' ''   3 `<gversion 3`>
 '&#x8804;' ''   4 `<gversion 4`>
@@ -55182,17 +55182,17 @@
 '&#x88fd;' '' 253
 '&#x88fe;' '' 254
 '&#x88ff;' '' 255
-utf8song88 0 255
+unisong88 0 255
 >>>
 
-\AddFont{utf8song88}{unicode/cjk/utf8/utf8song88}
+\AddFont{unisong88}{unicode/cjk/utf8/unisong88}
 
 
 
-\<utf8song4d\><<<
-utf8song4d 0 255
+\<unisong4d\><<<
+unisong4d 0 255
 '&#x4d00;' ''   0 `<gversion 0`>
-'&#x4d01;' ''   1 % utf8song4d.htf (unicode)                    `version %
+'&#x4d01;' ''   1 % unisong4d.htf (unicode)                    `version %
 '&#x4d02;' ''   2 `<gversion 2`>
 '&#x4d03;' ''   3 `<gversion 3`>
 '&#x4d04;' ''   4 `<gversion 4`>
@@ -55447,17 +55447,17 @@
 '&#x4dfd;' '' 253
 '&#x4dfe;' '' 254
 '&#x4dff;' '' 255
-utf8song4d 0 255
+unisong4d 0 255
 >>>
 
-\AddFont{utf8song4d}{unicode/cjk/utf8/utf8song4d}
+\AddFont{unisong4d}{unicode/cjk/utf8/unisong4d}
 
 
 
-\<utf8song89\><<<
-utf8song89 0 255
+\<unisong89\><<<
+unisong89 0 255
 '&#x8900;' ''   0 `<gversion 0`>
-'&#x8901;' ''   1 % utf8song89.htf (unicode)                    `version %
+'&#x8901;' ''   1 % unisong89.htf (unicode)                    `version %
 '&#x8902;' ''   2 `<gversion 2`>
 '&#x8903;' ''   3 `<gversion 3`>
 '&#x8904;' ''   4 `<gversion 4`>
@@ -55712,17 +55712,17 @@
 '&#x89fd;' '' 253
 '&#x89fe;' '' 254
 '&#x89ff;' '' 255
-utf8song89 0 255
+unisong89 0 255
 >>>
 
-\AddFont{utf8song89}{unicode/cjk/utf8/utf8song89}
+\AddFont{unisong89}{unicode/cjk/utf8/unisong89}
 
 
 
-\<utf8song4e\><<<
-utf8song4e 0 255
+\<unisong4e\><<<
+unisong4e 0 255
 '&#x4e00;' ''   0 `<gversion 0`>
-'&#x4e01;' ''   1 % utf8song4e.htf (unicode)                    `version %
+'&#x4e01;' ''   1 % unisong4e.htf (unicode)                    `version %
 '&#x4e02;' ''   2 `<gversion 2`>
 '&#x4e03;' ''   3 `<gversion 3`>
 '&#x4e04;' ''   4 `<gversion 4`>
@@ -55977,17 +55977,17 @@
 '&#x4efd;' '' 253
 '&#x4efe;' '' 254
 '&#x4eff;' '' 255
-utf8song4e 0 255
+unisong4e 0 255
 >>>
 
-\AddFont{utf8song4e}{unicode/cjk/utf8/utf8song4e}
+\AddFont{unisong4e}{unicode/cjk/utf8/unisong4e}
 
 
 
-\<utf8song4f\><<<
-utf8song4f 0 255
+\<unisong4f\><<<
+unisong4f 0 255
 '&#x4f00;' ''   0 `<gversion 0`>
-'&#x4f01;' ''   1 % utf8song4f.htf (unicode)                    `version %
+'&#x4f01;' ''   1 % unisong4f.htf (unicode)                    `version %
 '&#x4f02;' ''   2 `<gversion 2`>
 '&#x4f03;' ''   3 `<gversion 3`>
 '&#x4f04;' ''   4 `<gversion 4`>
@@ -56242,17 +56242,17 @@
 '&#x4ffd;' '' 253
 '&#x4ffe;' '' 254
 '&#x4fff;' '' 255
-utf8song4f 0 255
+unisong4f 0 255
 >>>
 
-\AddFont{utf8song4f}{unicode/cjk/utf8/utf8song4f}
+\AddFont{unisong4f}{unicode/cjk/utf8/unisong4f}
 
 
 
-\<utf8song90\><<<
-utf8song90 0 255
+\<unisong90\><<<
+unisong90 0 255
 '&#x9000;' ''   0 `<gversion 0`>
-'&#x9001;' ''   1 % utf8song90.htf (unicode)                    `version %
+'&#x9001;' ''   1 % unisong90.htf (unicode)                    `version %
 '&#x9002;' ''   2 `<gversion 2`>
 '&#x9003;' ''   3 `<gversion 3`>
 '&#x9004;' ''   4 `<gversion 4`>
@@ -56507,17 +56507,17 @@
 '&#x90fd;' '' 253
 '&#x90fe;' '' 254
 '&#x90ff;' '' 255
-utf8song90 0 255
+unisong90 0 255
 >>>
 
-\AddFont{utf8song90}{unicode/cjk/utf8/utf8song90}
+\AddFont{unisong90}{unicode/cjk/utf8/unisong90}
 
 
 
-\<utf8song91\><<<
-utf8song91 0 255
+\<unisong91\><<<
+unisong91 0 255
 '&#x9100;' ''   0 `<gversion 0`>
-'&#x9101;' ''   1 % utf8song91.htf (unicode)                    `version %
+'&#x9101;' ''   1 % unisong91.htf (unicode)                    `version %
 '&#x9102;' ''   2 `<gversion 2`>
 '&#x9103;' ''   3 `<gversion 3`>
 '&#x9104;' ''   4 `<gversion 4`>
@@ -56772,17 +56772,17 @@
 '&#x91fd;' '' 253
 '&#x91fe;' '' 254
 '&#x91ff;' '' 255
-utf8song91 0 255
+unisong91 0 255
 >>>
 
-\AddFont{utf8song91}{unicode/cjk/utf8/utf8song91}
+\AddFont{unisong91}{unicode/cjk/utf8/unisong91}
 
 
 
-\<utf8song92\><<<
-utf8song92 0 255
+\<unisong92\><<<
+unisong92 0 255
 '&#x9200;' ''   0 `<gversion 0`>
-'&#x9201;' ''   1 % utf8song92.htf (unicode)                    `version %
+'&#x9201;' ''   1 % unisong92.htf (unicode)                    `version %
 '&#x9202;' ''   2 `<gversion 2`>
 '&#x9203;' ''   3 `<gversion 3`>
 '&#x9204;' ''   4 `<gversion 4`>
@@ -57037,17 +57037,17 @@
 '&#x92fd;' '' 253
 '&#x92fe;' '' 254
 '&#x92ff;' '' 255
-utf8song92 0 255
+unisong92 0 255
 >>>
 
-\AddFont{utf8song92}{unicode/cjk/utf8/utf8song92}
+\AddFont{unisong92}{unicode/cjk/utf8/unisong92}
 
 
 
-\<utf8song93\><<<
-utf8song93 0 255
+\<unisong93\><<<
+unisong93 0 255
 '&#x9300;' ''   0 `<gversion 0`>
-'&#x9301;' ''   1 % utf8song93.htf (unicode)                    `version %
+'&#x9301;' ''   1 % unisong93.htf (unicode)                    `version %
 '&#x9302;' ''   2 `<gversion 2`>
 '&#x9303;' ''   3 `<gversion 3`>
 '&#x9304;' ''   4 `<gversion 4`>
@@ -57302,17 +57302,17 @@
 '&#x93fd;' '' 253
 '&#x93fe;' '' 254
 '&#x93ff;' '' 255
-utf8song93 0 255
+unisong93 0 255
 >>>
 
-\AddFont{utf8song93}{unicode/cjk/utf8/utf8song93}
+\AddFont{unisong93}{unicode/cjk/utf8/unisong93}
 
 
 
-\<utf8song94\><<<
-utf8song94 0 255
+\<unisong94\><<<
+unisong94 0 255
 '&#x9400;' ''   0 `<gversion 0`>
-'&#x9401;' ''   1 % utf8song94.htf (unicode)                    `version %
+'&#x9401;' ''   1 % unisong94.htf (unicode)                    `version %
 '&#x9402;' ''   2 `<gversion 2`>
 '&#x9403;' ''   3 `<gversion 3`>
 '&#x9404;' ''   4 `<gversion 4`>
@@ -57567,17 +57567,17 @@
 '&#x94fd;' '' 253
 '&#x94fe;' '' 254
 '&#x94ff;' '' 255
-utf8song94 0 255
+unisong94 0 255
 >>>
 
-\AddFont{utf8song94}{unicode/cjk/utf8/utf8song94}
+\AddFont{unisong94}{unicode/cjk/utf8/unisong94}
 
 
 
-\<utf8song95\><<<
-utf8song95 0 255
+\<unisong95\><<<
+unisong95 0 255
 '&#x9500;' ''   0 `<gversion 0`>
-'&#x9501;' ''   1 % utf8song95.htf (unicode)                    `version %
+'&#x9501;' ''   1 % unisong95.htf (unicode)                    `version %
 '&#x9502;' ''   2 `<gversion 2`>
 '&#x9503;' ''   3 `<gversion 3`>
 '&#x9504;' ''   4 `<gversion 4`>
@@ -57832,17 +57832,17 @@
 '&#x95fd;' '' 253
 '&#x95fe;' '' 254
 '&#x95ff;' '' 255
-utf8song95 0 255
+unisong95 0 255
 >>>
 
-\AddFont{utf8song95}{unicode/cjk/utf8/utf8song95}
+\AddFont{unisong95}{unicode/cjk/utf8/unisong95}
 
 
 
-\<utf8song5a\><<<
-utf8song5a 0 255
+\<unisong5a\><<<
+unisong5a 0 255
 '&#x5a00;' ''   0 `<gversion 0`>
-'&#x5a01;' ''   1 % utf8song5a.htf (unicode)                    `version %
+'&#x5a01;' ''   1 % unisong5a.htf (unicode)                    `version %
 '&#x5a02;' ''   2 `<gversion 2`>
 '&#x5a03;' ''   3 `<gversion 3`>
 '&#x5a04;' ''   4 `<gversion 4`>
@@ -58097,17 +58097,17 @@
 '&#x5afd;' '' 253
 '&#x5afe;' '' 254
 '&#x5aff;' '' 255
-utf8song5a 0 255
+unisong5a 0 255
 >>>
 
-\AddFont{utf8song5a}{unicode/cjk/utf8/utf8song5a}
+\AddFont{unisong5a}{unicode/cjk/utf8/unisong5a}
 
 
 
-\<utf8song96\><<<
-utf8song96 0 255
+\<unisong96\><<<
+unisong96 0 255
 '&#x9600;' ''   0 `<gversion 0`>
-'&#x9601;' ''   1 % utf8song96.htf (unicode)                    `version %
+'&#x9601;' ''   1 % unisong96.htf (unicode)                    `version %
 '&#x9602;' ''   2 `<gversion 2`>
 '&#x9603;' ''   3 `<gversion 3`>
 '&#x9604;' ''   4 `<gversion 4`>
@@ -58362,17 +58362,17 @@
 '&#x96fd;' '' 253
 '&#x96fe;' '' 254
 '&#x96ff;' '' 255
-utf8song96 0 255
+unisong96 0 255
 >>>
 
-\AddFont{utf8song96}{unicode/cjk/utf8/utf8song96}
+\AddFont{unisong96}{unicode/cjk/utf8/unisong96}
 
 
 
-\<utf8song5b\><<<
-utf8song5b 0 255
+\<unisong5b\><<<
+unisong5b 0 255
 '&#x5b00;' ''   0 `<gversion 0`>
-'&#x5b01;' ''   1 % utf8song5b.htf (unicode)                    `version %
+'&#x5b01;' ''   1 % unisong5b.htf (unicode)                    `version %
 '&#x5b02;' ''   2 `<gversion 2`>
 '&#x5b03;' ''   3 `<gversion 3`>
 '&#x5b04;' ''   4 `<gversion 4`>
@@ -58627,17 +58627,17 @@
 '&#x5bfd;' '' 253
 '&#x5bfe;' '' 254
 '&#x5bff;' '' 255
-utf8song5b 0 255
+unisong5b 0 255
 >>>
 
-\AddFont{utf8song5b}{unicode/cjk/utf8/utf8song5b}
+\AddFont{unisong5b}{unicode/cjk/utf8/unisong5b}
 
 
 
-\<utf8song97\><<<
-utf8song97 0 255
+\<unisong97\><<<
+unisong97 0 255
 '&#x9700;' ''   0 `<gversion 0`>
-'&#x9701;' ''   1 % utf8song97.htf (unicode)                    `version %
+'&#x9701;' ''   1 % unisong97.htf (unicode)                    `version %
 '&#x9702;' ''   2 `<gversion 2`>
 '&#x9703;' ''   3 `<gversion 3`>
 '&#x9704;' ''   4 `<gversion 4`>
@@ -58892,17 +58892,17 @@
 '&#x97fd;' '' 253
 '&#x97fe;' '' 254
 '&#x97ff;' '' 255
-utf8song97 0 255
+unisong97 0 255
 >>>
 
-\AddFont{utf8song97}{unicode/cjk/utf8/utf8song97}
+\AddFont{unisong97}{unicode/cjk/utf8/unisong97}
 
 
 
-\<utf8song5c\><<<
-utf8song5c 0 255
+\<unisong5c\><<<
+unisong5c 0 255
 '&#x5c00;' ''   0 `<gversion 0`>
-'&#x5c01;' ''   1 % utf8song5c.htf (unicode)                    `version %
+'&#x5c01;' ''   1 % unisong5c.htf (unicode)                    `version %
 '&#x5c02;' ''   2 `<gversion 2`>
 '&#x5c03;' ''   3 `<gversion 3`>
 '&#x5c04;' ''   4 `<gversion 4`>
@@ -59157,17 +59157,17 @@
 '&#x5cfd;' '' 253
 '&#x5cfe;' '' 254
 '&#x5cff;' '' 255
-utf8song5c 0 255
+unisong5c 0 255
 >>>
 
-\AddFont{utf8song5c}{unicode/cjk/utf8/utf8song5c}
+\AddFont{unisong5c}{unicode/cjk/utf8/unisong5c}
 
 
 
-\<utf8song98\><<<
-utf8song98 0 255
+\<unisong98\><<<
+unisong98 0 255
 '&#x9800;' ''   0 `<gversion 0`>
-'&#x9801;' ''   1 % utf8song98.htf (unicode)                    `version %
+'&#x9801;' ''   1 % unisong98.htf (unicode)                    `version %
 '&#x9802;' ''   2 `<gversion 2`>
 '&#x9803;' ''   3 `<gversion 3`>
 '&#x9804;' ''   4 `<gversion 4`>
@@ -59422,17 +59422,17 @@
 '&#x98fd;' '' 253
 '&#x98fe;' '' 254
 '&#x98ff;' '' 255
-utf8song98 0 255
+unisong98 0 255
 >>>
 
-\AddFont{utf8song98}{unicode/cjk/utf8/utf8song98}
+\AddFont{unisong98}{unicode/cjk/utf8/unisong98}
 
 
 
-\<utf8song5d\><<<
-utf8song5d 0 255
+\<unisong5d\><<<
+unisong5d 0 255
 '&#x5d00;' ''   0 `<gversion 0`>
-'&#x5d01;' ''   1 % utf8song5d.htf (unicode)                    `version %
+'&#x5d01;' ''   1 % unisong5d.htf (unicode)                    `version %
 '&#x5d02;' ''   2 `<gversion 2`>
 '&#x5d03;' ''   3 `<gversion 3`>
 '&#x5d04;' ''   4 `<gversion 4`>
@@ -59687,17 +59687,17 @@
 '&#x5dfd;' '' 253
 '&#x5dfe;' '' 254
 '&#x5dff;' '' 255
-utf8song5d 0 255
+unisong5d 0 255
 >>>
 
-\AddFont{utf8song5d}{unicode/cjk/utf8/utf8song5d}
+\AddFont{unisong5d}{unicode/cjk/utf8/unisong5d}
 
 
 
-\<utf8song99\><<<
-utf8song99 0 255
+\<unisong99\><<<
+unisong99 0 255
 '&#x9900;' ''   0 `<gversion 0`>
-'&#x9901;' ''   1 % utf8song99.htf (unicode)                    `version %
+'&#x9901;' ''   1 % unisong99.htf (unicode)                    `version %
 '&#x9902;' ''   2 `<gversion 2`>
 '&#x9903;' ''   3 `<gversion 3`>
 '&#x9904;' ''   4 `<gversion 4`>
@@ -59952,17 +59952,17 @@
 '&#x99fd;' '' 253
 '&#x99fe;' '' 254
 '&#x99ff;' '' 255
-utf8song99 0 255
+unisong99 0 255
 >>>
 
-\AddFont{utf8song99}{unicode/cjk/utf8/utf8song99}
+\AddFont{unisong99}{unicode/cjk/utf8/unisong99}
 
 
 
-\<utf8song5e\><<<
-utf8song5e 0 255
+\<unisong5e\><<<
+unisong5e 0 255
 '&#x5e00;' ''   0 `<gversion 0`>
-'&#x5e01;' ''   1 % utf8song5e.htf (unicode)                    `version %
+'&#x5e01;' ''   1 % unisong5e.htf (unicode)                    `version %
 '&#x5e02;' ''   2 `<gversion 2`>
 '&#x5e03;' ''   3 `<gversion 3`>
 '&#x5e04;' ''   4 `<gversion 4`>
@@ -60217,17 +60217,17 @@
 '&#x5efd;' '' 253
 '&#x5efe;' '' 254
 '&#x5eff;' '' 255
-utf8song5e 0 255
+unisong5e 0 255
 >>>
 
-\AddFont{utf8song5e}{unicode/cjk/utf8/utf8song5e}
+\AddFont{unisong5e}{unicode/cjk/utf8/unisong5e}
 
 
 
-\<utf8song5f\><<<
-utf8song5f 0 255
+\<unisong5f\><<<
+unisong5f 0 255
 '&#x5f00;' ''   0 `<gversion 0`>
-'&#x5f01;' ''   1 % utf8song5f.htf (unicode)                    `version %
+'&#x5f01;' ''   1 % unisong5f.htf (unicode)                    `version %
 '&#x5f02;' ''   2 `<gversion 2`>
 '&#x5f03;' ''   3 `<gversion 3`>
 '&#x5f04;' ''   4 `<gversion 4`>
@@ -60482,17 +60482,17 @@
 '&#x5ffd;' '' 253
 '&#x5ffe;' '' 254
 '&#x5fff;' '' 255
-utf8song5f 0 255
+unisong5f 0 255
 >>>
 
-\AddFont{utf8song5f}{unicode/cjk/utf8/utf8song5f}
+\AddFont{unisong5f}{unicode/cjk/utf8/unisong5f}
 
 
 
-\<utf8song6a\><<<
-utf8song6a 0 255
+\<unisong6a\><<<
+unisong6a 0 255
 '&#x6a00;' ''   0 `<gversion 0`>
-'&#x6a01;' ''   1 % utf8song6a.htf (unicode)                    `version %
+'&#x6a01;' ''   1 % unisong6a.htf (unicode)                    `version %
 '&#x6a02;' ''   2 `<gversion 2`>
 '&#x6a03;' ''   3 `<gversion 3`>
 '&#x6a04;' ''   4 `<gversion 4`>
@@ -60747,17 +60747,17 @@
 '&#x6afd;' '' 253
 '&#x6afe;' '' 254
 '&#x6aff;' '' 255
-utf8song6a 0 255
+unisong6a 0 255
 >>>
 
-\AddFont{utf8song6a}{unicode/cjk/utf8/utf8song6a}
+\AddFont{unisong6a}{unicode/cjk/utf8/unisong6a}
 
 
 
-\<utf8song6b\><<<
-utf8song6b 0 255
+\<unisong6b\><<<
+unisong6b 0 255
 '&#x6b00;' ''   0 `<gversion 0`>
-'&#x6b01;' ''   1 % utf8song6b.htf (unicode)                    `version %
+'&#x6b01;' ''   1 % unisong6b.htf (unicode)                    `version %
 '&#x6b02;' ''   2 `<gversion 2`>
 '&#x6b03;' ''   3 `<gversion 3`>
 '&#x6b04;' ''   4 `<gversion 4`>
@@ -61012,17 +61012,17 @@
 '&#x6bfd;' '' 253
 '&#x6bfe;' '' 254
 '&#x6bff;' '' 255
-utf8song6b 0 255
+unisong6b 0 255
 >>>
 
-\AddFont{utf8song6b}{unicode/cjk/utf8/utf8song6b}
+\AddFont{unisong6b}{unicode/cjk/utf8/unisong6b}
 
 
 
-\<utf8song6c\><<<
-utf8song6c 0 255
+\<unisong6c\><<<
+unisong6c 0 255
 '&#x6c00;' ''   0 `<gversion 0`>
-'&#x6c01;' ''   1 % utf8song6c.htf (unicode)                    `version %
+'&#x6c01;' ''   1 % unisong6c.htf (unicode)                    `version %
 '&#x6c02;' ''   2 `<gversion 2`>
 '&#x6c03;' ''   3 `<gversion 3`>
 '&#x6c04;' ''   4 `<gversion 4`>
@@ -61277,17 +61277,17 @@
 '&#x6cfd;' '' 253
 '&#x6cfe;' '' 254
 '&#x6cff;' '' 255
-utf8song6c 0 255
+unisong6c 0 255
 >>>
 
-\AddFont{utf8song6c}{unicode/cjk/utf8/utf8song6c}
+\AddFont{unisong6c}{unicode/cjk/utf8/unisong6c}
 
 
 
-\<utf8song6d\><<<
-utf8song6d 0 255
+\<unisong6d\><<<
+unisong6d 0 255
 '&#x6d00;' ''   0 `<gversion 0`>
-'&#x6d01;' ''   1 % utf8song6d.htf (unicode)                    `version %
+'&#x6d01;' ''   1 % unisong6d.htf (unicode)                    `version %
 '&#x6d02;' ''   2 `<gversion 2`>
 '&#x6d03;' ''   3 `<gversion 3`>
 '&#x6d04;' ''   4 `<gversion 4`>
@@ -61542,17 +61542,17 @@
 '&#x6dfd;' '' 253
 '&#x6dfe;' '' 254
 '&#x6dff;' '' 255
-utf8song6d 0 255
+unisong6d 0 255
 >>>
 
-\AddFont{utf8song6d}{unicode/cjk/utf8/utf8song6d}
+\AddFont{unisong6d}{unicode/cjk/utf8/unisong6d}
 
 
 
-\<utf8song6e\><<<
-utf8song6e 0 255
+\<unisong6e\><<<
+unisong6e 0 255
 '&#x6e00;' ''   0 `<gversion 0`>
-'&#x6e01;' ''   1 % utf8song6e.htf (unicode)                    `version %
+'&#x6e01;' ''   1 % unisong6e.htf (unicode)                    `version %
 '&#x6e02;' ''   2 `<gversion 2`>
 '&#x6e03;' ''   3 `<gversion 3`>
 '&#x6e04;' ''   4 `<gversion 4`>
@@ -61807,17 +61807,17 @@
 '&#x6efd;' '' 253
 '&#x6efe;' '' 254
 '&#x6eff;' '' 255
-utf8song6e 0 255
+unisong6e 0 255
 >>>
 
-\AddFont{utf8song6e}{unicode/cjk/utf8/utf8song6e}
+\AddFont{unisong6e}{unicode/cjk/utf8/unisong6e}
 
 
 
-\<utf8song6f\><<<
-utf8song6f 0 255
+\<unisong6f\><<<
+unisong6f 0 255
 '&#x6f00;' ''   0 `<gversion 0`>
-'&#x6f01;' ''   1 % utf8song6f.htf (unicode)                    `version %
+'&#x6f01;' ''   1 % unisong6f.htf (unicode)                    `version %
 '&#x6f02;' ''   2 `<gversion 2`>
 '&#x6f03;' ''   3 `<gversion 3`>
 '&#x6f04;' ''   4 `<gversion 4`>
@@ -62072,17 +62072,17 @@
 '&#x6ffd;' '' 253
 '&#x6ffe;' '' 254
 '&#x6fff;' '' 255
-utf8song6f 0 255
+unisong6f 0 255
 >>>
 
-\AddFont{utf8song6f}{unicode/cjk/utf8/utf8song6f}
+\AddFont{unisong6f}{unicode/cjk/utf8/unisong6f}
 
 
 
-\<utf8song7a\><<<
-utf8song7a 0 255
+\<unisong7a\><<<
+unisong7a 0 255
 '&#x7a00;' ''   0 `<gversion 0`>
-'&#x7a01;' ''   1 % utf8song7a.htf (unicode)                    `version %
+'&#x7a01;' ''   1 % unisong7a.htf (unicode)                    `version %
 '&#x7a02;' ''   2 `<gversion 2`>
 '&#x7a03;' ''   3 `<gversion 3`>
 '&#x7a04;' ''   4 `<gversion 4`>
@@ -62337,17 +62337,17 @@
 '&#x7afd;' '' 253
 '&#x7afe;' '' 254
 '&#x7aff;' '' 255
-utf8song7a 0 255
+unisong7a 0 255
 >>>
 
-\AddFont{utf8song7a}{unicode/cjk/utf8/utf8song7a}
+\AddFont{unisong7a}{unicode/cjk/utf8/unisong7a}
 
 
 
-\<utf8song7b\><<<
-utf8song7b 0 255
+\<unisong7b\><<<
+unisong7b 0 255
 '&#x7b00;' ''   0 `<gversion 0`>
-'&#x7b01;' ''   1 % utf8song7b.htf (unicode)                    `version %
+'&#x7b01;' ''   1 % unisong7b.htf (unicode)                    `version %
 '&#x7b02;' ''   2 `<gversion 2`>
 '&#x7b03;' ''   3 `<gversion 3`>
 '&#x7b04;' ''   4 `<gversion 4`>
@@ -62602,17 +62602,17 @@
 '&#x7bfd;' '' 253
 '&#x7bfe;' '' 254
 '&#x7bff;' '' 255
-utf8song7b 0 255
+unisong7b 0 255
 >>>
 
-\AddFont{utf8song7b}{unicode/cjk/utf8/utf8song7b}
+\AddFont{unisong7b}{unicode/cjk/utf8/unisong7b}
 
 
 
-\<utf8song7c\><<<
-utf8song7c 0 255
+\<unisong7c\><<<
+unisong7c 0 255
 '&#x7c00;' ''   0 `<gversion 0`>
-'&#x7c01;' ''   1 % utf8song7c.htf (unicode)                    `version %
+'&#x7c01;' ''   1 % unisong7c.htf (unicode)                    `version %
 '&#x7c02;' ''   2 `<gversion 2`>
 '&#x7c03;' ''   3 `<gversion 3`>
 '&#x7c04;' ''   4 `<gversion 4`>
@@ -62867,17 +62867,17 @@
 '&#x7cfd;' '' 253
 '&#x7cfe;' '' 254
 '&#x7cff;' '' 255
-utf8song7c 0 255
+unisong7c 0 255
 >>>
 
-\AddFont{utf8song7c}{unicode/cjk/utf8/utf8song7c}
+\AddFont{unisong7c}{unicode/cjk/utf8/unisong7c}
 
 
 
-\<utf8song7d\><<<
-utf8song7d 0 255
+\<unisong7d\><<<
+unisong7d 0 255
 '&#x7d00;' ''   0 `<gversion 0`>
-'&#x7d01;' ''   1 % utf8song7d.htf (unicode)                    `version %
+'&#x7d01;' ''   1 % unisong7d.htf (unicode)                    `version %
 '&#x7d02;' ''   2 `<gversion 2`>
 '&#x7d03;' ''   3 `<gversion 3`>
 '&#x7d04;' ''   4 `<gversion 4`>
@@ -63132,17 +63132,17 @@
 '&#x7dfd;' '' 253
 '&#x7dfe;' '' 254
 '&#x7dff;' '' 255
-utf8song7d 0 255
+unisong7d 0 255
 >>>
 
-\AddFont{utf8song7d}{unicode/cjk/utf8/utf8song7d}
+\AddFont{unisong7d}{unicode/cjk/utf8/unisong7d}
 
 
 
-\<utf8song7e\><<<
-utf8song7e 0 255
+\<unisong7e\><<<
+unisong7e 0 255
 '&#x7e00;' ''   0 `<gversion 0`>
-'&#x7e01;' ''   1 % utf8song7e.htf (unicode)                    `version %
+'&#x7e01;' ''   1 % unisong7e.htf (unicode)                    `version %
 '&#x7e02;' ''   2 `<gversion 2`>
 '&#x7e03;' ''   3 `<gversion 3`>
 '&#x7e04;' ''   4 `<gversion 4`>
@@ -63397,17 +63397,17 @@
 '&#x7efd;' '' 253
 '&#x7efe;' '' 254
 '&#x7eff;' '' 255
-utf8song7e 0 255
+unisong7e 0 255
 >>>
 
-\AddFont{utf8song7e}{unicode/cjk/utf8/utf8song7e}
+\AddFont{unisong7e}{unicode/cjk/utf8/unisong7e}
 
 
 
-\<utf8song7f\><<<
-utf8song7f 0 255
+\<unisong7f\><<<
+unisong7f 0 255
 '&#x7f00;' ''   0 `<gversion 0`>
-'&#x7f01;' ''   1 % utf8song7f.htf (unicode)                    `version %
+'&#x7f01;' ''   1 % unisong7f.htf (unicode)                    `version %
 '&#x7f02;' ''   2 `<gversion 2`>
 '&#x7f03;' ''   3 `<gversion 3`>
 '&#x7f04;' ''   4 `<gversion 4`>
@@ -63662,17 +63662,17 @@
 '&#x7ffd;' '' 253
 '&#x7ffe;' '' 254
 '&#x7fff;' '' 255
-utf8song7f 0 255
+unisong7f 0 255
 >>>
 
-\AddFont{utf8song7f}{unicode/cjk/utf8/utf8song7f}
+\AddFont{unisong7f}{unicode/cjk/utf8/unisong7f}
 
 
 
-\<utf8song8a\><<<
-utf8song8a 0 255
+\<unisong8a\><<<
+unisong8a 0 255
 '&#x8a00;' ''   0 `<gversion 0`>
-'&#x8a01;' ''   1 % utf8song8a.htf (unicode)                    `version %
+'&#x8a01;' ''   1 % unisong8a.htf (unicode)                    `version %
 '&#x8a02;' ''   2 `<gversion 2`>
 '&#x8a03;' ''   3 `<gversion 3`>
 '&#x8a04;' ''   4 `<gversion 4`>
@@ -63927,17 +63927,17 @@
 '&#x8afd;' '' 253
 '&#x8afe;' '' 254
 '&#x8aff;' '' 255
-utf8song8a 0 255
+unisong8a 0 255
 >>>
 
-\AddFont{utf8song8a}{unicode/cjk/utf8/utf8song8a}
+\AddFont{unisong8a}{unicode/cjk/utf8/unisong8a}
 
 
 
-\<utf8song8b\><<<
-utf8song8b 0 255
+\<unisong8b\><<<
+unisong8b 0 255
 '&#x8b00;' ''   0 `<gversion 0`>
-'&#x8b01;' ''   1 % utf8song8b.htf (unicode)                    `version %
+'&#x8b01;' ''   1 % unisong8b.htf (unicode)                    `version %
 '&#x8b02;' ''   2 `<gversion 2`>
 '&#x8b03;' ''   3 `<gversion 3`>
 '&#x8b04;' ''   4 `<gversion 4`>
@@ -64192,17 +64192,17 @@
 '&#x8bfd;' '' 253
 '&#x8bfe;' '' 254
 '&#x8bff;' '' 255
-utf8song8b 0 255
+unisong8b 0 255
 >>>
 
-\AddFont{utf8song8b}{unicode/cjk/utf8/utf8song8b}
+\AddFont{unisong8b}{unicode/cjk/utf8/unisong8b}
 
 
 
-\<utf8song8c\><<<
-utf8song8c 0 255
+\<unisong8c\><<<
+unisong8c 0 255
 '&#x8c00;' ''   0 `<gversion 0`>
-'&#x8c01;' ''   1 % utf8song8c.htf (unicode)                    `version %
+'&#x8c01;' ''   1 % unisong8c.htf (unicode)                    `version %
 '&#x8c02;' ''   2 `<gversion 2`>
 '&#x8c03;' ''   3 `<gversion 3`>
 '&#x8c04;' ''   4 `<gversion 4`>
@@ -64457,17 +64457,17 @@
 '&#x8cfd;' '' 253
 '&#x8cfe;' '' 254
 '&#x8cff;' '' 255
-utf8song8c 0 255
+unisong8c 0 255
 >>>
 
-\AddFont{utf8song8c}{unicode/cjk/utf8/utf8song8c}
+\AddFont{unisong8c}{unicode/cjk/utf8/unisong8c}
 
 
 
-\<utf8song8d\><<<
-utf8song8d 0 255
+\<unisong8d\><<<
+unisong8d 0 255
 '&#x8d00;' ''   0 `<gversion 0`>
-'&#x8d01;' ''   1 % utf8song8d.htf (unicode)                    `version %
+'&#x8d01;' ''   1 % unisong8d.htf (unicode)                    `version %
 '&#x8d02;' ''   2 `<gversion 2`>
 '&#x8d03;' ''   3 `<gversion 3`>
 '&#x8d04;' ''   4 `<gversion 4`>
@@ -64722,17 +64722,17 @@
 '&#x8dfd;' '' 253
 '&#x8dfe;' '' 254
 '&#x8dff;' '' 255
-utf8song8d 0 255
+unisong8d 0 255
 >>>
 
-\AddFont{utf8song8d}{unicode/cjk/utf8/utf8song8d}
+\AddFont{unisong8d}{unicode/cjk/utf8/unisong8d}
 
 
 
-\<utf8song8e\><<<
-utf8song8e 0 255
+\<unisong8e\><<<
+unisong8e 0 255
 '&#x8e00;' ''   0 `<gversion 0`>
-'&#x8e01;' ''   1 % utf8song8e.htf (unicode)                    `version %
+'&#x8e01;' ''   1 % unisong8e.htf (unicode)                    `version %
 '&#x8e02;' ''   2 `<gversion 2`>
 '&#x8e03;' ''   3 `<gversion 3`>
 '&#x8e04;' ''   4 `<gversion 4`>
@@ -64987,17 +64987,17 @@
 '&#x8efd;' '' 253
 '&#x8efe;' '' 254
 '&#x8eff;' '' 255
-utf8song8e 0 255
+unisong8e 0 255
 >>>
 
-\AddFont{utf8song8e}{unicode/cjk/utf8/utf8song8e}
+\AddFont{unisong8e}{unicode/cjk/utf8/unisong8e}
 
 
 
-\<utf8song8f\><<<
-utf8song8f 0 255
+\<unisong8f\><<<
+unisong8f 0 255
 '&#x8f00;' ''   0 `<gversion 0`>
-'&#x8f01;' ''   1 % utf8song8f.htf (unicode)                    `version %
+'&#x8f01;' ''   1 % unisong8f.htf (unicode)                    `version %
 '&#x8f02;' ''   2 `<gversion 2`>
 '&#x8f03;' ''   3 `<gversion 3`>
 '&#x8f04;' ''   4 `<gversion 4`>
@@ -65252,17 +65252,17 @@
 '&#x8ffd;' '' 253
 '&#x8ffe;' '' 254
 '&#x8fff;' '' 255
-utf8song8f 0 255
+unisong8f 0 255
 >>>
 
-\AddFont{utf8song8f}{unicode/cjk/utf8/utf8song8f}
+\AddFont{unisong8f}{unicode/cjk/utf8/unisong8f}
 
 
 
-\<utf8song9a\><<<
-utf8song9a 0 255
+\<unisong9a\><<<
+unisong9a 0 255
 '&#x9a00;' ''   0 `<gversion 0`>
-'&#x9a01;' ''   1 % utf8song9a.htf (unicode)                    `version %
+'&#x9a01;' ''   1 % unisong9a.htf (unicode)                    `version %
 '&#x9a02;' ''   2 `<gversion 2`>
 '&#x9a03;' ''   3 `<gversion 3`>
 '&#x9a04;' ''   4 `<gversion 4`>
@@ -65517,17 +65517,17 @@
 '&#x9afd;' '' 253
 '&#x9afe;' '' 254
 '&#x9aff;' '' 255
-utf8song9a 0 255
+unisong9a 0 255
 >>>
 
-\AddFont{utf8song9a}{unicode/cjk/utf8/utf8song9a}
+\AddFont{unisong9a}{unicode/cjk/utf8/unisong9a}
 
 
 
-\<utf8song9b\><<<
-utf8song9b 0 255
+\<unisong9b\><<<
+unisong9b 0 255
 '&#x9b00;' ''   0 `<gversion 0`>
-'&#x9b01;' ''   1 % utf8song9b.htf (unicode)                    `version %
+'&#x9b01;' ''   1 % unisong9b.htf (unicode)                    `version %
 '&#x9b02;' ''   2 `<gversion 2`>
 '&#x9b03;' ''   3 `<gversion 3`>
 '&#x9b04;' ''   4 `<gversion 4`>
@@ -65782,17 +65782,17 @@
 '&#x9bfd;' '' 253
 '&#x9bfe;' '' 254
 '&#x9bff;' '' 255
-utf8song9b 0 255
+unisong9b 0 255
 >>>
 
-\AddFont{utf8song9b}{unicode/cjk/utf8/utf8song9b}
+\AddFont{unisong9b}{unicode/cjk/utf8/unisong9b}
 
 
 
-\<utf8song9c\><<<
-utf8song9c 0 255
+\<unisong9c\><<<
+unisong9c 0 255
 '&#x9c00;' ''   0 `<gversion 0`>
-'&#x9c01;' ''   1 % utf8song9c.htf (unicode)                    `version %
+'&#x9c01;' ''   1 % unisong9c.htf (unicode)                    `version %
 '&#x9c02;' ''   2 `<gversion 2`>
 '&#x9c03;' ''   3 `<gversion 3`>
 '&#x9c04;' ''   4 `<gversion 4`>
@@ -66047,17 +66047,17 @@
 '&#x9cfd;' '' 253
 '&#x9cfe;' '' 254
 '&#x9cff;' '' 255
-utf8song9c 0 255
+unisong9c 0 255
 >>>
 
-\AddFont{utf8song9c}{unicode/cjk/utf8/utf8song9c}
+\AddFont{unisong9c}{unicode/cjk/utf8/unisong9c}
 
 
 
-\<utf8song9d\><<<
-utf8song9d 0 255
+\<unisong9d\><<<
+unisong9d 0 255
 '&#x9d00;' ''   0 `<gversion 0`>
-'&#x9d01;' ''   1 % utf8song9d.htf (unicode)                    `version %
+'&#x9d01;' ''   1 % unisong9d.htf (unicode)                    `version %
 '&#x9d02;' ''   2 `<gversion 2`>
 '&#x9d03;' ''   3 `<gversion 3`>
 '&#x9d04;' ''   4 `<gversion 4`>
@@ -66312,17 +66312,17 @@
 '&#x9dfd;' '' 253
 '&#x9dfe;' '' 254
 '&#x9dff;' '' 255
-utf8song9d 0 255
+unisong9d 0 255
 >>>
 
-\AddFont{utf8song9d}{unicode/cjk/utf8/utf8song9d}
+\AddFont{unisong9d}{unicode/cjk/utf8/unisong9d}
 
 
 
-\<utf8song9e\><<<
-utf8song9e 0 255
+\<unisong9e\><<<
+unisong9e 0 255
 '&#x9e00;' ''   0 `<gversion 0`>
-'&#x9e01;' ''   1 % utf8song9e.htf (unicode)                    `version %
+'&#x9e01;' ''   1 % unisong9e.htf (unicode)                    `version %
 '&#x9e02;' ''   2 `<gversion 2`>
 '&#x9e03;' ''   3 `<gversion 3`>
 '&#x9e04;' ''   4 `<gversion 4`>
@@ -66577,17 +66577,17 @@
 '&#x9efd;' '' 253
 '&#x9efe;' '' 254
 '&#x9eff;' '' 255
-utf8song9e 0 255
+unisong9e 0 255
 >>>
 
-\AddFont{utf8song9e}{unicode/cjk/utf8/utf8song9e}
+\AddFont{unisong9e}{unicode/cjk/utf8/unisong9e}
 
 
 
-\<utf8song9f\><<<
-utf8song9f 0 255
+\<unisong9f\><<<
+unisong9f 0 255
 '&#x9f00;' ''   0 `<gversion 0`>
-'&#x9f01;' ''   1 % utf8song9f.htf (unicode)                    `version %
+'&#x9f01;' ''   1 % unisong9f.htf (unicode)                    `version %
 '&#x9f02;' ''   2 `<gversion 2`>
 '&#x9f03;' ''   3 `<gversion 3`>
 '&#x9f04;' ''   4 `<gversion 4`>
@@ -66842,10 +66842,10 @@
 '&#x9ffd;' '' 253
 '&#x9ffe;' '' 254
 '&#x9fff;' '' 255
-utf8song9f 0 255
+unisong9f 0 255
 >>>
 
-\AddFont{utf8song9f}{unicode/cjk/utf8/utf8song9f}
+\AddFont{unisong9f}{unicode/cjk/utf8/unisong9f}
 
 
 \bye

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht	2022-06-20 21:09:35 UTC (rev 63668)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/hyperref-hooks.4ht	2022-06-20 21:46:09 UTC (rev 63669)
@@ -1,4 +1,4 @@
-% hyperref-hooks.4ht (2022-02-22-13:25), generated from tex4ht-4ht.tex
+% hyperref-hooks.4ht (2022-06-20-14:19), generated from tex4ht-4ht.tex
 % Copyright 2022 TeX Users Group
 %
 % This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2022-02-22-13:25}
+\immediate\write-1{version 2022-06-20-14:19}
 
 \:AtEndOfPackage{%
 \@ifpackageloaded{nameref}{}
@@ -49,5 +49,7 @@
 \providecommand*\theoremautorefname{Theorem}
 \providecommand*\pageautorefname{page}
 
+\def\Hy at numberline#1{#1 }
+
 }
 

Added: trunk/Master/texmf-dist/tex/generic/tex4ht/pdfpages.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/pdfpages.4ht	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/pdfpages.4ht	2022-06-20 21:46:09 UTC (rev 63669)
@@ -0,0 +1,35 @@
+% pdfpages.4ht (2022-06-20-14:19), generated from tex4ht-4ht.tex
+% Copyright 2022 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2022-06-20-14:19}
+
+\define at key{Gin}{page}[]{\edef\Gin at page{#1}}
+
+\def\AM at findfile#1{%
+  \AM at findfile@i{#1}{pdf}%
+  \AM at findfile@ii{#1}%
+}
+\catcode`\:=12
+\renewcommand\AM at output[1]{%
+  \@for\@pages:=\AM at pagestemp\do{\includegraphics[page=\@pages]{\AM at currentdocname}}
+}
+\catcode`\:=11
+
+\Hinput{pdfpages}
+\endinput
+


Property changes on: trunk/Master/texmf-dist/tex/generic/tex4ht/pdfpages.4ht
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property


More information about the tex-live-commits mailing list.