From 19fcb0d5b2d5ad2073a4f6663b2dd5777696cb6e Mon Sep 17 00:00:00 2001
From: stephenmk <stephenmk@users.noreply.github.com>
Date: Sun, 9 Jul 2023 13:34:33 -0500
Subject: [PATCH] Specify font names in MDict styles

---
 data/mdict/css/daijirin2.css        | 42 ++++++++++++++++++-----------
 data/mdict/css/jitenon-kokugo.css   | 18 ++++++++++---
 data/mdict/css/jitenon-kotowaza.css | 16 ++++++++---
 data/mdict/css/jitenon-yoji.css     | 16 ++++++++---
 data/mdict/css/smk8.css             | 27 +++++++++++++------
 5 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/data/mdict/css/daijirin2.css b/data/mdict/css/daijirin2.css
index fa512a0..59bd75a 100644
--- a/data/mdict/css/daijirin2.css
+++ b/data/mdict/css/daijirin2.css
@@ -1,8 +1,18 @@
 
+@font-face {
+    font-family: jpgothic;
+    src: local("メイリオ"), local("ヒラギノ角ゴ Pro W3"), local("Hiragino Kaku Gothic Pro"), local("Meiryo"), local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"), local("ＭＳ Ｐゴシック"), local("MS Pgothic"), local("sans-serif");
+}
+
+@font-face {
+    font-family: jpmincho;
+    src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif");
+}
+
 body {
     margin: 1em 44px 1em 1em;
     line-height: 1.5em;
-    font-family: serif;
+    font-family: jpmincho;
     font-size: 1.2em;
     color: black;
 }
@@ -33,7 +43,7 @@ span[data-name="i"] {
 }
 
 span[data-name="h1"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 1em;
     font-weight: bold;
 }
