update

devel/80_7.tmu

@@ -1,29 +1,44 @@
-<TMU|<tuple|1.0.4|1.2.9.3-rc2>>
+<TMU|<tuple|1.0.5|1.2.9.5>>
 
 <style|<tuple|generic|chinese>>
 
 <\body>
-  <\equation*>
-    <tabular*|<tformat|<table|<row|<cell|A\<longleftarrow\>B\<leftarrow\>C>|<cell|>|<cell|A\<rightarrow\>B\<longrightarrow\>C>|<cell|>|<cell|A\<leftrightarrow\>B>|<cell|>|<cell|A-B>>|<row|<cell|A\<longmapsfrom\>B\<mapsfrom\>C>|<cell|>|<cell|A\<mapsto\>B\<longmapsto\>C>|<cell|>|<cell|A\<longleftrightarrow\>B>|<cell|>|<cell|A\<longminus\>B>>|<row|<cell|A\<longtwoheadleftarrow\>B\<twoheadleftarrow\>C>|<cell|>|<cell|A\<twoheadrightarrow\>B\<longtwoheadrightarrow\>C>|<cell|>|<cell|A\<Leftrightarrow\>B>|<cell|>|<cell|A=B>>|<row|<cell|A\<Longleftarrow\>B\<Leftarrow\>C>|<cell|>|<cell|A\<Rightarrow\>B\<Longrightarrow\>C>|<cell|>|<cell|A\<Longleftrightarrow\>B>|<cell|>|<cell|A\<longequal\>B>>|<row|<cell|A\<longleftharpoonup\>B\<leftharpoonup\>C>|<cell|>|<cell|A\<rightharpoonup\>B\<longrightharpoonup\>C>|<cell|>|<cell|A\<rightleftarrows\>B>|<cell|>|<cell|A\<leftrightarrows\>B>>|<row|<cell|A\<longleftharpoondown\>B\<leftharpoondown\>C>|<cell|>|<cell|A\<rightharpoondown\>B\<longrightharpoondown\>C>|<cell|>|<cell|A\<longrightleftarrows\>B>|<cell|>|<cell|A\<longleftrightarrows\>B>>|<row|<cell|A\<longhookleftarrow\>B\<hookleftarrow\>C>|<cell|>|<cell|A\<hookrightarrow\>B\<longhookrightarrow\>C>|<cell|>|<cell|A\<rightleftharpoons\>B>|<cell|>|<cell|A\<leftrightharpoons\>B>>|<row|<cell|A\<longmapmulti\>B\<mapmulti\>C>|<cell|>|<cell|A\<multimap\>B\<longmultimap\>C>|<cell|>|<cell|A\<longrightleftharpoons\>B>|<cell|>|<cell|A\<longleftrightharpoons\>B>>>>>
-  </equation*>
+  Asana Math:
 
-  <\equation*>
-    <tabular*|<tformat|<table|<row|<cell|X<long-arrow|\<rubber-leftarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-rightarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-leftrightarrow\>|a+b+c+d>Y>>|<row|<cell|X<long-arrow|\<rubber-mapsfrom\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-mapsto\>|a+b+c+d>Y>|<cell|>|<cell|>>|<row|<cell|X<long-arrow|\<rubber-twoheadrightarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-twoheadleftarrow\>|a+b+c+d>Y>|<cell|>|<cell|>>|<row|<cell|X<long-arrow|\<rubber-Rightarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-Leftarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-Leftrightarrow\>|a+b+c+d>Y>>|<row|<cell|X<long-arrow|\<rubber-minus\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-equal\>|a+b+c+d>Y>|<cell|>|<cell|>>|<row|<cell|X<long-arrow|\<rubber-leftharpoonup\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-rightharpoonup\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-leftrightharpoons\>|a+b+c+d>Y>>|<row|<cell|X<long-arrow|\<rubber-leftharpoondown\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-rightharpoondown\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-rightleftharpoons\>|a+b+c+d>Y>>|<row|<cell|X<long-arrow|\<rubber-hookleftarrow\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-hookrightarrow\>|a+b+c+d>Y>|<cell|>|<cell|>>|<row|<cell|X<long-arrow|\<rubber-mapmulti\>|a+b+c+d>Y>|<cell|>|<cell|X<long-arrow|\<rubber-multimap\>|a+b+c+d>Y>|<cell|>|<cell|>>>>>
-  </equation*>
+  <\with|font|Asana Math>
+    <\equation*>
+      <big|sum><big|int><big|iint><big|iiint><big|idotsint><big|oint><big|oiint><big|oplus><big|otimes><big|pluscup><big|interleave><around*|{|<frac||>|}> <around*|{|<frac|<frac||>|>|}><sqrt|1+<sqrt|2>>
+    </equation*>
+  </with>
+
+  Fira Math:
 
   \;
 
   <\equation*>
