hyph-utf8 (27may13)

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

9 files changed, 188 insertions, 170 deletions

diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES b/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
index fdcb10e1c32..ce3c0bf5ddb 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/CHANGES
@@ -1,28 +1,4 @@
-== CTAN release 2013.05.26 (#647) ==
-
-2013-05-26 (#647)
-- minor documentation updates, CTAN release
-
-2013-05-26 (#646)
-- remove Georgian patterns (waiting for licence)
-
-2013-05-26 (#645)
-- update German patterns (by Werner Lemberg), version 2013-05-26
-
-2013-05-21 (#644)
-- add LPPL licence statement to Thai patterns
-
-2013-05-16 (#636-#643)
-- update luatex-hyphen.dtx and derivate files:
-- remove hyphen.cfg (Babel now provides a working one)
-- update etex.src
-- update luatex-hyphen.lua
-- update documentation
-
-2013-05-08 (#635)
-- texmf -> texmf-dist
-
-== CTAN release 2013.05.08 (#634) ==
+== CTAN release 2012.05.08 (#634) ==
 
 2013-05-08 (#634)
 - update the list of languages in documentation
@@ -55,7 +31,7 @@
 - add support for Georgian and Thai font encodings: T8M and LTH
 - fix a line in QX font encoding
 
-== CTAN release 2013.02.21 (#614) ==
+== CTAN release 2012.02.21 (#614) ==
 
 2013-02-14 (#613)
 - add Piedmontese patterns (by Claudio Beccari)
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.pdf b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.pdf
index d049a65918b..60aad2ab43c 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.pdf
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.pdf
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex
index 05282d28c28..7a349e603eb 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation-distribution.tex
@@ -32,7 +32,7 @@
 
 In \TeXLive\ you can install different language collections \type{collection-lang}{\tt\sl <foo>}.
 
-\placefigure[force]{}{\externalfigure[img/texlive-collection.png][width=150pt]}
+\placefigure[force]{}{\externalfigure[img/texlive-collection-lang.png]}
 
 For example, the German collection \type{collection-langgerman} contains packages \type{hyphen-german} and \type{dehyph-exptl} which both contain hyphenation patterns (in addition to many other packages related to German language). The Greek collection \type{collection-langgreek} contains \type{hyphen-greek} and \type{hyphen-ancientgreek} among other packages. The package \type{dehyph-exptl} is maintained independently, while all packages \type{hyphen-}{\tt\sl<foo>} belong to \type{hyph-utf8}.
 
@@ -59,8 +59,8 @@ execute AddHyphen \
 
 The keywords {\bf name} and {\bf synonyms} are used as language name to access the patterns in \TeX, {\bf file} is used as pattern loader for 8-bit engines and \XeTeX, while {\bf file\_patterns} and {\bf file\_exceptions} are plain text files used by \LuaTeX.
 
-The information from \type{AddHyphen} directives end up in three different files: \type{language.dat} used by \LaTeX, \type{language.def} used by plain \eTeX\  and \type{language.dat.lua} used by \LuaTeX. All the three are placed in\crlf \type{    $TEXMFSYSVAR/tex/generic/config},\crlf for example to\crlf \type{    /usr/local/texlive/2013/texmf-var/tex/generic/config},\crlf while a static copy also exists in\crlf
-	\type{    $TEXMFDIST/tex/generic/config},\crlf but that one contains all languages and only makes sense if you have a complete checkout from SVN repository for example.
+The information from \type{AddHyphen} directives end up in three different files: \type{language.dat} used by \LaTeX, \type{language.def} used by plain \eTeX\  and \type{language.dat.lua} used by \LuaTeX. All the three are placed in\crlf \type{    $TEXMFSYSVAR/tex/generic/config},\crlf for example to\crlf \type{    /usr/local/texlive/2011/texmf-var/tex/generic/config},\crlf while a static copy also exists in\crlf
+	\type{    $TEXMFMAIN/tex/generic/config},\crlf but that one contains all languages and only makes sense if you have a complete checkout from SVN repository for example.
 
 \placefigure[force]{\type{language.dat}}{
 \starttyping
@@ -106,6 +106,15 @@ nynorsk loadhyph-nn.tex
 
 The files \type{language.dat} and \type{language.def} are used both by 8-bit and native Unicode engines. On one hand this simplifies things, while on the other it makes very little sense to include sanskrit patterns in \pdfTeX\ -- the package doesn't load any patterns in that case any way. It might be that there will be multiple copies of \type{language.dat} for different engines in future.
 
+In addition to the three mentioned files, \TeXLive\ also provides two additional files for \pTeX:
+\startitemize[packed,joinedup]
+\item \type{$TEXMFDIST/tex/ptexgeneric/config/language.ptx} as an equivalent of \type{language.dat} which enables all languages that make sense in an 8-bit engine
+\item \type{$TEXMFDIST/tex/ptex/config/language.def} which enables just most frequently used languages
+\stopitemize
+The contents are almost the same as in the generated \type{language.dat} and \type{language.def}, except that these two files are not generated and might enable a different set of languages, independent of installed language collections. When \pTeX\ was first included into \TeXLive\ it was loading its own files with patterns, so it needed its own \type{language.ptx}. Nowadays this restriction is gone and one could replace both static files with the generated ones if needed.
+
+TODO: explain where are the sources
+
 \subsection{\MiKTeX}
 
 In \MiKTeX\ application {\bf MiKTeX Options} which you can run from Start menu ({\em Maintenance} $\rightarrow$ {\em Settings} or {\em Maintenance (Admin)} $\rightarrow$ {\em Settings (Admin)\/}) or from command line (\type{mo.exe} or \type{mo_admin.exe}) you can select which languages you want to include into \TeX\ formats.
@@ -146,155 +155,158 @@ patterns=hyph-nn.pat.txt
 
 \page
 
-List of languages in \TeXLive\ 2013:
-\startcolumns[two]
+List of languages in \TeXLive\ (has to be nicer):
 \starttyping
 collection-langafrican
-  hyphen-ethiopic
-    ethiopic,amharic,geez
+	hyphen-ethiopic
+		ethiopic,amharic,geez
 collection-langarabic
-  hyphen-arabic
-    arabic
-  hyphen-farsi
-    farsi,persian
+	hyphen-arabic
+		arabic
+	hyphen-farsi
+		farsi,persian
 collection-langcjk
-  hyphen-chinese
-    pinyin
+	hyphen-chinese
+		pinyin
+collection-langcroatian
+	hyphen-croatian
+		croatian
 collection-langcyrillic
-  hyphen-bulgarian
-    bulgarian
-  hyphen-mongolian
-    mongolian
-    mongolianlmc
-  hyphen-russian
-    russian
-  hyphen-serbian
-    serbian
-    serbianc
-  hyphen-ukrainian
-    ukrainian
+	hyphen-bulgarian
+		bulgarian
+	hyphen-russian
+		russian
+	hyphen-ukrainian
+		ukrainian
 collection-langczechslovak
-  hyphen-czech
-    czech
-  hyphen-slovak
-    slovak
+	hyphen-czech
+		czech
+	hyphen-slovak
+		slovak
+collection-langdanish
+	hyphen-danish
+		danish
+collection-langdutch
+	hyphen-dutch
+		dutch
 collection-langenglish
-  hyphen-english
-    ukenglish,british,UKenglish
-    usenglishmax
-collection-langeuropean
-  hyphen-armenian
-    armenian
-  hyphen-croatian
-    croatian
-  hyphen-danish
-    danish
-  hyphen-dutch
-    dutch
-  hyphen-estonian
-    estonian
-  hyphen-finnish
-    finnish
-  hyphen-friulan
-    friulan
-  hyphen-hungarian
-    hungarian
-  hyphen-icelandic
-    icelandic
-  hyphen-irish
-    irish
-  hyphen-kurmanji
-    kurmanji
-  hyphen-latin
-    latin
-  hyphen-latvian
-    latvian
-  hyphen-lithuanian
-    lithuanian
-  hyphen-norwegian
-    bokmal,norwegian,norsk
-    nynorsk
-  hyphen-piedmontese
-    piedmontese
-  hyphen-romanian
-    romanian
-  hyphen-romansh
-    romansh
-  hyphen-slovenian
-    slovenian,slovene
-  hyphen-swedish
-    swedish
-  hyphen-turkish
-    turkish
-  hyphen-uppersorbian
-    uppersorbian
-  hyphen-welsh
-    welsh
+	hyphen-english
+		ukenglish,british,UKenglish
+		usenglishmax
+collection-langfinnish
+	hyphen-finnish
+		finnish
 collection-langfrench
-  hyphen-basque
-    basque
-  hyphen-french
-    french,patois,francais
+	hyphen-basque
+		basque
+	hyphen-french
+		french,patois,francais
 collection-langgerman
-  hyphen-german
-    german
-    ngerman
-    swissgerman
+	hyphen-german
+		german
+		ngerman
+		swissgerman
 collection-langgreek
-  hyphen-greek
-    monogreek
-    greek,polygreek
-  hyphen-ancientgreek
-    ancientgreek
-    ibycus
+	hyphen-greek
+		monogreek
+		greek,polygreek
+	hyphen-ancientgreek
+		ancientgreek
+		ibycus
+collection-langhungarian
+	hyphen-hungarian
+		hungarian
 collection-langindic
-  hyphen-indic
-    assamese
-    bengali
-    gujarati
-    hindi
-    kannada
-    malayalam
-    marathi
-    oriya
-    panjabi
-    tamil
-    telugu
-  hyphen-sanskrit
-    sanskrit
+	hyphen-indic
+		assamese
+		bengali
+		gujarati
+		hindi
+		kannada
+		malayalam
+		marathi
+		oriya
+		panjabi
+		tamil
+		telugu
+	hyphen-sanskrit
+		sanskrit
 collection-langitalian
-  hyphen-italian
-    italian
+	hyphen-italian
+		italian
+collection-langlatin
+	hyphen-latin
+		latin
+collection-langlatvian
+	hyphen-latvian
+		latvian
+collection-langlithuanian
+	hyphen-lithuanian
+		lithuanian
+collection-langmongolian
+	hyphen-mongolian
+		mongolian
+		mongolianlmc
+collection-langnorwegian
+	hyphen-norwegian
+		bokmal,norwegian,norsk
+		nynorsk
 collection-langother
-  hyphen-afrikaans
-    afrikaans
-  hyphen-coptic
-    coptic
-  hyphen-esperanto
-    esperanto
-  hyphen-indonesian
-    indonesian
-  hyphen-interlingua
-    interlingua
-  hyphen-thai
-    thai
-  hyphen-turkmen
-    turkmen
+	hyphen-afrikaans
+		afrikaans
+	hyphen-armenian
+		armenian
+	hyphen-coptic
+		coptic
+	hyphen-esperanto
+		esperanto
+	hyphen-estonian
+		estonian
+	hyphen-icelandic
+		icelandic
+	hyphen-indonesian
+		indonesian
+	hyphen-interlingua
+		interlingua
+	hyphen-irish
+		irish
+	hyphen-kurmanji
+		kurmanji
+	hyphen-lao
+		lao
+	hyphen-romanian
+		romanian
+	hyphen-serbian
+		serbian
+		serbianc
+	hyphen-slovenian
+		slovenian,slovene
+	hyphen-turkish
+		turkish
+	hyphen-uppersorbian
+		uppersorbian
+	hyphen-welsh
+		welsh
 collection-langpolish
-  hyphen-polish
-    polish
+	hyphen-polish
+		polish
 collection-langportuguese
-  hyphen-portuguese
-    portuguese,portuges
+	hyphen-portuguese
+		portuguese,portuges
 collection-langspanish
-  hyphen-spanish
-    spanish,espanol
-  hyphen-catalan
-    catalan
-  hyphen-galician
-    galician
+	hyphen-spanish
+		spanish,espanol
+	hyphen-catalan
+		catalan
+	hyphen-galician
+		galician
+collection-langswedish
+	hyphen-swedish
+		swedish
+collection-langturkmen
+	hyphen-turkmen
+		turkmen
 \stoptyping
-\stopcolumns
 
 % \section{Special cases}
 % 
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf
index f5859ffe46f..9f6a975a06f 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 d797804ac6b..ea9219e4689 100644
--- a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.tex
@@ -24,7 +24,7 @@
 
 \blank[big]
 
-\centerline{Mojca Miklavec, Manuel Pégourié-Gonnard, Élie Roux, Khaled Hosny (current maintainers)}
+\centerline{Mojca Miklavec, Manuel Pégourié-Gonnard, Khaled Hosny (current maintainers)}
 \centerline{Arthur Reutenauer (no longer active on hyph-utf8)}
 
 \blank[big]
@@ -104,6 +104,8 @@ patterns to some 8-bit encoding when used with \PDFTEX{} or Knuth's \TEX.
 \landata{fur}{friulan}{}
 \lanname{Galician}
 \landata{gl}{galician}{}
+\lanname{Georgian}
+\landata{ka}{georgian}{}
 \lanname{German}
 \landata{de-1901}{german}{}
 \landata{de-1996}{ngerman}{}
@@ -117,9 +119,9 @@ patterns to some 8-bit encoding when used with \PDFTEX{} or Knuth's \TEX.
 \landata{hi}{hindi}{}
 \lanname{Hungarian}
 \landata{hu}{hungarian}{}
+\crlf
 \lanname{Icelandic}
 \landata{is}{icelandic}{}
-\crlf
 \lanname{Indonesian}
 \landata{id}{indonesian}{}
 \lanname{Interlingua}
@@ -197,7 +199,7 @@ patterns to some 8-bit encoding when used with \PDFTEX{} or Knuth's \TEX.
 % \landata{en-us}{usenglishmax}{}
 \lanname{Welsh}
 \landata{cy}{welsh}{}
-\crlf\crlf
+
 \stopcolumns
 
 \blank[3*big]
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection-lang.png b/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection-lang.png
new file mode 100644
index 00000000000..1b83ac97c11
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection-lang.png
diff --git a/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection.png b/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection.png
deleted file mode 100644
index 5fc9dd60fd1..00000000000
--- a/Master/texmf-dist/doc/generic/hyph-utf8/img/texlive-collection.png
+++ /dev/null
diff --git a/Master/texmf-dist/doc/luatex/hyph-utf8/README b/Master/texmf-dist/doc/luatex/hyph-utf8/README
index bb43e34cbb8..0ef0959f81c 100644
--- a/Master/texmf-dist/doc/luatex/hyph-utf8/README
+++ b/Master/texmf-dist/doc/luatex/hyph-utf8/README
@@ -1,18 +1,30 @@
                     The luatex hyphenation package.
 
-This package provides functions to be used for hyphenation pattern loading
-in LuaTeX. The patterns are loaded at runtime and not in the format.
+This package aims at replacing the standard hyphen.cfg for LuaTeX. The main
+difference is that the patterns are loaded at runtime and not in the format.
 This leads to much shorter format loading time, with no loss as the 
 patterns are not really loaded in the format, just copied and then loaded
 at runtime.
 
-This package is developped on <http://tug.org/svn/texhyphen/trunk/hyph-utf8/>.
+This package is developped on <http://github.com/eroux/luatex-hyphen>.
 
 Installation
 ------------
 
-These files are part of the format, so they should be installed in your
-TeX distribution (it is the case in TeXLive since 2010 release).
+Here are the recommended installation methods (preferred first).
+
+1. If you are using TeX Live 2010 or later, the files are already installed.
+
+2. a. Grab luatex-hyphen.tds.zip on the CTAN.
+   b. Unzip it at the root of one or your TDS trees.
+   c. Update some filename database after, and regenerate the formats for 
+      LuaTeX. See your TeX distribution's manual for details.
+
+3. a. Grab the sources from CTAN or github.
+   b. Run 'make install TEXMFROOT=/path/to/texmf'.
+   c. See 2c.
+
+4. Try to figure it out by looking at the Makefile and comments in the sources.
 
 Manifest
 --------
@@ -22,10 +34,26 @@ Source files:
 
 Derived files:
         luatex-hyphen.pdf            documentation
+        hyphen.cfg                   pattern loading file
         luatex-hyphen.lua            lua code used by the package
 
 
 License
 -------
 
-This work is under the CC0 license. 
+This work is under the CC0 license, with an additional restriction: 
+the article 6 of the LaTeX Project Public License (lppl), that applies to code
+that has been taken from LaTeX files.
+
+You can find the text of the lppl at
+
+The lppl can be found at http://www.latex-project.org/lppl.txt
+
+You can find the CC0 full text at
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+The file luatex-hyphen.dtx contains code with the lppl restriction as well as the
+derived files
+  hyphen.cfg
+  luatex-hyphen.pdf
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 0e9721d99cf..784dcc68e37 100644
--- a/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf
+++ b/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf