41 files changed, 122 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES b/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
index 93ef9be9ad9..29e0b5fc2c9 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
@@ -1,3 +1,12 @@
+== CTAN release 2012.04.16 (#603) ==
+
+2012-04-16 (#603)
+- get upstream changes for hyphen.cfg from Babel 2008/07/08 v3.8m
+
+2012-04-16 (#602)
+- patch \adddialect in hyphen.cfg to also register language synonyms at lua end;
+  fixes a problem in LuaTeX with missing synonyms defined by Babel
+
 == CTAN release 2012.04.10 (#599) ==
 
 2012-04-10 (#599)
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/README b/Master/texmf-dist/doc/generic/hyph-utf8/README
index f39f877ccf2..fcbf522ce32 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/README
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/README
@@ -54,7 +54,7 @@ For more information see
    http://tug.org/tex-hyphen
 
 
-Copyright 2008-2011 by TUG
+Copyright 2008-2012 by TUG
 
 The licence for hyph-foo.tex: Respect licences of original authors.
 The licence for the rest: Use common sense when modifying and coordinate your work.
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf
index ec554e2b427..3c41e0791c3 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex
index 51fb4797993..b9b13af578e 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex
@@ -197,6 +197,17 @@ patterns to some 8-bit encoding when used with \PDFTEX{} or Knuth's \TEX.
 
 \stopcolumns
 
+\blank[3*big]
+
+Babel defines a few more synonyms (which consequently only work in \LaTeX):
+
+\def\lansyn#1#2{\hbox to \textwidth{\hbox to 3mm{}\hbox to 6.5em{\bf#1\hss}\hbox{#2}\hss}}
+\lansyn{english}{canadian}
+\lansyn{british}{australian, newzealand}
+\lansyn{german}{austrian}
+\lansyn{ngerman}{naustrian}
+\lansyn{portuguese}{brazilian, brazil}
+
 \page
 
 \subject{Using hyphenation patterns}
diff --git a/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf b/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf
index 54a8ed233f8..0d15708bb1d 100644
--- a/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf
+++ b/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf
diff --git a/Master/texmf-dist/source/generic/hyph-utf8/languages/gl/README b/Master/texmf-dist/source/generic/hyph-utf8/languages/gl/README
index 95e00612c7b..6154587b019 100644
--- a/Master/texmf-dist/source/generic/hyph-utf8/languages/gl/README
+++ b/Master/texmf-dist/source/generic/hyph-utf8/languages/gl/README
@@ -1,25 +1,25 @@
-This directory contains seven files + README, licensed all but one under lppl 1.3:
-
-glpatter-utf8.tex:
-	The source file, version 2.4. When processed under the program
-	mkpatter ---by typing 'tex -ini -8bit glpatter-utf8.tex' (without the quotes)
-	at the command line, provided you have the utility
-	mkpattern installed--- it generates the file hyph-utf8-gl.tex.
-
-(hyph-gl.tex):
-	The generated file containing the patterns in UTF-8 (belongs to TEXMF/tex).
-
-
-glhyextr.tex:	##This file is in the public domain##
-	A configuration file, to include additional patterns other
-	than the ones in glpatter-utf8.tex. It is not \input by glpatter-utf8.tex
-	(iin contrast with the single-byte encoded version glpatter.tex)
-	as modern tools allow the addition of patterns at run time.
-
-glhybiox.tex, glhymed.tex, glhyquim.tex, glhytec.tex & glhyxeog.tex:
-	Files with aditional patterns drawn from serveral fields of
-	the language, so that you may input them from glhyextr.tex.
-
-The files for specific patterns are very incomplete and feedback is welcome.
-
---Javier A. M�gica
+This directory contains seven files + README, licensed all but one under lppl 1.3:
+
+glpatter-utf8.tex:
+	The source file, version 2.4. When processed under the program
+	mkpatter ---by typing 'tex -ini -8bit glpatter-utf8.tex' (without the quotes)
+	at the command line, provided you have the utility
+	mkpattern installed--- it generates the file hyph-utf8-gl.tex.
+
+(hyph-gl.tex):
+	The generated file containing the patterns in UTF-8 (belongs to TEXMF/tex).
+
+
+glhyextr.tex:	##This file is in the public domain##
+	A configuration file, to include additional patterns other
+	than the ones in glpatter-utf8.tex. It is not \input by glpatter-utf8.tex
+	(iin contrast with the single-byte encoded version glpatter.tex)
+	as modern tools allow the addition of patterns at run time.
+
+glhybiox.tex, glhymed.tex, glhyquim.tex, glhytec.tex & glhyxeog.tex:
+	Files with aditional patterns drawn from serveral fields of
+	the language, so that you may input them from glhyextr.tex.
+
+The files for specific patterns are very incomplete and feedback is welcome.
+
+--Javier A. M�gica
diff --git a/Master/texmf-dist/source/luatex/hyph-utf8/luatex-hyphen.dtx b/Master/texmf-dist/source/luatex/hyph-utf8/luatex-hyphen.dtx
index 36c0851ce1f..1f7b346b9cb 100644
--- a/Master/texmf-dist/source/luatex/hyph-utf8/luatex-hyphen.dtx
+++ b/Master/texmf-dist/source/luatex/hyph-utf8/luatex-hyphen.dtx
@@ -4,8 +4,8 @@
 % intended for use with LuaTeX, but compatible with other engines.
 % The present file IS NOT part of the babel system.
 %
-% The modifications are Copyright 2010 Khaled Hosny, Elie Roux, and Manuel
-% Pegourie-Gonnard, under LPPL version 1.3 or later.
+% The modifications are Copyright 2012 Khaled Hosny, Élie Roux, and Manuel
+% Pégourié-Gonnard, under LPPL version 1.3 or later.
 %
 % Here is the licence statement of the original hyphen.cfg file:
 %  |
@@ -47,7 +47,7 @@ This is a modified version of the hyphen.cfg file from the babel system,
 intended for use with LuaTeX, but compatible with other engines.
 The present file IS NOT part of the babel system.
 
-The modifications are Copyright 2010 Khaled Hosny, Elie Roux, and Manuel
+The modifications are Copyright 2012 Khaled Hosny, Elie Roux, and Manuel
 Pegourie-Gonnard, under LPPL version 1.3 or later.
 
 Here is the licence statement of the original hyphen.cfg file:
@@ -88,7 +88,7 @@ Here is the licence statement of the original hyphen.cfg file:
 
 This is a generated file (source: luatex-hyphen.dtx).
 
-Copyright (C) 2010 by The LuaLaTeX development team.
+Copyright (C) 2012 by The LuaLaTeX development team.
 
 This work is under the CC0 license.
 
@@ -106,9 +106,9 @@ This work is under the CC0 license.
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luatex-hyphen.drv}
-  [2010/04/28 v1.4 Hyphenation file for LuaTeX]
+  [2012/04/16 v1.5 Hyphenation file for LuaTeX]
 \documentclass{ltxdoc}
-\usepackage[ascii]{inputenc}
+\usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{lmodern}
 \EnableCrossrefs
@@ -140,8 +140,8 @@ This work is under the CC0 license.
 % \GetFileInfo{luatex-hyphen.drv}
 %
 % \title{The \texttt{hyphen.cfg} file for Lua\TeX }
-% \date{2010/04/28 v1.4}
-% \author{Khaled Hosny, \'Elie Roux, and Manuel P\'egouri\'e-Gonnard\\
+% \date{2012/04/16 v1.5}
+% \author{Khaled Hosny, Élie Roux, and Manuel Pégourié-Gonnard\\
 % \texttt{khaledhosny@eglug.org} \\
 % \texttt{elie.roux@telecom-bretagne.eu} \\
 % \texttt{mpg@elzevir.fr}}
@@ -198,7 +198,7 @@ This work is under the CC0 license.
 %         Each string contains a coma-separated list of file names (whitespace
 %         before or after the coma is not accepted).
 %         The files given by \verb+patterns+ (resp. \verb+hypenation+) must be
-%         plain text files encoded in utf8, with only patterns (resp.
+%         plain text files encoded in UTF-8, with only patterns (resp.
 %         exceptions) and not even comments: their content will be used
 %         directly without being parsed by \TeX.  If one of these keys is
 %         missing or is the empty string, it is ignored and no patterns (resp.
@@ -312,6 +312,9 @@ end
 %
 %    \begin{macrocode}
 function loadlanguage(lname, id)
+    if id == 0 then
+        return
+    end
     local msg = "loading%s patterns and exceptions for: %s (\\language%d)"
 %    \end{macrocode}
 %
@@ -360,6 +363,16 @@ function loadlanguage(lname, id)
         end
     end
 end
+function adddialect(dialect, language)
+    if dialect ~= '0' then
+        dialect = dialect:gsub('l@', '')
+        language = language:gsub('l@', '')
+        data = language_dat[language]
+        if data then
+            data.synonyms[#data.synonyms+1] = dialect
+        end
+    end
+end
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -434,8 +447,8 @@ end
 %
 %    \begin{macrocode}
 \ProvidesFile{hyphen.cfg}
-                [2010/04/26 v3.8l-luatex-1.4 %
-      Language switching mechanism for LuaTeX, adapted from babel v3.8l]
+                [2012/04/16 v3.8l-luatex-1.5 %
+      Language switching mechanism for LuaTeX, adapted from babel v3.8m]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -464,6 +477,16 @@ end
 \fi
 \def\adddialect#1#2{%
     \global\chardef#1#2\relax
+    \ifx\directlua\@undefined\else
+      \ifx\directlua\relax\else
+        \directlua{
+          if not luatexhyphen then
+              dofile(assert(kpse.find_file("luatex-hyphen.lua")))
+          end
+          luatexhyphen.adddialect("\string#1", "\string#2")
+        }%
+      \fi
+    \fi
     \wlog{\string#1 = a dialect from \string\language#2}}
 \def\iflanguage#1{%
   \expandafter\ifx\csname l@#1\endcsname\relax
@@ -801,6 +824,8 @@ end
   \message{I couldn't find the file language.dat,\space
            I will try the file hyphen.tex}
   \input hyphen.tex\relax
+  \def\l@english{0}%
+  \def\languagename{english}%
 \else
   \last@language\m@ne
   \loop
@@ -811,11 +836,16 @@ end
     \else
       \edef\bbl@line{\bbl@line\space/}%
       \expandafter\process@line\bbl@line
+      \ifx\bbl@defaultlanguage\@undefined
+        \let\bbl@defaultlanguage\languagename
+      \fi
     \fi
     \iftrue \csname fi\endcsname
     \csname if\ifeof1 false\else true\fi\endcsname
   \repeat
   \language=0
+  \let\languagename\bbl@defaultlanguage
+  \let\bbl@defaultlanguage\@undefined
 \fi
 \closein1
 \let\process@language\@undefined
diff --git a/Master/texmf-dist/tex/luatex/hyph-utf8/hyphen.cfg b/Master/texmf-dist/tex/luatex/hyph-utf8/hyphen.cfg
index d665d5212c0..f5fefbb8b17 100644
--- a/Master/texmf-dist/tex/luatex/hyph-utf8/hyphen.cfg
+++ b/Master/texmf-dist/tex/luatex/hyph-utf8/hyphen.cfg
@@ -10,7 +10,7 @@
 %% intended for use with LuaTeX, but compatible with other engines.
 %% The present file IS NOT part of the babel system.
 %% 
-%% The modifications are Copyright 2010 Khaled Hosny, Elie Roux, and Manuel
+%% The modifications are Copyright 2012 Khaled Hosny, Elie Roux, and Manuel
 %% Pegourie-Gonnard, under LPPL version 1.3 or later.
 %% 
 %% Here is the licence statement of the original hyphen.cfg file:
@@ -70,8 +70,8 @@
 \fi
 
 \ProvidesFile{hyphen.cfg}
-                [2010/04/26 v3.8l-luatex-1.4 %
-      Language switching mechanism for LuaTeX, adapted from babel v3.8l]
+                [2012/04/16 v3.8l-luatex-1.5 %
+      Language switching mechanism for LuaTeX, adapted from babel v3.8m]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -97,6 +97,16 @@
 \fi
 \def\adddialect#1#2{%
     \global\chardef#1#2\relax
+    \ifx\directlua\@undefined\else
+      \ifx\directlua\relax\else
+        \directlua{
+          if not luatexhyphen then
+              dofile(assert(kpse.find_file("luatex-hyphen.lua")))
+          end
+          luatexhyphen.adddialect("\string#1", "\string#2")
+        }%
+      \fi
+    \fi
     \wlog{\string#1 = a dialect from \string\language#2}}
 \def\iflanguage#1{%
   \expandafter\ifx\csname l@#1\endcsname\relax
@@ -391,6 +401,8 @@
   \message{I couldn't find the file language.dat,\space
            I will try the file hyphen.tex}
   \input hyphen.tex\relax
+  \def\l@english{0}%
+  \def\languagename{english}%
 \else
   \last@language\m@ne
   \loop
@@ -401,11 +413,16 @@
     \else
       \edef\bbl@line{\bbl@line\space/}%
       \expandafter\process@line\bbl@line
+      \ifx\bbl@defaultlanguage\@undefined
+        \let\bbl@defaultlanguage\languagename
+      \fi
     \fi
     \iftrue \csname fi\endcsname
     \csname if\ifeof1 false\else true\fi\endcsname
   \repeat
   \language=0
+  \let\languagename\bbl@defaultlanguage
+  \let\bbl@defaultlanguage\@undefined
 \fi
 \closein1
 \let\process@language\@undefined
diff --git a/Master/texmf-dist/tex/luatex/hyph-utf8/luatex-hyphen.lua b/Master/texmf-dist/tex/luatex/hyph-utf8/luatex-hyphen.lua
index 647a106659e..6196bafcc92 100644
--- a/Master/texmf-dist/tex/luatex/hyph-utf8/luatex-hyphen.lua
+++ b/Master/texmf-dist/tex/luatex/hyph-utf8/luatex-hyphen.lua
@@ -8,7 +8,7 @@
 --  
 --  This is a generated file (source: luatex-hyphen.dtx).
 --  
---  Copyright (C) 2010 by The LuaLaTeX development team.
+--  Copyright (C) 2012 by The LuaLaTeX development team.
 --  
 --  This work is under the CC0 license.
 --  
@@ -44,6 +44,9 @@ function lookupname(name)
     end
 end
 function loadlanguage(lname, id)
+    if id == 0 then
+        return
+    end
     local msg = "loading%s patterns and exceptions for: %s (\\language%d)"
     local ldata, cname = lookupname(lname)
     if not ldata then
@@ -76,5 +79,15 @@ function loadlanguage(lname, id)
         end
     end
 end
+function adddialect(dialect, language)
+    if dialect ~= '0' then
+        dialect = dialect:gsub('l@', '')
+        language = language:gsub('l@', '')
+        data = language_dat[language]
+        if data then
+            data.synonyms[#data.synonyms+1] = dialect
+        end
+    end
+end
 -- 
 --  End of File `luatex-hyphen.lua'.
diff --git a/Master/tlpkg/tlpsrc/hyphen-afrikaans.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-afrikaans.tlpsrc
index 2454a70f1fb..51295de29ce 100644
--- a/Master/tlpkg/tlpsrc/hyphen-afrikaans.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-afrikaans.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Afrikaans hyphenation patterns.
 longdesc Hyphenation patterns for Afrikaans in T1/EC and UTF-8 encodings.
 longdesc OpenOffice includes older patterns created by a different author,
 longdesc but the patterns packaged with TeX are considered superior in quality.
-#catalogue-version 0.9
 execute AddHyphen \
 	name=afrikaans \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
index 152117a260a..14082eca56c 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Ancient Greek in LGR and UTF-8 encodings,
 longdesc including support for (obsolete) Ibycus font encoding.
 longdesc Patterns in UTF-8 use two code positions for each of the vowels with
 longdesc acute accent (a.k.a tonos, oxia), e.g., U+03AE, U+1F75 for eta.
-#catalogue-version 5.0
 execute AddHyphen \
 	name=ancientgreek \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
index 44db20da4f7..71f8ca9b473 100644
--- a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Bulgarian hyphenation patterns.
 longdesc Hyphenation patterns for Bulgarian in T2A and UTF-8 encodings.
-#catalogue-version 1.7
 execute AddHyphen \
 	name=bulgarian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
index e55123a1eb7..0641e58e488 100644
--- a/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Catalan hyphenation patterns.
 longdesc Hyphenation patterns for Catalan in T1/EC and UTF-8 encodings.
-#catalogue-version 1.11
 execute AddHyphen \
 	name=catalan \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
index 30e5a095d11..da3fe08269a 100644
--- a/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
@@ -4,7 +4,6 @@ depend hyph-utf8
 shortdesc Chinese pinyin hyphenation patterns.
 longdesc Hyphenation patterns for unaccented transliterated Mandarin Chinese
 longdesc (pinyin) in T1/EC and UTF-8 encodings.
-#catalogue-version 4.8.0
 execute AddHyphen \
 	name=pinyin \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
index 69cdb04fc63..1ed443601ed 100644
--- a/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Czech hyphenation patterns.
 longdesc Hyphenation patterns for Czech in T1/EC and UTF-8 encodings.
 longdesc Original patterns 'czhyphen' are still distributed in the 'csplain'
 longdesc package and loaded with ISO Latin 2 encoding (IL2).
-#catalogue-version 3
 execute AddHyphen \
 	name=czech \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
index b769ff6ae8d..a8328231aac 100644
--- a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Dutch in T1/EC and UTF-8 encodings.
 longdesc These patterns don't handle cases like 'menuutje' > 'menu-tje',
 longdesc and don't hyphenate words that have different hyphenations according
 longdesc to their meaning.
-#catalogue-version 1.1
 execute AddHyphen \
 	name=dutch \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-english.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-english.tlpsrc
index b5d23bc924a..c144400cd0b 100644
--- a/Master/tlpkg/tlpsrc/hyphen-english.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-english.tlpsrc
@@ -8,7 +8,6 @@ longdesc (usenglishmax) greatly extend the standard patterns from Knuth
 longdesc to find many additional hyphenation points.  British English
 longdesc hyphenation is completely different from US English, so has its
 longdesc own set of patterns.
-#catalogue-version 1.0a
 execute AddHyphen \
 	name=ukenglish synonyms=british,UKenglish \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
index fbd3d29abc7..4a977974529 100644
--- a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Finnish hyphenation patterns.
 longdesc Hyphenation patterns for Finnish in T1/EC and UTF-8 encodings.
-#catalogue-version 2.2
 execute AddHyphen \
 	name=finnish \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
index 8e24ba59c64..46a0c878720 100644
--- a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc French hyphenation patterns.
 longdesc Hyphenation patterns for French in T1/EC and UTF-8 encodings.
-#catalogue-version 2.12
 execute AddHyphen \
 	name=french synonyms=patois,francais \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-friulan.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-friulan.tlpsrc
index d5acf82c9c6..0df6ac0275a 100644
--- a/Master/tlpkg/tlpsrc/hyphen-friulan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-friulan.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Friulan in ASCII encoding.
 longdesc They are supposed to comply with the common spelling of the
 longdesc Friulan (Furlan) language as fixed by the Regional Law N.15/96
 longdesc dated November 6, 1996 and its following amendments.
-#catalogue-version 1.1
 execute AddHyphen \
 	name=friulan synonyms=furlan \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
index 946488191af..65b19a1875f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Galician hyphenation patterns.
 longdesc Hyphenation patterns for Galician in T1/EC and UTF-8 encodings.
-#catalogue-version 2.4
 execute AddHyphen \
 	name=galician \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
index fc84f00110b..3c364aa1d49 100644
--- a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Modern Greek in monotonic and polytonic
 longdesc spelling in LGR and UTF-8 encodings.  Patterns in UTF-8 use two code
 longdesc positions for each of the vowels with acute accent (a.k.a tonos,
 longdesc oxia), e.g., U+03AC, U+1F71 for alpha.
-#catalogue-version 5.0
 execute AddHyphen \
 	name=monogreek \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-indic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-indic.tlpsrc
index 09bd0328c67..e7cb782a0cb 100644
--- a/Master/tlpkg/tlpsrc/hyphen-indic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-indic.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Indic hyphenation patterns.
 longdesc Hyphenation patterns for Assamese, Bengali, Gujarati, Hindi, Kannada,
 longdesc Malayalam, Marathi, Oriya, Panjabi, Tamil and Telugu for Unicode
 longdesc engines.
-#catalogue-version 0.5.3
 execute AddHyphen \
 	name=assamese \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
index 493c28a49ac..5076732a6da 100644
--- a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
@@ -4,7 +4,6 @@ depend hyph-utf8
 shortdesc Indonesian hyphenation patterns.
 longdesc Hyphenation patterns for Indonesian (Bahasa Indonesia) in ASCII
 longdesc encoding.  They are probably also usable for Malay (Bahasa Melayu).
-#catalogue-version 1.3
 execute AddHyphen \
 	name=indonesian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
index 11d2ef62b20..64e788fd03b 100644
--- a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Interlingua hyphenation patterns.
 longdesc Hyphenation patterns for Interlingua in ASCII encoding.
-#catalogue-version 0.2c
 execute AddHyphen \
 	name=interlingua \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
index 43671388d56..a31232234dd 100644
--- a/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
@@ -4,7 +4,6 @@ depend hyph-utf8
 shortdesc Irish hyphenation patterns.
 longdesc Hyphenation patterns for Irish (Gaeilge) in T1/EC and UTF-8 encodings.
 longdesc Visit http://borel.slu.edu/fleiscin/index.html for more information.
-#catalogue-version 1.0
 execute AddHyphen \
 	name=irish \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
index 6723b97b5a9..e0d69c85c9d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Italian in ASCII encoding.
 longdesc Compliant with the Recommendation UNI 6461 on hyphenation
 longdesc issued by the Italian Standards Institution
 longdesc (Ente Nazionale di Unificazione UNI).
-#catalogue-version 4.8h
 execute AddHyphen \
 	name=italian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-kurmanji.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-kurmanji.tlpsrc
index c70d6556a2c..9eccf422494 100644
--- a/Master/tlpkg/tlpsrc/hyphen-kurmanji.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-kurmanji.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Kurmanji hyphenation patterns.
 longdesc Hyphenation patterns for Kurmanji (Northern Kurdish) as spoken in
 longdesc Turkey and by the Kurdish diaspora in Europe, in T1/EC and UTF-8
 longdesc encodings.
-#catalogue-version 1.0
 execute AddHyphen \
 	name=kurmanji \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
index c3f4abfdfe3..b5e716857dd 100644
--- a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
@@ -8,7 +8,6 @@ longdesc medieval spelling with the ligatures \ae and \oe and the (uncial)
 longdesc lowercase 'v' written as a 'u' is also supported.  Apparently
 longdesc there is no conflict between the patterns of modern Latin and
 longdesc those of medieval Latin.
-#catalogue-version 3.2
 execute AddHyphen \
 	name=latin \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
index e4a7b658d12..91721df1304 100644
--- a/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Latvian hyphenation patterns.
 longdesc Hyphenation patterns for Latvian in L7X and UTF-8 encodings.
-#catalogue-version 0.3
 execute AddHyphen \
 	name=latvian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
index 92bab1d7771..1610d416d64 100644
--- a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Mongolian hyphenation patterns in Cyrillic script.
 longdesc Hyphenation patterns for Mongolian in T2A, LMC and UTF-8 encodings.
 longdesc LMC encoding is used in MonTeX. The package includes two sets of
 longdesc patterns that will hopefully be merged in future.
-#catalogue-version 1.2
 execute AddHyphen \
 	name=mongolian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
index 42c8176bf60..fe7232d7c01 100644
--- a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
@@ -4,7 +4,6 @@ depend hyph-utf8
 shortdesc Polish hyphenation patterns.
 longdesc Hyphenation patterns for Polish in QX and UTF-8 encodings.
 longdesc These patterns are also used by Polish TeX formats MeX and LaMeX.
-#catalogue-version 3.0a
 execute AddHyphen \
 	name=polish \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
index 6cdc5a10b07..1f462308936 100644
--- a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
@@ -3,10 +3,8 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Portuguese hyphenation patterns.
 longdesc Hyphenation patterns for Portuguese in T1/EC and UTF-8 encodings.
-# brazil and brazilian may be removed if a 'bug' in luatex-hyphen is fixed
-#catalogue-version 1.0
 execute AddHyphen \
-	name=portuguese synonyms=portuges,brazil,brazilian \
+	name=portuguese synonyms=portuges \
 	lefthyphenmin=2 \
 	righthyphenmin=3 \
 	file=loadhyph-pt.tex \
diff --git a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
index 35f4ccbd7a9..4563cd72a90 100644
--- a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
@@ -6,7 +6,6 @@ longdesc Hyphenation patterns for Romanian in T1/EC and UTF-8 encodings.
 longdesc The UTF-8 patterns use U+0219 for the character 's with comma accent'
 longdesc and U+021B for 't with comma accent', but we may consider using U+015F
 longdesc and U+0163 as well in the future.
-#catalogue-version 1.1R
 execute AddHyphen \
 	name=romanian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-romansh.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-romansh.tlpsrc
index 4a761ef3523..7b2ed02f14f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-romansh.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-romansh.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Romansh hyphenation patterns.
 longdesc Hyphenation patterns for Romansh in ASCII encoding.
 longdesc They are supposed to comply with the rules indicated by the Lia
 longdesc Rumantscha (Romansh language society).
-#catalogue-version 1.1
 execute AddHyphen \
 	name=romansh \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
index 0ffb40cabb0..d65da110005 100644
--- a/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Sanskrit hyphenation patterns.
 longdesc Hyphenation patterns for Sanskrit and Prakrit in transliteration,
 longdesc and in Devanagari, Bengali, Kannada, Malayalam and Telugu scripts
 longdesc for Unicode engines.
-#catalogue-version 0.4
 execute AddHyphen \
 	name=sanskrit \
 	lefthyphenmin=1 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
index 0c9dfa92bc8..1a98f4bfa38 100644
--- a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
@@ -7,7 +7,6 @@ longdesc For 8-bit engines the patterns are available separately as 'serbian'
 longdesc in T1/EC encoding for Latin script and 'serbianc' in T2A encoding for
 longdesc Cyrillic script. Unicode engines should only use 'serbian'
 longdesc which has patterns in both scripts combined.
-#catalogue-version 2.02
 execute AddHyphen \
 	name=serbian \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
index 1ba89d91145..de224a62296 100644
--- a/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
@@ -5,7 +5,6 @@ shortdesc Slovak hyphenation patterns.
 longdesc Hyphenation patterns for Slovak in T1/EC and UTF-8 encodings.
 longdesc Original patterns 'skhyphen' are still distributed in the 'csplain'
 longdesc package and loaded with ISO Latin 2 encoding (IL2).
-#catalogue-version 2
 execute AddHyphen \
 	name=slovak \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
index bd26c478a1b..10c17a958f1 100644
--- a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Slovenian hyphenation patterns.
 longdesc Hyphenation patterns for Slovenian in T1/EC and UTF-8 encodings.
-#catalogue-version 2.3
 execute AddHyphen \
 	name=slovenian synonyms=slovene \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
index 579cf0c0013..877206298dd 100644
--- a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Spanish hyphenation patterns.
 longdesc Hyphenation patterns for Spanish in T1/EC and UTF-8 encodings.
-#catalogue-version 4.6
 execute AddHyphen \
 	name=spanish synonyms=espanol \
 	lefthyphenmin=2 \
diff --git a/Master/tlpkg/tlpsrc/hyphen-turkmen.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-turkmen.tlpsrc
index 068f1468fbd..9f5ab5840b1 100644
--- a/Master/tlpkg/tlpsrc/hyphen-turkmen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-turkmen.tlpsrc
@@ -3,7 +3,6 @@ depend hyphen-base
 depend hyph-utf8
 shortdesc Turkmen hyphenation patterns.
 longdesc Hyphenation patterns for Turkmen in T1/EC and UTF-8 encodings.
-#catalogue-version 0.1
 execute AddHyphen \
 	name=turkmen \
 	lefthyphenmin=2 \