-    <tabular*|<tformat|<table|<row|<cell|\<upminus\>>|<cell|\<uparrow\>>|<cell|\<downarrow\>>|<cell|\<updownarrow\>>|<cell|>|<cell|\<downequal\>>|<cell|\<Uparrow\>>|<cell|\<Downarrow\>>|<cell|\<Updownarrow\>>|<cell|>|<cell|\<upharpoonleft\>>|<cell|\<downharpoonleft\>>|<cell|\<upharpoonright\>>|<cell|\<downharpoonright\>>|<cell|>|<cell|\<mapsup\>>|<cell|\<mapsdown\>>|<cell|\<hookuparrow\>>|<cell|\<hookdownarrow\>>>|<row|<cell|\<longdownminus\>>|<cell|\<longuparrow\>>|<cell|\<longdownarrow\>>|<cell|\<longupdownarrow\>>|<cell|>|<cell|\<longdownequal\>>|<cell|\<Longuparrow\>>|<cell|\<Longdownarrow\>>|<cell|\<Longupdownarrow\>>|<cell|>|<cell|\<longupharpoonleft\>>|<cell|\<longdownharpoonleft\>>|<cell|\<longupharpoonright\>>|<cell|\<longdownharpoonright\>>|<cell|>|<cell|\<longmapsup\>>|<cell|\<longmapsdown\>>|<cell|\<longhookuparrow\>>|<cell|\<longhookdownarrow\>>>|<row|<cell|<op|\<rubber-upminus-20\>>>|<cell|<op|\<rubber-uparrow-20\>>>|<cell|<op|\<rubber-downarrow-20\>>>|<cell|<op|\<rubber-updownarrow-20\>>>|<cell|>|<cell|<op|\<rubber-upequal-20\>>>|<cell|<op|\<rubber-Uparrow-20\>>>|<cell|<op|\<rubber-Downarrow-20\>>>|<cell|<op|\<rubber-Updownarrow-20\>>>|<cell|>|<cell|<op|\<rubber-upharpoonleft-20\>>>|<cell|<op|\<rubber-downharpoonleft-20\>>>|<cell|<op|\<rubber-upharpoonright-20\>>>|<cell|<op|\<rubber-downharpoonright-20\>>>|<cell|>|<cell|<op|\<rubber-mapsup-20\>>>|<cell|<op|\<rubber-mapsdown-20\>>>|<cell|<op|\<rubber-hookuparrow-20\>>>|<cell|<op|\<rubber-hookdownarrow-20\>>>>>>>
+    <with|font|Fira Math|<big|sum><big|int><big|iint><big|iiint><big|sum><big|idotsint><big|oint><big|oiint><big|oplus><big|otimes><big|pluscup><big|interleave><around*|{|<frac||>|}> <around*|{|<frac|<frac||>|>|}><sqrt|1+<sqrt|2>>>
   </equation*>
 
