From c7510496f85d7486b6f703b1e5ef6be33b2181a9 Mon Sep 17 00:00:00 2001
From: "kujiu (@uberwald)" <kujiu-git@kujiu.eu>
Date: Thu, 17 Aug 2023 02:03:10 +0200
Subject: [PATCH] Sphinx 7 & python 3.11 support

---
 requirements.txt |  2 +-
 source/conf.py   | 21 ++++++++++++---------
 source/refs.bib  |  0
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 source/refs.bib

diff --git a/requirements.txt b/requirements.txt
index 667ff23..aba3139 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,6 @@ sphinxcontrib-bibtex
 sphinx-galleria
 reportlab
 ablog
-sphinx-storymaker
+#sphinx-storymaker
 sphinx-fasvg
 sphinx-nervproject-theme
diff --git a/source/conf.py b/source/conf.py
index 0004fca..a48b7ea 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -14,7 +14,7 @@ vcs_uri = "https://procrastinator.nerv-project.eu/"
 repository_name = 'kujiu_writer/'
 repository_name += 'kujiulabs'
 use_ablog = True
-use_bibtex = False
+use_bibtex = True
 use_git = True
 language = 'fr'
 html_favicon = '_static/favicon.ico'
@@ -51,6 +51,10 @@ if use_ablog:
     fontawesome_included = True
     fontawesome_css_file = ''
     show_authors = True
+    blog_languages = {
+        'fr': ('French', None),
+        'en': ('English', None),
+    }
 
 if use_git:
     from git import Repo
@@ -126,8 +130,7 @@ html_theme_options = {
         ('solid', 'books', 'KBR&nbsp;Éditeur&nbsp;15066', 'https://www.kbr.be', False),
         ('solid', 'comment', 'xmpp', 'xmpp:kujiu@kujiu.eu', True),
         ('brands', 'mastodon', 'mastodon', 'https://tiphon.nerv-project.eu/@kujiu', True),
-        ('brands', 'twitter', 'twitter', 'https://twitter.com/@kujiu', True),
-        ('solid', 'mug-hot', 'gitea', 'https://procrastinator.nerv-project.eu/kujiu', True),
+        ('solid', 'mug-hot', 'forgejo', 'https://procrastinator.nerv-project.eu/kujiu', True),
         ('solid', 'film', 'peertube', 'https://clap.nerv-project.eu/video-channels/kujiu_channel/videos', True),
         ('brands', 'youtube', 'youtube', 'https://www.youtube.com/channel/UC6LcFMVZUOs4WbKvV3p1xVw', True),
         ('solid', 'podcast', 'podcasts', 'https://kreskenn.nerv-project.eu/channels/kujiulabs/', True),
@@ -135,7 +138,6 @@ html_theme_options = {
         ('solid', 'rss', 'rss', 'https://kujiu.eu/blog/atom.xml', False),
         ('solid', 'envelope', 'newsletter', 'https://e8eb781a.sibforms.com/serve/MUIEAJvJnY3tRS7Nh4RvCneup4b6zYrTqGw3TUsq3igy7_QACEbhSd8G26qTXES6uJS-fGtcGBaji0Os0eWK2CY2it80LrbbXL7WRdNibWlpKtLD2sv43rRROQxdBktxF0qci_7hXvkRuAKLRk_X3NtNCkRUV2prn0BHb4g4tr8vck_yic-nw_ZQlmAPWSrFd1FwGBGTqf1M_Frm', False),
     ],
-    "twitter_user": "kujiu",
     "mastodon_user": "@kujiu@tiphon.nerv-project.eu",
     "fathom": {
         'url': '//casanabo.nerv-project.eu',
@@ -168,12 +170,12 @@ html_sidebars = {
     '**': [
         'about.html',
         'social.html',
-        'postcard.html',
+        'ablog/postcard.html',
         'util/sidetoc.html',
-        'recentposts.html',
-        'categories.html',
-        'tagcloud.html',
-        'archives.html',
+        'ablog/recentposts.html',
+        'ablog/categories.html',
+        'ablog/tagcloud.html',
+        'ablog/archives.html',
         'util/searchbox.html',
     ],
 }
@@ -330,6 +332,7 @@ seqdiag_debug = diag_debug
 
 
 if use_bibtex:
+    bibtex_bibfiles = ['refs.bib']
     import pybtex.style.formatting
     from pybtex.richtext import Text, Tag
 
diff --git a/source/refs.bib b/source/refs.bib
new file mode 100644
index 0000000..e69de29