Merge pull request #546 from mathjax/issue2514

Fix issue with \textit, etc., not working with textmacros extension. (mathjax/MathJax#2514)

Author: dpvc

ts/input/tex/ParseUtil.ts

@@ -236,14 +236,16 @@ namespace ParseUtil {
    * @param {TexParser} parser The calling parser.
    * @param {string} text The text in the math expression to parse.
    * @param {number|string=} level The scriptlevel.
+   * @param {string} font The mathvariant to use
    * @return {MmlNode[]} The nodes corresponding to the internal math expression.
    */
   export function internalMath(parser: TexParser, text: string,
-                               level?: number | string): MmlNode[] {
+                               level?: number | string, font?: string): MmlNode[] {
     if (parser.configuration.options.internalMath) {
-      return parser.configuration.options.internalMath(parser, text, level);
+      return parser.configuration.options.internalMath(parser, text, level, font);
     }
-    let def = (parser.stack.env['font'] ? {mathvariant: parser.stack.env['font']} : {});
+    let mathvariant = font || parser.stack.env.font;
+    let def = (mathvariant ? {mathvariant} : {});
     let mml: MmlNode[] = [], i = 0, k = 0, c, node, match = '', braces = 0;
     if (text.match(/\\?[${}\\]|\\\(|\\(eq)?ref\s*\{/)) {
       while (i < text.length) {

ts/input/tex/base/BaseMappings.ts

@@ -620,11 +620,11 @@ new sm.CommandMap('macros', {
   mathfrak:          ['Macro', '{\\frak #1}', 1],
   mathsf:            ['Macro', '{\\sf #1}', 1],
   mathtt:            ['Macro', '{\\tt #1}', 1],
-  textrm:            ['Macro', '\\mathord{\\rm\\text{#1}}', 1],
-  textit:            ['Macro', '\\mathord{\\it\\text{#1}}', 1],
-  textbf:            ['Macro', '\\mathord{\\bf\\text{#1}}', 1],
-  textsf:            ['Macro', '\\mathord{\\sf\\text{#1}}', 1],
-  texttt:            ['Macro', '\\mathord{\\tt\\text{#1}}', 1],
+  textrm:            ['HBox', null, TexConstant.Variant.NORMAL],
+  textit:            ['HBox', null, TexConstant.Variant.ITALIC],
+  textbf:            ['HBox', null, TexConstant.Variant.BOLD],
+  textsf:            ['HBox', null, TexConstant.Variant.SANSSERIF],
+  texttt:            ['HBox', null, TexConstant.Variant.MONOSPACE],
   pmb:               ['Macro', '\\rlap{#1}\\kern1px{#1}', 1],
   TeX:               ['Macro', 'T\\kern-.14em\\lower.5ex{E}\\kern-.115em X'],
   LaTeX:             ['Macro', 'L\\kern-.325em\\raise.21em' +

ts/input/tex/base/BaseMethods.ts

@@ -1003,10 +1003,11 @@ BaseMethods.BuildRel = function(parser: TexParser, name: string) {
  * @param {TexParser} parser The calling parser.
  * @param {string} name The macro name.
  * @param {string} style Box style.
+ * @param {string} font The mathvariant to use
  */
-BaseMethods.HBox = function(parser: TexParser, name: string, style: string) {
+BaseMethods.HBox = function(parser: TexParser, name: string, style: string, font?: string) {
   // @test Hbox
-  parser.PushAll(ParseUtil.internalMath(parser, parser.GetArgument(name), style));
+  parser.PushAll(ParseUtil.internalMath(parser, parser.GetArgument(name), style, font));
 };
 
 /**

ts/input/tex/textmacros/TextMacrosConfiguration.ts

@@ -79,14 +79,15 @@ export const textBase = Configuration.local({
  * @param {TexParser} parser      The TexParser calling this function
  * @param {string} text           The text-mode string to be processed
  * @param {number|string} level   The scriptlevel of the text
+ * @param {string} mathvariant    The mathvariant for the text
  * @return {MmlNode[]}            The final MmlNode generated for the text
  */
-function internalMath(parser: TexParser, text: string, level?: number | string): MmlNode[] {
+function internalMath(parser: TexParser, text: string, level?: number | string, mathvariant?: string): MmlNode[] {
   const config = parser.configuration.packageData.get('textmacros');
   if (!(parser instanceof TextParser)) {
     config.texParser = parser;
   }
-  return [(new TextParser(text, {}, config.parseOptions, level)).mml()];
+  return [(new TextParser(text, mathvariant ? {mathvariant} : {}, config.parseOptions, level)).mml()];
 }
 
 //

ts/input/tex/textmacros/TextParser.ts

@@ -106,10 +106,8 @@ export class TextParser extends TexParser {
    */
   public saveText() {
     if (this.text) {
-      const text = ParseUtil.internalText(this, this.text, {});
-      if (this.stack.env.mathvariant) {
-        NodeUtil.setAttribute(text, 'mathvariant', this.stack.env.mathvariant);
-      }
+      const mathvariant = this.stack.env.mathvariant;
+      const text = ParseUtil.internalText(this, this.text, mathvariant ? {mathvariant} : {});
       this.text = '';
       this.Push(text);
     }