Update on-the-fly font-substitution patterns for .eps and .svg files

Key changes:

   o Merge patterns.
   o Add patterns to catch default monospace font.
   o Use "DejaVu Sans Mono" as a fallback for unmarked monospace
     (both .eps and .svg) and Courier (only .eps).
   o Use FreeSans of gnu-freefont as Symbol font. (mdsymbol is not
     required any longer.)
   o Update rules in Makefile to catch missing nice-to-have font
     packages and to emit informative messages.
   o Update item #9 of FAQ-BUILD.txt to mention the nice-to-have
     font packages.

"DejaVu Sans Mono" is thicker than Courier or its clone "Nimbus
Mono L/PS" and easier to read in diagrams.

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

4 files changed, 30 insertions, 30 deletions

diff --git a/utilities/fixfonts-urwps.sh b/utilities/fixfonts-urwps.sh
index f3e41fe3..a7a7b988 100644
--- a/utilities/fixfonts-urwps.sh
+++ b/utilities/fixfonts-urwps.sh
@@ -19,7 +19,7 @@
 #
 # Copyright (c) 2011-2019 Paul E. McKenney, IBM Corporation.
 # Copyright (c) 2019 Paul E. McKenney, Facebook.
-# Copyright (c) 2018 Akira Yokosawa.
+# Copyright (c) 2018, 2021 Akira Yokosawa.
 
 sed	-e 's+Times-Roman-BoldItalic+NimbusSans-BoldItalic+g' \
 	-e 's+Times-Roman-Italic+NimbusSans-Italic+g' \
@@ -56,4 +56,5 @@ sed	-e 's+Times-Roman-BoldItalic+NimbusSans-BoldItalic+g' \
 	-e 's+NimbusMono-Regular+NimbusMonoPS-Regular+g' \
 	-e 's+NimbusSans-Regular-Italic+NimbusSans-Italic+g' \
 	-e 's+NimbusSans-Regular-BoldItalic+NimbusSans-BoldItalic+g' \
-	-e 's+NimbusSans-Regular-Bold+NimbusSans-Bold+g'
+	-e 's+NimbusSans-Regular-Bold+NimbusSans-Bold+g' \
+	-e 's+NimbusMonoPS-Regular+DejaVuSansMono+g'
diff --git a/utilities/fixfonts.sh b/utilities/fixfonts.sh
index c5ea888a..275a289c 100644
--- a/utilities/fixfonts.sh
+++ b/utilities/fixfonts.sh
@@ -17,7 +17,7 @@
 #
 # Copyright (c) 2011-2019 Paul E. McKenney, IBM Corporation.
 # Copyright (c) 2019 Paul E. McKenney, Facebook.
-# Copyright (c) 2018 Akira Yokosawa
+# Copyright (c) 2018, 2021 Akira Yokosawa
 
 sed	-e 's+Times-Roman-BoldItalic+NimbusSanL-BoldItal+g' \
 	-e 's+Times-Roman-Italic+NimbusSanL-ReguItal+g' \
@@ -44,4 +44,5 @@ sed	-e 's+Times-Roman-BoldItalic+NimbusSanL-BoldItal+g' \
 	-e 's+Courier+NimbusMonL-Regu+g' \
 	-e 's+NimbusSanL-Regu-Italic+NimbusSanL-ReguItal+g' \
 	-e 's+NimbusSanL-Regu-BoldItalic+NimbusSanL-BoldItal+g' \
-	-e 's+NimbusSanL-Regu-Bold+NimbusSanL-Bold+g'
+	-e 's+NimbusSanL-Regu-Bold+NimbusSanL-Bold+g' \
+	-e 's+NimbusMonL-Regu +DejaVuSansMono +g'
diff --git a/utilities/fixsvgfonts-urwps.sh b/utilities/fixsvgfonts-urwps.sh
index 17c30e81..a3dcd91a 100644
--- a/utilities/fixsvgfonts-urwps.sh
+++ b/utilities/fixsvgfonts-urwps.sh
@@ -3,21 +3,18 @@
 # fixsvgfonts-urwps.sh: Convert an .svg file to use embeddable fonts,
 #       taking from standard input and putting on standard output.
 #
