Update to CJK 4.7.0

git-svn-id: svn://tug.org/texlive/trunk@2361 c570f23f-e606-0410-a88d-b1316a301751

29 files changed, 927 insertions, 24 deletions

diff --git a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada
index acaded60a4a..d5abfc50e09 100755
--- a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada
+++ b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada
@@ -1,8 +1,26 @@
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 # This script fixes the Wadalab fonts which have been created with the
 # `makefont' script of the CJK package version 4.5.1 or earlier.
 #
 # It converts all PFB files in the current directory.
 
+
 for i in *.pfb; do
   echo $i
   mv $i $i.old
diff --git a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada2.pl b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada2.pl
index 9c4a818da3d..2247a7c0c62 100644
--- a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada2.pl
+++ b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/fixwada2.pl
@@ -1,7 +1,24 @@
 #! /usr/bin/perl -w
 #
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 # This script fixes the Wadalab fonts which have been created with the
-# `makefont' script version 1.0 (from CJK 4.6.0), or which have been updated
+# `makefont' script version 1.0 (from CJK 4.7.0), or which have been updated
 # with the `fixwada' script.
 #
 #   . Make all glyph names compliant to the Adobe Glyph List (AGL) to
diff --git a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makefont b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makefont
index 7c70ef0c1ce..ecb5d14e82c 100755
--- a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makefont
+++ b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makefont
@@ -1,5 +1,22 @@
 #!/bin/sh
 #
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 # Version 1.0
 #
 # This script transforms Wadalab PFA and AFM files created by the
diff --git a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makeuniwada.pl b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makeuniwada.pl
index fa8c205f3c8..a0f0d71ac78 100644
--- a/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makeuniwada.pl
+++ b/Master/texmf-dist/source/latex/CJK/contrib/wadalab/makeuniwada.pl
@@ -1,5 +1,22 @@
 #! /usr/bin/perl -w
 #
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 # This script creates virtual subfonts in Unicode encoding for Wadalab
 # subfonts. It can merge a JIS X 0208 and JIS X 0212 family into a single
 # set of Unicode subfonts.
diff --git a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c63mj.fd b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c63mj.fd
index 9249aa2050d..426c869319f 100644
--- a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c63mj.fd
+++ b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c63mj.fd
@@ -3,10 +3,10 @@
 %
 % created by Werner Lemberg <wl@gnu.org>
 %
-% Version 4.6.0 (11-Aug-2005)
+% Version 4.7.0 (17-Oct-2006)
 
-\def\fileversion{4.6.0}
-\def\filedate{2005/08/11}
+\def\fileversion{4.7.0}
+\def\filedate{2006/10/17}
 \ProvidesFile{c63mj.fd}[\filedate\space\fileversion]
 
 % Korean characters (Hangul)
diff --git a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c64mj.fd b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c64mj.fd
index 5b348007fba..e660e69cb1c 100644
--- a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c64mj.fd
+++ b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c64mj.fd
@@ -3,10 +3,10 @@
 %
 % created by Werner Lemberg <wl@gnu.org>
 %
-% Version 4.6.0 (11-Aug-2005)
+% Version 4.7.0 (17-Oct-2006)
 
-\def\fileversion{4.6.0}
-\def\filedate{2005/08/11}
+\def\fileversion{4.7.0}
+\def\filedate{2006/10/17}
 \ProvidesFile{c64mj.fd}[\filedate\space\fileversion]
 
 % Korean characters (Symbols)
diff --git a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c65mj.fd b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c65mj.fd
index 8132c80545d..71043b9ed6e 100644
--- a/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c65mj.fd
+++ b/Master/texmf-dist/source/latex/CJK/texinput/KS/HLaTeX/c65mj.fd
@@ -3,10 +3,10 @@
 %
 % created by Werner Lemberg <wl@gnu.org>
 %
-% Version 4.6.0 (11-Aug-2005)
+% Version 4.7.0 (17-Oct-2006)
 
