Skip to content

Commit

Permalink
docs: pdfdocs: Choose Serif font as CJK mainfont if possible
Browse files Browse the repository at this point in the history
"Noto Serif CJK SC" and its variants suit better with the roman font
of Latin letters.

On some distros such as Fedora, it is possible to partially install
"Noto Sans CJK" fonts.
So, if the Serif fonts are not found on the system, fall back to the
Sans fonts.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Link: https://lore.kernel.org/r/5e454140-5d0c-35d4-8c31-3ffb2420793a@gmail.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
Akira Yokosawa authored and Jonathan Corbet committed Aug 12, 2021
1 parent e291ff6 commit 7eb368c
Showing 1 changed file with 36 additions and 5 deletions.
41 changes: 36 additions & 5 deletions Documentation/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,20 +360,48 @@
\\IfFontExistsTF{Noto Sans CJK SC}{
% This is needed for translations
\\usepackage{xeCJK}
\\setCJKmainfont{Noto Sans CJK SC}
\\IfFontExistsTF{Noto Serif CJK SC}{
\\setCJKmainfont{Noto Serif CJK SC}
}{
\\setCJKmainfont{Noto Sans CJK SC}
}
\\setCJKsansfont{Noto Sans CJK SC}
\\setCJKmonofont{Noto Sans Mono CJK SC}
% CJK Language-specific font choices
\\newCJKfontfamily[SCmain]\\scmain{Noto Sans CJK SC}
\\IfFontExistsTF{Noto Serif CJK SC}{
\\newCJKfontfamily[SCmain]\\scmain{Noto Serif CJK SC}
\\newCJKfontfamily[SCserif]\\scserif{Noto Serif CJK SC}
}{
\\newCJKfontfamily[SCmain]\\scmain{Noto Sans CJK SC}
\\newCJKfontfamily[SCserif]\\scserif{Noto Sans CJK SC}
}
\\newCJKfontfamily[SCsans]\\scsans{Noto Sans CJK SC}
\\newCJKfontfamily[SCmono]\\scmono{Noto Sans Mono CJK SC}
\\newCJKfontfamily[TCmain]\\tcmain{Noto Sans CJK TC}
\\IfFontExistsTF{Noto Serif CJK TC}{
\\newCJKfontfamily[TCmain]\\tcmain{Noto Serif CJK TC}
\\newCJKfontfamily[TCserif]\\tcserif{Noto Serif CJK TC}
}{
\\newCJKfontfamily[TCmain]\\tcmain{Noto Sans CJK TC}
\\newCJKfontfamily[TCserif]\\tcserif{Noto Sans CJK TC}
}
\\newCJKfontfamily[TCsans]\\tcsans{Noto Sans CJK TC}
\\newCJKfontfamily[TCmono]\\tcmono{Noto Sans Mono CJK TC}
\\newCJKfontfamily[KRmain]\\krmain{Noto Sans CJK KR}
\\IfFontExistsTF{Noto Serif CJK KR}{
\\newCJKfontfamily[KRmain]\\krmain{Noto Serif CJK KR}
\\newCJKfontfamily[KRserif]\\krserif{Noto Serif CJK KR}
}{
\\newCJKfontfamily[KRmain]\\krmain{Noto Sans CJK KR}
\\newCJKfontfamily[KRserif]\\krserif{Noto Sans CJK KR}
}
\\newCJKfontfamily[KRsans]\\krsans{Noto Sans CJK KR}
\\newCJKfontfamily[KRmono]\\krmono{Noto Sans Mono CJK KR}
\\newCJKfontfamily[JPmain]\\jpmain{Noto Sans CJK JP}
\\IfFontExistsTF{Noto Serif CJK JP}{
\\newCJKfontfamily[JPmain]\\jpmain{Noto Serif CJK JP}
\\newCJKfontfamily[JPserif]\\jpserif{Noto Serif CJK JP}
}{
\\newCJKfontfamily[JPmain]\\jpmain{Noto Sans CJK JP}
\\newCJKfontfamily[JPserif]\\jpserif{Noto Sans CJK JP}
}
\\newCJKfontfamily[JPsans]\\jpsans{Noto Sans CJK JP}
\\newCJKfontfamily[JPmono]\\jpmono{Noto Sans Mono CJK JP}
% Define custom macros to on/off CJK
Expand All @@ -387,20 +415,23 @@
\\newcommand{\\kerneldocBeginTC}{%
\\begingroup%
\\tcmain%
\\renewcommand{\\CJKrmdefault}{TCserif}%
\\renewcommand{\\CJKsfdefault}{TCsans}%
\\renewcommand{\\CJKttdefault}{TCmono}%
}
\\newcommand{\\kerneldocEndTC}{\\endgroup}
\\newcommand{\\kerneldocBeginKR}{%
\\begingroup%
\\krmain%
\\renewcommand{\\CJKrmdefault}{KRserif}%
\\renewcommand{\\CJKsfdefault}{KRsans}%
\\renewcommand{\\CJKttdefault}{KRmono}%
}
\\newcommand{\\kerneldocEndKR}{\\endgroup}
\\newcommand{\\kerneldocBeginJP}{%
\\begingroup%
\\jpmain%
\\renewcommand{\\CJKrmdefault}{JPserif}%
\\renewcommand{\\CJKsfdefault}{JPsans}%
\\renewcommand{\\CJKttdefault}{JPmono}%
}
Expand Down

0 comments on commit 7eb368c

Please sign in to comment.