anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not load the tipa package when fontspec is used

Browse Source 
This was until now only cared of by the IPA inset, not by unicodesymbols.
This commit is contained in:
Juergen Spitzmueller 2013-12-14 09:13:17 +01:00
parent 50066b46ab
commit 3f9e644c25
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/LaTeXFeatures.cpp
View File

@ -709,9 +709,6 @@ char const * simplefeatures[] = {
"fancybox",
"calc",
"units",
"tipa",
"tipx",
"tone",
"framed",
"soul",
"textcomp",
@ -859,6 +856,16 @@ string const LaTeXFeatures::getPackages() const
// The rest of these packages are somewhat more complicated
// than those above.
// The tipa package and its extenstions (tipx, tone) must not
// be loaded with non-TeX font, since fontspec includes the
// respective macros
if (mustProvide("tipa") && !params_.useNonTeXFonts)
packages << "\\usepackage{tipa}\n";
if (mustProvide("tipx") && !params_.useNonTeXFonts)
packages << "\\usepackage{tipx}\n";
if (mustProvide("tone") && !params_.useNonTeXFonts)
packages << "\\usepackage{tone}\n";
// if fontspec or newtxmath is used, AMS packages have to be loaded
// before fontspec (in BufferParams)
string const amsPackages = loadAMSPackages();

7
src/insets/InsetIPA.cpp
View File

@ -207,10 +207,9 @@ bool InsetIPA::notifyCursorLeaves(Cursor const & old, Cursor & cur)
void InsetIPA::validate(LaTeXFeatures & features) const
{
if (!buffer_->params().useNonTeXFonts) {
features.require("tipa");
features.require("tipx");
}
features.require("tipa");
features.require("tipx");
InsetText::validate(features);
}

6
src/insets/InsetIPAMacro.cpp
View File

@ -354,8 +354,7 @@ void InsetIPADeco::string2params(string const & in, InsetIPADecoParams & params)
void InsetIPADeco::validate(LaTeXFeatures & features) const
{
if (!buffer_->params().useNonTeXFonts)
features.require("tipa");
features.require("tipa");
InsetText::validate(features);
}
@ -610,8 +609,7 @@ void InsetIPAChar::validate(LaTeXFeatures & features) const
case TONE_HIGH_RISING:
case TONE_LOW_RISING:
case TONE_HIGH_RISING_FALLING:
if (!buffer_->params().useNonTeXFonts)
features.require("tone");
features.require("tone");
break;
default:
break;