[11_9] Support bbold font using glyph index

XmacsLabs · Dec 1, 2023 · 89525ad · 89525ad
1 parent 7ddbdab
commit 89525ad
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 0 deletions.
diff --git a/TeXmacs/fonts/tfm/math/bbold11.tfm b/TeXmacs/fonts/tfm/math/bbold11.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold14.tfm b/TeXmacs/fonts/tfm/math/bbold14.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold20.tfm b/TeXmacs/fonts/tfm/math/bbold20.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold24.tfm b/TeXmacs/fonts/tfm/math/bbold24.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold10.tfm → TeXmacs/fonts/tfm/public/bbold/bbold10.tfm b/TeXmacs/fonts/tfm/math/bbold10.tfm → TeXmacs/fonts/tfm/public/bbold/bbold10.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold12.tfm → TeXmacs/fonts/tfm/public/bbold/bbold12.tfm b/TeXmacs/fonts/tfm/math/bbold12.tfm → TeXmacs/fonts/tfm/public/bbold/bbold12.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold17.tfm → TeXmacs/fonts/tfm/public/bbold/bbold17.tfm b/TeXmacs/fonts/tfm/math/bbold17.tfm → TeXmacs/fonts/tfm/public/bbold/bbold17.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold5.tfm → TeXmacs/fonts/tfm/public/bbold/bbold5.tfm b/TeXmacs/fonts/tfm/math/bbold5.tfm → TeXmacs/fonts/tfm/public/bbold/bbold5.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold6.tfm → TeXmacs/fonts/tfm/public/bbold/bbold6.tfm b/TeXmacs/fonts/tfm/math/bbold6.tfm → TeXmacs/fonts/tfm/public/bbold/bbold6.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold7.tfm → TeXmacs/fonts/tfm/public/bbold/bbold7.tfm b/TeXmacs/fonts/tfm/math/bbold7.tfm → TeXmacs/fonts/tfm/public/bbold/bbold7.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold8.tfm → TeXmacs/fonts/tfm/public/bbold/bbold8.tfm b/TeXmacs/fonts/tfm/math/bbold8.tfm → TeXmacs/fonts/tfm/public/bbold/bbold8.tfm
diff --git a/TeXmacs/fonts/tfm/math/bbold9.tfm → TeXmacs/fonts/tfm/public/bbold/bbold9.tfm b/TeXmacs/fonts/tfm/math/bbold9.tfm → TeXmacs/fonts/tfm/public/bbold/bbold9.tfm
diff --git a/TeXmacs/fonts/type1/math/bbold10.pfb b/TeXmacs/fonts/type1/math/bbold10.pfb
diff --git a/TeXmacs/fonts/type1/math/bbold7.pfb b/TeXmacs/fonts/type1/math/bbold7.pfb
diff --git a/TeXmacs/fonts/type1/public/bbold-type1/bbold10.pfb b/TeXmacs/fonts/type1/public/bbold-type1/bbold10.pfb
diff --git a/TeXmacs/fonts/type1/public/bbold-type1/bbold5.pfb b/TeXmacs/fonts/type1/public/bbold-type1/bbold5.pfb
diff --git a/TeXmacs/fonts/type1/public/bbold-type1/bbold7.pfb b/TeXmacs/fonts/type1/public/bbold-type1/bbold7.pfb
diff --git a/src/Plugins/Metafont/tex_font.cpp b/src/Plugins/Metafont/tex_font.cpp
@@ -23,6 +23,7 @@
 #define TEX_CM 4
 #define TEX_ADOBE 5
 
+int         get_utf8_code (string c);
 static void special_initialize ();
 font_metric tfm_font_metric (tex_font_metric tfm, font_glyphs pk, double unit);
 
@@ -594,6 +595,10 @@ tex_font_rep::supports (string s) {
     if (s == "<less>") return raw_supports ('<');
     else if (s == "<gtr>") return raw_supports ('>');
     else if (N (s) == 1) return raw_supports (s[0]);
+    else if (starts (s, "<#") && N (s) == 7) {
+      int code= get_utf8_code (s);
+      return (code > 0) && (code < 256) && raw_supports ((unsigned char) code);
+    }
     else return false;
   case TEX_EC:
   case TEX_LA:
@@ -613,6 +618,11 @@ tex_font_rep::supports (string s) {
 
 void
 tex_font_rep::get_extents (string s, metric& ex) {
+  if (starts (s, "<#") && N (s) == 7) {
+    int code= get_utf8_code (s);
+    get_extents (string ((char) code), ex);
+    return;
+  }
   int i;
   switch (status) {
   case TEX_ANY:
@@ -739,6 +749,16 @@ tex_font_rep::get_xpositions (string s, SI* xpos, bool ligf) {
     break;
   }
 
+  if (starts (s, "<#") && N (s) == 7) {
+    int code= get_utf8_code (s);
+    STACK_NEW_ARRAY (s_copy, int, 1);
+    s_copy[0]= (QN) code;
+    tfm->get_xpositions (s_copy, 1, unit, xpos, ligf);
+    STACK_DELETE_ARRAY (s_copy);
+    xpos[7]= xpos[1];
+    return;
+  }
+
   STACK_NEW_ARRAY (s_copy, int, n);
   for (i= 0; i < n; i++)
     s_copy[i]= ((QN) s[i]);
@@ -753,6 +773,12 @@ tex_font_rep::get_xpositions (string s, SI* xpos) {
 
 void
 tex_font_rep::draw_fixed (renderer ren, string s, SI ox, SI y) {
+  if (starts (s, "<#") && N (s) == 7) {
+    int   code= get_utf8_code (s);
+    glyph gl  = pk->get (code);
+    ren->draw (code, pk, ox, y);
+    return;
+  }
   int i;
   switch (status) {
   case TEX_ANY: