--- xpdf-3.00/xpdf-korean/README.r	2002-02-02 00:16:01.000000000 +0100
+++ xpdf-3.00/xpdf-korean/README	2004-10-11 13:45:42.761460132 +0200
@@ -18,13 +18,13 @@
 
 Place all of these files in a directory, typically:
 
-    Unix - /usr/local/share/xpdf/korean
+    Unix - /usr/share/xpdf/korean
     Win32 - C:\Program Files\xpdf\korean
 
 Add the contents of the "add-to-xpdfrc" file to your system-wide
 xpdfrc config file, which is typically:
 
-    Unix - /usr/local/etc/xpdfrc
+    Unix - /etc/xpdfrc
     Win32 - C:\Program Files\Xpdf\xpdfrc
 
 Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.00/xpdf-korean/add-to-xpdfrc.r	2002-02-02 00:16:01.000000000 +0100
+++ xpdf-3.00/xpdf-korean/add-to-xpdfrc	2004-10-11 14:40:59.970274311 +0200
@@ -1,7 +1,7 @@
 #----- begin Korean support package (2002-jan-16)
-cidToUnicode	Adobe-Korea1	/usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
-unicodeMap	ISO-2022-KR	/usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir		Adobe-Korea1	/usr/local/share/xpdf/korean/CMap
-toUnicodeDir			/usr/local/share/xpdf/korean/CMap
-displayCIDFontX	Adobe-Korea1	"-*-mincho-medium-r-normal-*-%s-*-*-*-*-*-ksc5601.1987-0" ISO-2022-KR
+cidToUnicode	Adobe-Korea1	/usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
+unicodeMap	ISO-2022-KR	/usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir		Adobe-Korea1	/usr/share/xpdf/korean/CMap
+toUnicodeDir			/usr/share/xpdf/korean/CMap
+displayCIDFontTT	Adobe-Korea1	/usr/share/fonts/ko/TrueType/gulim.ttf
 #----- end Korean support package
--- xpdf-3.00/xpdf-chinese-simplified/README.r	2002-11-04 00:49:14.000000000 +0100
+++ xpdf-3.00/xpdf-chinese-simplified/README	2004-10-11 13:45:42.759460427 +0200
@@ -20,13 +20,13 @@
 
 Place all of these files in a directory, typically:
 
-    Unix - /usr/local/share/xpdf/chinese-simplified
+    Unix - /usr/share/xpdf/chinese-simplified
     Win32 - C:\Program Files\xpdf\chinese-simplified
 
 Add the contents of the "add-to-xpdfrc" file to your system-wide
 xpdfrc config file, which is typically:
 
-    Unix - /usr/local/etc/xpdfrc
+    Unix - /etc/xpdfrc
     Win32 - C:\Program Files\xpdf\xpdfrc
 
 Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.00/xpdf-chinese-simplified/add-to-xpdfrc.r	2002-11-04 00:49:14.000000000 +0100
+++ xpdf-3.00/xpdf-chinese-simplified/add-to-xpdfrc	2004-10-11 14:39:23.098544301 +0200
@@ -1,9 +1,9 @@
 #----- begin Chinese Simplified support package (2002-jun-17)
-cidToUnicode	Adobe-GB1	/usr/local/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
-unicodeMap	ISO-2022-CN	/usr/local/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
-unicodeMap	EUC-CN		/usr/local/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
-unicodeMap	GBK		/usr/local/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir		Adobe-GB1	/usr/local/share/xpdf/chinese-simplified/CMap
-toUnicodeDir			/usr/local/share/xpdf/chinese-simplified/CMap
-displayCIDFontX	Adobe-GB1	"-*-fangsong ti-medium-r-normal-*-%s-*-*-*-*-*-gb2312.1980-0" ISO-2022-CN
+cidToUnicode	Adobe-GB1	/usr/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
+unicodeMap	ISO-2022-CN	/usr/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+unicodeMap	EUC-CN		/usr/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
+unicodeMap	GBK		/usr/share/xpdf/chinese-simplified/GBK.unicodeMap
+cMapDir		Adobe-GB1	/usr/share/xpdf/chinese-simplified/CMap
+toUnicodeDir			/usr/share/xpdf/chinese-simplified/CMap
+displayCIDFontTT	Adobe-GB1	/usr/share/fonts/zh_CN/TrueType/gbsn00lp.ttf
 #----- end Chinese Simplified support package
--- xpdf-3.00/xpdf-japanese/README.r	2002-11-04 00:49:12.000000000 +0100
+++ xpdf-3.00/xpdf-japanese/README	2004-10-11 13:45:42.761460132 +0200
@@ -20,13 +20,13 @@
 
 Place all of these files in a directory, typically:
 
-    Unix - /usr/local/share/xpdf/japanese
+    Unix - /usr/share/xpdf/japanese
     Win32 - C:\Program Files\xpdf\japanese
 
 Add the contents of the "add-to-xpdfrc" file to your system-wide
 xpdfrc config file, which is typically:
 
