From b0a9ab5caec793a217ff168fec183c8dffacdb07 Mon Sep 17 00:00:00 2001 From: stephenmk Date: Sun, 16 Jul 2023 23:10:18 -0500 Subject: [PATCH] mdict: reconfigure font styles Taking advantage of the new fallback font selection functionality in GoldenDict-ng. If the user doesn't have one of the pre-defined fonts installed, the system serif and sans-serif fonts will be used. --- data/mdict/css/daijirin2.css | 38 ++++++++++++++--------------- data/mdict/css/jitenon-kokugo.css | 12 ++++----- data/mdict/css/jitenon-kotowaza.css | 10 ++++---- data/mdict/css/jitenon-yoji.css | 10 ++++---- data/mdict/css/smk8.css | 20 +++++++-------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/data/mdict/css/daijirin2.css b/data/mdict/css/daijirin2.css index 896b1ed..f3f54a6 100644 --- a/data/mdict/css/daijirin2.css +++ b/data/mdict/css/daijirin2.css @@ -1,18 +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"); + src: local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"); } @font-face { font-family: jpmincho; - src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif"); + src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("IPAmjMincho"), local("Source Han Serif JP"), local("HanaMinA"), local("HanaMinB"); } body { margin: 0em 1em; line-height: 1.5em; - font-family: jpmincho; + font-family: jpmincho, serif; font-size: 1.2em; color: black; } @@ -43,7 +43,7 @@ span[data-name="i"] { } span[data-name="h1"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 1em; font-weight: bold; } @@ -134,7 +134,7 @@ span[data-name="キャプション"] { } span[data-name="ルビG"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.7em; font-weight: normal; vertical-align: 0.35em; @@ -142,7 +142,7 @@ span[data-name="ルビG"] { } .warichu span[data-name="ルビG"] { - font-family: jpmincho; + font-family: jpmincho, serif; font-size: 0.5em; font-weight: normal; vertical-align: 0em; @@ -178,7 +178,7 @@ span[data-name="句仮名"] { } span[data-name="句表記"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -189,7 +189,7 @@ span[data-name="句項目"] { } span[data-name="和字"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; } span[data-name="品詞行"] { @@ -209,7 +209,7 @@ span[data-name="大語義"] { span[data-name="大語義num"] { margin: 0.025em; padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.8em; color: white; background-color: black; @@ -227,7 +227,7 @@ span[data-name="慣用G"] { } span[data-name="欧字"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; } span[data-name="歴史仮名"] { @@ -248,7 +248,7 @@ span[data-name="準大語義"] { span[data-name="準大語義num"] { margin: 0.025em; padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.8em; border: solid 1px black; } @@ -256,7 +256,7 @@ span[data-name="準大語義num"] { span[data-name="漢字音logo"] { margin: 0.025em; padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.8em; border: solid 0.5px black; border-radius: 1em; @@ -290,17 +290,17 @@ span[data-name="異字同訓"] { } span[data-name="異字同訓仮名"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } span[data-name="異字同訓漢字"] { - font-family: jpmincho; + font-family: jpmincho, serif; font-weight: normal; } span[data-name="異字同訓表記"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -321,12 +321,12 @@ rt { } span[data-name="見出仮名"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } span[data-name="見出相当部"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -371,7 +371,7 @@ span[data-name="logo"] { } .gothic { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -417,7 +417,7 @@ div[data-child-links] ul { div[data-child-links] span { padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; 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 94f9ec9..da46bf8 100644 --- a/data/mdict/css/jitenon-kokugo.css +++ b/data/mdict/css/jitenon-kokugo.css @@ -1,16 +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"); + src: local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"); } @font-face { font-family: jpmincho; - src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif"); + src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("IPAmjMincho"), local("Source Han Serif JP"), local("HanaMinA"), local("HanaMinB"); } body { - font-family: jpmincho; + font-family: jpmincho, serif; line-height: 1.5em; } @@ -21,7 +21,7 @@ table, th, td { } th { - font-family: jpgothic; + font-family: jpgothic, sans-serif; color: black; background-color: lightgray; font-weight: normal; @@ -40,7 +40,7 @@ td ul { } .読み方 { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -51,7 +51,7 @@ td ul { } .num_icon { - font-family: jpgothic; + font-family: jpgothic, sans-serif; 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 56d7c65..2929f89 100644 --- a/data/mdict/css/jitenon-kotowaza.css +++ b/data/mdict/css/jitenon-kotowaza.css @@ -1,16 +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"); + src: local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"); } @font-face { font-family: jpmincho; - src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif"); + src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("IPAmjMincho"), local("Source Han Serif JP"), local("HanaMinA"), local("HanaMinB"); } body { - font-family: jpmincho; + font-family: jpmincho, serif; line-height: 1.5em; } @@ -21,7 +21,7 @@ table, th, td { } th { - font-family: jpgothic; + font-family: jpgothic, sans-serif; color: black; background-color: lightgray; font-weight: normal; @@ -36,7 +36,7 @@ a { } .読み方 { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } diff --git a/data/mdict/css/jitenon-yoji.css b/data/mdict/css/jitenon-yoji.css index 56d7c65..2929f89 100644 --- a/data/mdict/css/jitenon-yoji.css +++ b/data/mdict/css/jitenon-yoji.css @@ -1,16 +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"); + src: local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"); } @font-face { font-family: jpmincho; - src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif"); + src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("IPAmjMincho"), local("Source Han Serif JP"), local("HanaMinA"), local("HanaMinB"); } body { - font-family: jpmincho; + font-family: jpmincho, serif; line-height: 1.5em; } @@ -21,7 +21,7 @@ table, th, td { } th { - font-family: jpgothic; + font-family: jpgothic, sans-serif; color: black; background-color: lightgray; font-weight: normal; @@ -36,7 +36,7 @@ a { } .読み方 { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } diff --git a/data/mdict/css/smk8.css b/data/mdict/css/smk8.css index 188ab40..29a23e8 100644 --- a/data/mdict/css/smk8.css +++ b/data/mdict/css/smk8.css @@ -1,18 +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"); + src: local("Noto Sans CJK JP"), local("IPAexGothic"), local("Source Han Sans JP"); } @font-face { font-family: jpmincho; - src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("Source Han Serif JP"), local("MS PMincho"), local("serif"); + src: local("Noto Serif CJK JP"), local("IPAexMincho"), local("IPAmjMincho"), local("Source Han Serif JP"), local("HanaMinA"), local("HanaMinB"); } body { margin: 0em 1em; line-height: 1.5em; - font-family: jpmincho; + font-family: jpmincho, serif; font-size: 1.2em; color: black; } @@ -30,7 +30,7 @@ span[data-name="見出部"].pri { } span[data-name="見出仮名"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } @@ -231,7 +231,7 @@ span[data-name="EXCLAMATION"] { } span[data-name="歴史仮名"] { - font-family: jpmincho; + font-family: jpmincho, serif; font-size: 0.7em; font-weight: normal; vertical-align: 0.35em; @@ -259,13 +259,13 @@ span[data-name="基本構文em"] { } span[data-name="ウ濁音参照"] { - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-weight: bold; } span[data-name="rect"] { padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.8em; border-width: 0.05em; border-style: solid; @@ -299,7 +299,7 @@ span[data-name="大語義番号"], span[data-name="語義番号"], span[data-name="副義番号"] { margin-right: 0.25em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; } span[data-name="ref"] span[data-name="大語義番号"], @@ -327,7 +327,7 @@ span[data-name="文法解説M"], span[data-name="かぞえ方解説M"], span[data-name="派生M"] { margin-right: 0.25em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; } span[data-name="派生ロゴ"] { @@ -423,7 +423,7 @@ div[data-child-links] ul { div[data-child-links] span { padding: 0.1em; - font-family: jpgothic; + font-family: jpgothic, sans-serif; font-size: 0.8em; color: white; border-width: 0.05em;