duplicate patterns with apostrophes in plan text files (there was a b…

…ug in conversion for Greek)
hyphenation · Jun 8, 2011 · 312c62d · 312c62d
1 parent deffaae
commit 312c62d
Show file tree

Hide file tree

Showing 19 changed files with 485 additions and 133 deletions.
diff --git a/hyph-utf8/doc/generic/hyph-utf8/CHANGES b/hyph-utf8/doc/generic/hyph-utf8/CHANGES
@@ -1,3 +1,7 @@
+2011-06-08 (#547)
+- duplicate patterns with apostrophes in plan text files
+- fix a bug in conversion of greek patterns into plain text files (no apostrophe replacement)
+
 2011-06-08 (#545, #546)
 - restore two version of plain text patterns for Serbian
   and load 'sh' patterns by default also for Cyrillic script

diff --git a/hyph-utf8/source/generic/hyph-utf8/generate-plain-patterns.rb b/hyph-utf8/source/generic/hyph-utf8/generate-plain-patterns.rb
@@ -72,7 +72,12 @@
 
 		# patterns
 		patterns.each do |pattern|
-			$file_pat.puts pattern.gsub(/'/,"’")
+			$file_pat.puts pattern
+			if pattern =~ /'/ then
+				if code != "grc" and code != "el-monoton" and code != "el-polyton" then
+					$file_pat.puts pattern.gsub(/'/,"’")
+				end
+			end
 		end
 		# exceptions
 		if exceptions != ""
@@ -82,6 +87,9 @@
 		characters_indexes.each do |c|
 			ch = [c].pack('U')
 			$file_let.puts ch + Unicode.upcase(ch)
+			if ch == "'" and code != "grc" and code != "el-monoton" and code != "el-polyton" then
+				$file_let.puts "’’"
+			end
 		end
 		# licence and readme
 		$file_inf.puts "#{language.message}\n\n(more info about the licence to be added later)\n\n"

diff --git a/hyph-utf8/source/generic/hyph-utf8/languages.rb b/hyph-utf8/source/generic/hyph-utf8/languages.rb
@@ -65,7 +65,6 @@ def get_patterns
 				gsub(/\s+/m,"\n").
 				gsub(/^\s*/m,'').
 				gsub(/\s*$/m,'').
-				gsub(/'/,"’").
 				split("\n")
 
 			if @code == 'eo' then

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt
@@ -1,3 +1,5 @@
+''
+’’
 --
 aA
 bB
@@ -35,4 +37,3 @@ zZ
 öÖ
 ûÛ
 üÜ
-’’
diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-af.pat.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-af.pat.txt
@@ -16,7 +16,9 @@
 .af7oes.
 .a4f5oo
 .a4f5ra
+.af6ro'
 .af6ro’
+.a7fro's
 .a7fro’s
 .af6ro-
 .a7fro-h
@@ -348,6 +350,7 @@
 .k4we
 .k4wo
 .ky7otop
+.l'7etji
 .l’7etji
 .la6eti
 .la6kwa
@@ -376,6 +379,7 @@
 .lui5sl
 .l6üder
 .m2
+.m'7etji
 .m’7etji
 .ma6cdo
 .ma6nal
@@ -520,6 +524,7 @@
 .pyp5r
 .py7thon
 .r2
+.r'7etji
 .r’7etji
 .r6aard
 .ra7dart
@@ -8099,6 +8104,7 @@ ry4ta
 ry5tra
 s2
 2s.
+s'9ie.
 s’9ie.
 1sa
 3sa.
@@ -10179,6 +10185,7 @@ wys3k
 wys3p
 wys5ta
 wyt7raak
+x'9ie.
 x’9ie.
 x1a
 xe1

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt
@@ -1,3 +1,4 @@
+''
 ʼʼ
 ΐΐ
 άΆ

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.pat.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.pat.txt
@@ -148,76 +148,76 @@
 4φ.
 4χ.
 4ψ.
-4’
+4'
 4ʼ
 4᾿
-4β’
+4β'
 4βʼ
 4β᾿
-4γ’
+4γ'
 4γʼ
 4γ᾿
-4δ’
+4δ'
 4δʼ
 4δ᾿
-4ζ’
+4ζ'
 4ζʼ
 4ζ᾿
-4θ’
+4θ'
 4θʼ
 4θ᾿
-4κ’
+4κ'
 4κʼ
 4κ᾿
-4λ’
+4λ'
 4λʼ
 4λ᾿
-4μ’
+4μ'
 4μʼ
 4μ᾿
-4μπ’
+4μπ'
 4μπʼ
 4μπ᾿
-4ν’
+4ν'
 4νʼ
 4ν᾿
-4ντ’
+4ντ'
 4ντ’
 4ντ᾿
-4ξ’
+4ξ'
 4ξʼ
 4ξ᾿
-4π’
+4π'
 4πʼ
 4π᾿
-4ρ’
+4ρ'
 4ρʼ
 4ρ᾿
-4σ’
+4σ'
 4σʼ
 4σ᾿
-4ϲ’
+4ϲ'
 4ϲʼ
 4ϲ᾿
-4τ’
+4τ'
 4τʼ
 4τ᾿
-4τζ’
+4τζ'
 4τζʼ
 4τζ᾿
-4τσ’
+4τσ'
 4τσʼ
 4τσ᾽
-4τϲ’
+4τϲ'
 4τϲʼ
 4τϲ᾿
-4φ’
+4φ'
 4φʼ
 4φ᾿
-4χ’
+4χ'
 4χʼ
 4χ᾿
-4ψ’
+4ψ'
 4ψʼ
 4ψ᾿
 .β4

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt
@@ -1,3 +1,4 @@
+''
 ʼʼ
 ΐΐ
 άΆ

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.pat.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.pat.txt
@@ -395,76 +395,76 @@
 6φ.
 6χ.
 6ψ.
-6’
+6'
 6ʼ
 6᾿
-6β’
+6β'
 6βʼ
 6β᾿
-6γ’
+6γ'
 6γʼ
 6γ᾿
-6δ’
+6δ'
 6δʼ
 6δ᾿
-6ζ’
+6ζ'
 6ζʼ
 6ζ᾿
-6θ’
+6θ'
 6θʼ
 6θ᾿
-6κ’
+6κ'
 6κʼ
 6κ᾿
-6λ’
+6λ'
 6λʼ
 6λ᾿
-6μ’
+6μ'
 6μʼ
 6μ᾿
-6μπ’
+6μπ'
 6μπʼ
 6μπ᾿
-6ν’
+6ν'
 6νʼ
 6ν᾿
-6ντ’
+6ντ'
 6ντ’
 6ντ᾿
-6ξ’
+6ξ'
 6ξʼ
 6ξ᾿
-6π’
+6π'
 6πʼ
 6π᾿
-6ρ’
+6ρ'
 6ρʼ
 6ρ᾿
-6σ’
+6σ'
 6σʼ
 6σ᾿
-6ϲ’
+6ϲ'
 6ϲʼ
 6ϲ᾿
-6τ’
+6τ'
 6τʼ
 6τ᾿
-6τζ’
+6τζ'
 6τζʼ
 6τζ᾿
-6τσ’
+6τσ'
 6τσʼ
 6τσ᾽
-6τϲ’
+6τϲ'
 6τϲʼ
 6τϲ᾿
-6φ’
+6φ'
 6φʼ
 6φ᾿
-6χ’
+6χ'
 6χʼ
 6χ᾿
-6ψ’
+6ψ'
 6ψʼ
 6ψ᾿
 .β6

diff --git a/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt b/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt
@@ -1,3 +1,5 @@
+''
+’’
 aA
 bB
 cC
@@ -35,4 +37,3 @@ zZ
 ôÔ
 ûÛ
 œŒ
-’’