diff mbox series

[bug#69432,3/3] website: Use Linux Libertine for the body of the manual.

Message ID 20240227213835.21147-3-ludo@gnu.org
State New
Headers show
Series [bug#69432,1/3] website: Adjust style of web site builder. | expand

Commit Message

Ludovic Courtès Feb. 27, 2024, 9:38 p.m. UTC 
* 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(-)

Comments

pelzflorian (Florian Pelz) Feb. 28, 2024, 7:56 a.m. UTC | #1 
Hi Ludo.  Serif fonts are fine, although they might not be more readable
as is often claimed.

Ludovic Courtès <ludo@gnu.org> writes:
> * website/static/base/css/manual.css: New @fontface entries for Linux

Nitpick; below you have written @font-face with a hyphen.  I have not
checked if hyphens are required, but MDN also writes @font-face with a
hyphen.

More importantly:

> +@font-face {
> +    font-family: 'Linux Libertine O';
> +    src: url('../fonts/Linux Libertine O_R.ttf') format('truetype');
> +    font-weight: normal;
> +    font-style: normal;
> +}

The files are at

src: url('../fonts/LinLibertine_R.ttf') format('truetype');

without a space, otherwise I get HTTP error 404.


Also, don’t forget your copyright headers for .guix.scm.

Regards,
Florian
Ludovic Courtès Feb. 29, 2024, 9:41 p.m. UTC | #2 
Hi!

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> skribis:

> Hi Ludo.  Serif fonts are fine, although they might not be more readable
> as is often claimed.

One of the sites that I find pleasant is that of Racket:

  https://docs.racket-lang.org/turnstile/

The serif font it uses seems to be slightly more legible than Linux
Libertine though.  Dunno, maybe we’ll change our mind eventually, but I
thought we could do better than Helvetica.

> The files are at
>
> src: url('../fonts/LinLibertine_R.ttf') format('truetype');
>
> without a space, otherwise I get HTTP error 404.

Oops, I must have messed up with search and replace.

> Also, don’t forget your copyright headers for .guix.scm.

Already up-to-date.

I’m sending v2 with your suggestions.

Thanks!

Ludo’.
diff mbox series

Patch

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" <div> but each of them is