Fix config to set Naskh Arabic as serif for fallback.

This commit is contained in:
Akira TAGOH 2022-03-08 19:39:02 +09:00
parent b8404861fd
commit 70ab261a2e
2 changed files with 52 additions and 17 deletions

View File

@ -21,13 +21,14 @@ in Unicode.\
Name: %{fontname}-fonts
Version: 20201206
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts
License: OFL
URL: https://github.com/googlefonts/noto-fonts/
Source0: https://github.com/googlefonts/noto-fonts/archive/v20201206-phase3.tar.gz#/noto-fonts-%{srcver}.tar.gz
Source1: google-noto-sans-math-vf.conf
Source2: google-noto-sans-math.conf
Source3: google-noto-naskh-arabic-ex.conf
BuildArch: noarch
BuildRequires: fonts-rpm-macros
@ -52,13 +53,12 @@ group["monospace"] = "Noto Sans Mono"
local subpackages = {
{ alias="cursive", family="Kufi Arabic", lang={ "ar" } },
{ alias="fantasy", family="Music" },
{ alias="cursive", family="Naskh Arabic", lang={ "ar" } },
{ alias="cursive", family="Naskh Arabic UI", lang={ "ar" },
priority=rpm.expand('%{lprio}')
},
{ alias="cursive", family="Nastaliq Urdu", lang={ "ur" } },
{ alias="serif", family="Rashi Hebrew", lang={ "he" } },
{ alias="fantasy", family="Music" },
{ alias="fantasy", family="Sans Symbols" },
{ alias="fantasy", family="Sans Symbols2" },
{ alias="sans-serif", family="Sans" },
{ alias="sans-serif", family="Sans Display",
priority=rpm.expand('%{lprio}'),
@ -230,10 +230,6 @@ local subpackages = {
{ alias="sans-serif", family="Sans Soyombo" },
{ alias="sans-serif", family="Sans Sundanese" },
{ alias="sans-serif", family="Sans Syloti Nagri" },
{ alias="fantasy", family="Sans Symbols" },
{ alias="fantasy", family="Sans Symbols2" },
{ alias="sans-serif", family="Sans Syriac", lang={ "syr" },
obsoletes={ "sans-syriac-eastern", "sans-syriac-estrangela", "sans-syriac-western" }
},
@ -280,6 +276,12 @@ local subpackages = {
{ alias="sans-serif", family="Sans Yi" },
{ alias="sans-serif", family="Sans Zanabazar Square" },
{ alias="serif", family="Naskh Arabic", lang={ "ar" },
fcconfexfile=rpm.expand('%{SOURCE3}') },
{ alias="serif", family="Naskh Arabic UI", lang={ "ar" },
priority=rpm.expand('%{lprio}')
},
{ alias="serif", family="Rashi Hebrew", lang={ "he" } },
{ alias="serif", family="Serif" },
{ alias="serif", family="Serif Ahom" },
{ alias="serif", family="Serif Armenian", lang={ "hy" } },
@ -318,11 +320,9 @@ local subpackages = {
{ alias="serif", family="Traditional Nushu" },
{ alias="cursive", variable=true, family="Kufi Arabic", lang={ "ar" } },
{ alias="cursive", variable=true, family="Naskh Arabic", lang={ "ar" } },
{ alias="cursive", variable=true, family="Naskh Arabic UI", lang={ "ar" },
priority=rpm.expand('%{lprio}'), nogroup=1
},
{ alias="serif", variable=true, family="Rashi Hebrew", lang={ "he" } },
{ alias="fantasy", variable=true, family="Sans Symbols" },
{ alias="sans-serif", variable=true, family="Sans",
priority=rpm.expand('%{hprio}')
},
@ -430,7 +430,6 @@ local subpackages = {
{ alias="sans-serif", variable=true, family="Sans Sora Sompeng" },
{ alias="sans-serif", variable=true, family="Sans Soyombo" },
{ alias="sans-serif", variable=true, family="Sans Sundanese" },
{ alias="fantasy", variable=true, family="Sans Symbols" },
{ alias="sans-serif", variable=true, family="Sans Tagbanwa", lang={ "twb" } },
{ alias="sans-serif", variable=true, family="Sans Tai Tham" },
{ alias="sans-serif", variable=true, family="Sans Takri" },
@ -456,6 +455,13 @@ local subpackages = {
{ alias="sans-serif", variable=true, family="Sans Zanabazar Square" },
{ alias="sans-serif", variable=true, family="Sans Thai Looped", lang={ "th" },
obsoletes={ "sansthai-looped-vf" } },
{ alias="serif", variable=true, family="Naskh Arabic", lang={ "ar" },
fcconfexfile=rpm.expand('%{SOURCE3}') },
{ alias="serif", variable=true, family="Naskh Arabic UI", lang={ "ar" },
priority=rpm.expand('%{lprio}'), nogroup=1
},
{ alias="serif", variable=true, family="Rashi Hebrew", lang={ "he" } },
{ alias="serif", variable=true, family="Serif",
priority=rpm.expand('%{hprio}')
},
@ -506,6 +512,19 @@ local function is_cjki(table)
end
local function genfcconf(table)
local extra = "\\\n"
if table.fcconfexfile then
local f = io.open(table.fcconfexfile, "r")
if f then
for line in f:lines() do
extra = extra .. line:gsub("\n$", ""):gsub("$", "\\\n")
end
extra = extra:gsub("\n\n$", "\n")
f:close()
else
error("Unable to open " .. table.fcconfexfile)
end
end
local generic = [[
<test name="family">\
<string>]] .. table.alias .. [[</string>\
@ -544,6 +563,7 @@ local function genfcconf(table)
<family>]] .. table.alias .. [[</family>\
</default>\
</alias>\
]] .. extra .. [[
</fontconfig>\
]]
if table.fcconffile then
@ -952,6 +972,9 @@ done
%changelog
* Mon Mar 7 2022 Akira TAGOH <tagoh@redhat.com> - 20201206-9
- Fix config to set Naskh Arabic as serif for fallback.
* Fri Feb 4 2022 Akira TAGOH <tagoh@redhat.com> - 20201206-8
- Fix the priority for Indic fonts.
We postponed to replace Lohit with Noto this time.

View File

@ -0,0 +1,12 @@
<match>
<test name="family">
<string>sans-serif</string>
</test>
<test name="lang">
<string>ar</string>
</test>
<edit name="family" mode="prepend" binding="same">
<string>Noto Sans Arabic</string>
<string>Noto Naskh Arabic</string>
</edit>
</match>