Merge ~gunnarhj/ubuntu/+source/language-selector:noto into ~ubuntu-desktop/ubuntu/+source/language-selector:ubuntu/master

[Gunnar Hjalmarsson]

diff --git a/data/10-prefer-noto.conf b/data/10-prefer-noto.conf
new file mode 100644
index 0000000..94a985c
--- /dev/null
+++ b/data/10-prefer-noto.conf
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+<!--
+ Currently (2023-07-19) this file is a copy of the new fontconfig file
+ /etc/fonts/conf.d/56-language-selector-prefer.conf. Its purpose is to
+ make the transition to Noto as default sans-serif and serif font
+ available to the snaps until the snaps start using core24 as base snap.
+-->
+
+<!--
+ This file prefers quite a few non-latin fonts to give them higher
+ precedence than DejaVu Sans and DejaVu Serif. The latter are preferred
+ in 60-latin.conf, but besides latin, cyrillic and greek they include
+ many non-latin characters. So this way we can make Noto fonts be used
+ even if the fonts-dejavu-core package is installed.
+-->
+
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Sans</family>
+      <family>Noto Sans Adlam</family>
+      <family>Noto Sans Arabic UI</family>
+      <family>Noto Sans Arabic</family>
+      <family>Noto Sans Armenian</family>
+      <family>Noto Sans Avestan</family>
+      <family>Noto Sans Balinese</family>
+      <family>Noto Sans Bamum</family>
+      <family>Noto Sans Bassa Vah</family>
+      <family>Noto Sans Batak</family>
+      <family>Noto Sans Bengali</family>
+      <family>Noto Sans Bhaiksuki</family>
+      <family>Noto Sans Brahmi</family>
+      <family>Noto Sans Buginese</family>
+      <family>Noto Sans Buhid</family>
+      <family>Noto Sans Canadian Aboriginal</family>
+      <family>Noto Sans Carian</family>
+      <family>Noto Sans Caucasian Albanian</family>
+      <family>Noto Sans Chakma</family>
+      <family>Noto Sans Cham</family>
+      <family>Noto Sans Cherokee</family>
+      <family>Noto Sans Coptic</family>
+      <family>Noto Sans Cuneiform</family>
+      <family>Noto Sans Cypriot</family>
+      <family>Noto Sans Deseret</family>
+      <family>Noto Sans Devanagari</family>
+      <family>Noto Sans Duployan</family>
+      <family>Noto Sans Elbasan</family>
+      <family>Noto Sans Elymaic</family>
+      <family>Noto Sans Ethiopic</family>
+      <family>Noto Sans Georgian</family>
+      <family>Noto Sans Glagolitic</family>
+      <family>Noto Sans Gothic</family>
+      <family>Noto Sans Grantha</family>
+      <family>Noto Sans Gujarati</family>
+      <family>Noto Sans Gunjala Gondi</family>
+      <family>Noto Sans Gurmukhi</family>
+      <family>Noto Sans Hanifi Rohingya</family>
+      <family>Noto Sans Hanunoo</family>
+      <family>Noto Sans Hatran</family>
+      <family>Noto Sans Hebrew</family>
+      <family>Noto Sans Javanese</family>
+      <family>Noto Sans Kaithi</family>
+      <family>Noto Sans Kannada</family>
+      <family>Noto Sans Kayah Li</family>
+      <family>Noto Sans Kharoshthi</family>
+      <family>Noto Sans Khmer</family>
+      <family>Noto Sans Khojki</family>
+      <family>Noto Sans Khudawadi</family>
+      <family>Noto Sans Lao</family>
+      <family>Noto Sans Lepcha</family>
+      <family>Noto Sans Limbu</family>
+      <family>Noto Sans Linear A</family>
+      <family>Noto Sans Linear B</family>
+      <family>Noto Sans Lisu</family>
+      <family>Noto Sans Lycian</family>
+      <family>Noto Sans Lydian</family>
+      <family>Noto Sans Mahajani</family>
+      <family>Noto Sans Malayalam</family>
+      <family>Noto Sans Mandaic</family>
+      <family>Noto Sans Manichaean</family>
+      <family>Noto Sans Marchen</family>
+      <family>Noto Sans Masaram Gondi</family>
+      <family>Noto Sans Mayan Numerals</family>
+      <family>Noto Sans Medefaidrin</family>
+      <family>Noto Sans Meetei Mayek</family>
+      <family>Noto Sans Mende Kikakui</family>
+      <family>Noto Sans Meroitic</family>
+      <family>Noto Sans Miao</family>
+      <family>Noto Sans Modi</family>
+      <family>Noto Sans Mongolian</family>
+      <family>Noto Sans Mro</family>
+      <family>Noto Sans Multani</family>
+      <family>Noto Sans Myanmar</family>
+      <family>Noto Sans NKo</family>
+      <family>Noto Sans Nabataean</family>
+      <family>Noto Sans New Tai Lue</family>
+      <family>Noto Sans Newa</family>
+      <family>Noto Sans Nushu</family>
+      <family>Noto Sans Ogham</family>
+      <family>Noto Sans Ol Chiki</family>
+      <family>Noto Sans Oriya</family>
+      <family>Noto Sans Osage</family>
+      <family>Noto Sans Osmanya</family>
+      <family>Noto Sans Pahawh Hmong</family>
+      <family>Noto Sans Palmyrene</family>
+      <family>Noto Sans Pau Cin Hau</family>
+      <family>Noto Sans PhagsPa</family>
+      <family>Noto Sans Phoenician</family>
+      <family>Noto Sans Rejang</family>
+      <family>Noto Sans Saurashtra</family>
+      <family>Noto Sans Sharada</family>
+      <family>Noto Sans Shavian</family>
+      <family>Noto Sans Siddham</family>
+      <family>Noto Sans Sinhala</family>
+      <family>Noto Sans Sogdian</family>
+      <family>Noto Sans Sora Sompeng</family>
+      <family>Noto Sans Soyombo</family>
+      <family>Noto Sans Sundanese</family>
+      <family>Noto Sans Syloti Nagri</family>
+      <family>Noto Sans Syriac</family>
+      <family>Noto Sans Tagalog</family>
+      <family>Noto Sans Tagbanwa</family>
+      <family>Noto Sans Tai Le</family>
+      <family>Noto Sans Tai Tham</family>
+      <family>Noto Sans Tai Viet</family>
+      <family>Noto Sans Tamil</family>
+      <family>Noto Sans Takri</family>
+      <family>Noto Sans Telugu</family>
+      <family>Noto Sans Thaana</family>
+      <family>Noto Sans Thai</family>
+      <family>Noto Sans Tifinagh</family>
+      <family>Noto Sans Tirhuta</family>
+      <family>Noto Sans Ugaritic</family>
+      <family>Noto Nastaliq Urdu</family>
+      <family>Noto Sans Vai</family>
+      <family>Noto Sans Wancho</family>
+      <family>Noto Sans Warang Citi</family>
+      <family>Noto Sans Yi</family>
+      <family>Noto Sans Zanabazar Square</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif</family>
+      <family>Noto Serif Ahom</family>
+      <family>Noto Naskh Arabic</family>
+      <family>Noto Serif Armenian</family>
+      <family>Noto Serif Balinese</family>
+      <family>Noto Serif Bengali</family>
+      <family>Noto Serif Devanagari</family>
+      <family>Noto Serif Dogra</family>
+      <family>Noto Serif Ethiopic</family>
+      <family>Noto Serif Georgian</family>
+      <family>Noto Serif Grantha</family>
+      <family>Noto Serif Gujarati</family>
+      <family>Noto Serif Gurmukhi</family>
+      <family>Noto Serif Hebrew</family>
+      <family>Noto Serif Hmong Nyiakeng</family>
+      <family>Noto Serif Kannada</family>
+      <family>Noto Serif Khmer</family>
+      <family>Noto Serif Khojki</family>
+      <family>Noto Serif Lao</family>
+      <family>Noto Serif Malayalam</family>
+      <family>Noto Serif Myanmar</family>
+      <family>Noto Serif Sinhala</family>
+      <family>Noto Serif Tamil</family>
+      <family>Noto Serif Tamil Slanted</family>
+      <family>Noto Serif Tangut</family>
+      <family>Noto Serif Telugu</family>
+      <family>Noto Serif Thai</family>
+      <family>Noto Serif Tibetan</family>
+      <family>Noto Serif Yezidi</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/data/pkg_depends b/data/pkg_depends
index 91c51a1..dd14cb2 100644
--- a/data/pkg_depends
+++ b/data/pkg_depends
@@ -106,42 +106,13 @@ wa:sv::wswedish
 wa:uk::wukrainian
 
 # fonts
