From 9d51929278483d4f1cbfe10dee38085f3ca4811c Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Mon, 16 Apr 2012 20:27:04 +0000 Subject: hyph-utf8 (16apr12) - fix babel synonyms in lualatex, upgrade from babel v3.8l to v.3.8m for hyphen.cfg - remove brazil,brazilian from hyphen-portuguese.tlpsrc (temporary patch no longer needed) - remove catalogue version from all hyphen-.tlpsrc git-svn-id: svn://tug.org/texlive/trunk@25990 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/hyph-utf8/CHANGES | 9 ++++ Master/texmf-dist/doc/generic/hyph-utf8/README | 2 +- .../doc/generic/hyph-utf8/hyphenation.pdf | Bin 34413 -> 34768 bytes .../doc/generic/hyph-utf8/hyphenation.tex | 11 +++++ .../doc/luatex/hyph-utf8/luatex-hyphen.pdf | Bin 402141 -> 403220 bytes .../source/generic/hyph-utf8/languages/gl/README | 50 ++++++++++---------- .../source/luatex/hyph-utf8/luatex-hyphen.dtx | 52 ++++++++++++++++----- Master/texmf-dist/tex/luatex/hyph-utf8/hyphen.cfg | 23 +++++++-- .../tex/luatex/hyph-utf8/luatex-hyphen.lua | 15 +++++- 9 files changed, 121 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist') 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 Binary files a/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf and b/Master/texmf-dist/doc/generic/hyph-utf8/hyphenation.pdf differ 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 Binary files a/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf and b/Master/texmf-dist/doc/luatex/hyph-utf8/luatex-hyphen.pdf differ 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'. -- cgit v1.2.3