Исправлен шаблон замены Helvetica на Arial при отсутствии шрифта

8 years ago · 2edf9b41b8
parent 793cbf7e71
commit 2edf9b41b8
3 changed files with 6 additions and 1 deletions
--- a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
+++ b/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
@ -3,6 +3,7 @@
 	&lt;alias binding="same"&gt;
 	  &lt;family&gt;Helvetica&lt;/family&gt;
 	  &lt;accept&gt;
+	  &lt;family&gt;TeX Gyre Heros&lt;/family&gt;
 	  &lt;family&gt;Nimbus Sans L&lt;/family&gt;
 	  &lt;/accept&gt;
 	&lt;/alias&gt;
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@ -2,4 +2,4 @@

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20170119.1
+remerge = 20170119.2
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.2
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.2
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=media-libs/fontconfig
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#