-\def\fileversion{4.6.0}
-\def\filedate{2005/08/11}
+\def\fileversion{4.7.0}
+\def\filedate{2006/10/17}
 \ProvidesFile{c65mj.fd}[\filedate\space\fileversion]
 
 % Korean characters (Hanja)
diff --git a/Master/texmf-dist/source/latex/CJK/utils/lisp/cjkspace.el b/Master/texmf-dist/source/latex/CJK/utils/lisp/cjkspace.el
index c8f18330d1c..e9c9239d1a2 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/lisp/cjkspace.el
+++ b/Master/texmf-dist/source/latex/CJK/utils/lisp/cjkspace.el
@@ -1,7 +1,24 @@
 ;;; cjkspace.el --- provide a tilde character if you type a space.
 ;;; use this file with AUCTeX.
 
-;; This file is part of the CJK package Version 4.6.0 (11-Aug-2005)
+;; Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program in doc/COPYING; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+;; MA 02110-1301 USA
+
+;; This file is part of the CJK package Version 4.7.0 (17-Oct-2006)
 
 ;; Insert tilde characters instead of spaces for LaTeX CJK documents.
 ;; If `CJK-space-after-space' is non-nil, typing a space yields a space.
diff --git a/Master/texmf-dist/source/latex/CJK/utils/lisp/cjktilde.el b/Master/texmf-dist/source/latex/CJK/utils/lisp/cjktilde.el
index b3eebfb7731..4868d3021d6 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/lisp/cjktilde.el
+++ b/Master/texmf-dist/source/latex/CJK/utils/lisp/cjktilde.el
@@ -1,6 +1,23 @@
 ;;; cjktilde.el -- minor mode exchanging `~' and ` ' keys.
 
-;; This file is part of the CJK package Version 4.6.0 (11-Aug-2005)
+;; Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program in doc/COPYING; if not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+;; MA 02110-1301 USA
+
+;; This file is part of the CJK package Version 4.7.0 (17-Oct-2006)
 
 ;; Function `cjk-tilde-mode' activates a minor mode (`cjk-tilde-minor-mode')
 ;; which exchanges the tilde key with the space key. This is useful for
diff --git a/Master/texmf-dist/source/latex/CJK/utils/lisp/emacs/cjk-enc.el b/Master/texmf-dist/source/latex/CJK/utils/lisp/emacs/cjk-enc.el
index a926203b061..ee1e857321e 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/lisp/emacs/cjk-enc.el
+++ b/Master/texmf-dist/source/latex/CJK/utils/lisp/emacs/cjk-enc.el
@@ -22,7 +22,7 @@
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;
-;; CJK Version 4.6.0 (11-Aug-2005)
+;; CJK Version 4.7.0 (17-Oct-2006)
 ;;
 
 ;;; Code
diff --git a/Master/texmf-dist/source/latex/CJK/utils/lisp/mule-2.3/cjk-enc.el b/Master/texmf-dist/source/latex/CJK/utils/lisp/mule-2.3/cjk-enc.el
index 379c168e884..031cc23814a 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/lisp/mule-2.3/cjk-enc.el
+++ b/Master/texmf-dist/source/latex/CJK/utils/lisp/mule-2.3/cjk-enc.el
@@ -22,7 +22,7 @@
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;
-;; CJK Version 4.6.0 (11-Aug-2005)
+;; CJK Version 4.7.0 (17-Oct-2006)
 ;;
 
 ;;; Code
diff --git a/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.c b/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.c
index ec2a56c0e16..7c9c9f83d6b 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.c
+++ b/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.c
@@ -1,7 +1,7 @@
 /*
 
-  This is the file pinyin.c of the CJK macro package ver. 4.6.0
-  (11-Aug-2005).
+  This is the file pinyin.c of the CJK macro package ver. 4.7.0
+  (17-Oct-2006).
 
   Use this file to generate a hyphenation input file for patgen.
 
@@ -11,6 +11,25 @@
 
  */
 
+/*
+  Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program in doc/COPYING; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+  MA 02110-1301 USA
+ */
+
 #include <stdio.h>
 
 
