From patchwork Tue Feb 27 21:38:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 61182 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B46E227BBE2; Tue, 27 Feb 2024 21:39:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B0E9327BBEA for ; Tue, 27 Feb 2024 21:39:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf5An-0003as-SD; Tue, 27 Feb 2024 16:39:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf5Am-0003Yp-9o for guix-patches@gnu.org; Tue, 27 Feb 2024 16:39:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rf5Am-000340-0P for guix-patches@gnu.org; Tue, 27 Feb 2024 16:39:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rf5BC-0005Fv-2z for guix-patches@gnu.org; Tue, 27 Feb 2024 16:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69432] [PATCH 1/3] website: Adjust style of web site builder. References: <20240227165114.19942-1-ludo@gnu.org> In-Reply-To: <20240227165114.19942-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69432@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69432-submit@debbugs.gnu.org id=B69432.170906996120059 (code B ref 69432); Tue, 27 Feb 2024 21:40:02 +0000 Received: (at 69432) by debbugs.gnu.org; 27 Feb 2024 21:39:21 +0000 Received: from localhost ([127.0.0.1]:56704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5AX-0005DS-5Q for submit@debbugs.gnu.org; Tue, 27 Feb 2024 16:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5AU-0005Co-B9 for 69432@debbugs.gnu.org; Tue, 27 Feb 2024 16:39:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf59y-0002xb-2P; Tue, 27 Feb 2024 16:38:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=T4SQLdjTpoBs4UbEQT/ytqUeOzMc9KXCZXMSdyKbmI4=; b=AgXgwUw5Qprf26 wE6owadVisMj4JkkfX9YKmJa3adLS3uwStXt4kYiphh3HhuOXQTp4nDip75EbdzF6GOW6tRB25d4N 6GvosAfMsRz4oQ3z4QBkGtiAkUzXwMRTavs1U1FkMD1A5tIk3yT8al61nYBFrna/yznZBzKoU3IEY 81ebMpRxZLAEFc8NtvGzCoXIlYNYYhWmii15KkJBsfEHvuYqVRug3CxBpYjlfFbp1a17UhuJG7+mx Bw/Xjq5zx66RNQUzaoOEKD4HDnmzCCPTiZ1RaMRNNqyQqiFzkr5tZfwEJFUXTUDBPydVLcpIpQDN+ qPmXYo+IPKiBxb9iIAVw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Feb 2024 22:38:33 +0100 Message-ID: <20240227213835.21147-1-ludo@gnu.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * website/.guix.scm (lingua-web-site)[build]: Use ‘for-each’ and ‘install-file’ when copying font files. --- website/.guix.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/website/.guix.scm b/website/.guix.scm index 3d8fdb6..438d337 100644 --- a/website/.guix.scm +++ b/website/.guix.scm @@ -207,12 +207,13 @@ ;; Include the Fira fonts used in ;; website/static/base/css/manual.css. (mkdir-p (string-append #$output "/static/base/fonts")) - (map (lambda (file) - (copy-file (string-append #+font-fira-sans - "/share/fonts/truetype/" file) - (string-append #$output - "/static/base/fonts/" file))) - '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf")))))) + (for-each (lambda (file) + (install-file (string-append #+font-fira-sans + "/share/fonts/truetype/" + file) + (string-append #$output + "/static/base/fonts"))) + '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf")))))) (computed-file (string-append "guix-web-site-" lingua) build From patchwork Tue Feb 27 21:38:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 61181 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 08D9E27BBEC; Tue, 27 Feb 2024 21:39:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C013627BBE2 for ; Tue, 27 Feb 2024 21:39:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf5Ap-0003bS-Ey; Tue, 27 Feb 2024 16:39:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf5An-0003al-Gu for guix-patches@gnu.org; Tue, 27 Feb 2024 16:39:37 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rf5An-00035V-8s for guix-patches@gnu.org; Tue, 27 Feb 2024 16:39:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rf5BC-0005G4-Ui for guix-patches@gnu.org; Tue, 27 Feb 2024 16:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69432] [PATCH 2/3] website: Use Fira Sans for section headings only. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69432@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69432-submit@debbugs.gnu.org id=B69432.170906996220066 (code B ref 69432); Tue, 27 Feb 2024 21:40:02 +0000 Received: (at 69432) by debbugs.gnu.org; 27 Feb 2024 21:39:22 +0000 Received: from localhost ([127.0.0.1]:56706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5AX-0005DW-I1 for submit@debbugs.gnu.org; Tue, 27 Feb 2024 16:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5AU-0005Cq-Gz for 69432@debbugs.gnu.org; Tue, 27 Feb 2024 16:39:19 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf59y-0002xi-PP; Tue, 27 Feb 2024 16:38:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PRyGj/Xspgdu8oUP7NqrA723BhOGKZrcapxi0bGcXCk=; b=VwcbXud1BzOkXBsV2npV 6Ne++qCrQp44P6g3iEUEdDytDO+N2oO1sOa2p5Ps05oP6clBgS+K6nACM9itEvBOuwqKtWXfltxNu tilUfpyU8PIymAB0HQBEe3ysEFJSuKlWeOWCvV/MQG609dQKMItd9cFnaaOp/gwAKyPeIKjAOUCSG J8N+yaGiCFrtkx5a9nSuBkpZhipZzUWXBjaQsF13CCYC5le1IUXtbq0X89mRXIy7zvq3BivGXuJcz F0uoPzRNtvgEe+CKIkLZ4o/4nX4ysnmqOaheg0V+s/xc8la+N8D65bTSXGavkZ2oSKkKKryKbVAIu b+O9MdQ9hUKefw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Feb 2024 22:38:34 +0100 Message-ID: <20240227213835.21147-2-ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240227213835.21147-1-ludo@gnu.org> References: <20240227213835.21147-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches With commit b7ccc5cb1b4ec936c00dbd98376c5d2677e60a63, Fira Sans was used for the body of sections, not just section headings. This is what prescribes but it’s not what was intended. * website/static/base/css/manual.css: Add rule. --- website/static/base/css/manual.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/website/static/base/css/manual.css b/website/static/base/css/manual.css index 8ecd872..8970457 100644 --- a/website/static/base/css/manual.css +++ b/website/static/base/css/manual.css @@ -323,6 +323,13 @@ h1.settitle, h1.top, h2.chapter, h3.section, h4.subsection, h4.subsubsection { font-weight: bold; } +/* Use a serif font for section bodies (this overrides /gnulib/manual.css, + which currently applies to entire section classes, as opposed to section + classes for headings only). */ +div.settitle, div.top, div.chapter, div.section, div.subsection, div.subsubsection { + font-family: serif; +} + /* Texinfo footnotes are in a "footnote"
but each of them is wrapped in
(go figure). Have them use a regular font instead of bold. */ From patchwork Tue Feb 27 21:38:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 61183 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B675027BBEA; Tue, 27 Feb 2024 21:40:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7798727BBE2 for ; Tue, 27 Feb 2024 21:40:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf5Bz-0003sM-29; Tue, 27 Feb 2024 16:40:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf5Bp-0003rO-V0 for guix-patches@gnu.org; Tue, 27 Feb 2024 16:40:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rf5Bk-0003Yd-Ek for guix-patches@gnu.org; Tue, 27 Feb 2024 16:40:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rf5CA-0005JX-GP for guix-patches@gnu.org; Tue, 27 Feb 2024 16:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69432] [PATCH 3/3] website: Use Linux Libertine for the body of the manual. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69432@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69432-submit@debbugs.gnu.org id=B69432.170907002220284 (code B ref 69432); Tue, 27 Feb 2024 21:41:02 +0000 Received: (at 69432) by debbugs.gnu.org; 27 Feb 2024 21:40:22 +0000 Received: from localhost ([127.0.0.1]:56787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5BV-0005H5-9r for submit@debbugs.gnu.org; Tue, 27 Feb 2024 16:40:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf5AV-0005Cw-Mm for 69432@debbugs.gnu.org; Tue, 27 Feb 2024 16:39:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf59z-0002y2-Gc; Tue, 27 Feb 2024 16:38:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=psEhAIK5eWxRWNzgZUbq/olJicsJF2d0CmJUaQQ5kds=; b=Cduwv4CA3dI0noj13tYx lprmkAyFYWFENrp2ii/AILhGplisLBzSXDnyptYHW5PbrU282XCzz7D0D+/Y/Ufdoi1jnFFby6AMY RvqSZlGh7BCldVhxudZcjwNuUMHVXuvdSf124bkVN09BrV1IPnTJMXB1a+i4FohnfJhUFWcTqQlzg j5tMKoKHPtRwpzHUIk4ftwcn/PoAoCHWDKPtAnJqBp7O+oBJErpUNsmZDd0wLSKGGaMoxINSUFJk+ gUOUbQQEY4Bnqm03vDimb+hAqymX9hP7Os0qFOOyrcoj9ruSwsO3IJhm9udGqdvxZIKgptJ+RaDHI 7HKL5DMg2d3lTA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Feb 2024 22:38:35 +0100 Message-ID: <20240227213835.21147-3-ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240227213835.21147-1-ludo@gnu.org> References: <20240227213835.21147-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * website/static/base/css/manual.css: New @fontface entries for Linux Libertine. Use it for section bodies. Add rule for ‘samp’, etc. * website/static/base/css/code.css (.symbol-definition-prototype): Remove ‘font-size’. * website/.guix.scm (lingua-web-site)[build]: Install Linux Libertine fonts. --- website/.guix.scm | 13 ++++++++++- website/static/base/css/code.css | 1 - website/static/base/css/manual.css | 35 +++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/website/.guix.scm b/website/.guix.scm index 438d337..4c74391 100644 --- a/website/.guix.scm +++ b/website/.guix.scm @@ -213,7 +213,18 @@ file) (string-append #$output "/static/base/fonts"))) - '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf")))))) + '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf")) + + (for-each (lambda (file) + (install-file (string-append #+font-linuxlibertine + "/share/fonts/truetype/" + file) + (string-append #$output + "/static/base/fonts"))) + '("LinLibertine_R.ttf" + "LinLibertine_RI.ttf" + "LinLibertine_RB.ttf" + "LinLibertine_RBI.ttf")))))) (computed-file (string-append "guix-web-site-" lingua) build diff --git a/website/static/base/css/code.css b/website/static/base/css/code.css index e7c53ac..efdb70a 100644 --- a/website/static/base/css/code.css +++ b/website/static/base/css/code.css @@ -72,7 +72,6 @@ a[href].syntax-symbol:hover { .symbol-definition-prototype { /* remaining arguments to @deffn etc. */ font-family: monospace; - font-size: 110%; } .symbol-definition + dd { diff --git a/website/static/base/css/manual.css b/website/static/base/css/manual.css index 8970457..0e5b9df 100644 --- a/website/static/base/css/manual.css +++ b/website/static/base/css/manual.css @@ -316,6 +316,31 @@ label[for=all-dropdowns-hidden] { font-style: normal; } +@font-face { + font-family: 'Linux Libertine O'; + src: url('../fonts/Linux Libertine O_R.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Linux Libertine O'; + src: url('../fonts/Linux Libertine O_RI.ttf') format('truetype'); + font-weight: normal; + font-style: italic; +} +@font-face { + font-family: 'Linux Libertine O'; + src: url('../fonts/Linux Libertine O_RB.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: 'Linux Libertine O'; + src: url('../fonts/Linux Libertine O_RBI.ttf') format('truetype'); + font-weight: bold; + font-style: italic; +} + /* In title and node titles, use Fira Sans as it is more pleasant and more compact than Helvetica. */ h1.settitle, h1.top, h2.chapter, h3.section, h4.subsection, h4.subsubsection { @@ -327,7 +352,15 @@ h1.settitle, h1.top, h2.chapter, h3.section, h4.subsection, h4.subsubsection { which currently applies to entire section classes, as opposed to section classes for headings only). */ div.settitle, div.top, div.chapter, div.section, div.subsection, div.subsubsection { - font-family: serif; + font-family: Linux Libertine O, serif; + font-size: 18px; +} + +/* Arrange so fixed-width samples don't look too big compared to Linux + Libertine text. */ +samp, code, .example { + font-family: monospace; + font-size: 85%; } /* Texinfo footnotes are in a "footnote"
but each of them is