Remove trivial diffs between dvipdfmx and xdvipdfmx

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

22 files changed, 39 insertions, 29 deletions

diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index f334840ce4c..2d9d9742c60 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,16 @@
 ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
 =================================================
 
+2011-03-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/cff_dict.h, src/cff_types.h, src/cmap.c, src/cmap_write.c,
+	src/dpxcrypt.[ch], src/mfileio.c, src/mpost.h, src/otl_conf.c,
+	src/otl_opt.c, src/pdfencoding.[ch], src/pdflimits.h,
+	src/pdfparse.h, src/specials.h, src/subfont.c, src/t1_char.c,
+	src/tt_post.h, src/vf.c: Remove trivial diffs with dvipdfmx.
+
+	* src/Makefile.am: Mark asl_charset.h as unused.
+
 2011-03-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* src/dvipdfmx.c, src/pdfencrypt.c and src/pdfencrypt.h:
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index 992799d5784..cf4ba279b5b 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/src/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
@@ -22,7 +22,7 @@ xdvipdfmx_SOURCES = \
 	tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
 	type0.c t1_char.c t1_load.c type1.c type1c.c \
 	unicode.c vf.c xbb.c \
-	agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
+	agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
 	cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
 	cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
 	jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
@@ -54,5 +54,5 @@ endif !build_MacOsX
 ## Rebuild libz
 @ZLIB_RULE@
 
-EXTRA_DIST = mk_agl_standard_c.pl
+EXTRA_DIST = asl_charset.h mk_agl_standard_c.pl
 
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index 7af62a9969f..4fb7b7c8497 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -259,7 +259,7 @@ xdvipdfmx_SOURCES = \
 	tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
 	type0.c t1_char.c t1_load.c type1.c type1c.c \
 	unicode.c vf.c xbb.c \
-	agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
+	agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
 	cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
 	cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
 	jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
