tex2lyx: support for newtxmath

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 1e14cef7072137777407a7d1191870f625d630d9..7d71f333f051417c94563b40548bd152d627eb17 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -138,7 +138,7 @@ const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
 "courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
 "newcent", "tgcursor", "txtt", 0};
 
-const char * const known_math_fonts[] = { "eulervm", 0};
+const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
 
 const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
 "a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
@@ -738,6 +738,17 @@ void Preamble::handle_package(Parser &p, string const & name,
        if (is_known(name, known_math_fonts))
                h_font_math = name;
 
+       if (name == "newtxmath") {
+               if (opts.empty())
+                       h_font_math = "newtxmath";
+               else if (opts == "garamondx")
+                       h_font_math = "garamondx-ntxm";
+               else if (opts == "libertine")
+                       h_font_math = "libertine-ntxm";
+               else if (opts == "minion")
+                       h_font_math = "minion-ntxm";
+       }
+
        if (name == "refstyle")
                h_use_refstyle = "1";
 

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index d45296944c94c64b3d9301e43f13f0ba900c7450..ebaa56de99771f6302f5d8b99494192b6dd2712c 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -68,7 +68,6 @@ Format LaTeX feature                        LyX feature
        \bottomtiebar
 439    MinionPro.sty                        \font_roman, \font_osf
 440    MinionPro.sty,                       \font_math
-442    newtxmath.sty,                       \font_math
 443    unicode-math.sty                     InsetMath*
 444    libertine.sty,                       \font_osf, \font_sans
        libertine-legacy.sty
@@ -80,7 +79,6 @@ Format LaTeX feature                        LyX feature
 448
 449    \item[<arg>]                         \begin_inset Argument item:<nr>
 450    ugm LaTeX font,                      \font_roman, \font_osf,
-       [garamondx]{newtxmath}               \font_math
 451    beamer overlay arguments             InsetArgument
        \command<arg>, \begin{env}<arg>
 452    beamer block arguments               InsetArgument