-fn:am::fonts-noto-core
-fn:ar::fonts-noto-core
+fn:::fonts-noto-core
 fn:ar::fonts-noto-ui-core
-fn:as::fonts-beng
-fn:bn::fonts-beng
-fn:bo::fonts-tibetan-machine
-fn:dz::fonts-tibetan-machine
-fn:fa::fonts-farsiweb
-fn:fa::fonts-sil-scheherazade
-fn:gu::fonts-gujr
-fn:he::fonts-sil-ezra
-fn:hi::fonts-deva
-fn:ii::fonts-sil-nuosusil
+fn:fa::fonts-noto-ui-core
 fn:ja::fonts-noto-cjk
 fn:ja::fonts-noto-cjk-extra
-fn:km::fonts-khmeros
-fn:kn::fonts-knda
 fn:ko::fonts-noto-cjk
 fn:ko::fonts-noto-cjk-extra
-fn:lo::fonts-lao
-fn:ml::fonts-mlym
-fn:mn::fonts-manchufont
-fn:mnc::fonts-manchufont
-fn:mr::fonts-deva
-fn:my::fonts-sil-padauk
-fn:ne::fonts-deva
-fn:or::fonts-orya
-fn:pa::fonts-guru
-fn:si::fonts-noto-core
-fn:ta::fonts-taml
-fn:te::fonts-telu
-fn:th::fonts-thai-tlwg
-fn:ug::fonts-ukij-uyghur
-fn:ur::fonts-nafees
-fn:ur::fonts-sil-scheherazade
-fn:yi::fonts-sil-ezra
 fn:zh-hans::fonts-noto-cjk
 fn:zh-hans::fonts-noto-cjk-extra
 fn:zh-hans::fonts-arphic-uming