-  \;
+  TeX Gyre Pagella Math:
+
+  <with|font|TeX Gyre Pagella Math|<\equation*>
+    <big|sum><with|font|TeX Gyre Pagella Math|<big|iint><big|iiint><big|idotsint><big|oint><big|oiint><big|oplus><big|otimes><big|pluscup><big|interleave><around*|{|<frac||>|}> <around*|{|<frac|<frac||>|>|}><sqrt|1+<sqrt|2>>>
+  </equation*>>
+
+  \ TeX Gyre Schola Math:
+
+  <with|font|TeX Gyre Schola Math|<\equation*>
+    <big|sum><big|iint><big|iiint><big|idotsint><big|oint><big|oiint><big|oplus><big|otimes><big|pluscup><big|interleave><around*|{|<frac||>|}> <around*|{|<frac|<frac||>|>|}><sqrt|1+<sqrt|2>>
+  </equation*>>
 </body>
 
 <\initial>
   <\collection>
-    <associate|font|Asana Math>
+    <associate|font|roman>
     <associate|font-family|rm>
-    <associate|page-type|a5>
+    <associate|font-shape|italic>
+    <associate|math-font|roman>
+    <associate|page-medium|paper>
+    <associate|page-screen-margin|false>
   </collection>
-</initial>
+</initial>

src/Graphics/Fonts/font.hpp

@@ -124,7 +124,7 @@ struct font_rep : rep<font> {
   font_rep (string name);
   font_rep (string name, font fn);
   void copy_math_pars (font fn);
-  
+
   virtual font make_rubber_font (font base);
   virtual bool supports (string c)               = 0;
   virtual void get_extents (string s, metric& ex)= 0;

src/Plugins/Freetype/rubber_unicode_font.cpp

@@ -123,7 +123,8 @@ rubber_unicode_font_rep::get_font (int nr) {
     subfn[nr]= rubber_assemble_font (base);
     break;
   case 5:
-    subfn[nr] = font_rep::make_rubber_font (base);
+    // if opentype math font fails, use default rubber font
+    subfn[nr]= font_rep::make_rubber_font (base);
     break;
   }
   return subfn[nr];
@@ -206,7 +207,7 @@ rubber_unicode_font_rep::search_font_sub_opentype (string s, string& rew) {
     }
   }
   cout << "No variant for " << uu << " -> " << glyphID << LF;
-  int nr = search_font_sub (s, rew);
+  int nr= search_font_sub (s, rew);
   return nr == 0 ? 5 : nr;
 }
 
@@ -284,7 +285,7 @@ rubber_unicode_font_rep::search_font_cached (string s, string& rew) {
   }
   int nr= 0;
   if (!is_nil (math_face) && !is_nil (math_face->math_table)) {
-    nr = search_font_sub_opentype (s, rew);
+    nr= search_font_sub_opentype (s, rew);
   }
   else {
     nr= search_font_sub (s, rew);

src/Plugins/Freetype/unicode_font.hpp

@@ -1,4 +1,14 @@
 
+/******************************************************************************
+ * MODULE     : unicode_font.hpp
+ * DESCRIPTION: True Type fonts (using FreeType II)
+ * COPYRIGHT  : (C) 1999  Joris van der Hoeven
+ *******************************************************************************
+ * This software falls under the GNU general public license version 3 or later.
+ * It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE
+ * in the root directory or <http://www.gnu.org/licenses/gpl-3.0.html>.
+ ******************************************************************************/
+
 #include "Freetype/free_type.hpp"
 #include "Freetype/tt_face.hpp"
 #include "Freetype/tt_file.hpp"
@@ -25,7 +35,7 @@ struct unicode_font_rep : font_rep {
   // only for OpenType fonts
   tt_face      math_face;
   ot_mathtable math_table;
-  font make_rubber_font( font base ) override;
+  font         make_rubber_font (font base) override;
 
   unicode_font_rep (string name, string family, int size, int hdpi, int vdpi);
   void tex_gyre_operators ();
@@ -59,5 +69,4 @@ struct unicode_font_rep : font_rep {
   int    metric_to_design_unit (SI m);
 };
 
-// for opentype math font
-font rubber_unicode_font(font base, tt_face face);
+font rubber_unicode_font (font base, tt_face face);