From 3244799eff7affea43a2635065374a2c08a60a50 Mon Sep 17 00:00:00 2001
From: dtb <trinity@trinity.moe>
Date: Thu, 22 Dec 2022 08:36:32 -0500
Subject: [PATCH] move fonts out of X

---
 wiki/unix/X.m4     | 19 ++-----------------
 wiki/unix/fonts.m4 | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/wiki/unix/X.m4 b/wiki/unix/X.m4
index 404b8b6..f129105 100644
--- a/wiki/unix/X.m4
+++ b/wiki/unix/X.m4
@@ -25,27 +25,12 @@ the _code(`PYTHONPATH') fix works as _code(`PYTHONPATH=/usr/lib/python3.11/site-
 </P>
 
 _subheader(`Fonts')
-_subsubheader(`日本語 (Japanese)')
+_subsubheader(`日本語')
 _bibliography(`
-_bentr(`_link(`CJK characters', `https://en.wikipedia.org/wiki/CJK_characters') (Wikipedia)')
-_bentr(`_link(`jiskan', `https://ja.wikipedia.org/wiki/Jiskan') (Wikipedia) (_link(`English', `https://ja-m-wikipedia-org.translate.goog/wiki/Jiskan'))')
 _bentr(`_link(`Xorg', `https://gitlab.freedesktop.org/xorg/')/_link(`font/jis-misc', `https://gitlab.freedesktop.org/xorg/font/jis-misc')')
-_bentr(`_link(`久しぶりにPostmarketOS on PinePhone', `https://twitter.com/osakanataro2/status/1379410388110864385')')
 ')
 <P>
-jiskan is a family of fonts comprising jiskan16 and jiskan24.
-Both are included in Xorg, in the source tree at font/jis-misc but usually packaged separately (_package(`font-jis-misc') on _ref(`#alpine')).
-</P>
-
-_subsubheader(`Noto')
-_bibliography(`
-_bentr(`_link(`Noto fonts', `https://en.wikipedia.org/wiki/Noto_fonts') (Wikipedia)')
-')
-<P>
-Noto has glyphs for CJK characters and emoji.
-</P>
-<P>
-On _ref(`#alpine'), the _link(`_package(`font-noto-')', `https://pkgs.alpinelinux.org/packages?name=font-noto-*&branch=edge&repo=&arch=&maintainer=') prefix precedes all Noto family fonts.
+Both jiskan16 and jiskan24 are included in Xorg, in the source tree at font/jis-misc but usually packaged separately (_package(`font-jis-misc') on _ref(`#alpine')).
 </P>
 
 _subheader(`Mail')
diff --git a/wiki/unix/fonts.m4 b/wiki/unix/fonts.m4
index 2a7d932..f73790a 100644
--- a/wiki/unix/fonts.m4
+++ b/wiki/unix/fonts.m4
@@ -1 +1,29 @@
 _header(`Fonts')
+<P>
+Also see _ref(`#x#fonts').
+
+_subheader(`Noto')
+_bibliography(`
+_bentr(`_link(`Noto fonts', `https://en.wikipedia.org/wiki/Noto_fonts') (Wikipedia)')
+_bentr(`_link(`Overview of Unicode coverage by Noto', `https://notofonts.github.io/overview/')')
+')
+<P>
+As of 2021-04, Noto has fonts for 54% of Unicode.
+</P>
+<P>
+On _ref(`#alpine'), all Noto family fonts match the pattern _link(`_package(`font-noto-*')', `https://pkgs.alpinelinux.org/packages?name=font-noto-*').
+</P>
+
+_subheader(`日本語')
+_bibliography(`
+_bentr(`_link(`CJK characters', `https://en.wikipedia.org/wiki/CJK_characters') (Wikipedia)')
+_bentr(`_link(`jiskan', `https://ja.wikipedia.org/wiki/Jiskan') (Wikipedia) (_link(`English', `https://ja-m-wikipedia-org.translate.goog/wiki/Jiskan'))')
+_bentr(`_link(`久しぶりにPostmarketOS on PinePhone', `https://twitter.com/osakanataro2/status/1379410388110864385')')
+')
+<P>
+jiskan is a family of fonts comprising jiskan16 and jiskan24.
+</P>
+_subsubheader(`あずき')
+_bibliography(`
+_bentr(`_link(`あずきフォント', `http://azukifont.com/font/azuki.html')')
+')