diff --git a/debian/changelog b/debian/changelog
index ebccd8c..18b674f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ language-selector (0.222) UNRELEASED; urgency=medium
 
   * data/pkg_depends:
     - Always pull hunspell and myspell dicts
+  * Switch to Noto as default font
+    - Add 56-language-selector-prefer.conf
+    - Drop 56-language-selector-ar.conf (no longer needed)
+    - Simplify list of fonts pulled by check-language-support
+    - Install extra fontconfig file for the snaps
+    - This is a step to achieve the goal in
+      https://discourse.ubuntu.com/t/36923
+    - Fixes LP: #1866038 and LP: #2009303
 
  -- Gunnar Hjalmarsson <[e-mail]>  Wed, 12 Jul 2023 20:04:51 +0200
 
diff --git a/debian/language-selector-common.install b/debian/language-selector-common.install
index 6c1860b..a97a31a 100644
--- a/debian/language-selector-common.install
+++ b/debian/language-selector-common.install
@@ -7,6 +7,7 @@ usr/bin/check-language-support
 usr/lib/python*/*-packages/*.egg-info
 usr/lib/python*/*-packages/LanguageSelector/*.py
 usr/lib/python*/*-packages/language_support_pkgs*.py
+usr/share/fonts/snap-config-hack
 usr/share/language-selector
 usr/share/locale
 usr/share/pixmaps
