Merge ~gunnarhj/ubuntu/+source/language-selector:noto into ~ubuntu-desktop/ubuntu/+source/language-selector:ubuntu/master
- Git
- lp:~gunnarhj/ubuntu/+source/language-selector
- noto
- Merge into ubuntu/master
Proposed by
Gunnar Hjalmarsson
| Status: | Merged |
|---|---|
| Merged at revision: | 2547c2643525bd01da1e37b4def070fd941e4b21 |
| Proposed branch: | ~gunnarhj/ubuntu/+source/language-selector:noto |
| Merge into: | ~ubuntu-desktop/ubuntu/+source/language-selector:ubuntu/master |
| Diff against target: |
529 lines (+367/-65) 9 files modified
data/10-prefer-noto.conf (+179/-0) data/pkg_depends (+2/-31) debian/changelog (+8/-0) debian/language-selector-common.install (+1/-0) debian/language-selector-common.links (+2/-2) dev/null (+0/-28) fontconfig/56-language-selector-prefer.conf (+172/-0) fontconfig/64-language-selector-cjk-prefer.conf (+0/-4) setup.py (+3/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | diff --git a/data/10-prefer-noto.conf b/data/10-prefer-noto.conf | |||
| 2 | 0 | new file mode 100644 | 0 | new file mode 100644 |
| 3 | index 0000000..94a985c | |||
| 4 | --- /dev/null | |||
| 5 | +++ b/data/10-prefer-noto.conf | |||
| 6 | @@ -0,0 +1,179 @@ | |||
| 7 | 1 | <?xml version="1.0"?> | ||
| 8 | 2 | <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | ||
| 9 | 3 | |||
| 10 | 4 | <!-- | ||
| 11 | 5 | Currently (2023-07-19) this file is a copy of the new fontconfig file | ||
| 12 | 6 | /etc/fonts/conf.d/56-language-selector-prefer.conf. Its purpose is to | ||
| 13 | 7 | make the transition to Noto as default sans-serif and serif font | ||
| 14 | 8 | available to the snaps until the snaps start using core24 as base snap. | ||
| 15 | 9 | --> | ||
| 16 | 10 | |||
| 17 | 11 | <!-- | ||
| 18 | 12 | This file prefers quite a few non-latin fonts to give them higher | ||
| 19 | 13 | precedence than DejaVu Sans and DejaVu Serif. The latter are preferred | ||
| 20 | 14 | in 60-latin.conf, but besides latin, cyrillic and greek they include | ||
| 21 | 15 | many non-latin characters. So this way we can make Noto fonts be used | ||
| 22 | 16 | even if the fonts-dejavu-core package is installed. | ||
| 23 | 17 | --> | ||
| 24 | 18 | |||
| 25 | 19 | <fontconfig> | ||
| 26 | 20 | <alias> | ||
| 27 | 21 | <family>sans-serif</family> | ||
| 28 | 22 | <prefer> | ||
| 29 | 23 | <family>Noto Sans</family> | ||
| 30 | 24 | <family>Noto Sans Adlam</family> | ||
| 31 | 25 | <family>Noto Sans Arabic UI</family> | ||
| 32 | 26 | <family>Noto Sans Arabic</family> | ||
| 33 | 27 | <family>Noto Sans Armenian</family> | ||
| 34 | 28 | <family>Noto Sans Avestan</family> | ||
| 35 | 29 | <family>Noto Sans Balinese</family> | ||
| 36 | 30 | <family>Noto Sans Bamum</family> | ||
| 37 | 31 | <family>Noto Sans Bassa Vah</family> | ||
| 38 | 32 | <family>Noto Sans Batak</family> | ||
| 39 | 33 | <family>Noto Sans Bengali</family> | ||
| 40 | 34 | <family>Noto Sans Bhaiksuki</family> | ||
| 41 | 35 | <family>Noto Sans Brahmi</family> | ||
| 42 | 36 | <family>Noto Sans Buginese</family> | ||
| 43 | 37 | <family>Noto Sans Buhid</family> | ||
| 44 | 38 | <family>Noto Sans Canadian Aboriginal</family> | ||
| 45 | 39 | <family>Noto Sans Carian</family> | ||
| 46 | 40 | <family>Noto Sans Caucasian Albanian</family> | ||
| 47 | 41 | <family>Noto Sans Chakma</family> | ||
| 48 | 42 | <family>Noto Sans Cham</family> | ||
| 49 | 43 | <family>Noto Sans Cherokee</family> | ||
| 50 | 44 | <family>Noto Sans Coptic</family> | ||
| 51 | 45 | <family>Noto Sans Cuneiform</family> | ||
| 52 | 46 | <family>Noto Sans Cypriot</family> | ||
| 53 | 47 | <family>Noto Sans Deseret</family> | ||
| 54 | 48 | <family>Noto Sans Devanagari</family> | ||
| 55 | 49 | <family>Noto Sans Duployan</family> | ||
| 56 | 50 | <family>Noto Sans Elbasan</family> | ||
| 57 | 51 | <family>Noto Sans Elymaic</family> | ||
| 58 | 52 | <family>Noto Sans Ethiopic</family> | ||
| 59 | 53 | <family>Noto Sans Georgian</family> | ||
| 60 | 54 | <family>Noto Sans Glagolitic</family> | ||
| 61 | 55 | <family>Noto Sans Gothic</family> | ||
| 62 | 56 | <family>Noto Sans Grantha</family> | ||
| 63 | 57 | <family>Noto Sans Gujarati</family> | ||
| 64 | 58 | <family>Noto Sans Gunjala Gondi</family> | ||
| 65 | 59 | <family>Noto Sans Gurmukhi</family> | ||
| 66 | 60 | <family>Noto Sans Hanifi Rohingya</family> | ||
| 67 | 61 | <family>Noto Sans Hanunoo</family> | ||
| 68 | 62 | <family>Noto Sans Hatran</family> | ||
| 69 | 63 | <family>Noto Sans Hebrew</family> | ||
| 70 | 64 | <family>Noto Sans Javanese</family> | ||
| 71 | 65 | <family>Noto Sans Kaithi</family> | ||
| 72 | 66 | <family>Noto Sans Kannada</family> | ||
| 73 | 67 | <family>Noto Sans Kayah Li</family> | ||
| 74 | 68 | <family>Noto Sans Kharoshthi</family> | ||
| 75 | 69 | <family>Noto Sans Khmer</family> | ||
| 76 | 70 | <family>Noto Sans Khojki</family> | ||
| 77 | 71 | <family>Noto Sans Khudawadi</family> | ||
| 78 | 72 | <family>Noto Sans Lao</family> | ||
| 79 | 73 | <family>Noto Sans Lepcha</family> | ||
| 80 | 74 | <family>Noto Sans Limbu</family> | ||
| 81 | 75 | <family>Noto Sans Linear A</family> | ||
| 82 | 76 | <family>Noto Sans Linear B</family> | ||
| 83 | 77 | <family>Noto Sans Lisu</family> | ||
| 84 | 78 | <family>Noto Sans Lycian</family> | ||
| 85 | 79 | <family>Noto Sans Lydian</family> | ||
| 86 | 80 | <family>Noto Sans Mahajani</family> | ||
| 87 | 81 | <family>Noto Sans Malayalam</family> | ||
| 88 | 82 | <family>Noto Sans Mandaic</family> | ||
| 89 | 83 | <family>Noto Sans Manichaean</family> | ||
| 90 | 84 | <family>Noto Sans Marchen</family> | ||
| 91 | 85 | <family>Noto Sans Masaram Gondi</family> | ||
| 92 | 86 | <family>Noto Sans Mayan Numerals</family> | ||
| 93 | 87 | <family>Noto Sans Medefaidrin</family> | ||
| 94 | 88 | <family>Noto Sans Meetei Mayek</family> | ||
| 95 | 89 | <family>Noto Sans Mende Kikakui</family> | ||
| 96 | 90 | <family>Noto Sans Meroitic</family> | ||
| 97 | 91 | <family>Noto Sans Miao</family> | ||
| 98 | 92 | <family>Noto Sans Modi</family> | ||
| 99 | 93 | <family>Noto Sans Mongolian</family> | ||
| 100 | 94 | <family>Noto Sans Mro</family> | ||
| 101 | 95 | <family>Noto Sans Multani</family> | ||
| 102 | 96 | <family>Noto Sans Myanmar</family> | ||
| 103 | 97 | <family>Noto Sans NKo</family> | ||
| 104 | 98 | <family>Noto Sans Nabataean</family> | ||
| 105 | 99 | <family>Noto Sans New Tai Lue</family> | ||
| 106 | 100 | <family>Noto Sans Newa</family> | ||
| 107 | 101 | <family>Noto Sans Nushu</family> | ||
| 108 | 102 | <family>Noto Sans Ogham</family> | ||
| 109 | 103 | <family>Noto Sans Ol Chiki</family> | ||
| 110 | 104 | <family>Noto Sans Oriya</family> | ||
| 111 | 105 | <family>Noto Sans Osage</family> | ||
| 112 | 106 | <family>Noto Sans Osmanya</family> | ||
| 113 | 107 | <family>Noto Sans Pahawh Hmong</family> | ||
| 114 | 108 | <family>Noto Sans Palmyrene</family> | ||
| 115 | 109 | <family>Noto Sans Pau Cin Hau</family> | ||
| 116 | 110 | <family>Noto Sans PhagsPa</family> | ||
| 117 | 111 | <family>Noto Sans Phoenician</family> | ||
| 118 | 112 | <family>Noto Sans Rejang</family> | ||
| 119 | 113 | <family>Noto Sans Saurashtra</family> | ||
| 120 | 114 | <family>Noto Sans Sharada</family> | ||
| 121 | 115 | <family>Noto Sans Shavian</family> | ||
| 122 | 116 | <family>Noto Sans Siddham</family> | ||
| 123 | 117 | <family>Noto Sans Sinhala</family> | ||
| 124 | 118 | <family>Noto Sans Sogdian</family> | ||
| 125 | 119 | <family>Noto Sans Sora Sompeng</family> | ||
| 126 | 120 | <family>Noto Sans Soyombo</family> | ||
| 127 | 121 | <family>Noto Sans Sundanese</family> | ||
| 128 | 122 | <family>Noto Sans Syloti Nagri</family> | ||
| 129 | 123 | <family>Noto Sans Syriac</family> | ||
| 130 | 124 | <family>Noto Sans Tagalog</family> | ||
| 131 | 125 | <family>Noto Sans Tagbanwa</family> | ||
| 132 | 126 | <family>Noto Sans Tai Le</family> | ||
| 133 | 127 | <family>Noto Sans Tai Tham</family> | ||
| 134 | 128 | <family>Noto Sans Tai Viet</family> | ||
| 135 | 129 | <family>Noto Sans Tamil</family> | ||
| 136 | 130 | <family>Noto Sans Takri</family> | ||
| 137 | 131 | <family>Noto Sans Telugu</family> | ||
| 138 | 132 | <family>Noto Sans Thaana</family> | ||
| 139 | 133 | <family>Noto Sans Thai</family> | ||
| 140 | 134 | <family>Noto Sans Tifinagh</family> | ||
| 141 | 135 | <family>Noto Sans Tirhuta</family> | ||
| 142 | 136 | <family>Noto Sans Ugaritic</family> | ||
| 143 | 137 | <family>Noto Nastaliq Urdu</family> | ||
| 144 | 138 | <family>Noto Sans Vai</family> | ||
| 145 | 139 | <family>Noto Sans Wancho</family> | ||
| 146 | 140 | <family>Noto Sans Warang Citi</family> | ||
| 147 | 141 | <family>Noto Sans Yi</family> | ||
| 148 | 142 | <family>Noto Sans Zanabazar Square</family> | ||
| 149 | 143 | </prefer> | ||
| 150 | 144 | </alias> | ||
| 151 | 145 | <alias> | ||
| 152 | 146 | <family>serif</family> | ||
| 153 | 147 | <prefer> | ||
| 154 | 148 | <family>Noto Serif</family> | ||
| 155 | 149 | <family>Noto Serif Ahom</family> | ||
| 156 | 150 | <family>Noto Naskh Arabic</family> | ||
| 157 | 151 | <family>Noto Serif Armenian</family> | ||
| 158 | 152 | <family>Noto Serif Balinese</family> | ||
| 159 | 153 | <family>Noto Serif Bengali</family> | ||
| 160 | 154 | <family>Noto Serif Devanagari</family> | ||
| 161 | 155 | <family>Noto Serif Dogra</family> | ||
| 162 | 156 | <family>Noto Serif Ethiopic</family> | ||
| 163 | 157 | <family>Noto Serif Georgian</family> | ||
| 164 | 158 | <family>Noto Serif Grantha</family> | ||
| 165 | 159 | <family>Noto Serif Gujarati</family> | ||
| 166 | 160 | <family>Noto Serif Gurmukhi</family> | ||
| 167 | 161 | <family>Noto Serif Hebrew</family> | ||
| 168 | 162 | <family>Noto Serif Hmong Nyiakeng</family> | ||
| 169 | 163 | <family>Noto Serif Kannada</family> | ||
| 170 | 164 | <family>Noto Serif Khmer</family> | ||
| 171 | 165 | <family>Noto Serif Khojki</family> | ||
| 172 | 166 | <family>Noto Serif Lao</family> | ||
| 173 | 167 | <family>Noto Serif Malayalam</family> | ||
| 174 | 168 | <family>Noto Serif Myanmar</family> | ||
| 175 | 169 | <family>Noto Serif Sinhala</family> | ||
| 176 | 170 | <family>Noto Serif Tamil</family> | ||
| 177 | 171 | <family>Noto Serif Tamil Slanted</family> | ||
| 178 | 172 | <family>Noto Serif Tangut</family> | ||
| 179 | 173 | <family>Noto Serif Telugu</family> | ||
| 180 | 174 | <family>Noto Serif Thai</family> | ||
| 181 | 175 | <family>Noto Serif Tibetan</family> | ||
| 182 | 176 | <family>Noto Serif Yezidi</family> | ||
| 183 | 177 | </prefer> | ||
| 184 | 178 | </alias> | ||
| 185 | 179 | </fontconfig> | ||
| 186 | diff --git a/data/pkg_depends b/data/pkg_depends | |||
| 187 | index 91c51a1..dd14cb2 100644 | |||
| 188 | --- a/data/pkg_depends | |||
| 189 | +++ b/data/pkg_depends | |||
| 190 | @@ -106,42 +106,13 @@ wa:sv::wswedish | |||
| 191 | 106 | wa:uk::wukrainian | 106 | wa:uk::wukrainian |
| 192 | 107 | 107 | ||
| 193 | 108 | # fonts | 108 | # fonts |
| 196 | 109 | fn:am::fonts-noto-core | 109 | fn:::fonts-noto-core |
| 195 | 110 | fn:ar::fonts-noto-core | ||
| 197 | 111 | fn:ar::fonts-noto-ui-core | 110 | fn:ar::fonts-noto-ui-core |
| 208 | 112 | fn:as::fonts-beng | 111 | fn:fa::fonts-noto-ui-core |
| 199 | 113 | fn:bn::fonts-beng | ||
| 200 | 114 | fn:bo::fonts-tibetan-machine | ||
| 201 | 115 | fn:dz::fonts-tibetan-machine | ||
| 202 | 116 | fn:fa::fonts-farsiweb | ||
| 203 | 117 | fn:fa::fonts-sil-scheherazade | ||
| 204 | 118 | fn:gu::fonts-gujr | ||
| 205 | 119 | fn:he::fonts-sil-ezra | ||
| 206 | 120 | fn:hi::fonts-deva | ||
| 207 | 121 | fn:ii::fonts-sil-nuosusil | ||
| 209 | 122 | fn:ja::fonts-noto-cjk | 112 | fn:ja::fonts-noto-cjk |
| 210 | 123 | fn:ja::fonts-noto-cjk-extra | 113 | fn:ja::fonts-noto-cjk-extra |
| 211 | 124 | fn:km::fonts-khmeros | ||
| 212 | 125 | fn:kn::fonts-knda | ||
| 213 | 126 | fn:ko::fonts-noto-cjk | 114 | fn:ko::fonts-noto-cjk |
| 214 | 127 | fn:ko::fonts-noto-cjk-extra | 115 | fn:ko::fonts-noto-cjk-extra |
| 215 | 128 | fn:lo::fonts-lao | ||
| 216 | 129 | fn:ml::fonts-mlym | ||
| 217 | 130 | fn:mn::fonts-manchufont | ||
| 218 | 131 | fn:mnc::fonts-manchufont | ||
| 219 | 132 | fn:mr::fonts-deva | ||
| 220 | 133 | fn:my::fonts-sil-padauk | ||
| 221 | 134 | fn:ne::fonts-deva | ||
| 222 | 135 | fn:or::fonts-orya | ||
| 223 | 136 | fn:pa::fonts-guru | ||
| 224 | 137 | fn:si::fonts-noto-core | ||
| 225 | 138 | fn:ta::fonts-taml | ||
| 226 | 139 | fn:te::fonts-telu | ||
| 227 | 140 | fn:th::fonts-thai-tlwg | ||
| 228 | 141 | fn:ug::fonts-ukij-uyghur | ||
| 229 | 142 | fn:ur::fonts-nafees | ||
| 230 | 143 | fn:ur::fonts-sil-scheherazade | ||
| 231 | 144 | fn:yi::fonts-sil-ezra | ||
| 232 | 145 | fn:zh-hans::fonts-noto-cjk | 116 | fn:zh-hans::fonts-noto-cjk |
| 233 | 146 | fn:zh-hans::fonts-noto-cjk-extra | 117 | fn:zh-hans::fonts-noto-cjk-extra |
| 234 | 147 | fn:zh-hans::fonts-arphic-uming | 118 | fn:zh-hans::fonts-arphic-uming |
| 235 | diff --git a/debian/changelog b/debian/changelog | |||
| 236 | index ebccd8c..18b674f 100644 | |||
| 237 | --- a/debian/changelog | |||
| 238 | +++ b/debian/changelog | |||
| 239 | @@ -2,6 +2,14 @@ language-selector (0.222) UNRELEASED; urgency=medium | |||
| 240 | 2 | 2 | ||
| 241 | 3 | * data/pkg_depends: | 3 | * data/pkg_depends: |
| 242 | 4 | - Always pull hunspell and myspell dicts | 4 | - Always pull hunspell and myspell dicts |
| 243 | 5 | * Switch to Noto as default font | ||
| 244 | 6 | - Add 56-language-selector-prefer.conf | ||
| 245 | 7 | - Drop 56-language-selector-ar.conf (no longer needed) | ||
| 246 | 8 | - Simplify list of fonts pulled by check-language-support | ||
| 247 | 9 | - Install extra fontconfig file for the snaps | ||
| 248 | 10 | - This is a step to achieve the goal in | ||
| 249 | 11 | https://discourse.ubuntu.com/t/36923 | ||
| 250 | 12 | - Fixes LP: #1866038 and LP: #2009303 | ||
| 251 | 5 | 13 | ||
| 252 | 6 | -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Wed, 12 Jul 2023 20:04:51 +0200 | 14 | -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Wed, 12 Jul 2023 20:04:51 +0200 |
| 253 | 7 | 15 | ||
| 254 | diff --git a/debian/language-selector-common.install b/debian/language-selector-common.install | |||
| 255 | index 6c1860b..a97a31a 100644 | |||
| 256 | --- a/debian/language-selector-common.install | |||
| 257 | +++ b/debian/language-selector-common.install | |||
| 258 | @@ -7,6 +7,7 @@ usr/bin/check-language-support | |||
| 259 | 7 | usr/lib/python*/*-packages/*.egg-info | 7 | usr/lib/python*/*-packages/*.egg-info |
| 260 | 8 | usr/lib/python*/*-packages/LanguageSelector/*.py | 8 | usr/lib/python*/*-packages/LanguageSelector/*.py |
| 261 | 9 | usr/lib/python*/*-packages/language_support_pkgs*.py | 9 | usr/lib/python*/*-packages/language_support_pkgs*.py |
| 262 | 10 | usr/share/fonts/snap-config-hack | ||
| 263 | 10 | usr/share/language-selector | 11 | usr/share/language-selector |
| 264 | 11 | usr/share/locale | 12 | usr/share/locale |
| 265 | 12 | usr/share/pixmaps | 13 | usr/share/pixmaps |
| 266 | diff --git a/debian/language-selector-common.links b/debian/language-selector-common.links | |||
| 267 | index 51a709c..bf5a341 100644 | |||
| 268 | --- a/debian/language-selector-common.links | |||
| 269 | +++ b/debian/language-selector-common.links | |||
| 270 | @@ -1,6 +1,6 @@ | |||
| 271 | 1 | /usr/share/fontconfig/conf.avail/30-cjk-aliases.conf /etc/fonts/conf.d/30-cjk-aliases.conf | 1 | /usr/share/fontconfig/conf.avail/30-cjk-aliases.conf /etc/fonts/conf.d/30-cjk-aliases.conf |
| 274 | 2 | /usr/share/fontconfig/conf.avail/56-language-selector-ar.conf /etc/fonts/conf.d/56-language-selector-ar.conf | 2 | /usr/share/fontconfig/conf.avail/56-language-selector-prefer.conf /etc/fonts/conf.d/56-language-selector-prefer.conf |
| 275 | 3 | /usr/share/fontconfig/conf.avail/64-language-selector-prefer.conf /etc/fonts/conf.d/64-language-selector-prefer.conf | 3 | /usr/share/fontconfig/conf.avail/64-language-selector-cjk-prefer.conf /etc/fonts/conf.d/64-language-selector-cjk-prefer.conf |
| 276 | 4 | /usr/share/fontconfig/conf.avail/69-language-selector-ja.conf /etc/fonts/conf.d/69-language-selector-ja.conf | 4 | /usr/share/fontconfig/conf.avail/69-language-selector-ja.conf /etc/fonts/conf.d/69-language-selector-ja.conf |
| 277 | 5 | /usr/share/fontconfig/conf.avail/69-language-selector-zh-cn.conf /etc/fonts/conf.d/69-language-selector-zh-cn.conf | 5 | /usr/share/fontconfig/conf.avail/69-language-selector-zh-cn.conf /etc/fonts/conf.d/69-language-selector-zh-cn.conf |
| 278 | 6 | /usr/share/fontconfig/conf.avail/69-language-selector-zh-hk.conf /etc/fonts/conf.d/69-language-selector-zh-hk.conf | 6 | /usr/share/fontconfig/conf.avail/69-language-selector-zh-hk.conf /etc/fonts/conf.d/69-language-selector-zh-hk.conf |
| 279 | diff --git a/fontconfig/56-language-selector-ar.conf b/fontconfig/56-language-selector-ar.conf | |||
| 280 | 7 | deleted file mode 100644 | 7 | deleted file mode 100644 |
| 281 | index 6a1f3e7..0000000 | |||
| 282 | --- a/fontconfig/56-language-selector-ar.conf | |||
| 283 | +++ /dev/null | |||
| 284 | @@ -1,28 +0,0 @@ | |||
| 285 | 1 | <?xml version="1.0"?> | ||
| 286 | 2 | <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | ||
| 287 | 3 | <fontconfig> | ||
| 288 | 4 | <match target="pattern"> | ||
| 289 | 5 | <test name="lang"> | ||
| 290 | 6 | <string>ar</string> | ||
| 291 | 7 | </test> | ||
| 292 | 8 | <test qual="any" name="family"> | ||
| 293 | 9 | <string>sans-serif</string> | ||
| 294 | 10 | </test> | ||
| 295 | 11 | <edit name="family" mode="prepend"> | ||
| 296 | 12 | <string>Noto Sans</string> | ||
| 297 | 13 | <string>Noto Sans Arabic UI</string> | ||
| 298 | 14 | </edit> | ||
| 299 | 15 | </match> | ||
| 300 | 16 | <match target="pattern"> | ||
| 301 | 17 | <test name="lang"> | ||
| 302 | 18 | <string>ar</string> | ||
| 303 | 19 | </test> | ||
| 304 | 20 | <test qual="any" name="family"> | ||
| 305 | 21 | <string>serif</string> | ||
| 306 | 22 | </test> | ||
| 307 | 23 | <edit name="family" mode="prepend"> | ||
| 308 | 24 | <string>Noto Serif</string> | ||
| 309 | 25 | <string>Noto Naskh Arabic</string> | ||
| 310 | 26 | </edit> | ||
| 311 | 27 | </match> | ||
| 312 | 28 | </fontconfig> | ||
| 313 | diff --git a/fontconfig/56-language-selector-prefer.conf b/fontconfig/56-language-selector-prefer.conf | |||
| 314 | 29 | new file mode 100644 | 0 | new file mode 100644 |
| 315 | index 0000000..9a83ea6 | |||
| 316 | --- /dev/null | |||
| 317 | +++ b/fontconfig/56-language-selector-prefer.conf | |||
| 318 | @@ -0,0 +1,172 @@ | |||
| 319 | 1 | <?xml version="1.0"?> | ||
| 320 | 2 | <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | ||
| 321 | 3 | |||
| 322 | 4 | <!-- | ||
| 323 | 5 | This file prefers quite a few non-latin fonts to give them higher | ||
| 324 | 6 | precedence than DejaVu Sans and DejaVu Serif. The latter are preferred | ||
| 325 | 7 | in 60-latin.conf, but besides latin, cyrillic and greek they include | ||
| 326 | 8 | many non-latin characters. So this way we can make Noto fonts be used | ||
| 327 | 9 | even if the fonts-dejavu-core package is installed. | ||
| 328 | 10 | --> | ||
| 329 | 11 | |||
| 330 | 12 | <fontconfig> | ||
| 331 | 13 | <alias> | ||
| 332 | 14 | <family>sans-serif</family> | ||
| 333 | 15 | <prefer> | ||
| 334 | 16 | <family>Noto Sans</family> | ||
| 335 | 17 | <family>Noto Sans Adlam</family> | ||
| 336 | 18 | <family>Noto Sans Arabic UI</family> | ||
| 337 | 19 | <family>Noto Sans Arabic</family> | ||
| 338 | 20 | <family>Noto Sans Armenian</family> | ||
| 339 | 21 | <family>Noto Sans Avestan</family> | ||
| 340 | 22 | <family>Noto Sans Balinese</family> | ||
| 341 | 23 | <family>Noto Sans Bamum</family> | ||
| 342 | 24 | <family>Noto Sans Bassa Vah</family> | ||
| 343 | 25 | <family>Noto Sans Batak</family> | ||
| 344 | 26 | <family>Noto Sans Bengali</family> | ||
| 345 | 27 | <family>Noto Sans Bhaiksuki</family> | ||
| 346 | 28 | <family>Noto Sans Brahmi</family> | ||
| 347 | 29 | <family>Noto Sans Buginese</family> | ||
| 348 | 30 | <family>Noto Sans Buhid</family> | ||
| 349 | 31 | <family>Noto Sans Canadian Aboriginal</family> | ||
| 350 | 32 | <family>Noto Sans Carian</family> | ||
| 351 | 33 | <family>Noto Sans Caucasian Albanian</family> | ||
| 352 | 34 | <family>Noto Sans Chakma</family> | ||
| 353 | 35 | <family>Noto Sans Cham</family> | ||
| 354 | 36 | <family>Noto Sans Cherokee</family> | ||
| 355 | 37 | <family>Noto Sans Coptic</family> | ||
| 356 | 38 | <family>Noto Sans Cuneiform</family> | ||
| 357 | 39 | <family>Noto Sans Cypriot</family> | ||
| 358 | 40 | <family>Noto Sans Deseret</family> | ||
| 359 | 41 | <family>Noto Sans Devanagari</family> | ||
| 360 | 42 | <family>Noto Sans Duployan</family> | ||
| 361 | 43 | <family>Noto Sans Elbasan</family> | ||
| 362 | 44 | <family>Noto Sans Elymaic</family> | ||
| 363 | 45 | <family>Noto Sans Ethiopic</family> | ||
| 364 | 46 | <family>Noto Sans Georgian</family> | ||
| 365 | 47 | <family>Noto Sans Glagolitic</family> | ||
| 366 | 48 | <family>Noto Sans Gothic</family> | ||
| 367 | 49 | <family>Noto Sans Grantha</family> | ||
| 368 | 50 | <family>Noto Sans Gujarati</family> | ||
| 369 | 51 | <family>Noto Sans Gunjala Gondi</family> | ||
| 370 | 52 | <family>Noto Sans Gurmukhi</family> | ||
| 371 | 53 | <family>Noto Sans Hanifi Rohingya</family> | ||
| 372 | 54 | <family>Noto Sans Hanunoo</family> | ||
| 373 | 55 | <family>Noto Sans Hatran</family> | ||
| 374 | 56 | <family>Noto Sans Hebrew</family> | ||
| 375 | 57 | <family>Noto Sans Javanese</family> | ||
| 376 | 58 | <family>Noto Sans Kaithi</family> | ||
| 377 | 59 | <family>Noto Sans Kannada</family> | ||
| 378 | 60 | <family>Noto Sans Kayah Li</family> | ||
| 379 | 61 | <family>Noto Sans Kharoshthi</family> | ||
| 380 | 62 | <family>Noto Sans Khmer</family> | ||
| 381 | 63 | <family>Noto Sans Khojki</family> | ||
| 382 | 64 | <family>Noto Sans Khudawadi</family> | ||
| 383 | 65 | <family>Noto Sans Lao</family> | ||
| 384 | 66 | <family>Noto Sans Lepcha</family> | ||
| 385 | 67 | <family>Noto Sans Limbu</family> | ||
| 386 | 68 | <family>Noto Sans Linear A</family> | ||
| 387 | 69 | <family>Noto Sans Linear B</family> | ||
| 388 | 70 | <family>Noto Sans Lisu</family> | ||
| 389 | 71 | <family>Noto Sans Lycian</family> | ||
| 390 | 72 | <family>Noto Sans Lydian</family> | ||
| 391 | 73 | <family>Noto Sans Mahajani</family> | ||
| 392 | 74 | <family>Noto Sans Malayalam</family> | ||
| 393 | 75 | <family>Noto Sans Mandaic</family> | ||
| 394 | 76 | <family>Noto Sans Manichaean</family> | ||
| 395 | 77 | <family>Noto Sans Marchen</family> | ||
| 396 | 78 | <family>Noto Sans Masaram Gondi</family> | ||
| 397 | 79 | <family>Noto Sans Mayan Numerals</family> | ||
| 398 | 80 | <family>Noto Sans Medefaidrin</family> | ||
| 399 | 81 | <family>Noto Sans Meetei Mayek</family> | ||
| 400 | 82 | <family>Noto Sans Mende Kikakui</family> | ||
| 401 | 83 | <family>Noto Sans Meroitic</family> | ||
| 402 | 84 | <family>Noto Sans Miao</family> | ||
| 403 | 85 | <family>Noto Sans Modi</family> | ||
| 404 | 86 | <family>Noto Sans Mongolian</family> | ||
| 405 | 87 | <family>Noto Sans Mro</family> | ||
| 406 | 88 | <family>Noto Sans Multani</family> | ||
| 407 | 89 | <family>Noto Sans Myanmar</family> | ||
| 408 | 90 | <family>Noto Sans NKo</family> | ||
| 409 | 91 | <family>Noto Sans Nabataean</family> | ||
| 410 | 92 | <family>Noto Sans New Tai Lue</family> | ||
| 411 | 93 | <family>Noto Sans Newa</family> | ||
| 412 | 94 | <family>Noto Sans Nushu</family> | ||
| 413 | 95 | <family>Noto Sans Ogham</family> | ||
| 414 | 96 | <family>Noto Sans Ol Chiki</family> | ||
| 415 | 97 | <family>Noto Sans Oriya</family> | ||
| 416 | 98 | <family>Noto Sans Osage</family> | ||
| 417 | 99 | <family>Noto Sans Osmanya</family> | ||
| 418 | 100 | <family>Noto Sans Pahawh Hmong</family> | ||
| 419 | 101 | <family>Noto Sans Palmyrene</family> | ||
| 420 | 102 | <family>Noto Sans Pau Cin Hau</family> | ||
| 421 | 103 | <family>Noto Sans PhagsPa</family> | ||
| 422 | 104 | <family>Noto Sans Phoenician</family> | ||
| 423 | 105 | <family>Noto Sans Rejang</family> | ||
| 424 | 106 | <family>Noto Sans Saurashtra</family> | ||
| 425 | 107 | <family>Noto Sans Sharada</family> | ||
| 426 | 108 | <family>Noto Sans Shavian</family> | ||
| 427 | 109 | <family>Noto Sans Siddham</family> | ||
| 428 | 110 | <family>Noto Sans Sinhala</family> | ||
| 429 | 111 | <family>Noto Sans Sogdian</family> | ||
| 430 | 112 | <family>Noto Sans Sora Sompeng</family> | ||
| 431 | 113 | <family>Noto Sans Soyombo</family> | ||
| 432 | 114 | <family>Noto Sans Sundanese</family> | ||
| 433 | 115 | <family>Noto Sans Syloti Nagri</family> | ||
| 434 | 116 | <family>Noto Sans Syriac</family> | ||
| 435 | 117 | <family>Noto Sans Tagalog</family> | ||
| 436 | 118 | <family>Noto Sans Tagbanwa</family> | ||
| 437 | 119 | <family>Noto Sans Tai Le</family> | ||
| 438 | 120 | <family>Noto Sans Tai Tham</family> | ||
| 439 | 121 | <family>Noto Sans Tai Viet</family> | ||
| 440 | 122 | <family>Noto Sans Tamil</family> | ||
| 441 | 123 | <family>Noto Sans Takri</family> | ||
| 442 | 124 | <family>Noto Sans Telugu</family> | ||
| 443 | 125 | <family>Noto Sans Thaana</family> | ||
| 444 | 126 | <family>Noto Sans Thai</family> | ||
| 445 | 127 | <family>Noto Sans Tifinagh</family> | ||
| 446 | 128 | <family>Noto Sans Tirhuta</family> | ||
| 447 | 129 | <family>Noto Sans Ugaritic</family> | ||
| 448 | 130 | <family>Noto Nastaliq Urdu</family> | ||
| 449 | 131 | <family>Noto Sans Vai</family> | ||
| 450 | 132 | <family>Noto Sans Wancho</family> | ||
| 451 | 133 | <family>Noto Sans Warang Citi</family> | ||
| 452 | 134 | <family>Noto Sans Yi</family> | ||
| 453 | 135 | <family>Noto Sans Zanabazar Square</family> | ||
| 454 | 136 | </prefer> | ||
| 455 | 137 | </alias> | ||
| 456 | 138 | <alias> | ||
| 457 | 139 | <family>serif</family> | ||
| 458 | 140 | <prefer> | ||
| 459 | 141 | <family>Noto Serif</family> | ||
| 460 | 142 | <family>Noto Serif Ahom</family> | ||
| 461 | 143 | <family>Noto Naskh Arabic</family> | ||
| 462 | 144 | <family>Noto Serif Armenian</family> | ||
| 463 | 145 | <family>Noto Serif Balinese</family> | ||
| 464 | 146 | <family>Noto Serif Bengali</family> | ||
| 465 | 147 | <family>Noto Serif Devanagari</family> | ||
| 466 | 148 | <family>Noto Serif Dogra</family> | ||
| 467 | 149 | <family>Noto Serif Ethiopic</family> | ||
| 468 | 150 | <family>Noto Serif Georgian</family> | ||
| 469 | 151 | <family>Noto Serif Grantha</family> | ||
| 470 | 152 | <family>Noto Serif Gujarati</family> | ||
| 471 | 153 | <family>Noto Serif Gurmukhi</family> | ||
| 472 | 154 | <family>Noto Serif Hebrew</family> | ||
| 473 | 155 | <family>Noto Serif Hmong Nyiakeng</family> | ||
| 474 | 156 | <family>Noto Serif Kannada</family> | ||
| 475 | 157 | <family>Noto Serif Khmer</family> | ||
| 476 | 158 | <family>Noto Serif Khojki</family> | ||
| 477 | 159 | <family>Noto Serif Lao</family> | ||
| 478 | 160 | <family>Noto Serif Malayalam</family> | ||
| 479 | 161 | <family>Noto Serif Myanmar</family> | ||
| 480 | 162 | <family>Noto Serif Sinhala</family> | ||
| 481 | 163 | <family>Noto Serif Tamil</family> | ||
| 482 | 164 | <family>Noto Serif Tamil Slanted</family> | ||
| 483 | 165 | <family>Noto Serif Tangut</family> | ||
| 484 | 166 | <family>Noto Serif Telugu</family> | ||
| 485 | 167 | <family>Noto Serif Thai</family> | ||
| 486 | 168 | <family>Noto Serif Tibetan</family> | ||
| 487 | 169 | <family>Noto Serif Yezidi</family> | ||
| 488 | 170 | </prefer> | ||
| 489 | 171 | </alias> | ||
| 490 | 172 | </fontconfig> | ||
| 491 | diff --git a/fontconfig/64-language-selector-prefer.conf b/fontconfig/64-language-selector-cjk-prefer.conf | |||
| 492 | 0 | similarity index 94% | 173 | similarity index 94% |
| 493 | 1 | rename from fontconfig/64-language-selector-prefer.conf | 174 | rename from fontconfig/64-language-selector-prefer.conf |
| 494 | 2 | rename to fontconfig/64-language-selector-cjk-prefer.conf | 175 | rename to fontconfig/64-language-selector-cjk-prefer.conf |
| 495 | index bce3696..8cf9d25 100644 | |||
| 496 | --- a/fontconfig/64-language-selector-prefer.conf | |||
| 497 | +++ b/fontconfig/64-language-selector-cjk-prefer.conf | |||
| 498 | @@ -9,8 +9,6 @@ | |||
| 499 | 9 | <family>Noto Sans CJK SC</family> | 9 | <family>Noto Sans CJK SC</family> |
| 500 | 10 | <family>Noto Sans CJK TC</family> | 10 | <family>Noto Sans CJK TC</family> |
| 501 | 11 | <family>Noto Sans CJK HK</family> | 11 | <family>Noto Sans CJK HK</family> |
| 502 | 12 | <family>Lohit Devanagari</family> | ||
| 503 | 13 | <family>Noto Sans Sinhala</family> | ||
| 504 | 14 | </prefer> | 12 | </prefer> |
| 505 | 15 | </alias> | 13 | </alias> |
| 506 | 16 | <alias> | 14 | <alias> |
| 507 | @@ -20,8 +18,6 @@ | |||
| 508 | 20 | <family>Noto Serif CJK KR</family> | 18 | <family>Noto Serif CJK KR</family> |
| 509 | 21 | <family>Noto Serif CJK SC</family> | 19 | <family>Noto Serif CJK SC</family> |
| 510 | 22 | <family>Noto Serif CJK TC</family> | 20 | <family>Noto Serif CJK TC</family> |
| 511 | 23 | <family>Lohit Devanagari</family> | ||
| 512 | 24 | <family>Noto Serif Sinhala</family> | ||
| 513 | 25 | </prefer> | 21 | </prefer> |
| 514 | 26 | </alias> | 22 | </alias> |
| 515 | 27 | <alias> | 23 | <alias> |
| 516 | diff --git a/setup.py b/setup.py | |||
| 517 | index 2c3654a..841054d 100755 | |||
| 518 | --- a/setup.py | |||
| 519 | +++ b/setup.py | |||
| 520 | @@ -34,6 +34,9 @@ setup(name='language-selector', | |||
| 521 | 34 | # session init config file | 34 | # session init config file |
| 522 | 35 | ('../etc/profile.d', | 35 | ('../etc/profile.d', |
| 523 | 36 | ["data/cedilla-portuguese.sh"]), | 36 | ["data/cedilla-portuguese.sh"]), |
| 524 | 37 | # extra fontconfig file for the snaps | ||
| 525 | 38 | ('../usr/share/fonts/snap-config-hack', | ||
| 526 | 39 | ["data/10-prefer-noto.conf"]), | ||
| 527 | 37 | ], | 40 | ], |
| 528 | 38 | entry_points='''[aptdaemon.plugins] | 41 | entry_points='''[aptdaemon.plugins] |
| 529 | 39 | modify_cache_after=language_support_pkgs:apt_cache_add_language_packs | 42 | modify_cache_after=language_support_pkgs:apt_cache_add_language_packs |
