/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Jan 1 10:56:54 2013 UTC (18 months, 1 week ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for now.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

1 From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
2 From: Caolán McNamara <caolanm@redhat.com>
3 Date: Sun, 13 May 2012 21:41:30 +0000
4 Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
5
6 i.e. sync with svn diff -c 31071
7 http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
8
9 Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
10 ---
11 diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
12 index cbabee6..91c8f3d 100644
13 --- a/i18npool/source/breakiterator/data/line.txt
14 +++ b/i18npool/source/breakiterator/data/line.txt
15 @@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:];
16 $BK = [:LineBreak = Mandatory_Break:];
17 $B2 = [:LineBreak = Break_Both:];
18 $CB = [:LineBreak = Contingent_Break:];
19 +$CJ = [:LineBreak = Conditional_Japanese_Starter:];
20 $CL = [:LineBreak = Close_Punctuation:] ;
21 $CM = [:LineBreak = Combining_Mark:];
22 $CR = [:LineBreak = Carriage_Return:];
23 $EX = [:LineBreak = Exclamation:];
24 $GL = [:LineBreak = Glue:];
25 +$HL = [:LineBreak = Hebrew_Letter:];
26 $HY = [:LineBreak = Hyphen:];
27 $H2 = [:LineBreak = H2:];
28 $H3 = [:LineBreak = H3:];
29 @@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:];
30 $JT = [:LineBreak = JT:];
31 $LF = [:LineBreak = Line_Feed:];
32 $NL = [:LineBreak = Next_Line:];
33 -$NS = [:LineBreak = Nonstarter:];
34 +$NS = [[:LineBreak = Nonstarter:] $CJ];
35 $NU = [:LineBreak = Numeric:];
36 $OP = [[:LineBreak = Open_Punctuation:] - $DG];
37 $PO = [:LineBreak = Postfix_Numeric:];
38 @@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
39 $CLcm = $CL $CM*;
40 $EXcm = $EX $CM*;
41 $GLcm = $GL $CM*;
42 +$HLcm = $HL $CM*;
43 $HYcm = $HY $CM*;
44 $H2cm = $H2 $CM*;
45 $H3cm = $H3 $CM*;
46 @@ -150,6 +153,7 @@ $B2 $CM+;
47 $CL $CM+;
48 $EX $CM+;
49 $GL $CM+;
50 +$HL $CM+;
51 $HY $CM+;
52 $H2 $CM+;
53 $H3 $CM+;
54 @@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs
55 # so for this one case we need to manually list out longer sequences.
56 #
57 $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
58 -$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
59 +$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
60 $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
61
62
63 @@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
64 $BBcm [^$CB]; # $BB x
65 $BBcm $LB20NonBreaks $CM*;
66
67 +# LB 21a Don't break after Hebrew + Hyphen
68 +# HL (HY | BA) x
69 +#
70 +$HLcm ($HYcm | $BAcm) [^$CB]?;
71 +
72 # LB 22
73 -$ALcm $INcm;
74 +($ALcm | $HLcm) $INcm;
75 $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
76 $IDcm $INcm;
77 $INcm $INcm;
78 @@ -331,16 +340,18 @@ $NUcm $INcm;
79 # $LB 23
80 $IDcm $POcm;
81 $ALcm $NUcm; # includes $LB19
82 +$HLcm $NUcm;
83 $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
84 $NUcm $ALcm;
85 +$NUcm $HLcm;
86
87 #
88 # LB 24
89 #
90 $PRcm $IDcm;
91 $ALcm $PRcm;
92 -$PRcm $ALcm;
93 -$POcm $ALcm;
94 +$PRcm ($ALcm | $HLcm);
95 +$POcm ($ALcm | $HLcm);
96
97 #
98 # LB 25 Numbers.
99 @@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
100
101 # LB 28 Do not break between alphabetics
102 #
103 -$ALcm $ALcm;
104 -$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL
105 +($ALcm | $HLcm) ($ALcm | $HLcm);
106 +$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
107
108 # LB 29
109 $IScm ($ALcm | $NUcm);
110 @@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
111 # Rule 30 Do not break between letters, numbers or ordinary symbols
112 # and opening or closing punctuation
113 #
114 -($ALcm | $NUcm) $OPcm;
115 +($ALcm | $HLcm | $NUcm) $OPcm;
116 $CM+ $OPcm;
117 -$CLcm ($ALcm | $NUcm);
118 -
119 -
120 +$CLcm ($ALcm | $HLcm | $NUcm);
121
122 #
123 # Reverse Rules.
124 @@ -391,6 +400,7 @@ $CM+ $B2;
125 $CM+ $CL;
126 $CM+ $EX;
127 $CM+ $GL;
128 +$CM+ $HL;
129 $CM+ $HY;
130 $CM+ $H2;
131 $CM+ $H3;
132 @@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS)
133 $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x .
134 [^$CB] $CM* $BB; #
135
136 -
137 +# LB21a
138 +[^$CB] $CM* ($HY | $BA) $CM* $HL;
139
140 # LB 22
141 -$CM* $IN $CM* $ALPlus;
142 +$CM* $IN $CM* ($ALPlus | $HL);
143 $CM* $IN $CM* $ID;
144 $CM* $IN $CM* $IN;
145 $CM* $IN $CM* $NU;
146
147 # LB 23
148 $CM* $PO $CM* $ID;
149 -$CM* $NU $CM* $ALPlus;
150 -$CM* $ALPlus $CM* $NU;
151 +$CM* $NU $CM* ($ALPlus | $HL);
152 +$CM* ($ALPlus | $HL) $CM* $NU;
153
154 # LB 24
155 $CM* $ID $CM* $PR;
156 $CM* $PR $CM* $ALPlus;
157 -$CM* $ALPlus $CM* $PR;
158 -$CM* $ALPlus $CM* $PO;
159 +$CM* ($ALPlus | $HL) $CM* $PR;
160 +$CM* ($ALPlus | $HL) $CM* $PO;
161
162 $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
163 $CM* $NU+ $CM* $HY+ / $SP;
164 @@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
165 $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
166
167 # LB 28
168 -$CM* $ALPlus $CM* $ALPlus;
169 -
170 +$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
171
172 # LB 29
173 $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
174
175 # LB 30
176 -$CM* $OP $CM* ($NU | $ALPlus);
177 -$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
178 +$CM* $OP $CM* ($ALPlus | $HL | $NU);
179 +$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
180
181
182 ## -------------------------------------------------
183 @@ -609,6 +619,9 @@ $SP+ $CM* $QU;
184 $SP+ $CM* $CL;
185 $SP+ $CM* $B2;
186
187 +# LB 21
188 +$CM* ($HY | $BA) $CM* $HL;
189 +
190 # LB 18
191 ($CM* ($IS | $SY))+ $CM* $NU;
192 $CL $CM* ($NU | $IS | $SY);
193 @@ -629,6 +642,6 @@ $dictionary $dictionary;
194 # turn off rule chaining. We don't want to move more
195 # than necessary.
196 #
197 -[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
198 +[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
199 $dictionary $dictionary;
200
201 --
202 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20