diff --git a/debian/language-selector-common.links b/debian/language-selector-common.links
index 51a709c..bf5a341 100644
--- a/debian/language-selector-common.links
+++ b/debian/language-selector-common.links
@@ -1,6 +1,6 @@
 /usr/share/fontconfig/conf.avail/30-cjk-aliases.conf /etc/fonts/conf.d/30-cjk-aliases.conf
-/usr/share/fontconfig/conf.avail/56-language-selector-ar.conf /etc/fonts/conf.d/56-language-selector-ar.conf
-/usr/share/fontconfig/conf.avail/64-language-selector-prefer.conf /etc/fonts/conf.d/64-language-selector-prefer.conf
+/usr/share/fontconfig/conf.avail/56-language-selector-prefer.conf /etc/fonts/conf.d/56-language-selector-prefer.conf
+/usr/share/fontconfig/conf.avail/64-language-selector-cjk-prefer.conf /etc/fonts/conf.d/64-language-selector-cjk-prefer.conf
 /usr/share/fontconfig/conf.avail/69-language-selector-ja.conf /etc/fonts/conf.d/69-language-selector-ja.conf
 /usr/share/fontconfig/conf.avail/69-language-selector-zh-cn.conf /etc/fonts/conf.d/69-language-selector-zh-cn.conf
 /usr/share/fontconfig/conf.avail/69-language-selector-zh-hk.conf /etc/fonts/conf.d/69-language-selector-zh-hk.conf