@@ -124,14 +134,14 @@ span[data-name="キャプション"] {
 }
 
 span[data-name="ルビG"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.7em;
     font-weight: normal;
     vertical-align: 0.35em;
 }
 
 .warichu span[data-name="ルビG"] {
-    font-family: serif;
+    font-family: jpmincho;
     font-size: 0.5em;
     font-weight: normal;
     vertical-align: 0em;
@@ -172,7 +182,7 @@ span[data-name="句項目"] {
 }
 
 span[data-name="和字"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
 }
 
 span[data-name="品詞行"] {
@@ -192,7 +202,7 @@ span[data-name="大語義"] {
 span[data-name="大語義num"] {
     margin: 0.025em;
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     color: white;
     background-color: black;
@@ -210,7 +220,7 @@ span[data-name="慣用G"] {
 }
 
 span[data-name="欧字"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
 }
 
 span[data-name="歴史仮名"] {
@@ -230,7 +240,7 @@ span[data-name="準大語義"] {
 span[data-name="準大語義num"] {
     margin: 0.025em;
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     border: solid 1px black;
 }
@@ -238,7 +248,7 @@ span[data-name="準大語義num"] {
 span[data-name="漢字音logo"] {
     margin: 0.025em;
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     border: solid 0.5px black;
     border-radius: 1em;
@@ -272,17 +282,17 @@ span[data-name="異字同訓"] {
 }
 
 span[data-name="異字同訓仮名"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
 span[data-name="異字同訓漢字"] {
-    font-family: serif;
+    font-family: jpmincho;
     font-weight: normal;
 }
 
 span[data-name="異字同訓表記"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
@@ -304,12 +314,12 @@ span[data-name="表外字マーク"] {
 }
 
 span[data-name="見出仮名"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
 span[data-name="見出相当部"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
@@ -354,7 +364,7 @@ span[data-name="logo"] {
 }
 
 .gothic {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
@@ -400,7 +410,7 @@ div[data-child-links] ul {
 
 div[data-child-links] span {
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     color: white;
     border-width: 0.05em;
diff --git a/data/mdict/css/jitenon-kokugo.css b/data/mdict/css/jitenon-kokugo.css
index 70197ff..2200c5c 100644
--- a/data/mdict/css/jitenon-kokugo.css
+++ b/data/mdict/css/jitenon-kokugo.css
@@ -1,6 +1,16 @@
 
+@font-face {
+    font-family: jpgothic;
+    src: local("メイリオ"), local("ヒラギノ角ゴ Pro W3"), local("Hiragino Kaku Gothic Pro"), local("Meiryo"), local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"), local("ＭＳ Ｐゴシック"), local("MS Pgothic"), local("sans-serif");
+}
+
+@font-face {
+    font-family: jpmincho;
+    src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif");
+}
+
 body {
-    font-family: serif;
+    font-family: jpmincho;
     margin: 1em 44px 1em 1.5em;
     line-height: 1.5em;
     font-size: 1.2em;
@@ -14,7 +24,7 @@ table, th, td {
 }
 
 th {
-    font-family: sans-serif;
+    font-family: jpgothic;
     color: black;
     background-color: lightgray;
     font-weight: normal;
@@ -33,7 +43,7 @@ td ul {
 }
 
 .読み方 {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
@@ -43,7 +53,7 @@ td ul {
 }
 
 .num_icon {
-    font-family: sans-serif;
+    font-family: jpgothic;
     padding-left: 0.25em;
     margin-right: 0.5em;
     font-size: 0.8em;
diff --git a/data/mdict/css/jitenon-kotowaza.css b/data/mdict/css/jitenon-kotowaza.css
index 05bd394..bd9c29b 100644
--- a/data/mdict/css/jitenon-kotowaza.css
+++ b/data/mdict/css/jitenon-kotowaza.css
@@ -1,6 +1,16 @@
 
+@font-face {
+    font-family: jpgothic;
+    src: local("メイリオ"), local("ヒラギノ角ゴ Pro W3"), local("Hiragino Kaku Gothic Pro"), local("Meiryo"), local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"), local("ＭＳ Ｐゴシック"), local("MS Pgothic"), local("sans-serif");
+}
+
+@font-face {
+    font-family: jpmincho;
+    src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif");
+}
+
 body {
-    font-family: serif;
+    font-family: jpmincho;
     margin: 1em 44px 1em 1.5em;
     line-height: 1.5em;
     font-size: 1.2em;
@@ -14,7 +24,7 @@ table, th, td {
 }
 
 th {
-    font-family: sans-serif;
+    font-family: jpgothic;
     color: black;
     background-color: lightgray;
     font-weight: normal;
@@ -29,7 +39,7 @@ a {
 }
 
 .読み方 {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
diff --git a/data/mdict/css/jitenon-yoji.css b/data/mdict/css/jitenon-yoji.css
index 05bd394..bd9c29b 100644
--- a/data/mdict/css/jitenon-yoji.css
+++ b/data/mdict/css/jitenon-yoji.css
@@ -1,6 +1,16 @@
 
+@font-face {
+    font-family: jpgothic;
+    src: local("メイリオ"), local("ヒラギノ角ゴ Pro W3"), local("Hiragino Kaku Gothic Pro"), local("Meiryo"), local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"), local("ＭＳ Ｐゴシック"), local("MS Pgothic"), local("sans-serif");
+}
+
+@font-face {
+    font-family: jpmincho;
+    src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif");
+}
+
 body {
-    font-family: serif;
+    font-family: jpmincho;
     margin: 1em 44px 1em 1.5em;
     line-height: 1.5em;
     font-size: 1.2em;
@@ -14,7 +24,7 @@ table, th, td {
 }
 
 th {
-    font-family: sans-serif;
+    font-family: jpgothic;
     color: black;
     background-color: lightgray;
     font-weight: normal;
@@ -29,7 +39,7 @@ a {
 }
 
 .読み方 {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
diff --git a/data/mdict/css/smk8.css b/data/mdict/css/smk8.css
index 24710ca..521b053 100644
--- a/data/mdict/css/smk8.css
+++ b/data/mdict/css/smk8.css
@@ -1,8 +1,18 @@
 
+@font-face {
+    font-family: jpgothic;
+    src: local("メイリオ"), local("ヒラギノ角ゴ Pro W3"), local("Hiragino Kaku Gothic Pro"), local("Meiryo"), local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"), local("ＭＳ Ｐゴシック"), local("MS Pgothic"), local("sans-serif");
+}
+
+@font-face {
+    font-family: jpmincho;
+    src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif");
+}
+
 body {
     margin: 1em 44px 1em 1.5em;
     line-height: 1.5em;
-    font-family: serif;
+    font-family: jpmincho;
     font-size: 1.2em;
     color: black;
 }
@@ -20,7 +30,7 @@ span[data-name="見出部"].pri {
 }
 
 span[data-name="見出仮名"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
@@ -79,6 +89,7 @@ span[data-name="教育漢字"] {
 }
 
 span[data-name="ルビ"] {
+    font-family: jpgothic;
     font-size: 0.7em;
     vertical-align: 0.5em;
 }
@@ -221,7 +232,7 @@ span[data-name="EXCLAMATION"] {
 }
 
 span[data-name="歴史仮名"] {
-    font-family: serif;
+    font-family: jpmincho;
     font-size: 0.7em;
     font-weight: normal;
     vertical-align: 0.35em;
@@ -249,13 +260,13 @@ span[data-name="基本構文em"] {
 }
 
 span[data-name="ウ濁音参照"] {
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-weight: bold;
 }
 
 span[data-name="rect"] {
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     border-width: 0.05em;
     border-style: solid;
@@ -289,7 +300,7 @@ span[data-name="大語義番号"],
 span[data-name="語義番号"],
 span[data-name="副義番号"] {
     margin-right: 0.25em;
-    font-family: sans-serif;
+    font-family: jpgothic;
 }
 
 span[data-name="ref"] span[data-name="大語義番号"],
@@ -326,7 +337,7 @@ span[data-name="文法解説M"],
 span[data-name="かぞえ方解説M"],
 span[data-name="派生M"] {
     margin-right: 0.25em;
-    font-family: sans-serif;
+    font-family: jpgothic;
 }
 
 span[data-name="派生ロゴ"] {
@@ -422,7 +433,7 @@ div[data-child-links] ul {
 
 div[data-child-links] span {
     padding: 0.1em;
-    font-family: sans-serif;
+    font-family: jpgothic;
     font-size: 0.8em;
     color: white;
     border-width: 0.05em;