From nobody Sat Jan 21 00:20:25 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NzH7t13WBz2t0qn for ; Sat, 21 Jan 2023 00:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzH7t0WC8z41jm; Sat, 21 Jan 2023 00:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674260426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdyM47EUyuz78yp7K5Wg7QHMUSH/2f7NSh84pNhfPa4=; b=Arcn1UoFxNi9EFas9mqgQUV6+dSZpwwGzdqisrrzao2ztDRK2GwyRp4i1Rsj6JzrsCO0Js Hf5HNQJSg6S/BjH6WzwOzWUPtJBmW8CpdtmuBQTc5LbZbH2POrhZpkiRd3QAagYdshXkMJ nny4kSTDnQ2MatShkaMfWHZP0CIuqHBtVatWDTTmTeEB0O7ejbxO0ZxQw+ZhXBDmidlTkI /WvIM4exGxS5W3o+rVwHCXKyhcVJwf7m9418KdvQ4Xtcj84jOq6KLjlLn70CseiRdqqILQ zXnNCNPAlFthadA0ugYgxXGn/S5lVyGwdpyil+8O2iuvoeu50sm2z9CW8qyPvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674260426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdyM47EUyuz78yp7K5Wg7QHMUSH/2f7NSh84pNhfPa4=; b=WNww2SwXZOs2oGJG7N/1RAFNnwIINqVX1RCRO9SkbA8Bv5tk+cOrChNaVO7N6XJaa6Dr7K PUPIgTy6xVDmvBA3fFHNJ+XWaS36enJXwf6/DiM3SHdkzknX1dA1+WzrP9oRUVRH2a6Eu7 6qcg1se8v+jdfISgxocgqAmuMxUo2fX87Cb8JTlQrAkGyOpLV1Z9JkTnzSH8wau0QQPirY ZwADgJ01ri0Wn890OM0tL4xMm14iAqzWlVJxEOLBlFSwribKf5e+kGwHSCWAG0grxSqtU/ kx9BX9pg77aix9yehj8b5J/UvQt1eWy+c0Ywz1nFA1Jpve3vzwKePAVrrv+xDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674260426; a=rsa-sha256; cv=none; b=EOu5BIy8U/HXt2ondamb9Np5IZ2fL0S4uPziE8ngXEHrcZjvwV9vJSA0alslgSjE6il0On sBHDMLcIsyUB0seHpK/FdLJUCwMnsPMBHXwbyciZydxpbwKMHwMXMAqSMMezFEVJIro6F7 4XEheevvdZ3JW2w4O3o2ztc/JRSQ3xdAEYw1laxi9dcGK0fDILZZlt124AsyqRBoxpyMSS tzBojTR4z5pxlZpm5pN+QvWx1Iasyb+U8NMhbBOIw2D+c/zA2VlX2ULkiyB2Of0AmYNGOL hmO9ODAKSEATpnwSXCQVwut22Z/CUpfYRSmi38zAMX1hqelHZYL3GjZlE/wBTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzH7s6gF5zqGd; Sat, 21 Jan 2023 00:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30L0KPHg039973; Sat, 21 Jan 2023 00:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30L0KPvp039972; Sat, 21 Jan 2023 00:20:25 GMT (envelope-from git) Date: Sat, 21 Jan 2023 00:20:25 GMT Message-Id: <202301210020.30L0KPvp039972@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 6a430fe152 - main - documentation/pdf: Improve zh-cn|zh-tw font issues List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a430fe152e6374caf0851d253819293522fcdb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=6a430fe152e6374caf0851d253819293522fcdb4 commit 6a430fe152e6374caf0851d253819293522fcdb4 Author: Yan Hao Wang AuthorDate: 2023-01-20 19:50:45 +0000 Commit: Danilo G. Baio CommitDate: 2023-01-21 00:14:53 +0000 documentation/pdf: Improve zh-cn|zh-tw font issues The build script now uses fonts installed by the port/pkg docproj-fonts-cjk. Differential Revision: https://reviews.freebsd.org/D36623 Differential Revision: https://reviews.freebsd.org/D37447 Co-authored-by: Danilo G. Baio --- documentation/tools/asciidoctor.sh | 25 ++++++++++++++++++++++++- shared/zh-cn/zh-cn-theme.yml | 16 ++++++++++++++++ shared/zh-tw/zh-tw-theme.yml | 16 ++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/documentation/tools/asciidoctor.sh b/documentation/tools/asciidoctor.sh index 27ce3f790c..ab5125bc0f 100755 --- a/documentation/tools/asciidoctor.sh +++ b/documentation/tools/asciidoctor.sh @@ -49,6 +49,8 @@ build_pdf() { local cur_dir_source="content/$doc_lang/$doc_type/$doc_name/" local cur_dir_output="public/$doc_lang/$doc_type/$doc_name/" + local theme_font="" + if [ ! -d "$cur_dir_output" ]; then mkdir -p "$cur_dir_output" fi @@ -68,6 +70,27 @@ build_pdf() { local asciidoctor_file_name="_index.adoc" fi + # Check non default fonts + case "$doc_lang" in + zh-cn) + if [ ! -f "$LOCALBASE/share/docproj-fonts-cjk/NotoSansSC-Medium.otf" ]; then + echo " font not found, skipping pdf build" + return + fi + theme_font="-a scripts=cjk -a pdf-theme=./shared/zh-cn/zh-cn-theme.yml -a pdf-fontsdir=$LOCALBASE/share/docproj-fonts-cjk" + ;; + zh-tw) + if [ ! -f "$LOCALBASE/share/docproj-fonts-cjk/NotoSansTC-Medium.otf" ]; then + echo " font not found, skipping pdf build" + return + fi + theme_font="-a pdf-theme=./shared/zh-tw/zh-tw-theme.yml -a pdf-fontsdir=$LOCALBASE/share/docproj-fonts-cjk/" + ;; + *) + theme_font="-a pdf-theme=default-with-fallback-font" + ;; + esac + $ASCIIDOCTORPDF_CMD \ -r ./shared/lib/man-macro.rb \ -r ./shared/lib/git-macro.rb \ @@ -80,7 +103,7 @@ build_pdf() { -a lang="$doc_lang" \ -a isonline=1 \ -a env-beastie=1 \ - -a pdf-theme=default-with-fallback-font \ + ${theme_font} \ -o "${cur_dir_output}${doc_name}_${doc_lang}.pdf" \ "${cur_dir_source}${asciidoctor_file_name}" } diff --git a/shared/zh-cn/zh-cn-theme.yml b/shared/zh-cn/zh-cn-theme.yml new file mode 100644 index 0000000000..8e1c288aad --- /dev/null +++ b/shared/zh-cn/zh-cn-theme.yml @@ -0,0 +1,16 @@ +extends: default +font: + catalog: + merge: true + Noto Sans SC: NotoSansSC-Medium.otf + fallbacks: + - Noto Serif +base: + text-align: left + font-family: Noto Sans SC +codespan: + font-family: Noto Sans SC +kbd: + font-family: $codespan-font-family +code: + font-family: $codespan-font-family diff --git a/shared/zh-tw/zh-tw-theme.yml b/shared/zh-tw/zh-tw-theme.yml new file mode 100644 index 0000000000..b4ce1d6f05 --- /dev/null +++ b/shared/zh-tw/zh-tw-theme.yml @@ -0,0 +1,16 @@ +extends: default +font: + catalog: + merge: true + Noto Sans TC: NotoSansTC-Medium.otf + fallbacks: + - Noto Serif +base: + text-align: left + font-family: Noto Sans TC +codespan: + font-family: Noto Sans TC +kbd: + font-family: $codespan-font-family +code: + font-family: $codespan-font-family