diff --git a/fontconfig/56-language-selector-ar.conf b/fontconfig/56-language-selector-ar.conf
deleted file mode 100644
index 6a1f3e7..0000000
--- a/fontconfig/56-language-selector-ar.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <match target="pattern">
-        <test name="lang">
-            <string>ar</string>
-        </test>
-        <test qual="any" name="family">
-            <string>sans-serif</string>
-        </test>
-        <edit name="family" mode="prepend">
-            <string>Noto Sans</string>
-            <string>Noto Sans Arabic UI</string>
-        </edit>
-    </match>
-    <match target="pattern">
-        <test name="lang">
-            <string>ar</string>
-        </test>
-        <test qual="any" name="family">
-            <string>serif</string>
-        </test>
-        <edit name="family" mode="prepend">
-            <string>Noto Serif</string>
-            <string>Noto Naskh Arabic</string>
-        </edit>
-    </match>
-</fontconfig>
diff --git a/fontconfig/56-language-selector-prefer.conf b/fontconfig/56-language-selector-prefer.conf
new file mode 100644
index 0000000..9a83ea6
--- /dev/null
+++ b/fontconfig/56-language-selector-prefer.conf
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+<!--
+ This file prefers quite a few non-latin fonts to give them higher
+ precedence than DejaVu Sans and DejaVu Serif. The latter are preferred
+ in 60-latin.conf, but besides latin, cyrillic and greek they include
+ many non-latin characters. So this way we can make Noto fonts be used
+ even if the fonts-dejavu-core package is installed.
+-->
+
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Sans</family>
+      <family>Noto Sans Adlam</family>
+      <family>Noto Sans Arabic UI</family>
+      <family>Noto Sans Arabic</family>
+      <family>Noto Sans Armenian</family>
+      <family>Noto Sans Avestan</family>
+      <family>Noto Sans Balinese</family>
+      <family>Noto Sans Bamum</family>
+      <family>Noto Sans Bassa Vah</family>
+      <family>Noto Sans Batak</family>
+      <family>Noto Sans Bengali</family>
+      <family>Noto Sans Bhaiksuki</family>
+      <family>Noto Sans Brahmi</family>
+      <family>Noto Sans Buginese</family>
+      <family>Noto Sans Buhid</family>
+      <family>Noto Sans Canadian Aboriginal</family>
+      <family>Noto Sans Carian</family>
+      <family>Noto Sans Caucasian Albanian</family>
+      <family>Noto Sans Chakma</family>
+      <family>Noto Sans Cham</family>
+      <family>Noto Sans Cherokee</family>
+      <family>Noto Sans Coptic</family>
+      <family>Noto Sans Cuneiform</family>
+      <family>Noto Sans Cypriot</family>
+      <family>Noto Sans Deseret</family>
+      <family>Noto Sans Devanagari</family>
+      <family>Noto Sans Duployan</family>
+      <family>Noto Sans Elbasan</family>
+      <family>Noto Sans Elymaic</family>
+      <family>Noto Sans Ethiopic</family>
+      <family>Noto Sans Georgian</family>
+      <family>Noto Sans Glagolitic</family>
+      <family>Noto Sans Gothic</family>
+      <family>Noto Sans Grantha</family>
+      <family>Noto Sans Gujarati</family>
+      <family>Noto Sans Gunjala Gondi</family>
+      <family>Noto Sans Gurmukhi</family>
+      <family>Noto Sans Hanifi Rohingya</family>
+      <family>Noto Sans Hanunoo</family>
+      <family>Noto Sans Hatran</family>
+      <family>Noto Sans Hebrew</family>
+      <family>Noto Sans Javanese</family>
+      <family>Noto Sans Kaithi</family>
+      <family>Noto Sans Kannada</family>
+      <family>Noto Sans Kayah Li</family>
+      <family>Noto Sans Kharoshthi</family>
+      <family>Noto Sans Khmer</family>
+      <family>Noto Sans Khojki</family>
+      <family>Noto Sans Khudawadi</family>
+      <family>Noto Sans Lao</family>
+      <family>Noto Sans Lepcha</family>
+      <family>Noto Sans Limbu</family>
+      <family>Noto Sans Linear A</family>
+      <family>Noto Sans Linear B</family>
+      <family>Noto Sans Lisu</family>
+      <family>Noto Sans Lycian</family>
+      <family>Noto Sans Lydian</family>
+      <family>Noto Sans Mahajani</family>
+      <family>Noto Sans Malayalam</family>
+      <family>Noto Sans Mandaic</family>
+      <family>Noto Sans Manichaean</family>
+      <family>Noto Sans Marchen</family>
+      <family>Noto Sans Masaram Gondi</family>
+      <family>Noto Sans Mayan Numerals</family>
+      <family>Noto Sans Medefaidrin</family>
+      <family>Noto Sans Meetei Mayek</family>
+      <family>Noto Sans Mende Kikakui</family>
+      <family>Noto Sans Meroitic</family>
+      <family>Noto Sans Miao</family>
+      <family>Noto Sans Modi</family>
+      <family>Noto Sans Mongolian</family>
+      <family>Noto Sans Mro</family>
+      <family>Noto Sans Multani</family>
+      <family>Noto Sans Myanmar</family>
+      <family>Noto Sans NKo</family>
+      <family>Noto Sans Nabataean</family>
+      <family>Noto Sans New Tai Lue</family>
+      <family>Noto Sans Newa</family>
+      <family>Noto Sans Nushu</family>
+      <family>Noto Sans Ogham</family>
+      <family>Noto Sans Ol Chiki</family>
+      <family>Noto Sans Oriya</family>
+      <family>Noto Sans Osage</family>
+      <family>Noto Sans Osmanya</family>
+      <family>Noto Sans Pahawh Hmong</family>
+      <family>Noto Sans Palmyrene</family>
+      <family>Noto Sans Pau Cin Hau</family>
+      <family>Noto Sans PhagsPa</family>
+      <family>Noto Sans Phoenician</family>
+      <family>Noto Sans Rejang</family>
+      <family>Noto Sans Saurashtra</family>
+      <family>Noto Sans Sharada</family>
+      <family>Noto Sans Shavian</family>
+      <family>Noto Sans Siddham</family>
+      <family>Noto Sans Sinhala</family>
+      <family>Noto Sans Sogdian</family>
+      <family>Noto Sans Sora Sompeng</family>
+      <family>Noto Sans Soyombo</family>
+      <family>Noto Sans Sundanese</family>
+      <family>Noto Sans Syloti Nagri</family>
+      <family>Noto Sans Syriac</family>
+      <family>Noto Sans Tagalog</family>
+      <family>Noto Sans Tagbanwa</family>
+      <family>Noto Sans Tai Le</family>
+      <family>Noto Sans Tai Tham</family>
+      <family>Noto Sans Tai Viet</family>
+      <family>Noto Sans Tamil</family>
+      <family>Noto Sans Takri</family>
+      <family>Noto Sans Telugu</family>
+      <family>Noto Sans Thaana</family>
+      <family>Noto Sans Thai</family>
+      <family>Noto Sans Tifinagh</family>
+      <family>Noto Sans Tirhuta</family>
+      <family>Noto Sans Ugaritic</family>
+      <family>Noto Nastaliq Urdu</family>
+      <family>Noto Sans Vai</family>
+      <family>Noto Sans Wancho</family>
+      <family>Noto Sans Warang Citi</family>
+      <family>Noto Sans Yi</family>
+      <family>Noto Sans Zanabazar Square</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif</family>
+      <family>Noto Serif Ahom</family>
+      <family>Noto Naskh Arabic</family>
+      <family>Noto Serif Armenian</family>
+      <family>Noto Serif Balinese</family>
+      <family>Noto Serif Bengali</family>
+      <family>Noto Serif Devanagari</family>
+      <family>Noto Serif Dogra</family>
+      <family>Noto Serif Ethiopic</family>
+      <family>Noto Serif Georgian</family>
+      <family>Noto Serif Grantha</family>
+      <family>Noto Serif Gujarati</family>
+      <family>Noto Serif Gurmukhi</family>
+      <family>Noto Serif Hebrew</family>
+      <family>Noto Serif Hmong Nyiakeng</family>
+      <family>Noto Serif Kannada</family>
+      <family>Noto Serif Khmer</family>
+      <family>Noto Serif Khojki</family>
+      <family>Noto Serif Lao</family>
+      <family>Noto Serif Malayalam</family>
+      <family>Noto Serif Myanmar</family>
+      <family>Noto Serif Sinhala</family>
+      <family>Noto Serif Tamil</family>
+      <family>Noto Serif Tamil Slanted</family>
+      <family>Noto Serif Tangut</family>
+      <family>Noto Serif Telugu</family>
+      <family>Noto Serif Thai</family>
+      <family>Noto Serif Tibetan</family>
+      <family>Noto Serif Yezidi</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fontconfig/64-language-selector-prefer.conf b/fontconfig/64-language-selector-cjk-prefer.conf
similarity index 94%
rename from fontconfig/64-language-selector-prefer.conf
rename to fontconfig/64-language-selector-cjk-prefer.conf
index bce3696..8cf9d25 100644
--- a/fontconfig/64-language-selector-prefer.conf
+++ b/fontconfig/64-language-selector-cjk-prefer.conf
@@ -9,8 +9,6 @@
 			<family>Noto Sans CJK SC</family>
 			<family>Noto Sans CJK TC</family>
 			<family>Noto Sans CJK HK</family>
-			<family>Lohit Devanagari</family>
-			<family>Noto Sans Sinhala</family>
 		</prefer>
 	</alias>
 	<alias>
@@ -20,8 +18,6 @@
 			<family>Noto Serif CJK KR</family>
 			<family>Noto Serif CJK SC</family>
 			<family>Noto Serif CJK TC</family>
-			<family>Lohit Devanagari</family>
-			<family>Noto Serif Sinhala</family>
 		</prefer>
 	</alias>
 	<alias>
diff --git a/setup.py b/setup.py
index 2c3654a..841054d 100755
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,9 @@ setup(name='language-selector',
                   # session init config file
                   ('../etc/profile.d',
                    ["data/cedilla-portuguese.sh"]),
+                  # extra fontconfig file for the snaps
+                  ('../usr/share/fonts/snap-config-hack',
+                   ["data/10-prefer-noto.conf"]),
                   ],
       entry_points='''[aptdaemon.plugins]
 modify_cache_after=language_support_pkgs:apt_cache_add_language_packs