cjk (9may12)

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

1 files changed, 8 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/cjk/Makefile b/Master/texmf-dist/doc/latex/cjk/Makefile
index 3ff57b867d9..3b72e119ac9 100644
--- a/Master/texmf-dist/doc/latex/cjk/Makefile
+++ b/Master/texmf-dist/doc/latex/cjk/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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
@@ -27,13 +27,13 @@
 #
 # o GNU extensions of various utility programs are used.
 #
-# o emacs 22 and the `cweave' program from the `c2cweb' package,
-#   renamed to `cweavex', are needed.
+# o emacs 22 (or newer) and the `cweave' program from the `c2cweb'
+#   package, renamed to `cweavex', are needed.
 #
 # o The TeXLive version of some font definition files are used (in the
 #   `texlive' subdirectory).
 
-version=4.8.2
+version=4.8.3
 
 distdir=cjk-$(version)
 abs-distdir=$(shell pwd)/$(distdir)
@@ -44,6 +44,7 @@ DISTDIRS=$(shell find . -type d | grep -v .git | grep -v $(distdir))
 CJK2DVI=\
   (cd dvi; \
    TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \
+   TFMFONTS=$(abs-distdir)/utils/thaifont/texmf/fonts/tfm//: \
      texi2dvi -l latex ../cjk/$@.cjk; \
    rm -f $@.aux $@.log $@.toc)
 
@@ -53,6 +54,7 @@ LATEX2DVI=\
   cp $(1)/$@.tex $(2)/dvi; \
   (cd $(2)/dvi; \
    TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \
+   TFMFONTS=$(abs-distdir)/utils/thaifont/texmf/fonts/tfm//: \
      texi2dvi -l latex $@.tex; \
    rm -f $@.tex $@.aux $@.log $@.toc)
 
@@ -89,17 +91,6 @@ LATEX=\
   cd $(2); \
   $(if $(3),$(call DVI2PDF,$(3)),$(call DVI2PDF,letter))
 
-# XELATEX srcdir targetdir
-XELATEX=\
-  cd $(distdir); \
-  cp $(1)/$@.tex $(2)/pdf; \
-  (cd $(2)/pdf; \
-   TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \
-     xelatex $@.tex; \
-   TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \
-     xelatex $@.tex; \
-   rm -f $@.tex $@.aux $@.log $@.toc $@.out $@.ovt)
-
 
 DISTTARGETS=\
   READMEb5 \
@@ -112,7 +103,6 @@ DISTTARGETS=\
   CJKutf8 \
   CJKspace \
   CJKmixed \
-  xCJK \
   GB \
   JIS \
   KS \
@@ -123,6 +113,7 @@ DISTTARGETS=\
   py_test \
   rubytest \
   thai \
+  thai_utf8 \
   c90
 
 
@@ -142,12 +133,10 @@ CEF_test:
 	$(call CONVERT,cefconv,examples,examples)
 SJIS:
 	$(call CONVERT,sjisconv,examples,examples)
-CJKbabel muletest rubytest thai:
+CJKbabel muletest rubytest thai thai_utf8:
 	$(call MULE,examples,examples)
 GB JIS KS UTF8 py_test CJKfntef CJKutf8 CJKspace CJKmixed:
 	$(call LATEX,examples,examples)
-xCJK:
-	$(call XELATEX,examples,examples)
 pytest:
 	$(call LATEX,utils/pyhyphen,examples)
 c90: