Changeset 187729 in webkit
- Timestamp:
- Aug 1, 2015 5:48:48 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 35 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r187725 r187729 1 2015-08-01 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [OS X] Font fallback is not language-sensitive 4 https://bugs.webkit.org/show_bug.cgi?id=147390 5 6 Reviewed by Dean Jackson. 7 8 Updating tests. 9 10 * css3/line-break/line-break-auto-centered-expected.html: 11 * css3/line-break/line-break-auto-centered.html: 12 * css3/line-break/line-break-auto-postfixes-expected.html: 13 * css3/line-break/line-break-auto-postfixes.html: 14 * css3/line-break/line-break-loose-centered-expected.html: 15 * css3/line-break/line-break-loose-centered.html: 16 * css3/line-break/line-break-loose-hyphens-expected.html: 17 * css3/line-break/line-break-loose-hyphens.html: 18 * css3/line-break/line-break-loose-postfixes-expected.html: 19 * css3/line-break/line-break-loose-postfixes.html: 20 * css3/line-break/line-break-loose-sound-marks-expected.html: 21 * css3/line-break/line-break-loose-sound-marks.html: 22 * css3/line-break/line-break-normal-centered-expected.html: 23 * css3/line-break/line-break-normal-centered.html: 24 * css3/line-break/line-break-normal-hyphens-expected.html: 25 * css3/line-break/line-break-normal-hyphens.html: 26 * css3/line-break/line-break-normal-postfixes-expected.html: 27 * css3/line-break/line-break-normal-postfixes.html: 28 * css3/line-break/line-break-normal-sound-marks-expected.html: 29 * css3/line-break/line-break-normal-sound-marks.html: 30 * css3/line-break/line-break-strict-centered-expected.html: 31 * css3/line-break/line-break-strict-centered.html: 32 * css3/line-break/line-break-strict-hyphens-expected.html: 33 * css3/line-break/line-break-strict-hyphens.html: 34 * css3/line-break/line-break-strict-postfixes-expected.html: 35 * css3/line-break/line-break-strict-postfixes.html: 36 * css3/line-break/line-break-strict-sound-marks-expected.html: 37 * css3/line-break/line-break-strict-sound-marks.html: 38 * fast/text/fallback-language-han-expected.html: Added. 39 * fast/text/fallback-language-han.html: Added. 40 * platform/efl/TestExpectations: 41 * platform/gtk/TestExpectations: 42 * platform/win/TestExpectations: 43 1 44 2015-08-01 Myles C. Maxfield <mmaxfield@apple.com> 2 45 -
trunk/LayoutTests/css3/line-break/line-break-auto-centered-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四:</p> … … 57 58 <p><nobr>一二三</nobr><br>四?</p> 58 59 </div> 59 </ div>60 < divlang="ja">60 </span> 61 <span lang="ja"> 61 62 <div> 62 63 <p><nobr>一二三</nobr><br>四:</p> … … 101 102 <p><nobr>一二三</nobr><br>四?</p> 102 103 </div> 103 </ div>104 < divlang="ko">104 </span> 105 <span lang="ko"> 105 106 <div> 106 107 <p><nobr>一二三</nobr><br>四:</p> … … 145 146 <p><nobr>一二三</nobr><br>四?</p> 146 147 </div> 147 </ div>148 < divlang="zh">148 </span> 149 <span lang="zh"> 149 150 <div> 150 151 <p><nobr>一二三</nobr><br>四:</p> … … 189 190 <p><nobr>一二三</nobr><br>四?</p> 190 191 </div> 191 </ div>192 </span> 192 193 </body> 193 194 </html> -
trunk/LayoutTests/css3/line-break/line-break-auto-centered.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四:</p> … … 58 59 <p>一二三四?</p> 59 60 </div> 60 </ div>61 < divlang="ja">61 </span> 62 <span lang="ja"> 62 63 <div> 63 64 <p>一二三四:</p> … … 102 103 <p>一二三四?</p> 103 104 </div> 104 </ div>105 < divlang="ko">105 </span> 106 <span lang="ko"> 106 107 <div> 107 108 <p>一二三四:</p> … … 146 147 <p>一二三四?</p> 147 148 </div> 148 </ div>149 < divlang="zh">149 </span> 150 <span lang="zh"> 150 151 <div> 151 152 <p>一二三四:</p> … … 190 191 <p>一二三四?</p> 191 192 </div> 192 </ div>193 </span> 193 194 </body> 194 195 </html> -
trunk/LayoutTests/css3/line-break/line-break-auto-postfixes-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.8em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四%</p> … … 42 43 <p><nobr>一二三</nobr><br>四¢</p> 43 44 </div> 44 </ div>45 < divlang="ja">45 </span> 46 <span lang="ja"> 46 47 <div> 47 48 <p><nobr>一二三</nobr><br>四%</p> … … 71 72 <p><nobr>一二三</nobr><br>四¢</p> 72 73 </div> 73 </ div>74 < divlang="ko">74 </span> 75 <span lang="ko"> 75 76 <div> 76 77 <p><nobr>一二三</nobr><br>四%</p> … … 100 101 <p><nobr>一二三</nobr><br>四¢</p> 101 102 </div> 102 </ div>103 < divlang="zh">103 </span> 104 <span lang="zh"> 104 105 <div> 105 106 <p><nobr>一二三</nobr><br>四%</p> … … 129 130 <p><nobr>一二三</nobr><br>四¢</p> 130 131 </div> 131 </ div>132 </span> 132 133 </body> 133 134 </html> -
trunk/LayoutTests/css3/line-break/line-break-auto-postfixes.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.8em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四%</p> … … 43 44 <p>一二三四¢</p> 44 45 </div> 45 </ div>46 < divlang="ja">46 </span> 47 <span lang="ja"> 47 48 <div> 48 49 <p>一二三四%</p> … … 72 73 <p>一二三四¢</p> 73 74 </div> 74 </ div>75 < divlang="ko">75 </span> 76 <span lang="ko"> 76 77 <div> 77 78 <p>一二三四%</p> … … 101 102 <p>一二三四¢</p> 102 103 </div> 103 </ div>104 < divlang="zh">104 </span> 105 <span lang="zh"> 105 106 <div> 106 107 <p>一二三四%</p> … … 130 131 <p>一二三四¢</p> 131 132 </div> 132 </ div>133 </span> 133 134 </body> 134 135 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-centered-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四:</p> … … 57 58 <p><nobr>一二三</nobr><br>四?</p> 58 59 </div> 59 </ div>60 < divlang="ja">60 </span> 61 <span lang="ja"> 61 62 <div> 62 63 <p><nobr>一二三四</nobr><br>:</p> … … 101 102 <p><nobr>一二三四</nobr><br>?</p> 102 103 </div> 103 </div> 104 <div lang="ko"> 104 </span> 105 <span lang="ko"> 106 <div style="width: 3.75em;"> 107 <p><nobr>一二三四</nobr><br>:</p> 108 </div> 109 <div style="width: 3.75em;"> 110 <p><nobr>一二三四</nobr><br>;</p> 111 </div> 112 <div style="width: 3.75em;"> 113 <p><nobr>一二三四</nobr><br>・</p> 114 </div> 115 <div> 116 <p><nobr>一二三四</nobr><br>:</p> 117 </div> 118 <div> 119 <p><nobr>一二三四</nobr><br>;</p> 120 </div> 121 <div style="width: 3.75em;"> 122 <p><nobr>一二三四</nobr><br>・</p> 123 </div> 124 <div style="width: 3.75em;"> 125 <p><nobr>一二三四</nobr><br>!</p> 126 </div> 127 <div style="width: 3.75em;"> 128 <p><nobr>一二三四</nobr><br>?</p> 129 </div> 130 <div style="width: 3.75em;"> 131 <p><nobr>一二三四</nobr><br>‼</p> 132 </div> 133 <div> 134 <p><nobr>一二三四</nobr><br>⁇</p> 135 </div> 136 <div> 137 <p><nobr>一二三四</nobr><br>⁈</p> 138 </div> 139 <div> 140 <p><nobr>一二三四</nobr><br>⁉</p> 141 </div> 142 <div> 143 <p><nobr>一二三四</nobr><br>!</p> 144 </div> 145 <div> 146 <p><nobr>一二三四</nobr><br>?</p> 147 </div> 148 </span> 149 <span lang="zh"> 105 150 <div> 106 151 <p><nobr>一二三四</nobr><br>:</p> … … 145 190 <p><nobr>一二三四</nobr><br>?</p> 146 191 </div> 147 </div> 148 <div lang="zh"> 149 <div> 150 <p><nobr>一二三四</nobr><br>:</p> 151 </div> 152 <div> 153 <p><nobr>一二三四</nobr><br>;</p> 154 </div> 155 <div> 156 <p><nobr>一二三四</nobr><br>・</p> 157 </div> 158 <div> 159 <p><nobr>一二三四</nobr><br>:</p> 160 </div> 161 <div> 162 <p><nobr>一二三四</nobr><br>;</p> 163 </div> 164 <div> 165 <p><nobr>一二三四</nobr><br>・</p> 166 </div> 167 <div> 168 <p><nobr>一二三四</nobr><br>!</p> 169 </div> 170 <div> 171 <p><nobr>一二三四</nobr><br>?</p> 172 </div> 173 <div> 174 <p><nobr>一二三四</nobr><br>‼</p> 175 </div> 176 <div> 177 <p><nobr>一二三四</nobr><br>⁇</p> 178 </div> 179 <div> 180 <p><nobr>一二三四</nobr><br>⁈</p> 181 </div> 182 <div> 183 <p><nobr>一二三四</nobr><br>⁉</p> 184 </div> 185 <div> 186 <p><nobr>一二三四</nobr><br>!</p> 187 </div> 188 <div> 189 <p><nobr>一二三四</nobr><br>?</p> 190 </div> 191 </div> 192 </span> 192 193 </body> 193 194 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-centered.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : loose - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四:</p> … … 58 59 <p>一二三四?</p> 59 60 </div> 60 </ div>61 < divlang="ja">61 </span> 62 <span lang="ja"> 62 63 <div> 63 64 <p>一二三四:</p> … … 102 103 <p>一二三四?</p> 103 104 </div> 104 </div> 105 <div lang="ko"> 105 </span> 106 <span lang="ko"> 107 <div style="width: 3.75em;"> 108 <p>一二三四:</p> 109 </div> 110 <div style="width: 3.75em;"> 111 <p>一二三四;</p> 112 </div> 113 <div style="width: 3.75em;"> 114 <p>一二三四・</p> 115 </div> 116 <div> 117 <p>一二三四:</p> 118 </div> 119 <div> 120 <p>一二三四;</p> 121 </div> 122 <div style="width: 3.75em;"> 123 <p>一二三四・</p> 124 </div> 125 <div style="width: 3.75em;"> 126 <p>一二三四!</p> 127 </div> 128 <div style="width: 3.75em;"> 129 <p>一二三四?</p> 130 </div> 131 <div style="width: 3.75em;"> 132 <p>一二三四‼</p> 133 </div> 134 <div> 135 <p>一二三四⁇</p> 136 </div> 137 <div> 138 <p>一二三四⁈</p> 139 </div> 140 <div> 141 <p>一二三四⁉</p> 142 </div> 143 <div> 144 <p>一二三四!</p> 145 </div> 146 <div> 147 <p>一二三四?</p> 148 </div> 149 </span> 150 <span lang="zh"> 106 151 <div> 107 152 <p>一二三四:</p> … … 146 191 <p>一二三四?</p> 147 192 </div> 148 </div> 149 <div lang="zh"> 150 <div> 151 <p>一二三四:</p> 152 </div> 153 <div> 154 <p>一二三四;</p> 155 </div> 156 <div> 157 <p>一二三四・</p> 158 </div> 159 <div> 160 <p>一二三四:</p> 161 </div> 162 <div> 163 <p>一二三四;</p> 164 </div> 165 <div> 166 <p>一二三四・</p> 167 </div> 168 <div> 169 <p>一二三四!</p> 170 </div> 171 <div> 172 <p>一二三四?</p> 173 </div> 174 <div> 175 <p>一二三四‼</p> 176 </div> 177 <div> 178 <p>一二三四⁇</p> 179 </div> 180 <div> 181 <p>一二三四⁈</p> 182 </div> 183 <div> 184 <p>一二三四⁉</p> 185 </div> 186 <div> 187 <p>一二三四!</p> 188 </div> 189 <div> 190 <p>一二三四?</p> 191 </div> 192 </div> 193 </span> 193 194 </body> 194 195 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-hyphens-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 4.05em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四‐</p> … … 27 28 <p><nobr>一二三</nobr><br>四゠</p> 28 29 </div> 29 </ div>30 < divlang="ja">30 </span> 31 <span lang="ja"> 31 32 <div> 32 33 <p><nobr>一二三四</nobr><br>‐</p> … … 41 42 <p><nobr>一二三四</nobr><br>゠</p> 42 43 </div> 43 </div> 44 <div lang="ko"> 44 </span> 45 <span lang="ko"> 46 <div> 47 <p><nobr>一二三四</nobr><br>‐</p> 48 </div> 49 <div style="width: 3.9em"> 50 <p><nobr>一二三四</nobr><br>–</p> 51 </div> 52 <div> 53 <p><nobr>一二三四</nobr><br>〜</p> 54 </div> 55 <div> 56 <p><nobr>一二三四</nobr><br>゠</p> 57 </div> 58 </span> 59 <span lang="zh"> 45 60 <div> 46 61 <p><nobr>一二三四</nobr><br>‐</p> … … 55 70 <p><nobr>一二三四</nobr><br>゠</p> 56 71 </div> 57 </div> 58 <div lang="zh"> 59 <div> 60 <p><nobr>一二三四</nobr><br>‐</p> 61 </div> 62 <div> 63 <p><nobr>一二三四</nobr><br>–</p> 64 </div> 65 <div> 66 <p><nobr>一二三四</nobr><br>〜</p> 67 </div> 68 <div> 69 <p><nobr>一二三四</nobr><br>゠</p> 70 </div> 71 </div> 72 </span> 72 73 </body> 73 74 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-hyphens.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : loose - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 4.05em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四‐</p> … … 28 29 <p>一二三四゠</p> 29 30 </div> 30 </ div>31 < divlang="ja">31 </span> 32 <span lang="ja"> 32 33 <div> 33 34 <p>一二三四‐</p> … … 42 43 <p>一二三四゠</p> 43 44 </div> 44 </div> 45 <div lang="ko"> 45 </span> 46 <span lang="ko"> 47 <div> 48 <p>一二三四‐</p> 49 </div> 50 <div style="width: 3.9em"> 51 <p>一二三四–</p> 52 </div> 53 <div> 54 <p>一二三四〜</p> 55 </div> 56 <div> 57 <p>一二三四゠</p> 58 </div> 59 </span> 60 <span lang="zh"> 46 61 <div> 47 62 <p>一二三四‐</p> … … 56 71 <p>一二三四゠</p> 57 72 </div> 58 </div> 59 <div lang="zh"> 60 <div> 61 <p>一二三四‐</p> 62 </div> 63 <div> 64 <p>一二三四–</p> 65 </div> 66 <div> 67 <p>一二三四〜</p> 68 </div> 69 <div> 70 <p>一二三四゠</p> 71 </div> 72 </div> 73 </span> 73 74 </body> 74 75 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-postfixes-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四%</p> … … 42 43 <p><nobr>一二三</nobr><br>四¢</p> 43 44 </div> 44 </ div>45 < divlang="ja">45 </span> 46 <span lang="ja"> 46 47 <div> 47 48 <p><nobr>一二三四</nobr><br>%</p> … … 71 72 <p><nobr>一二三四</nobr><br>¢</p> 72 73 </div> 73 </div> 74 <div lang="ko"> 74 </span> 75 <span lang="ko"> 76 <div> 77 <p><nobr>一二三四</nobr><br>%</p> 78 </div> 79 <div> 80 <p><nobr>一二三四</nobr><br>¢</p> 81 </div> 82 <div style="width: 3.8em;"> 83 <p><nobr>一二三四</nobr><br>°</p> 84 </div> 85 <div> 86 <p><nobr>一二三四</nobr><br>‰</p> 87 </div> 88 <div style="width: 3.8em;"> 89 <p><nobr>一二三四</nobr><br>′</p> 90 </div> 91 <div style="width: 3.8em;"> 92 <p><nobr>一二三四</nobr><br>″</p> 93 </div> 94 <div> 95 <p><nobr>一二三四</nobr><br>℃</p> 96 </div> 97 <div> 98 <p><nobr>一二三四</nobr><br>%</p> 99 </div> 100 <div style="width: 3.8em;"> 101 <p><nobr>一二三四</nobr><br>¢</p> 102 </div> 103 </span> 104 <span lang="zh"> 75 105 <div> 76 106 <p><nobr>一二三四</nobr><br>%</p> … … 100 130 <p><nobr>一二三四</nobr><br>¢</p> 101 131 </div> 102 </div> 103 <div lang="zh"> 104 <div> 105 <p><nobr>一二三四</nobr><br>%</p> 106 </div> 107 <div> 108 <p><nobr>一二三四</nobr><br>¢</p> 109 </div> 110 <div> 111 <p><nobr>一二三四</nobr><br>°</p> 112 </div> 113 <div> 114 <p><nobr>一二三四</nobr><br>‰</p> 115 </div> 116 <div> 117 <p><nobr>一二三四</nobr><br>′</p> 118 </div> 119 <div> 120 <p><nobr>一二三四</nobr><br>″</p> 121 </div> 122 <div> 123 <p><nobr>一二三四</nobr><br>℃</p> 124 </div> 125 <div> 126 <p><nobr>一二三四</nobr><br>%</p> 127 </div> 128 <div> 129 <p><nobr>一二三四</nobr><br>¢</p> 130 </div> 131 </div> 132 </span> 132 133 </body> 133 134 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-postfixes.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : loose - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四%</p> … … 43 44 <p>一二三四¢</p> 44 45 </div> 45 </ div>46 < divlang="ja">46 </span> 47 <span lang="ja"> 47 48 <div> 48 49 <p>一二三四%</p> … … 72 73 <p>一二三四¢</p> 73 74 </div> 74 </div> 75 <div lang="ko"> 75 </span> 76 <span lang="ko"> 77 <div> 78 <p>一二三四%</p> 79 </div> 80 <div> 81 <p>一二三四¢</p> 82 </div> 83 <div style="width: 3.8em;"> 84 <p>一二三四°</p> 85 </div> 86 <div> 87 <p>一二三四‰</p> 88 </div> 89 <div style="width: 3.8em;"> 90 <p>一二三四′</p> 91 </div> 92 <div style="width: 3.8em;"> 93 <p>一二三四″</p> 94 </div> 95 <div> 96 <p>一二三四℃</p> 97 </div> 98 <div> 99 <p>一二三四%</p> 100 </div> 101 <div style="width: 3.8em;"> 102 <p>一二三四¢</p> 103 </div> 104 </span> 105 <span lang="zh"> 76 106 <div> 77 107 <p>一二三四%</p> … … 101 131 <p>一二三四¢</p> 102 132 </div> 103 </div> 104 <div lang="zh"> 105 <div> 106 <p>一二三四%</p> 107 </div> 108 <div> 109 <p>一二三四¢</p> 110 </div> 111 <div> 112 <p>一二三四°</p> 113 </div> 114 <div> 115 <p>一二三四‰</p> 116 </div> 117 <div> 118 <p>一二三四′</p> 119 </div> 120 <div> 121 <p>一二三四″</p> 122 </div> 123 <div> 124 <p>一二三四℃</p> 125 </div> 126 <div> 127 <p>一二三四%</p> 128 </div> 129 <div> 130 <p>一二三四¢</p> 131 </div> 132 </div> 133 </span> 133 134 </body> 134 135 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-sound-marks-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三四</nobr><br>ー</p> … … 21 22 <p><nobr>一二三四</nobr><br>ー</p> 22 23 </div> 23 </ div>24 < divlang="ja">24 </span> 25 <span lang="ja"> 25 26 <div> 26 27 <p><nobr>一二三四</nobr><br>ー</p> … … 29 30 <p><nobr>一二三四</nobr><br>ー</p> 30 31 </div> 31 </div> 32 <div lang="ko"> 32 </span> 33 <span lang="ko"> 34 <div> 35 <p><nobr>一二三四</nobr><br>ー</p> 36 </div> 37 <div style="width: 3.9em;"> 38 <p><nobr>一二三四</nobr><br>ー</p> 39 </div> 40 </span> 41 <span lang="zh"> 33 42 <div> 34 43 <p><nobr>一二三四</nobr><br>ー</p> … … 37 46 <p><nobr>一二三四</nobr><br>ー</p> 38 47 </div> 39 </div> 40 <div lang="zh"> 41 <div> 42 <p><nobr>一二三四</nobr><br>ー</p> 43 </div> 44 <div> 45 <p><nobr>一二三四</nobr><br>ー</p> 46 </div> 47 </div> 48 </span> 48 49 </body> 49 50 </html> -
trunk/LayoutTests/css3/line-break/line-break-loose-sound-marks.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : loose - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四ー</p> … … 22 23 <p>一二三四ー</p> 23 24 </div> 24 </ div>25 < divlang="ja">25 </span> 26 <span lang="ja"> 26 27 <div> 27 28 <p>一二三四ー</p> … … 30 31 <p>一二三四ー</p> 31 32 </div> 32 </div> 33 <div lang="ko"> 33 </span> 34 <span lang="ko"> 35 <div> 36 <p>一二三四ー</p> 37 </div> 38 <div style="width: 3.9em;"> 39 <p>一二三四ー</p> 40 </div> 41 </span> 42 <span lang="zh"> 34 43 <div> 35 44 <p>一二三四ー</p> … … 38 47 <p>一二三四ー</p> 39 48 </div> 40 </div> 41 <div lang="zh"> 42 <div> 43 <p>一二三四ー</p> 44 </div> 45 <div> 46 <p>一二三四ー</p> 47 </div> 48 </div> 49 </span> 49 50 </body> 50 51 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-centered-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四:</p> … … 57 58 <p><nobr>一二三</nobr><br>四?</p> 58 59 </div> 59 </ div>60 < divlang="ja">60 </span> 61 <span lang="ja"> 61 62 <div> 62 63 <p><nobr>一二三</nobr><br>四:</p> … … 101 102 <p><nobr>一二三</nobr><br>四?</p> 102 103 </div> 103 </ div>104 < divlang="ko">104 </span> 105 <span lang="ko"> 105 106 <div> 106 107 <p><nobr>一二三</nobr><br>四:</p> … … 145 146 <p><nobr>一二三</nobr><br>四?</p> 146 147 </div> 147 </ div>148 < divlang="zh">148 </span> 149 <span lang="zh"> 149 150 <div> 150 151 <p><nobr>一二三</nobr><br>四:</p> … … 189 190 <p><nobr>一二三</nobr><br>四?</p> 190 191 </div> 191 </ div>192 </span> 192 193 </body> 193 194 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-centered.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : normal - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四:</p> … … 58 59 <p>一二三四?</p> 59 60 </div> 60 </ div>61 < divlang="ja">61 </span> 62 <span lang="ja"> 62 63 <div> 63 64 <p>一二三四:</p> … … 102 103 <p>一二三四?</p> 103 104 </div> 104 </ div>105 < divlang="ko">105 </span> 106 <span lang="ko"> 106 107 <div> 107 108 <p>一二三四:</p> … … 146 147 <p>一二三四?</p> 147 148 </div> 148 </ div>149 < divlang="zh">149 </span> 150 <span lang="zh"> 150 151 <div> 151 152 <p>一二三四:</p> … … 190 191 <p>一二三四?</p> 191 192 </div> 192 </ div>193 </span> 193 194 </body> 194 195 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-hyphens-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 4.05em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四‐</p> … … 27 28 <p><nobr>一二三</nobr><br>四゠</p> 28 29 </div> 29 </ div>30 < divlang="ja">30 </span> 31 <span lang="ja"> 31 32 <div> 32 33 <p><nobr>一二三四</nobr><br>‐</p> … … 41 42 <p><nobr>一二三四</nobr><br>゠</p> 42 43 </div> 43 </div> 44 <div lang="ko"> 44 </span> 45 <span lang="ko"> 46 <div> 47 <p><nobr>一二三四</nobr><br>‐</p> 48 </div> 49 <div style="width: 3.8em;"> 50 <p><nobr>一二三四</nobr><br>–</p> 51 </div> 52 <div> 53 <p><nobr>一二三四</nobr><br>〜</p> 54 </div> 55 <div> 56 <p><nobr>一二三四</nobr><br>゠</p> 57 </div> 58 </span> 59 <span lang="zh"> 45 60 <div> 46 61 <p><nobr>一二三四</nobr><br>‐</p> … … 55 70 <p><nobr>一二三四</nobr><br>゠</p> 56 71 </div> 57 </div> 58 <div lang="zh"> 59 <div> 60 <p><nobr>一二三四</nobr><br>‐</p> 61 </div> 62 <div> 63 <p><nobr>一二三四</nobr><br>–</p> 64 </div> 65 <div> 66 <p><nobr>一二三四</nobr><br>〜</p> 67 </div> 68 <div> 69 <p><nobr>一二三四</nobr><br>゠</p> 70 </div> 71 </div> 72 </span> 72 73 </body> 73 74 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-hyphens.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : normal - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 4.05em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四‐</p> … … 28 29 <p>一二三四゠</p> 29 30 </div> 30 </ div>31 < divlang="ja">31 </span> 32 <span lang="ja"> 32 33 <div> 33 34 <p>一二三四‐</p> … … 42 43 <p>一二三四゠</p> 43 44 </div> 44 </div> 45 <div lang="ko"> 45 </span> 46 <span lang="ko"> 47 <div> 48 <p>一二三四‐</p> 49 </div> 50 <div style="width: 3.8em;"> 51 <p>一二三四–</p> 52 </div> 53 <div> 54 <p>一二三四〜</p> 55 </div> 56 <div> 57 <p>一二三四゠</p> 58 </div> 59 </span> 60 <span lang="zh"> 46 61 <div> 47 62 <p>一二三四‐</p> … … 56 71 <p>一二三四゠</p> 57 72 </div> 58 </div> 59 <div lang="zh"> 60 <div> 61 <p>一二三四‐</p> 62 </div> 63 <div> 64 <p>一二三四–</p> 65 </div> 66 <div> 67 <p>一二三四〜</p> 68 </div> 69 <div> 70 <p>一二三四゠</p> 71 </div> 72 </div> 73 </span> 73 74 </body> 74 75 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-postfixes-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四%</p> … … 42 43 <p><nobr>一二三</nobr><br>四¢</p> 43 44 </div> 44 </ div>45 < divlang="ja">45 </span> 46 <span lang="ja"> 46 47 <div> 47 48 <p><nobr>一二三</nobr><br>四%</p> … … 71 72 <p><nobr>一二三</nobr><br>四¢</p> 72 73 </div> 73 </ div>74 < divlang="ko">74 </span> 75 <span lang="ko"> 75 76 <div> 76 77 <p><nobr>一二三</nobr><br>四%</p> … … 100 101 <p><nobr>一二三</nobr><br>四¢</p> 101 102 </div> 102 </ div>103 < divlang="zh">103 </span> 104 <span lang="zh"> 104 105 <div> 105 106 <p><nobr>一二三</nobr><br>四%</p> … … 129 130 <p><nobr>一二三</nobr><br>四¢</p> 130 131 </div> 131 </ div>132 </span> 132 133 </body> 133 134 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-postfixes.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : normal - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四%</p> … … 43 44 <p>一二三四¢</p> 44 45 </div> 45 </ div>46 < divlang="ja">46 </span> 47 <span lang="ja"> 47 48 <div> 48 49 <p>一二三四%</p> … … 72 73 <p>一二三四¢</p> 73 74 </div> 74 </ div>75 < divlang="ko">75 </span> 76 <span lang="ko"> 76 77 <div> 77 78 <p>一二三四%</p> … … 101 102 <p>一二三四¢</p> 102 103 </div> 103 </ div>104 < divlang="zh">104 </span> 105 <span lang="zh"> 105 106 <div> 106 107 <p>一二三四%</p> … … 130 131 <p>一二三四¢</p> 131 132 </div> 132 </ div>133 </span> 133 134 </body> 134 135 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-sound-marks-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三四</nobr><br>ー</p> … … 21 22 <p><nobr>一二三四</nobr><br>ー</p> 22 23 </div> 23 </ div>24 < divlang="ja">24 </span> 25 <span lang="ja"> 25 26 <div> 26 27 <p><nobr>一二三四</nobr><br>ー</p> … … 29 30 <p><nobr>一二三四</nobr><br>ー</p> 30 31 </div> 31 </div> 32 <div lang="ko"> 32 </span> 33 <span lang="ko"> 34 <div> 35 <p><nobr>一二三四</nobr><br>ー</p> 36 </div> 37 <div style="width: 3.9em;"> 38 <p><nobr>一二三四</nobr><br>ー</p> 39 </div> 40 </span> 41 <span lang="zh"> 33 42 <div> 34 43 <p><nobr>一二三四</nobr><br>ー</p> … … 37 46 <p><nobr>一二三四</nobr><br>ー</p> 38 47 </div> 39 </div> 40 <div lang="zh"> 41 <div> 42 <p><nobr>一二三四</nobr><br>ー</p> 43 </div> 44 <div> 45 <p><nobr>一二三四</nobr><br>ー</p> 46 </div> 47 </div> 48 </span> 48 49 </body> 49 50 </html> -
trunk/LayoutTests/css3/line-break/line-break-normal-sound-marks.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : normal - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 8 width: 4.1em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四ー</p> … … 22 23 <p>一二三四ー</p> 23 24 </div> 24 </ div>25 < divlang="ja">25 </span> 26 <span lang="ja"> 26 27 <div> 27 28 <p>一二三四ー</p> … … 30 31 <p>一二三四ー</p> 31 32 </div> 32 </div> 33 <div lang="ko"> 33 </span> 34 <span lang="ko"> 35 <div> 36 <p>一二三四ー</p> 37 </div> 38 <div style="width: 3.9em;"> 39 <p>一二三四ー</p> 40 </div> 41 </span> 42 <span lang="zh"> 34 43 <div> 35 44 <p>一二三四ー</p> … … 38 47 <p>一二三四ー</p> 39 48 </div> 40 </div> 41 <div lang="zh"> 42 <div> 43 <p>一二三四ー</p> 44 </div> 45 <div> 46 <p>一二三四ー</p> 47 </div> 48 </div> 49 </span> 49 50 </body> 50 51 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-centered-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四:</p> … … 57 58 <p><nobr>一二三</nobr><br>四?</p> 58 59 </div> 59 </ div>60 < divlang="ja">60 </span> 61 <span lang="ja"> 61 62 <div> 62 63 <p><nobr>一二三</nobr><br>四:</p> … … 101 102 <p><nobr>一二三</nobr><br>四?</p> 102 103 </div> 103 </ div>104 < divlang="ko">104 </span> 105 <span lang="ko"> 105 106 <div> 106 107 <p><nobr>一二三</nobr><br>四:</p> … … 145 146 <p><nobr>一二三</nobr><br>四?</p> 146 147 </div> 147 </ div>148 < divlang="zh">148 </span> 149 <span lang="zh"> 149 150 <div> 150 151 <p><nobr>一二三</nobr><br>四:</p> … … 189 190 <p><nobr>一二三</nobr><br>四?</p> 190 191 </div> 191 </ div>192 </span> 192 193 </body> 193 194 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-centered.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : strict - before centered punctuation</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四:</p> … … 58 59 <p>一二三四?</p> 59 60 </div> 60 </ div>61 < divlang="ja">61 </span> 62 <span lang="ja"> 62 63 <div> 63 64 <p>一二三四:</p> … … 102 103 <p>一二三四?</p> 103 104 </div> 104 </ div>105 < divlang="ko">105 </span> 106 <span lang="ko"> 106 107 <div> 107 108 <p>一二三四:</p> … … 146 147 <p>一二三四?</p> 147 148 </div> 148 </ div>149 < divlang="zh">149 </span> 150 <span lang="zh"> 150 151 <div> 151 152 <p>一二三四:</p> … … 190 191 <p>一二三四?</p> 191 192 </div> 192 </ div>193 </span> 193 194 </body> 194 195 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-hyphens-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.95em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四‐</p> … … 27 28 <p><nobr>一二三</nobr><br>四゠</p> 28 29 </div> 29 </ div>30 < divlang="ja">30 </span> 31 <span lang="ja"> 31 32 <div> 32 33 <p><nobr>一二三</nobr><br>四‐</p> … … 41 42 <p><nobr>一二三</nobr><br>四゠</p> 42 43 </div> 43 </ div>44 < divlang="ko">44 </span> 45 <span lang="ko"> 45 46 <div> 46 47 <p><nobr>一二三</nobr><br>四‐</p> … … 55 56 <p><nobr>一二三</nobr><br>四゠</p> 56 57 </div> 57 </ div>58 < divlang="zh">58 </span> 59 <span lang="zh"> 59 60 <div> 60 61 <p><nobr>一二三</nobr><br>四‐</p> … … 69 70 <p><nobr>一二三</nobr><br>四゠</p> 70 71 </div> 71 </ div>72 </span> 72 73 </body> 73 74 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-hyphens.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : strict - before hyphens</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.95em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四‐</p> … … 28 29 <p>一二三四゠</p> 29 30 </div> 30 </ div>31 < divlang="ja">31 </span> 32 <span lang="ja"> 32 33 <div> 33 34 <p>一二三四‐</p> … … 42 43 <p>一二三四゠</p> 43 44 </div> 44 </ div>45 < divlang="ko">45 </span> 46 <span lang="ko"> 46 47 <div> 47 48 <p>一二三四‐</p> … … 56 57 <p>一二三四゠</p> 57 58 </div> 58 </ div>59 < divlang="zh">59 </span> 60 <span lang="zh"> 60 61 <div> 61 62 <p>一二三四‐</p> … … 70 71 <p>一二三四゠</p> 71 72 </div> 72 </ div>73 </span> 73 74 </body> 74 75 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-postfixes-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四%</p> … … 42 43 <p><nobr>一二三</nobr><br>四¢</p> 43 44 </div> 44 </ div>45 < divlang="ja">45 </span> 46 <span lang="ja"> 46 47 <div> 47 48 <p><nobr>一二三</nobr><br>四%</p> … … 71 72 <p><nobr>一二三</nobr><br>四¢</p> 72 73 </div> 73 </ div>74 < divlang="ko">74 </span> 75 <span lang="ko"> 75 76 <div> 76 77 <p><nobr>一二三</nobr><br>四%</p> … … 100 101 <p><nobr>一二三</nobr><br>四¢</p> 101 102 </div> 102 </ div>103 < divlang="zh">103 </span> 104 <span lang="zh"> 104 105 <div> 105 106 <p><nobr>一二三</nobr><br>四%</p> … … 129 130 <p><nobr>一二三</nobr><br>四¢</p> 130 131 </div> 131 </ div>132 </span> 132 133 </body> 133 134 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-postfixes.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : strict - before postfixes</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四%</p> … … 43 44 <p>一二三四¢</p> 44 45 </div> 45 </ div>46 < divlang="ja">46 </span> 47 <span lang="ja"> 47 48 <div> 48 49 <p>一二三四%</p> … … 72 73 <p>一二三四¢</p> 73 74 </div> 74 </ div>75 < divlang="ko">75 </span> 76 <span lang="ko"> 76 77 <div> 77 78 <p>一二三四%</p> … … 101 102 <p>一二三四¢</p> 102 103 </div> 103 </ div>104 < divlang="zh">104 </span> 105 <span lang="zh"> 105 106 <div> 106 107 <p>一二三四%</p> … … 130 131 <p>一二三四¢</p> 131 132 </div> 132 </ div>133 </span> 133 134 </body> 134 135 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-sound-marks-expected.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : auto - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 14 15 </head> 15 16 <body> 16 < divlang="en">17 <span lang="en"> 17 18 <div> 18 19 <p><nobr>一二三</nobr><br>四ー</p> … … 21 22 <p><nobr>一二三</nobr><br>四ー</p> 22 23 </div> 23 </ div>24 < divlang="ja">24 </span> 25 <span lang="ja"> 25 26 <div> 26 27 <p><nobr>一二三</nobr><br>四ー</p> … … 29 30 <p><nobr>一二三</nobr><br>四ー</p> 30 31 </div> 31 </ div>32 < divlang="ko">32 </span> 33 <span lang="ko"> 33 34 <div> 34 35 <p><nobr>一二三</nobr><br>四ー</p> … … 37 38 <p><nobr>一二三</nobr><br>四ー</p> 38 39 </div> 39 </ div>40 < divlang="zh">40 </span> 41 <span lang="zh"> 41 42 <div> 42 43 <p><nobr>一二三</nobr><br>四ー</p> … … 45 46 <p><nobr>一二三</nobr><br>四ー</p> 46 47 </div> 47 </ div>48 </span> 48 49 </body> 49 50 </html> -
trunk/LayoutTests/css3/line-break/line-break-strict-sound-marks.html
r143378 r187729 3 3 <title>Line breaks using [-webkit-]line-break : strict - before sound marks</title> 4 4 <style> 5 div> div {5 span > div { 6 6 font-family: 'Lucida Grande'; 7 7 font-size: 16pt; 8 width: 4.1em; 8 width: 3.75em; 9 display: inline-block; 9 10 } 10 11 div > p { … … 15 16 </head> 16 17 <body> 17 < divlang="en">18 <span lang="en"> 18 19 <div> 19 20 <p>一二三四ー</p> … … 22 23 <p>一二三四ー</p> 23 24 </div> 24 </ div>25 < divlang="ja">25 </span> 26 <span lang="ja"> 26 27 <div> 27 28 <p>一二三四ー</p> … … 30 31 <p>一二三四ー</p> 31 32 </div> 32 </ div>33 < divlang="ko">33 </span> 34 <span lang="ko"> 34 35 <div> 35 36 <p>一二三四ー</p> … … 38 39 <p>一二三四ー</p> 39 40 </div> 40 </ div>41 < divlang="zh">41 </span> 42 <span lang="zh"> 42 43 <div> 43 44 <p>一二三四ー</p> … … 46 47 <p>一二三四ー</p> 47 48 </div> 48 </ div>49 </span> 49 50 </body> 50 51 </html> -
trunk/LayoutTests/platform/efl/TestExpectations
r187701 r187729 2258 2258 webkit.org/b/146888 editing/spelling/context-menu-suggestions-subword-selection.html [ Failure ] 2259 2259 webkit.org/b/146888 editing/spelling/context-menu-suggestions.html [ Failure ] 2260 2261 # This test hardcodes the result of a platform-dependent font lookup algorithm. 2262 fast/text/fallback-language-han.html [ Skip ] -
trunk/LayoutTests/platform/gtk/TestExpectations
r187699 r187729 2406 2406 fast/text/han-generic-font-families.html [ WontFix ] 2407 2407 fast/text/hangul-generic-font-families.html [ WontFix ] 2408 2409 # This test hardcodes the result of a platform-dependent font lookup algorithm. 2410 fast/text/fallback-language-han.html [ Skip ] -
trunk/LayoutTests/platform/ios-simulator/TestExpectations
r185609 r187729 2687 2687 # this test uses to determine location. 2688 2688 fast/text/softbank-emoji.html [ Failure Pass ] 2689 2690 # This test hardcodes the result of the Mac font lookup algorithm. 2691 fast/text/fallback-language-han.html [ Skip ] -
trunk/LayoutTests/platform/win/TestExpectations
r187725 r187729 3131 3131 3132 3132 fast/inline/padding-ellipsis-right.html [ ImageOnlyFailure ] 3133 3134 # This test hardcodes the result of a platform-dependent font lookup algorithm. 3135 fast/text/fallback-language-han.html [ Skip ] -
trunk/Source/WebCore/ChangeLog
r187728 r187729 1 2015-08-01 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [OS X] Font fallback is not language-sensitive 4 https://bugs.webkit.org/show_bug.cgi?id=147390 5 6 Reviewed by Dean Jackson. 7 8 We need to make our font fallback code sensitive to locale. 9 10 Test: fast/text/fallback-language-han.html 11 12 * platform/graphics/mac/FontCacheMac.mm: 13 (WebCore::lookupCTFont): 14 (WebCore::FontCache::systemFallbackForCharacters): 15 1 16 2015-08-01 Myles C. Maxfield <mmaxfield@apple.com> 2 17 -
trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
r187709 r187729 473 473 } 474 474 475 static inline RetainPtr<CTFontRef> lookupCTFont(CTFontRef font, float fontSize, const UChar* characters, unsigned length)475 static inline RetainPtr<CTFontRef> lookupCTFont(CTFontRef font, float fontSize, const AtomicString& locale, const UChar* characters, unsigned length) 476 476 { 477 477 #if __MAC_OS_X_VERSION_MIN_REQUIRED != 1090 … … 494 494 #endif 495 495 CFIndex coveredLength = 0; 496 return adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, nullptr, &coveredLength));496 return adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, locale.string().createCFString().get(), &coveredLength)); 497 497 } 498 498 … … 501 501 const FontPlatformData& platformData = originalFontData->platformData(); 502 502 NSFont *nsFont = platformData.nsFont(); 503 RetainPtr<CTFontRef> result = lookupCTFont(platformData.font(), platformData.size(), characters, length);503 RetainPtr<CTFontRef> result = lookupCTFont(platformData.font(), platformData.size(), description.locale(), characters, length); 504 504 if (!result) 505 505 return nullptr;
Note: See TracChangeset
for help on using the changeset viewer.