Add face property to determine default face for default-fonts-<language code>

This commit is contained in:
Akira TAGOH 2023-06-28 16:07:27 +09:00
parent b3c8b88d0b
commit 687672981f

View File

@ -1,6 +1,6 @@
Name: langpacks
Version: 4.0
Release: 0.8%{?dist}
Release: 0.9%{?dist}
Summary: Langpacks meta-package
License: GPL-2.0-or-later
@ -39,6 +39,7 @@ Langpack meta-package to provide individual langpacks packages.
# lang: language identifier
# fclang: language identifier in fontconfig. lang will be used if not present
# default: default font sets
# face: default typeface for default-fonts-<language code>.
# sans: default sans-serif font package
# serif: default serif font package
# mono: default monospace font package
@ -1418,6 +1419,7 @@ for i = 1, #langpacks_package_list do
if langpacks_package_list[i]["default"] ~= nil then
local has_default = false
local default_face = langpacks_package_list[i]["default"]["face"] and langpacks_package_list[i]["default"]["face"] or "sans"
for j = 1, #face do
local current = langpacks_package_list[i]["default"][face[j]]
if current ~= "" then
@ -1427,12 +1429,12 @@ for i = 1, #langpacks_package_list do
for j = 1, #face do
local current = (has_default and langpacks_package_list[i]["default"][face[j]] or corefonts[face[j]])
-- Only install sans fonts as default fonts per lang
if face[j] == "sans" then
-- Only install a font which is set by "face" or "sans" if not, for default-fonts-<language code>
if face[j] == default_face then
if lang == "en" then
-- Special take care of required packages
for k = 1, #core_font_package_list["default"]["sans"] do
table.insert(default_deps, core_font_package_list["default"]["sans"][k])
for k = 1, #core_font_package_list["default"][default_face] do
table.insert(default_deps, core_font_package_list["default"][default_face][k])
end
else
table.insert(default_deps, current)