-    Unix - /usr/local/etc/xpdfrc
+    Unix - /etc/xpdfrc
     Win32 - C:\Program Files\xpdf\xpdfrc
 
 Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.00/xpdf-japanese/add-to-xpdfrc.r	2002-11-04 00:49:12.000000000 +0100
+++ xpdf-3.00/xpdf-japanese/add-to-xpdfrc	2004-10-11 14:44:50.835263480 +0200
@@ -1,9 +1,9 @@
 #----- begin Japanese support package (2002-apr-01)
-cidToUnicode	Adobe-Japan1	/usr/local/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-unicodeMap	ISO-2022-JP	/usr/local/share/xpdf/japanese/ISO-2022-JP.unicodeMap
-unicodeMap	EUC-JP		/usr/local/share/xpdf/japanese/EUC-JP.unicodeMap
-unicodeMap	Shift-JIS	/usr/local/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir		Adobe-Japan1	/usr/local/share/xpdf/japanese/CMap
-toUnicodeDir			/usr/local/share/xpdf/japanese/CMap
-displayCIDFontX	Adobe-Japan1	"-*-fixed-medium-r-normal-*-%s-*-*-*-*-*-jisx0208.1983-0" ISO-2022-JP
+cidToUnicode	Adobe-Japan1	/usr/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
+unicodeMap	ISO-2022-JP	/usr/share/xpdf/japanese/ISO-2022-JP.unicodeMap
+unicodeMap	EUC-JP		/usr/share/xpdf/japanese/EUC-JP.unicodeMap
+unicodeMap	Shift-JIS	/usr/share/xpdf/japanese/Shift-JIS.unicodeMap
+cMapDir		Adobe-Japan1	/usr/share/xpdf/japanese/CMap
+toUnicodeDir			/usr/share/xpdf/japanese/CMap
+displayCIDFontTT Adobe-Japan1   /usr/share/fonts/ja/TrueType/kochi-gothic-subst.ttf
 #----- end Japanese support package
--- xpdf-3.00/xpdf-chinese-traditional/README.r	2002-11-04 00:49:13.000000000 +0100
+++ xpdf-3.00/xpdf-chinese-traditional/README	2004-10-11 13:45:42.760460279 +0200
@@ -19,13 +19,13 @@
 
 Place all of these files in a directory, typically:
 
-    Unix - /usr/local/share/xpdf/chinese-traditional
+    Unix - /usr/share/xpdf/chinese-traditional
     Win32 - C:\Program Files\xpdf\chinese-traditional
 
 Add the contents of the "add-to-xpdfrc" file to your system-wide
 xpdfrc config file, which is typically:
 
-    Unix - /usr/local/etc/xpdfrc
+    Unix - /etc/xpdfrc
     Win32 - C:\Program Files\xpdf\xpdfrc
 
 Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.00/xpdf-chinese-traditional/add-to-xpdfrc.r	2002-11-04 00:49:13.000000000 +0100
+++ xpdf-3.00/xpdf-chinese-traditional/add-to-xpdfrc	2004-10-11 14:45:20.065956987 +0200
@@ -1,10 +1,8 @@
 #----- begin Chinese Traditional support package (2002-apr-14)
-cidToUnicode	Adobe-CNS1	/usr/local/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
-unicodeMap	Big5		/usr/local/share/xpdf/chinese-traditional/Big5.unicodeMap
-unicodeMap	Big5ascii	/usr/local/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir		Adobe-CNS1	/usr/local/share/xpdf/chinese-traditional/CMap
-toUnicodeDir			/usr/local/share/xpdf/chinese-traditional/CMap
-displayCIDFontX	Adobe-CNS1	"-*-fixed-medium-r-normal-*-%s-*-*-*-*-*-big5-0" Big5
-# If you have the Arphic fonts, you may want to use this instead:
-# displayCIDFontX Adobe-CNS1	"-arphic-ar pl kaitim big5-medium-r-normal--%s-*-*-*-c-*-iso10646-1" UCS-2
+cidToUnicode	Adobe-CNS1	/usr/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
+unicodeMap	Big5		/usr/share/xpdf/chinese-traditional/Big5.unicodeMap
+unicodeMap	Big5ascii	/usr/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
+cMapDir		Adobe-CNS1	/usr/share/xpdf/chinese-traditional/CMap
+toUnicodeDir			/usr/share/xpdf/chinese-traditional/CMap
+displayCIDFontTT	Adobe-CNS1 /usr/share/fonts/zh_TW/TrueType/bsmi00lp.ttf
 #----- end Chinese Traditional support package
--- xpdf-3.00/doc/xpdfrc.5.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/xpdfrc.5	2004-10-11 13:45:42.763459836 +0200
@@ -7,7 +7,7 @@
 .I .xpdfrc
 file in your home directory, it will be read.  Otherwise, a
 system-wide configuration file will be read from