diff --git a/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.tr b/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.tr
index 966b752dd24..984c667e68f 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.tr
+++ b/Master/texmf-dist/source/latex/CJK/utils/pyhyphen/pinyin.tr
@@ -2,10 +2,27 @@
 %% This is the file pinyin.tr of the CJK package
 %% defining the letters used for generating pinyin hyphenation patterns
 %% with patgen.
-%%
+%
 %% created by Werner Lemberg <wl@gnu.org>
 %%
-%% Version 4.6.0 (11-Aug-2005)
+%% Version 4.7.0 (17-Oct-2006)
+%%
+%% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%%
+%% This program is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU General Public License as published by
+%% the Free Software Foundation; either version 2 of the License, or
+%% (at your option) any later version.
+%%
+%% This program is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%% GNU General Public License for more details.
+%%
+%% You should have received a copy of the GNU General Public License
+%% along with this program in doc/COPYING; if not, write to the Free
+%% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+%% MA 02110-1301 USA
  a A
  b B
  c C
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/clonevf.pl b/Master/texmf-dist/source/latex/CJK/utils/subfonts/clonevf.pl
index f6b35b207a5..b622bf35257 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/clonevf.pl
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/clonevf.pl
@@ -11,7 +11,24 @@
 #
 # Example:
 #
