Enable the ebook for 2024 (#4022)

* Enable the ebook for 2024

* Ebook updates

* Missed contributors

* Linting

* Dummy updated entries

* Fix authors

Author: tunetheweb

.github/workflows/predeploy.yml

@@ -14,7 +14,7 @@ name: Predeploy script
 
 env:
   # Update periodically from https://www.princexml.com/latest/
-  PRINCE_PACKAGE: 'prince_13.6-1_ubuntu20.04_amd64.deb'
+  PRINCE_PACKAGE: 'prince_20250207-1_ubuntu24.04_amd64.deb'
 
 on:
   workflow_dispatch:

sql/2024/javascript/bytes_by_3p.sql

@@ -12,10 +12,9 @@ FROM (
     IF(NET.HOST(url) IN (
       SELECT domain FROM `httparchive.almanac.third_parties` WHERE date = '2024-06-01' AND category != 'hosting'
     ), 'third party', 'first party') AS host,
-    SUM(INT64(summary.respBodySize)) / 1024 AS kbytes
+    SUM(SAFE.INT64(summary.respBodySize)) / 1024 AS kbytes
   FROM
     `httparchive.crawl.requests`
-
   WHERE
     date = '2024-06-01' AND
     type = 'script'

src/config/2024.json

@@ -3,7 +3,7 @@
     {
       "is_live": true,
       "supported_languages": ["en","es","fr","hi","it","ja","nl","pt","ru","tr","uk","zh-CN","zh-TW"],
-      "ebook_languages": []
+      "ebook_languages": ["en"]
     }
   ],
   "outline": [

src/config/last_updated.json

@@ -185,16 +185,22 @@
     "hash": "b8f7931adacb18da3ab6ad9eab418cc3",
     "size": 32
   },
-  "/static/pdfs/web_almanac_2022_js_cover_A5.pdf": {
-    "date_published": "2024-09-26T00:00:00.000Z",
-    "date_modified": "2024-09-20T00:00:00.000Z",
-    "hash": "ba776e3c29abaa9eea11517072e3e29d"
+  "/static/pdfs/web_almanac_2024_en.pdf": {
+    "date_published": "2025-03-03T00:00:00.000Z",
+    "date_modified": "2025-03-03T00:00:00.000Z",
+    "hash": "c9c1dcd338656feacf598be3e131ca1f",
+    "size": 32
   },
-  "/static/pdfs/web_almanac_2022_js_print_A5.pdf": {
-    "date_published": "2024-09-26T00:00:00.000Z",
-    "date_modified": "2024-09-20T00:00:00.000Z",
-    "hash": "81e8470168d9c1cb3ec4fa87cb0bf335",
-    "size": 31
+  "/static/pdfs/web_almanac_2024_en_cover_A5.pdf": {
+    "date_published": "2025-03-03T00:00:00.000Z",
+    "date_modified": "2025-03-03T00:00:00.000Z",
+    "hash": "1124729db24dbc4f1d34614a52f351bc"
+  },
+  "/static/pdfs/web_almanac_2024_en_print_A5.pdf": {
+    "date_published": "2025-03-03T00:00:00.000Z",
+    "date_modified": "2025-03-03T00:00:00.000Z",
+    "hash": "3fece0f716b2d344158a3ec175bbbef5",
+    "size": 32
   },
   "en/2019/chapters/accessibility.html": {
     "date_published": "2019-11-11T00:00:00.000Z",

src/static/css/ebook.css

@@ -392,8 +392,18 @@ section.chapter {
     string-set: chapter-subtitle content() " : ";
   }
 
+  /* Work around due to flex bug. */
+  /* See: https://www.princexml.com/forum/topic/4525/image-flex-bug-in-prince-14?p=1#22775 */
   figure {
-    margin: 0;
+    margin: 0 auto;
+    display: block;
+  }
+
+  /* Work around due to flex bug. */
+  /* See: https://www.princexml.com/forum/topic/4525/image-flex-bug-in-prince-14?p=1#22775 */
+  .table-wrap {
+    margin: 0 auto;
+    display: block;
   }
 
   figure,
@@ -468,18 +478,15 @@ section.chapter {
     width: 4.29rem;
   }
 
-  /* Prince does not yet support Grid https://www.princexml.com/roadmap/ */
-  @supports not (display: grid) {
-    .content .authors li {
-      display: flex;
-      margin-bottom: 10px;
-      margin-bottom: 1rem;
-    }
+  .content .authors li {
+    display: flex;
+    margin-bottom: 10px;
+    margin-bottom: 1rem;
+  }
 
-    .authors .avatar-link {
-      flex-basis: 60px;
-      flex-shrink: 0;
-    }
+  .authors .avatar-link {
+    flex-basis: 60px;
+    flex-shrink: 0;
   }
 
   .fn {

src/templates/base/base_ebook.html

@@ -123,6 +123,7 @@
 {% if year == '2020' and lang == 'ja' %}{% set spine = 37.0 %}{% endif %}
 {% if year == '2021' %}{% set spine = 46.5 %}{% endif %}
 {% if year == '2022' %}{% set spine = 42.5 %}{% endif %}
+{% if year == '2024' %}{% set spine = 42.5 %}{% endif %}
 {% set pageWidth = 148 %}
 {% set pageHeight = 210 %}
 {% if request.args.get('unit') != None %}{% set unit = request.args.get('unit') %}{% endif %}