From 5384258f4ef0c27cc9d5255ce4992f13656e215d Mon Sep 17 00:00:00 2001 From: Akira Yokosawa Date: Sat, 27 Apr 2024 17:24:11 +0900 Subject: [PATCH] docs: scripts/check-variable-fonts.sh: Improve commands for detection As mentioned in "Assumption:", current grep expression can't catch font files whose names are changed from upstream "Noto CJK fonts". To avoid false negatives, use command of the form: fc-list : file family variable , where ":" works as a wildcard pattern. Variable fonts can be detected by filtering the output with "variable=True" and "Noto CJK" font-family variants. Signed-off-by: Akira Yokosawa Signed-off-by: Jonathan Corbet Link: https://lore.kernel.org/r/c62ba2e6-c124-4e91-8011-cb1da408a3c5@gmail.com --- scripts/check-variable-fonts.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/check-variable-fonts.sh b/scripts/check-variable-fonts.sh index 12765e54e4f3..ce63f0acea5f 100755 --- a/scripts/check-variable-fonts.sh +++ b/scripts/check-variable-fonts.sh @@ -20,10 +20,6 @@ # suggestions if variable-font files of "Noto CJK" fonts are in the list of # fonts accessible from XeTeX. # -# Assumption: -# File names are not modified from those of upstream Noto CJK fonts: -# https://github.com/notofonts/noto-cjk/ -# # References: # [1]: https://lore.kernel.org/r/8734tqsrt7.fsf@meer.lwn.net/ # [2]: https://lore.kernel.org/r/1708585803.600323099@f111.i.mail.ru/ @@ -96,13 +92,15 @@ export XDG_CONFIG_HOME=${FONTS_CONF_DENY_VF} -vffonts=`fc-list -b | grep -iE 'file: .*noto.*cjk.*-vf' | \ - sed -e 's/\tfile:/ file:/' -e 's/(s)$//' | sort | uniq` +notocjkvffonts=`fc-list : file family variable | \ + grep 'variable=True' | \ + grep -E -e 'Noto (Sans|Sans Mono|Serif) CJK' | \ + sed -e 's/^/ /' -e 's/: Noto S.*$//' | sort | uniq` -if [ "x$vffonts" != "x" ] ; then +if [ "x$notocjkvffonts" != "x" ] ; then echo '=============================================================================' echo 'XeTeX is confused by "variable font" files listed below:' - echo "$vffonts" + echo "$notocjkvffonts" echo echo 'For CJK pages in PDF, they need to be hidden from XeTeX by denylisting.' echo 'Or, CJK pages can be skipped by uninstalling texlive-xecjk.'