-#   perl clonevf.pl bsmiuv bsmilp
+#   perl clonevf.pl bsmiuv bsmilpv
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
 
 use strict;
 
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/hlatex2agl.pl b/Master/texmf-dist/source/latex/CJK/utils/subfonts/hlatex2agl.pl
new file mode 100644
index 00000000000..71645a96700
--- /dev/null
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/hlatex2agl.pl
@@ -0,0 +1,477 @@
+#! /usr/bin/perl -w
+#
+# This script adds AGL compliant glyph names to fonts from the HLaTeX
+# package version 0.97 or newer. Note that only glyphs actually used in the
+# (virtual) HLaTeX subfonts get new names; additionally, the used glyph
+# shapes in the HLaTeX fonts aren't always correct -- consider this script
+# as an auxiliary means, not a definitive solution. At least the Hangul and
+# Hanja shapes are correct.
+#
+# As prerequisites, it needs the programs `t1asm' and `t1disasm' (from the
+# t1utils package) and `vftovp' which must be in the path. The subfont
+# definition file `UKS-HLaTeX.sfd' (from the ttf2pk package) and the file
+#
+#   http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt
+#
+# are necessary also.
+#
+# Call the script as
+#
+#   perl hlatex2agl.pl virtual_namestem real_namestem
+#
+# `virtual_namestem' specifies the name stem of the virtual subfonts
+# directly used by LaTeX; both the VF and TFM files are needed.
+# `real_namestem' gives the name stem of the real subfonts used by the
+# virtual fonts; TFM, AFM, and PFB files are needed.
+#
+# Example:
+#
+#   perl hlatex2agl.pl wmj umj UKS-HLaTeX.sfd
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
+use strict;
+
+my $prog = $0;
+$prog =~ s@.*/@@;
+
+if ($#ARGV != 2) {
+  die("usage: $prog virtual_namestem real_namestem sfd_file\n");  
+}
+ 
+my $virtnamestem = $ARGV[0];
+my $realnamestem = $ARGV[1];
+my $sfdfile = $ARGV[2];
+
+
+# Read UKS-HLaTeX.sfd.
+
+my @sfd;
+my @virtsubfonts;
+
+read_sfdfile($sfdfile, \@sfd, \@virtsubfonts);
+
+
+# Read AGL file.
+
+my %agl;
+
+read_aglfile("aglfn13.txt", \%agl);
+
+
+# Read VF files.
+
+my %vpl;
+my %subfonts;
+
+for my $suffix (@virtsubfonts) {
+  read_vffile("$virtnamestem$suffix.vf", $suffix, \%vpl, \%subfonts);
+}
+
+
+# Decompose all Hangul syllables.
+
+my @hangul;
+
+decompose_hangul(\@hangul);
+
+
+# Build glyph names.
+
+my %names;
+
+build_glyphnames(\%names);
+
+
+# Process AFM files.
+
+foreach my $suffix (sort (keys %subfonts)) {
+  process_afmfile("$realnamestem$suffix.afm", $suffix);
+}
+
+
+# Process PFB files.
+
+foreach my $suffix (sort (keys %subfonts)) {
+  process_pfbfile("$realnamestem$suffix.pfb", $suffix);
+}
+
+
+# Read an SFD file.
+#
+#   $1: Name of the SFD file.
+#   $2: Reference to the target array, mapping from Unicode to the subfont.
+#       The format of the array values is the concatenation of the subfont
+#       suffix, a space, and the index.
+#   $3: Reference to a target array which holds the subfont suffixes.
+
+sub read_sfdfile {
+  my ($sfdfile, $sfdarray, $subarray) = @_;
+
+  print("Reading subfont definition file \`$sfdfile'...\n");
+
+  open(SFD, $sfdfile)
+  || die("$prog: can't open \`$sfdfile': $!\n");
+
+  my $line;
+  my $continuation = 0;
+  while (<SFD>) {
+    chop;
+
+    next if /^\s*$/;
+    next if /^#/;
+
+    if ($continuation) {
+      $line .= $_;
+    }
+    else {
+      $line = $_;
+    }
+    $continuation = 0;
+
+    if ($line =~ s/\\$//) {
+      $continuation = 1;
+      next;
+    }
+
+    $_ = $line;
+    my @field = split(" ");
+
+    my $suffix = $field[0];
+    push(@{$subarray}, $suffix);
+
+    shift(@field);
+    my $index = 0;
+
+    while (@field) {
+      if ($field[0] =~ /(.*):$/) {
+        $index = $1;
+      }
+      elsif ($field[0] =~ /(.*)_(.*)/) {
+        my $start = $1;
+        my $end = $2;
+        $start = oct($start) if ($start =~ /^0/);
+        $end = oct($end) if ($end =~ /^0/);
+        foreach my $i ($start .. $end) {
+          $sfdarray->[$i] = "$suffix $index";
+          $index++;
+        }
+      }
+      else {
+        my $value = $field[0];
+        $value = oct($value) if ($value =~ /^0/);
+        $sfdarray->[$value] = "$suffix $index";
+        $index++;
+      }
+      shift(@field);
+    }
+  }
+  close(SFD);
+}
+
+
+# Read an AGL file.
+#
+#  $1: Name of the AGL file.
+#  $2: Reference to the target hash file, mapping from the Unicode value
+#      to the glyph name.
+
+sub read_aglfile {
+  my ($aglfile, $aglhash) = @_;
+
+  print("Reading Adobe Glyph List file \`$aglfile'...\n");
+
+  open(AGL, $aglfile)
+  || die("$prog: can't open \`$aglfile': $!\n");
+
+  while (<AGL>) {
+    chop;
+
+    next if /^\s*$/;
+    next if /^#/;
+
+    my @field = split(";");
+    $aglhash->{hex($field[0])} = $field[1];
+  }
+  close(AGL);
+}
+
+
+# Read a VF file.
+#
+#   $1: Name of the VF file.
+#   $2: Subfont suffix.
+#   $3: Reference to a target hash, mapping from the virtual subfont to the
+#       real subfonts. The format of the key is the concatenation of the
+#       subfont suffix, a space, and the index. The format of the hash value
+#       is `<suffix1> <idx1>[,<suffix2> <idx2>[,...]]'.
+#   $4: Reference to a target hash, collecting the suffixes of the real
+#       subfonts.
+
+sub read_vffile {
+  my ($vffile, $vfsuffix, $vplhash, $subfonthash) = @_;
+  my $vplfile = "$vffile.vpl";
+
+  print("Creating virtual property list file \`$vplfile'...\n");
+  my $arg = "vftovp -charcode-format=octal $vffile > $vplfile";
+  system("$arg") == 0
+  || die("$prog: calling \`$arg' failed: $?");
+
+  print("Reading \`$vplfile'...\n");
+  open(VPL, $vplfile)
+  || die("$prog: can't open \`$vplfile': $!\n");
+
+  my @subfonts;
+  my $subindex;
+  my $index;
+  my $currfont;
+  my $map = "";
+
+  while (<VPL>) {
+    if (/\(MAPFONT D ([0-9]+)/) {
+      $subindex = $1;
+    }
+    elsif (/\(FONTNAME $realnamestem(.*?)\)/) {
+      $subfonts[$subindex] = $1;
+      if (!defined ($subfonthash->{$1})) {
+        $subfonthash->{$1} = 1;
+      }
+    }
+    elsif (/\(CHARACTER O ([0-7]+)/) {
+      # Save data from previous CHARACTER block.
+      $vplhash->{"$vfsuffix $index"} = $map if ($map);
+
+      # Reset variables.
+      $index = oct($1);
+      $currfont = 0;
+      $map = "";
+    }
+    elsif (/\(SELECTFONT D ([0-9]+)\)/) {
+      $currfont = $1;
+    }
+    elsif (/\(SETCHAR O ([0-7]+)\)/) {
+      $map .= "," if ($map);
+      $map .= "$subfonts[$currfont] " . oct($1);
+    }
+  }
+
+  # Save data from last CHARACTER block.
+  $vplhash->{"$vfsuffix $index"} = $map if ($map);
+
+  close(VPL);
+  unlink($vplfile);
+}
+
+
+# Decompose all Unicode Hangul syllables into Jamo elements.
+#
+#   $1: The target array, mapping from Unicode value to a list of Jamos (in
+#       Unicode), separated by commata.
+#
+# This follows the algorithm given in the Unicode standard.
+
+sub decompose_hangul {
+  my ($hangularray) = @_;
+
+  my $s_base = 0xAC00;
+  my $l_base = 0x1100;
+  my $v_base = 0x1161;
+  my $t_base = 0x11A7;
+
+  my $s_count = 11172;
+  my $l_count = 19;
+  my $v_count = 21;
+  my $t_count = 28;
+
+  my $n_count = $v_count * $t_count;
+
+  for my $s ($s_base .. ($s_base + $s_count - 1)) {
+    my $s_index = $s - $s_base;
+
+    my $l = $l_base + int($s_index / $n_count);
+    my $v = $v_base + int(($s_index % $n_count) / $t_count);
+    my $t = $t_base + $s_index % $t_count;
+
+    my $jamos = "$l,$v";
+    $jamos .= ",$t" if ($t != $t_base);
+    $hangularray->[$s] = $jamos;
+  }
+}
+
+
+# Build glyph names.
+#
+#   $1: The target hash which maps from real subfonts to glyph names. Keys
+#       are of the form `<suffix> <index>', hash values are AGL compliant
+#       glyph names.  Glyph variants get a trailing suffix of the form `.N',
+#       where is is a running number starting with 1. Example: `uni1100.24'.
+
+sub build_glyphnames {
+  my ($nameshash) = @_;
+
+  my @entries;
+
+  foreach my $unicode (0 .. 0xFFFF) {
+    next if !defined ($sfd[$unicode]);
+
+    my $virtdata = $sfd[$unicode];
+
+    # We assume that only Hangul syllables are composed of more than
+    # a single element.
+    if (defined ($hangul[$unicode])) {
+      my @unijamos = split(",", $hangul[$unicode]);
+      my @jamos = split(",", $vpl{$virtdata});
+
+      foreach my $i (0 .. $#jamos) {
+        if (!defined ($nameshash->{$jamos[$i]})) {
+          if (defined ($entries[$unijamos[$i]])) {
+            $nameshash->{$jamos[$i]} = sprintf("uni%04X.%d",
+                                         $unijamos[$i],
+                                         $entries[$unijamos[$i]]);
+            $entries[$unijamos[$i]] += 1;
+          }
+          else {
+            $nameshash->{$jamos[$i]} = sprintf("uni%04X", $unijamos[$i]);
+            $entries[$unijamos[$i]] = 1;
+          }
+        }
+      }
+    }
+    else {
+      if (defined ($agl{$unicode})) {
+        $nameshash->{$vpl{$virtdata}} = $agl{$unicode};
+      }
+      else {
+        $nameshash->{$vpl{$virtdata}} = sprintf("uni%04X", $unicode);
+      }
+    }
+  }
+}
+
+
+# Process AFM file.
+#
+#   $1: Name of the AFM file to process. The file is first saved, then all
+#       glyph names are replaced for which an AGL compliant glyph name is
+#       known.
+#   $2: The suffix.
+
+sub process_afmfile {
+  my ($afmfile, $sub) = @_;
+
+  print("Processing \`$afmfile'...\n");
+
+  if (!-f $afmfile) {
+    die("$prog: \`$afmfile' doesn't exist\n");
+  }
+
+  rename($afmfile, "$afmfile.old");
+
+  open(INFILE, "$afmfile.old")
+  || die("$prog: can't open \`$afmfile.old': $!\n");
+  open(OUTFILE, ">", "$afmfile")
+  || die("$prog: can't open \`$afmfile': $!\n");
+
+  while (<INFILE>) {
+    # Replace the `kxx' entries.
+    if (/ N k(.*?) ;/) {
+      my $index = hex($1);
+      if (defined ($names{"$sub $index"})) {
+        s/ N .*? ;/ N $names{"$sub $index"} ;/;
+      }
+    }
+
+    # Update version number.
+    s/001\.000/001.001/;
+    s/Altsys\ Fontographer\ 4\.1\ 1\/10\/95$/001.001/;
+
+    print(OUTFILE $_);
+
+    # Add comment.
+    if (/^Comment\ UniqueID/ || /^Comment\ Generated/) {
+      print(OUTFILE "Comment AGL compliant glyph names added "
+                    . "by script $prog 2005-Jul-27.\n");
+    }
+  }
+
+  close(INFILE);
+  close(OUTFILE);
+}
+
+
+# Process PFB file.
+#
+#   $1: Name of the PFB file to process. The file is first saved, then all
+#       glyph names are replaced for which an AGL compliant glyph name is
+#       known.
+#   $2: The suffix.
+
+sub process_pfbfile {
+  my ($pfbfile, $sub) = @_;
+  my $arg;
+
+  print("Processing \`$pfbfile'...\n");
+
+  if (!-f $pfbfile) {
+    die("$prog: \`$pfbfile' doesn't exist\n");
+  }
+
+  rename($pfbfile, "$pfbfile.old");
+
+  $arg = "t1disasm < $pfbfile.old > $pfbfile.disasm.old";
+  system("$arg") == 0
+  || die("$prog: calling \`$arg' failed: $?");
+
+  open(INFILE, "$pfbfile.disasm.old")
+  || die("$prog: can't open \`$pfbfile.disasm.old': $!\n");
+  open(OUTFILE, ">", "$pfbfile.disasm")
+  || die("$prog: can't open \`$pfbfile.disasm': $!\n");
+
+  while (<INFILE>) {
+    # Replace the `kxx' entries.
+    if (m@/k(.*?) @) {
+      my $index = hex($1);
+      if (defined ($names{"$sub $index"})) {
+        s@/k.*? @/$names{"$sub $index"} @;
+      }
+    }
+
+    # Update version number.
+    s/001\.000/001.001/;
+
+    print(OUTFILE $_);
+
+    # Add comment.
+    if (/^%%CreationDate/) {
+      print(OUTFILE "% AGL compliant glyph names added "
+                    . "by script $prog 2005-Jul-27.\n");
+    }
+  }
+
+  close(INFILE);
+  close(OUTFILE);
+
+  $arg = "t1asm < $pfbfile.disasm > $pfbfile";
+  system("$arg") == 0
+  || die("$prog: calling \`$arg' failed: $?");
+
+  unlink("$pfbfile.disasm.old", "$pfbfile.disasm");
+}
+
+
+# eof
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/makefdx.pl b/Master/texmf-dist/source/latex/CJK/utils/subfonts/makefdx.pl
index c2bd1c4d027..5b0666afe76 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/makefdx.pl
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/makefdx.pl
@@ -3,23 +3,43 @@
 # This script creates proper entries for an FDX file as used by the
 # CJK package for LaTeX.
 #
-# As a prerequisite, it needs the file `aglfn13.txt', available from
+# As a prerequisite, it needs the file
 #
-#   http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+#   http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt
 #
 # Call the script as
 #
 #   perl makefdx.pl vertref_afm_file sfd_file fdx_file
 #
 # `vertref_afm_file' is an AFM file as produced by the script `vertref.pe'.
-# `sfd_file' gives the subfont scheme to get the proper entries in
-# `fdx_file'.
+# The subfont definition file `sfd_file' gives the subfont scheme to get the
+# proper entries in `fdx_file'.
 #
 # Note that the created FDX file has to be completed manually.
 #
 # Example:
 #
-#   perl makefdx.pl bsmiuv.afm bsmiuvr.afm UBig5.sfd c00bsmi.fdx
+#   perl makefdx.pl bsmiuvr.afm UBig5.sfd c00bsmi.fdx
+#
+# A collection of useful subfont definition files for CJK fonts can be found
+# in the ttf2pk package.
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
 
 use strict;
 
@@ -64,6 +84,23 @@ open(FDX, ">", $fdxfile)
 || die("$prog: can't open \`$fdxfile': $!\n");
 my $oldfh = select(FDX);
 
+print("% This is the file $fdxfile of the CJK package
+%   for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
+%
+% created by the script makefdx.pl for CJK Version 4.7.0 (17-Oct-2006).
+
+\\def\\fileversion{4.7.0}
+\\def\\filedate{2006/10/17}
+\\ProvidesFile{$fdxfile}[\\filedate\\space\\fileversion]
+
+\\CJKvdef{fullheight}{1em}
+\\CJKvdef{height}{.88em}
+\\CJKvdef{offset}{.6em}
+
+% Uncomment if necessary.
+%\\CJKvdef{norotate}{}
+");
+
 foreach my $index (0 .. ($#vertref - 1)) {
   my $glyphnameref = $vertref[$index];
   my $unicode;
@@ -100,7 +137,10 @@ foreach my $index (0 .. ($#vertref - 1)) {
 
   print("\\CJKvdef{m/n/$sfdentry}");
   print("{\\def\\CJK\@plane{v}\\selectfont\\CJKsymbol{$index}}\n");
+  print("\\CJKvlet{bx/n/$sfdentry}");
+  print("{m/n/$sfdentry}\n");
 }
+print("\n\\endinput");
 
 
 # Read an AGL file.
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/sfd2uni.pl b/Master/texmf-dist/source/latex/CJK/utils/subfonts/sfd2uni.pl
index d01d8d0ac21..be9694244f5 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/sfd2uni.pl
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/sfd2uni.pl
@@ -22,6 +22,26 @@
 # Example:
 #
 #   perl sfd2uni.pl UKS-HLaTeX.sfd wmj uwmj HLATEX
+#
+# A collection of useful subfont definition files for CJK fonts can be found
+# in the ttf2pk package.
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
 
 use strict;
 
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/subfonts.pe b/Master/texmf-dist/source/latex/CJK/utils/subfonts/subfonts.pe
index 141ce6d39dc..f6643484b62 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/subfonts.pe
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/subfonts.pe
@@ -4,6 +4,26 @@
 # $1: The master font (e.g., `bsmi00lp.ttf').
 # $2: The name stem for the subfonts (e.g., `bsmilp').
 # $3: The subfont definition file (e.g., `UBig5.sfd').
+#
+# A collection of useful subfont definition files for CJK fonts can be found
+# in the ttf2pk package.
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
 
 if ($argc != 4)
   Print("usage: [fontforge -script] ", $0, " master-font name-stem SFD-file");
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/uni2sfd.pl b/Master/texmf-dist/source/latex/CJK/utils/subfonts/uni2sfd.pl
index 34c32134990..b6054e4152c 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/uni2sfd.pl
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/uni2sfd.pl
@@ -20,6 +20,26 @@
 # Example:
 #
 #   perl uni2sfd.pl bsmiu UBig5.sfd bsmilp cjkbig5
+#
+# A collection of useful subfont definition files for CJK fonts can be found
+# in the ttf2pk package.
+
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
 
 use strict;
 
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertical.pe b/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertical.pe
index 727c06a7dbf..df8e0bf1dcf 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertical.pe
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertical.pe
@@ -4,6 +4,23 @@
 # $1: The master font (e.g., `bsmi00lp.ttf').
 # $2: The name of the vertical font (e.g., `bsmilpv').
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 if ($argc != 3)
   Print("usage: [fontforge -script] ", $0, " master-font vertical-fontname");
   Quit(1);
diff --git a/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertref.pe b/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertref.pe
index 284b7070d98..02e2074aa81 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertref.pe
+++ b/Master/texmf-dist/source/latex/CJK/utils/subfonts/vertref.pe
@@ -8,6 +8,23 @@
 # $1: The master font (e.g., `bsmi00lp.ttf').
 # $2: The name of the target font (e.g., `bsmilpvr').
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 if ($argc != 3)
   Print("usage: [fontforge -script] ", $0, " master-font fontname");
   Quit(1);
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.etx b/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.etx
index e6ee96a53e9..ecc055ce3af 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.etx
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.etx
@@ -1,5 +1,22 @@
 % c90.etx
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \relax
 \documentclass{article}
 
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.mtx b/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.mtx
index 79c4d27ed5a..3f747cb67b8 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.mtx
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/c90.mtx
@@ -1,5 +1,22 @@
 % c90.mtx
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \relax
 
 \metrics
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.etx b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.etx
index 7e8b7d34965..11e0bf5d3ac 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.etx
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.etx
@@ -1,5 +1,22 @@
 % dbtt-old-alias.etx
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \relax
 
 \encoding
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.mtx b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.mtx
index e9acca8ffec..0ef5fc47fe3 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.mtx
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.mtx
@@ -1,5 +1,22 @@
 % dbtt-old-alias.mtx
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \relax
 
 \metrics
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.tex b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.tex
index 6fed8f42095..b66988f1341 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.tex
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old-alias.tex
@@ -1,5 +1,22 @@
 % dbtt-old-alias.tex
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \galias{ucircumflex}{endash}
 \galias{uacute}{emdash}
 \galias{quotedbl}{quotedblleft}
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old.fontinst b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old.fontinst
index 5b5ca25e8ea..955583d344f 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old.fontinst
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/dbtt-old/dbtt-old.fontinst
@@ -1,5 +1,22 @@
 % dbtt-old.fontinst
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \input fontinst.sty
 
 \needsfontinstversion{1.918}
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/garuda.fontinst b/Master/texmf-dist/source/latex/CJK/utils/thaifont/garuda.fontinst
index 0fd74a42e6c..91fba38cabc 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/garuda.fontinst
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/garuda.fontinst
@@ -1,5 +1,22 @@
 % garuda.fontinst
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \input fontinst.sty
 
 \needsfontinstversion{1.918}
diff --git a/Master/texmf-dist/source/latex/CJK/utils/thaifont/norasi.fontinst b/Master/texmf-dist/source/latex/CJK/utils/thaifont/norasi.fontinst
index b9ae7d6e925..d3625a4a367 100644
--- a/Master/texmf-dist/source/latex/CJK/utils/thaifont/norasi.fontinst
+++ b/Master/texmf-dist/source/latex/CJK/utils/thaifont/norasi.fontinst
@@ -1,5 +1,22 @@
 % norasi.fontinst
 
+% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program in doc/COPYING; if not, write to the Free
+% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+% MA 02110-1301 USA
+
 \input fontinst.sty
 
 \needsfontinstversion{1.918}