resolves asciidoctor#2482 add select combining characters to bundled …

…fonts
mojavelinux · Jan 29, 2024 · 9672edf · 9672edf
1 parent c53c906
commit 9672edf
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 1 deletion.
diff --git a/data/fonts/ABOUT-mplus1p-subset b/data/fonts/ABOUT-mplus1p-subset
@@ -9,6 +9,7 @@ The following changes were made using fontforge to produce mplus1p-regular-fallb
  ** Latin Extended-A (U+0100–U+017f)
  ** Latin Extended-B (U+0180–U+024f)
  ** IPA (U+0259, U+02b0–U+02ff)
+ ** Combining characters (U+0300-U+030F) (used for NFD normalized forms of characters with a diacritical mark)
  ** Greek (U+0370–U+03ff)
  ** Cyrillic (U+0400–U+04ff)
  ** Vietnamese (U+01a0–U01b0, U+1ea0–U1ef9)

diff --git a/data/fonts/ABOUT-notosans-subset b/data/fonts/ABOUT-notosans-subset
@@ -10,6 +10,7 @@ The following changes were made using fontforge to produce the notosans-*-subset
  ** Basic Latin (U+0020–U+007e)
  ** Latin-1 Supplement (U+00a0–U+00fd)
  ** Latin Extended-A (U+0100–U+017f)
+ ** Combining characters (U+0300-U+030F) (used for NFD normalized forms of characters with a diacritical mark)
  ** Greek (U+0370–U+03ff)
  ** Cyrillic (U+0400–U+04ff)
  ** Vietnamese (U+01a0–U01b0, U+1ea0–U1ef9)

diff --git a/data/fonts/ABOUT-notoserif-subset b/data/fonts/ABOUT-notoserif-subset
@@ -10,6 +10,7 @@ The following changes were made using fontforge to produce the notoserif-*-subse
  ** Basic Latin (U+0020–U+007e)
  ** Latin-1 Supplement (U+00a0–U+00fd)
  ** Latin Extended-A (U+0100–U+017f)
+ ** Combining characters (U+0300-U+030F) (used for NFD normalized forms of characters with a diacritical mark)
  ** Greek (U+0370–U+03ff)
  ** Cyrillic (U+0400–U+04ff)
  ** Vietnamese (U+01a0–U01b0, U+1ea0–U1ef9)

diff --git a/data/fonts/mplus1p-regular-fallback.ttf b/data/fonts/mplus1p-regular-fallback.ttf
diff --git a/data/fonts/notosans-bold-subset.ttf b/data/fonts/notosans-bold-subset.ttf
diff --git a/data/fonts/notosans-bold_italic-subset.ttf b/data/fonts/notosans-bold_italic-subset.ttf
diff --git a/data/fonts/notosans-italic-subset.ttf b/data/fonts/notosans-italic-subset.ttf
diff --git a/data/fonts/notosans-regular-subset.ttf b/data/fonts/notosans-regular-subset.ttf
diff --git a/data/fonts/notoserif-bold-subset.ttf b/data/fonts/notoserif-bold-subset.ttf
diff --git a/data/fonts/notoserif-bold_italic-subset.ttf b/data/fonts/notoserif-bold_italic-subset.ttf
diff --git a/data/fonts/notoserif-italic-subset.ttf b/data/fonts/notoserif-italic-subset.ttf
diff --git a/data/fonts/notoserif-regular-subset.ttf b/data/fonts/notoserif-regular-subset.ttf
diff --git a/scripts/subset-fonts.pe b/scripts/subset-fonts.pe
@@ -220,6 +220,8 @@ while (fi < num_copy_fonts)
       # Small Caps
       SelectMoreSingletons(0u1d00,0u0299,0u1d04,0u1d05,0u1d07,0ua730,0u0262,0u029c,0u026a,0u1d0a,0u1d0b,0u029f,0u1d0d)
       SelectMoreSingletons(0u0274,0u1d0f,0u1d18,0ua7af,0u0280,0ua731,0u1d1b,0u1d1c,0u1d20,0u1d21,0u028f,0u1d22,0u01eb)
+      # Combining characters for NFD normalized form (needed to support small caps with a diacritical mark)
+      SelectMore(0u0300,0u030f)
       if (is_mplus)
         # CJK Symbols and Punctuation (not present in mainstream Noto Serif fonts)
         SelectMore(0u3000,0u303f)

diff --git a/spec/fixtures/i18n-font-test.adoc b/spec/fixtures/i18n-font-test.adoc
@@ -15,7 +15,7 @@ But they feared not, for they had the many tongues of Noto Serif on their side.
 
 ᴀ ʙ ᴄ ᴅ ᴇ ғ ɢ ʜ ɪ ᴊ ᴋ ʟ ᴍ ɴ o ᴘ ǫ ʀ s ᴛ ᴜ ᴠ ᴡ x ʏ ᴢ
 
-ꜰ ꞯ ꜱ (missing)
+ꜰ ꞯ ꜱ (missing) ᴇ́ (with diacritical mark)
 
 == List Markers
 

diff --git a/spec/reference/font-i18n-default-with-fallback.pdf b/spec/reference/font-i18n-default-with-fallback.pdf
diff --git a/spec/reference/font-i18n-default.pdf b/spec/reference/font-i18n-default.pdf