r40874 - lyx-devel/trunk/src/insets

[spitz]

Author: spitz
Date: Tue Mar  6 11:39:01 2012
New Revision: 40874
URL: http://www.lyx.org/trac/changeset/40874

Log:
InsetIPA: fixes with non-tex-fonts.

Modified:
   lyx-devel/trunk/src/insets/InsetIPA.cpp

Modified: lyx-devel/trunk/src/insets/InsetIPA.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetIPA.cpp     Tue Mar  6 10:41:41 2012        
(r40873)
+++ lyx-devel/trunk/src/insets/InsetIPA.cpp     Tue Mar  6 11:39:01 2012        
(r40874)
@@ -187,6 +187,8 @@
 
 void InsetIPA::validate(LaTeXFeatures & features) const
 {
+       if (buffer_->params().useNonTeXFonts)
+               return;
        features.require("tipa");
        features.require("tipx");
 }
@@ -195,12 +197,14 @@
 void InsetIPA::latex(otexstream & os, OutputParams const & runparams) const
 {
        bool const multipar = (text().paragraphs().size() > 1);
-       if (multipar)
+       // fontspec knows \textipa, but not the IPA environment
+       bool const nontexfonts = buffer_->params().useNonTeXFonts;
+       if (multipar && !nontexfonts)
                os << "\\begin{IPA}\n";
        else
                os << "\\textipa{";
        InsetText::latex(os, runparams);
-       if (multipar)
+       if (multipar && !nontexfonts)
                os << "\n\\end{IPA}";
        else
                os << "}";