From 090ded961825be917116732276cd3ec07bcf1f7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Feb 2016 00:08:09 +0000 Subject: hyph-utf8 (12feb16) git-svn-id: svn://tug.org/texlive/trunk@39700 c570f23f-e606-0410-a88d-b1316a301751 --- .../generic/hyph-utf8/generate-pattern-loaders.rb | 16 ++++----- .../generic/hyph-utf8/generate-plain-patterns.rb | 2 +- .../source/generic/hyph-utf8/languages.rb | 38 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/source/generic/hyph-utf8') diff --git a/Master/texmf-dist/source/generic/hyph-utf8/generate-pattern-loaders.rb b/Master/texmf-dist/source/generic/hyph-utf8/generate-pattern-loaders.rb index f861cec1464..78eaee9ba1e 100644 --- a/Master/texmf-dist/source/generic/hyph-utf8/generate-pattern-loaders.rb +++ b/Master/texmf-dist/source/generic/hyph-utf8/generate-pattern-loaders.rb @@ -35,7 +35,7 @@ text_header = % source/generic/hyph-utf8/generate-pattern-loaders.rb % See also http://tug.org/tex-hyphen % -% Copyright 2008-2015 TeX Users Group. +% Copyright 2008-2016 TeX Users Group. % You may freely use, modify and/or distribute this file. % (But consider adapting the scripts if you need modifications.) % @@ -78,19 +78,21 @@ text_patterns_utf8 = text_patterns text_patterns_quote = " \\input hyph-quote-#{language.code}.tex" +list_languages_with_quotes = ['af', 'fr', 'fur', 'it', 'oc', 'pms', 'rm', 'uk', 'zh-latn-pinyin'] + ########### # lccodes # ########### lccodes_common = [] -if language.code == 'af' or language.code == 'it' or language.code == 'rm' or language.code == 'fur' or language.code == 'pms' or language.code == 'fr' or language.code == 'uk' or language.code == 'zh-latn-pinyin' then +if list_languages_with_quotes.include?(language.code) lccodes_common.push("\\lccode`\\'=`\\'") end -if language.code == 'af' or language.code == 'pt' or language.code == 'tk' or language.code == 'ru' or language.code == 'uk' then +if ['af', 'pt', 'ru', 'tk', 'uk'].include?(language.code) lccodes_common.push("\\lccode`\\-=`\\-") end -if language.code == 'sh-latn' or language.code == 'sh-cyrl' then +if ['sh-latn', 'sh-cyrl'].include?(language.code) text_patterns_utf8 = [" \\input hyph-sh-latn.tex", " \\input hyph-sh-cyrl.tex"] text_engine_utf8 = [" #{comment_engine_utf8}", @@ -151,7 +153,7 @@ end ####################### # GROUP nr. 2 - ASCII # ####################### - elsif language.code == 'it' or language.code == 'rm' or language.code == 'pms' then + elsif ['it', 'pms', 'rm'].include?(language.code) file.puts(text_if_native_utf) file.puts(text_engine_utf8) file.puts(text_patterns) @@ -207,7 +209,7 @@ end file.puts(text_if_native_utf) file.puts(text_engine_utf8) file.puts(text_patterns_utf8) - if language.code == 'af' or language.code == 'fr' or language.code == 'fur' or language.code == 'uk' or language.code == 'zh-latn-pinyin' then + if list_languages_with_quotes.include?(language.code) file.puts(text_patterns_quote) end file.puts('\else') @@ -226,5 +228,3 @@ end end end end - - diff --git a/Master/texmf-dist/source/generic/hyph-utf8/generate-plain-patterns.rb b/Master/texmf-dist/source/generic/hyph-utf8/generate-plain-patterns.rb index 6aefcc95a57..87aa742d1e5 100755 --- a/Master/texmf-dist/source/generic/hyph-utf8/generate-plain-patterns.rb +++ b/Master/texmf-dist/source/generic/hyph-utf8/generate-plain-patterns.rb @@ -95,7 +95,7 @@ languages.sort{|x,y| x.code <=> y.code }.each do |language| end end # licence and readme - $file_inf.puts "#{language.message}\n\n(more info about the licence to be added later)\n\n" + # $file_inf.puts "#{language.message}\n\n(more info about the licence to be added later)\n\n" $file_inf.puts language.get_comments_and_licence $file_pat.close diff --git a/Master/texmf-dist/source/generic/hyph-utf8/languages.rb b/Master/texmf-dist/source/generic/hyph-utf8/languages.rb index c5db306161f..bf91035d29b 100644 --- a/Master/texmf-dist/source/generic/hyph-utf8/languages.rb +++ b/Master/texmf-dist/source/generic/hyph-utf8/languages.rb @@ -886,7 +886,7 @@ class Languages < Hash "last_modified" => "2004-04-13", "type" => "dictionary", "authors" => [ "een_saar" ], - "licence" => "LPPL", + "licence" => "LPPL|MIT", # Dual MIT-LPPL "description_s" => "Estonian hyphenation patterns", "description_l" => [ #......................................................................# @@ -982,7 +982,7 @@ class Languages < Hash "last_modified" => "2010-05", "type" => "rules", "authors" => ["sahak_petrosyan"], - "licence" => "LPGL", + "licence" => "LGPL", "description_s" => "Armenian hyphenation patterns", "description_l" => [ #......................................................................# @@ -1344,6 +1344,32 @@ class Languages < Hash "to their meaning." ], }, +# occitan +{ + "code" => "oc", + "name" => "occitan", + "use_new_loader" => true, + "use_old_patterns" => false, + "hyphenmin" => [2,2], + "encoding" => "ec", + "exceptions" => false, + "message" => "Occitan hyphenation patterns", + + "version" => "0.1", + "last_modified" => "2016-02-04", + "type" => "rules", + "authors" => [ "claudio_beccari" ], + "licence" => "LPPL", + "description_s" => "Occitan hyphenation patterns", + "description_l" => [ + #......................................................................# + "Hyphenation patterns for Occitan in T1/EC and UTF-8 encodings.", + "They are supposed to be valid for all the Occitan variants", + "spoken and written in the wide area called 'Occitanie' by the French.", + "It ranges from the Val d'Aran within Catalunya, to the South Western", + "Italian Alps encompassing the southern half of the French pentagon.", + ], +}, # polish { "code" => "pl", @@ -1386,7 +1412,7 @@ class Languages < Hash "last_modified" => "1996-07-21", "type" => "rules", # TODO: we could create a generating script "authors" => ["pedro_j_de_rezende", "j_joao_dias_almeida"], - "licence" => "LPPL", + "licence" => "BSD-3", "description_s" => "Portuguese hyphenation patterns", "description_l" => [ #......................................................................# @@ -1832,11 +1858,11 @@ class Languages < Hash "message" => "Assamese hyphenation patterns", # this is true for all Indic patterns - "version" => "0.5.3", - "last_modified" => "2010-05-01", + "version" => "0.9.0", + "last_modified" => "2016-01-16", "type" => "rules", "authors" => ["santhosh_thottingal"], - "licence" => "LGPL", + "licence" => "MIT", "description_s" => "Indic hyphenation patterns", "description_l" => [ #......................................................................# -- cgit v1.2.3