@@ -275,7 +275,7 @@ xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(K
 LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \
 	$(am__append_2)
 @build_MacOsX_TRUE@AM_LDFLAGS = -framework ApplicationServices
-EXTRA_DIST = mk_agl_standard_c.pl
+EXTRA_DIST = asl_charset.h mk_agl_standard_c.pl
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/texk/xdvipdfmx/src/cff_dict.h b/Build/source/texk/xdvipdfmx/src/cff_dict.h
index c74e1172e61..7a8d1f888b7 100644
--- a/Build/source/texk/xdvipdfmx/src/cff_dict.h
+++ b/Build/source/texk/xdvipdfmx/src/cff_dict.h
@@ -2,7 +2,7 @@
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
diff --git a/Build/source/texk/xdvipdfmx/src/cff_types.h b/Build/source/texk/xdvipdfmx/src/cff_types.h
index 33173efebda..388dc5b77d3 100644
--- a/Build/source/texk/xdvipdfmx/src/cff_types.h
+++ b/Build/source/texk/xdvipdfmx/src/cff_types.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cff_types.h,v 1.3 2002/10/30 02:27:05 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cff_types.h,v 1.4 2011/03/06 03:14:13 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/cmap.c b/Build/source/texk/xdvipdfmx/src/cmap.c
index 4dbe4b7537f..9ab66aece8a 100644
--- a/Build/source/texk/xdvipdfmx/src/cmap.c
+++ b/Build/source/texk/xdvipdfmx/src/cmap.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cmap.c,v 1.29 2007/12/03 03:10:43 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cmap.c,v 1.30 2011/03/06 03:14:13 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/cmap_write.c b/Build/source/texk/xdvipdfmx/src/cmap_write.c
index 5b25ff7158f..eb900512a11 100644
--- a/Build/source/texk/xdvipdfmx/src/cmap_write.c
+++ b/Build/source/texk/xdvipdfmx/src/cmap_write.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cmap_write.c,v 1.6 2004/09/05 13:30:05 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cmap_write.c,v 1.7 2011/03/06 03:14:13 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
index e2666c1d4d3..8c818b038d5 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
+++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.c,v 1.2 2004/07/27 12:08:46 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.c,v 1.3 2011/03/06 03:14:13 chofchof Exp $
  
     This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.h b/Build/source/texk/xdvipdfmx/src/dpxcrypt.h
index 77ca47888d4..edbf7d1c8cc 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.h
+++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.h,v 1.1 2003/08/05 07:09:09 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.h,v 1.2 2011/03/06 03:14:13 chofchof Exp $
  
     This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/mfileio.c b/Build/source/texk/xdvipdfmx/src/mfileio.c
index b1ed18706a9..bec5020fa06 100644
--- a/Build/source/texk/xdvipdfmx/src/mfileio.c
+++ b/Build/source/texk/xdvipdfmx/src/mfileio.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/mfileio.c,v 1.3 2002/10/30 02:27:11 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/mfileio.c,v 1.4 2011/03/06 03:14:14 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/mpost.h b/Build/source/texk/xdvipdfmx/src/mpost.h
index 1471bbcdaad..49b9bbd9817 100644
--- a/Build/source/texk/xdvipdfmx/src/mpost.h
+++ b/Build/source/texk/xdvipdfmx/src/mpost.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/mpost.h,v 1.11 2004/09/11 14:50:28 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/mpost.h,v 1.12 2011/03/06 03:14:14 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/otl_conf.c b/Build/source/texk/xdvipdfmx/src/otl_conf.c
index 107f8cb597e..a439e821543 100644
--- a/Build/source/texk/xdvipdfmx/src/otl_conf.c
+++ b/Build/source/texk/xdvipdfmx/src/otl_conf.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/otl_conf.c,v 1.8 2008/05/18 12:05:22 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/otl_conf.c,v 1.9 2011/03/06 03:14:14 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/otl_opt.c b/Build/source/texk/xdvipdfmx/src/otl_opt.c
index 9b97f4008b4..1ef8e48152c 100644
--- a/Build/source/texk/xdvipdfmx/src/otl_opt.c
+++ b/Build/source/texk/xdvipdfmx/src/otl_opt.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/otl_opt.c,v 1.3 2004/08/22 10:26:24 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/otl_opt.c,v 1.4 2011/03/06 03:14:14 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/pdfencoding.c b/Build/source/texk/xdvipdfmx/src/pdfencoding.c
index 00a041c3b81..9e72b2276f0 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfencoding.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfencoding.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.c,v 1.11 2008/05/22 11:03:09 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.c,v 1.13 2011/03/06 03:14:14 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/pdfencoding.h b/Build/source/texk/xdvipdfmx/src/pdfencoding.h
index d65b2e9781b..abc62b2bf6c 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfencoding.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfencoding.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.h,v 1.4 2007/11/14 03:12:21 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.h,v 1.5 2011/03/06 03:14:14 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/pdflimits.h b/Build/source/texk/xdvipdfmx/src/pdflimits.h
index 43590df6433..f3871dea24a 100644
--- a/Build/source/texk/xdvipdfmx/src/pdflimits.h
+++ b/Build/source/texk/xdvipdfmx/src/pdflimits.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdflimits.h,v 1.4 2004/09/05 13:30:05 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdflimits.h,v 1.6 2009/05/06 06:07:09 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -26,10 +26,10 @@
 #define _PDFLIMITS_H_
 
 /*
- *  * The minimal and maximal PDF version supported by DVIPDFMx.
- *   * NOTE: Don't forget to update CIDFont_stdcc_def[] in cid.c
- *    * if you increase PDF_VERSION_MAX!
- *     */
+ * The minimal and maximal PDF version supported by DVIPDFMx.
+ * NOTE: Don't forget to update CIDFont_stdcc_def[] in cid.c
+ * if you increase PDF_VERSION_MAX!
+ */
 #define PDF_VERSION_MIN  3
 #define PDF_VERSION_MAX  7
 #define PDF_VERSION_DEFAULT 4
diff --git a/Build/source/texk/xdvipdfmx/src/pdfparse.h b/Build/source/texk/xdvipdfmx/src/pdfparse.h
index 327b0cfc60e..01106a1977c 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfparse.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfparse.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfparse.h,v 1.15 2008/05/13 12:23:45 matthias Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfparse.h,v 1.16 2011/03/06 03:14:14 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/specials.h b/Build/source/texk/xdvipdfmx/src/specials.h
index 74a69293d00..98f9b8d05ef 100644
--- a/Build/source/texk/xdvipdfmx/src/specials.h
+++ b/Build/source/texk/xdvipdfmx/src/specials.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/specials.h,v 1.4 2007/01/20 23:53:20 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/specials.h,v 1.5 2011/03/06 03:14:15 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
diff --git a/Build/source/texk/xdvipdfmx/src/subfont.c b/Build/source/texk/xdvipdfmx/src/subfont.c
index 9448601910e..091b551a022 100644
--- a/Build/source/texk/xdvipdfmx/src/subfont.c
+++ b/Build/source/texk/xdvipdfmx/src/subfont.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.c,v 1.22 2008/01/13 21:25:31 matthias Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.c,v 1.23 2011/03/06 03:14:15 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/t1_char.c b/Build/source/texk/xdvipdfmx/src/t1_char.c
index 59bb0793178..c76338d3d21 100644
--- a/Build/source/texk/xdvipdfmx/src/t1_char.c
+++ b/Build/source/texk/xdvipdfmx/src/t1_char.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/t1_char.c,v 1.5 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/t1_char.c,v 1.6 2011/03/06 03:14:15 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/tt_post.h b/Build/source/texk/xdvipdfmx/src/tt_post.h
index 414c680a570..afb5c080e08 100644
--- a/Build/source/texk/xdvipdfmx/src/tt_post.h
+++ b/Build/source/texk/xdvipdfmx/src/tt_post.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/tt_post.h,v 1.1 2004/09/11 14:50:29 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/tt_post.h,v 1.2 2011/03/06 03:14:15 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
diff --git a/Build/source/texk/xdvipdfmx/src/vf.c b/Build/source/texk/xdvipdfmx/src/vf.c
index fcce8efe095..5da73f93658 100644
--- a/Build/source/texk/xdvipdfmx/src/vf.c
+++ b/Build/source/texk/xdvipdfmx/src/vf.c
@@ -2,7 +2,7 @@
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>