hyphenex update (6apr09)

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

5 files changed, 30 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/generic/hyphenex/GNUmakefile b/Master/texmf-dist/source/generic/hyphenex/GNUmakefile
new file mode 100644
index 00000000000..a83bb1c812d
--- /dev/null
+++ b/Master/texmf-dist/source/generic/hyphenex/GNUmakefile
@@ -0,0 +1,20 @@
+# Public domain.
+
+check: compare test.tex
+	tex '\nonstopmode\input test.tex'
+
+compare: pl-ushyphex.tex sh-ushyphex.tex
+	diff $^
+
+pl-ushyphex.tex: hyphenex.pl tb0hyf.tex 
+	perl $^ >$@ || rm -f $@
+
+sh-ushyphex.tex: hyphenex.sh tb0hyf.tex 
+	sh $< <tb0hyf.tex >$@ || rm -f $@
+
+ushyphex.tex: pl-ushyphex.tex
+	ln $< $@
+
+dist: ushyphex.tex
+	rm -f dist.zip
+	zip dist.zip README GNUmakefile $< hyphenex.?? tb0hyf.tex test.tex
diff --git a/Master/texmf-dist/source/generic/hyphenex/README b/Master/texmf-dist/source/generic/hyphenex/README
index ae2e66f3cff..01912961bfe 100644
--- a/Master/texmf-dist/source/generic/hyphenex/README
+++ b/Master/texmf-dist/source/generic/hyphenex/README
@@ -9,4 +9,4 @@ as ushyphex.tex).
 If questions, problems, or suggestions for additional exceptions, please
 email tugboat@tug.org.
 
-This material either public domain or under an all-permissive license.
+This material is either public domain or under an all-permissive license.
diff --git a/Master/texmf-dist/source/generic/hyphenex/test.tex b/Master/texmf-dist/source/generic/hyphenex/test.tex
new file mode 100644
index 00000000000..f1803fd777e
--- /dev/null
+++ b/Master/texmf-dist/source/generic/hyphenex/test.tex
@@ -0,0 +1,5 @@
+% public domain.
+% ensure both versions of the hyphenation exception list go through tex.
+\input pl-ushyphex.tex
+\input sh-ushyphex.tex
+\end
diff --git a/Master/texmf-dist/source/generic/hyphenex/ushyphex.tex b/Master/texmf-dist/tex/generic/hyphenex/ushyphex.tex
index 9575857981d..340d34064ff 100644
--- a/Master/texmf-dist/source/generic/hyphenex/ushyphex.tex
+++ b/Master/texmf-dist/tex/generic/hyphenex/ushyphex.tex
@@ -913,7 +913,7 @@
   tem-po-rar-ily
   ten-ure
   test-bed
-  {
+  text-height
   text-length
   text-width
   thal-a-mus
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 89aa7710fe3..ce67097753a 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -577,9 +577,9 @@ $standardsource='\.fdd|\.dtx|\.ins|\.c$|Makefile|configure.*|install-sh|\.drv';
  'eskdx',		'NULL',  # leave makefiles
  'eurosym',		'NULL',  # leave makefiles, etc.
  'feynmf',		'feynmf\.pl' . $standardsource,
+ 'hyphenex',		'.*',
  'mff',			'\.mfj|\.bat|\.diz',
  'fpl',			'Add|\.sfd|\.pe|\.ps' . $standardsource,
- 'hyphenex',		".*",
  'impatient',		'NULL',	# doc package
  'intro-scientific',	'NULL',	# doc package
  'latex2e-help-texinfo','NULL',	# doc package
@@ -731,6 +731,7 @@ $standardsourcefmt='latex';
  'fltpoint',	'generic',
  'fontch',	'plain',
  'genmisc',	'generic',
+ 'hyphenex',	'generic',
  'hyplain',	'plain',
  'ibygrk',	'generic',
  'ifxetex',	'generic',
@@ -831,6 +832,7 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'hc',		'\.hld|' . $standardtex,
  'hfoldsty',	'\.sty|\.fd|\.cpa',
  'hyper',	'\.sty|\.hyp',
+ 'hyphenex',	'ushyphex\.tex',
  'hyplain',	'(hyrules|hy.*plain|hylang)\..*',
  'ibygrk',	'iby4extr.tex|ibycus4.tex|ibycusps.tex|pssetiby.tex|setiby4.tex|tlgsqq.tex|version4.tex|' . $standardtex,
  'insbox',	'insbox.tex',