-.IR /usr/local/etc/xpdfrc ,
+.IR /etc/xpdfrc ,
 if it exists.  (This is its default location; depending on build
 options, it may be placed elsewhere.)  On Win32 systems, the
 .I xpdfrc
@@ -458,7 +458,7 @@
 .fi
 .SH FILES
 .TP
-.B /usr/local/etc/xpdfrc
+.B /etc/xpdfrc
 This is the default location for the system-wide configuration file.
 Depending on build options, it may be placed elsewhere.
 .TP
--- xpdf-3.00/doc/sample-xpdfrc.r	2004-10-11 14:48:05.093642822 +0200
+++ xpdf-3.00/doc/sample-xpdfrc	2004-10-11 14:48:11.106756854 +0200
@@ -73,7 +73,7 @@
 
 # Set the default PostScript file or command.
 
-#psFile			"|lpr -Pmyprinter"
+psFile			"|lpr"
 
 # Set the default PostScript paper size -- this can be letter, legal,
 # A4, or A3.  You can also specify a paper size as width and height
@@ -108,3 +108,9 @@
 
 urlCommand	"htmlview '%s'"
 #urlCommand	"netscape -remote 'openURL(%s)'"
+
+# CJK
+include /usr/share/xpdf/japanese/add-to-xpdfrc
+include /usr/share/xpdf/korean/add-to-xpdfrc
+include /usr/share/xpdf/chinese-simplified/add-to-xpdfrc
+include /usr/share/xpdf/chinese-traditional/add-to-xpdfrc
--- xpdf-3.00/doc/pdffonts.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/pdffonts.1	2004-10-11 13:45:42.763459836 +0200
@@ -62,7 +62,7 @@
 Pdffonts reads a configuration file at startup.  It first tries to
 find the user's private config file, ~/.xpdfrc.  If that doesn't
 exist, it looks for a system-wide config file, typically
-/usr/local/etc/xpdfrc (but this location can be changed when pdffonts
+/etc/xpdfrc (but this location can be changed when pdffonts
 is built).  See the
 .BR xpdfrc (5)
 man page for details.
--- xpdf-3.00/doc/pdftotext.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/pdftotext.1	2004-10-11 13:45:42.765459541 +0200
@@ -29,7 +29,7 @@
 Pdftotext reads a configuration file at startup.  It first tries to
 find the user's private config file, ~/.xpdfrc.  If that doesn't
 exist, it looks for a system-wide config file, typically
-/usr/local/etc/xpdfrc (but this location can be changed when pdftotext
+/etc/xpdfrc (but this location can be changed when pdftotext
 is built).  See the
 .BR xpdfrc (5)
 man page for details.
--- xpdf-3.00/doc/pdfimages.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/pdfimages.1	2004-10-11 13:45:42.764459689 +0200
@@ -25,7 +25,7 @@
 Pdfimages reads a configuration file at startup.  It first tries to
 find the user's private config file, ~/.xpdfrc.  If that doesn't
 exist, it looks for a system-wide config file, typically
-/usr/local/etc/xpdfrc (but this location can be changed when pdfimages
+/etc/xpdfrc (but this location can be changed when pdfimages
 is built).  See the
 .BR xpdfrc (5)
 man page for details.
--- xpdf-3.00/doc/xpdf.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/xpdf.1	2004-10-11 13:45:42.766459393 +0200
@@ -40,7 +40,7 @@
 .SH CONFIGURATION FILE
 Xpdf reads a configuration file at startup.  It first tries to find
 the user's private config file, ~/.xpdfrc.  If that doesn't exist, it
-looks for a system-wide config file, typically /usr/local/etc/xpdfrc
+looks for a system-wide config file, typically /etc/xpdfrc
 (but this location can be changed when xpdf is built).  See the
 .BR xpdfrc (5)
 man page for details.
--- xpdf-3.00/doc/pdftops.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/pdftops.1	2004-10-11 13:45:42.765459541 +0200
@@ -31,7 +31,7 @@
 .SH CONFIGURATION FILE
 Pdftops reads a configuration file at startup.  It first tries to find
 the user's private config file, ~/.xpdfrc.  If that doesn't exist, it
-looks for a system-wide config file, typically /usr/local/etc/xpdfrc
+looks for a system-wide config file, typically /etc/xpdfrc
 (but this location can be changed when pdftops is built).  See the
 .BR xpdfrc (5)
 man page for details.
--- xpdf-3.00/doc/pdfinfo.1.r	2004-01-22 02:26:44.000000000 +0100
+++ xpdf-3.00/doc/pdfinfo.1	2004-10-11 13:45:42.764459689 +0200
@@ -71,7 +71,7 @@
 .SH CONFIGURATION FILE
 Pdfinfo reads a configuration file at startup.  It first tries to find
 the user's private config file, ~/.xpdfrc.  If that doesn't exist, it
-looks for a system-wide config file, typically /usr/local/etc/xpdfrc
+looks for a system-wide config file, typically /etc/xpdfrc
 (but this location can be changed when pdfinfo is built).  See the
 .BR xpdfrc (5)
 man page for details.
