resolves asciidoctor#2482 add select combining characters to bundled …

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

Hide file tree

Showing 16 changed files with 6 additions and 5 deletions.
diff --git a/data/fonts/ABOUT-mplus1p-subset b/data/fonts/ABOUT-mplus1p-subset
@@ -17,7 +17,7 @@ The following changes were made using fontforge to produce mplus1p-regular-fallb
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0–U+21d5, U+2190–U+2195, U+2610–U+2611, U+2713–U+2714)
- ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730, U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731, U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730, U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731, U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+0300-U+030F)
  ** .notdef glyph
 * Added BOM (U+feff), hair space (U+200a), zero-width space (U+200b) and line feed (U+000a) characters (from blank)
 * Manually added non-breaking hyphen (U+2011) from hyphen (U+002d)

diff --git a/data/fonts/ABOUT-notosans-subset b/data/fonts/ABOUT-notosans-subset
@@ -17,7 +17,7 @@ The following changes were made using fontforge to produce the notosans-*-subset
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
- ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB, U+0300-U+030F)
  ** .notdef glyph
 * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
 * Added line feed character (U+000a)

diff --git a/data/fonts/ABOUT-notoserif-subset b/data/fonts/ABOUT-notoserif-subset
@@ -17,7 +17,7 @@ The following changes were made using fontforge to produce the notoserif-*-subse
  ** General Punctuation (U+2000–U203a)
  ** Geometric Shapes (U+25a0–U25ff)
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
- ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB, U+0300-U+030F)
  ** .notdef glyph
 * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
 * Added line feed character (U+000a)

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
@@ -217,9 +217,10 @@ while (fi < num_copy_fonts)
       SelectMore(0u0168,0u0169)
       SelectMore(0u01a0,0u01b0)
       SelectMore(0u1ea0,0u1ef9)
-      # Small Caps
+      # Small Caps as well as combining characters used for small caps with diacritical marks
       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)
+      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