-# Copyright (c) 2018 Akira Yokosawa
+# Copyright (c) 2018, 2021 Akira Yokosawa
 
-sed	-e 's+family:Helvetica+family:Nimbus Sans+g' \
-	-e 's+family="Helvetica+family="Nimbus Sans+g' \
-	-e 's+family:Sans+family:Nimbus Sans+g' \
-	-e 's+cation:Sans+cation:Nimbus Sans+g' \
-	-e 's+family:sans-serif+family:Nimbus Sans+g' \
-	-e 's+cation:sans-serif+cation:Nimbus Sans+g' \
-	-e 's+family:Courier+family:Nimbus Mono PS+g' \
-	-e 's+family="Courier+family="Nimbus Mono PS+g' \
-	-e 's+family:Symbol+family:MdSymbol+g' \
-	-e 's+cation:Symbol+cation:MdSymbol+g' \
-	-e 's+family:Nimbus Sans L+family:Nimbus Sans+g' \
-	-e 's+family="Nimbus Sans L+family="Nimbus Sans+g' \
-	-e 's+cation:Nimbus Sans L+cation:Nimbus Sans+g' \
-	-e 's+family:Nimbus Mono L+family:Nimbus Mono PS+g' \
-	-e 's+family="Nimbus Mono L+family="Nimbus Mono PS+g' \
-	-e 's+cation:Nimbus Mono L+cation:Nimbus Mono PS+g'
+sed	-e 's+:Helvetica+:Nimbus Sans+g' \
+	-e 's+="Helvetica+="Nimbus Sans+g' \
+	-e 's+:Sans+:Nimbus Sans+g' \
+	-e 's+:sans-serif+:Nimbus Sans+g' \
+	-e 's+:Courier+:Nimbus Mono PS+g' \
+	-e 's+="Courier+="Nimbus Mono PS+g' \
+	-e 's+:monospace+:DejaVu Sans Mono+g' \
+	-e 's+monospace,+DejaVu Sans Mono,+g' \
+	-e 's+:Symbol+:FreeSans+g' \
+	-e 's+:Nimbus Sans L+:Nimbus Sans+g' \
+	-e 's+="Nimbus Sans L+="Nimbus Sans+g' \
+	-e 's+:Nimbus Mono L+:Nimbus Mono PS+g' \
+	-e 's+="Nimbus Mono L+="Nimbus Mono PS+g'
diff --git a/utilities/fixsvgfonts.sh b/utilities/fixsvgfonts.sh
index 47dbaea9..1fa4fedb 100644
--- a/utilities/fixsvgfonts.sh
+++ b/utilities/fixsvgfonts.sh
@@ -3,13 +3,14 @@
 # fixsvgfonts.sh: Convert an .svg file to use embeddable fonts, taking from
 #	standard input and putting on standard output.
 #
-# Copyright (c) 2018 Akira Yokosawa
+# Copyright (c) 2018, 2021 Akira Yokosawa
 
-sed	-e 's+family:Helvetica+family:Nimbus Sans L+g' \
-	-e 's+family="Helvetica+family="Nimbus Sans L+g' \
-	-e 's+family:Sans+family:Nimbus Sans L+g' \
-	-e 's+cation:Sans+cation:Nimbus Sans L+g' \
-	-e 's+family:sans-serif+family:Nimbus Sans L+g' \
-	-e 's+cation:sans-serif+cation:Nimbus Sans L+g' \
-	-e 's+family:Courier+family:Nimbus Mono L+g' \
-	-e 's+family="Courier+family="Nimbus Mono L+g'
+sed	-e 's+:Helvetica+:Nimbus Sans L+g' \
+	-e 's+="Helvetica+="Nimbus Sans L+g' \
+	-e 's+:Sans+:Nimbus Sans L+g' \
+	-e 's+:sans-serif+:Nimbus Sans L+g' \
+	-e 's+:Courier+:Nimbus Mono L+g' \
+	-e 's+="Courier+="Nimbus Mono L+g' \
+	-e 's+:monospace+:DejaVu Sans Mono+g' \
+	-e 's+monospace,+DejaVu Sans Mono,+g' \
+	-e 's+:Symbol+:FreeSans+g'