X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=4c993b6f7b9c55041a4a08e1e9b2f0490b5725d2;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=79ff5870c715edf8236de068323428f6955f0e5c;hpb=261e7ae9ce7e6a1ffc4932ff9c33107588a9a4ac;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 79ff5870c7..4c993b6f7b 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -118,6 +118,25 @@ static docstring const guilsinglright_def = from_ascii(
 	"  {\\usefont{U}{lasy}{m}{n}\\char'51}%\n"
 	"}");
 
+static docstring const textquotedbl_def = from_ascii(
+	"\\DeclareTextSymbolDefault{\\textquotedbl}{T1}");
+
+static docstring const textquotedblp_xetex_def = from_ascii(
+	"\\providecommand\\textquotedblplain{%\n"
+	"  \\bgroup\\addfontfeatures{Mapping=}\\textquotedbl\\egroup}");
+
+static docstring const textquotedblp_luatex_def = from_ascii(
+	"\\providecommand\\textquotedblplain{%\n"
+	"  \\bgroup\\addfontfeatures{RawFeature=-tlig}\\textquotedbl\\egroup}");
+
+static docstring const textquotesinglep_xetex_def = from_ascii(
+	"\\providecommand\\textquotesingleplain{%\n"
+	"  \\bgroup\\addfontfeatures{Mapping=}\\textquotesingle\\egroup}");
+
+static docstring const textquotesinglep_luatex_def = from_ascii(
+	"\\providecommand\\textquotesingleplain{%\n"
+	"  \\bgroup\\addfontfeatures{RawFeature=-tlig}\\textquotesingle\\egroup}");
+
 static docstring const paragraphleftindent_def = from_ascii(
 	"\\newenvironment{LyXParagraphLeftIndent}[1]%\n"
 	"{\n"
@@ -206,7 +225,7 @@ static docstring const changetracking_tikz_math_sout_def = from_ascii(
 	"%% Strike out display math with tikz\n"
 	"\\usepackage{tikz}\n"
 	"\\usetikzlibrary{calc}\n"
-	"\\newcommand{\\lyxmathsout}[1]{\n"
+	"\\newcommand{\\lyxmathsout}[1]{%\n"
 	"  \\tikz[baseline=(math.base)]{\n"
 	"    \\node[inner sep=0pt,outer sep=0pt](math){#1};\n"
 	"    \\draw($(math.south west)+(2em,.5em)$)--($(math.north east)-(2em,.5em)$);\n"
@@ -327,6 +346,23 @@ static docstring const textbaltic_def = from_ascii(
         "\\DeclareTextCompositeCommand{\\c}{T1}{r}{\\textcommabelow{r}}\n"
         "\\DeclareTextCompositeCommand{\\c}{T1}{R}{\\textcommabelow{R}}\n");
 
+// split-level fractions
+static docstring const xfrac_def = from_ascii(
+	   "\\usepackage{xfrac}\n");
+static docstring const smallLetterFrac_def = from_ascii(
+        "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
+		"  {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
+		"\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmr}{text}\n"
+		"  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+		"\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmss}{text}\n"
+		"  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+		"\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmr}{text}\n"
+		"  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+		"\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmss}{text}\n"
+		"  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+		"\\newcommand{\\smallLetterFrac}[2]{%\n"
+		"  {\\UseCollection{xfrac}{smallLetterFrac}\\sfrac{#1}{#2}}}\n");
+
 static docstring const lyxref_def = from_ascii(
 		"\\RS@ifundefined{subsecref}\n"
 		"  {\\newref{subsec}{name = \\RSsectxt}}\n"
@@ -736,6 +772,42 @@ bool LaTeXFeatures::hasPolyglossiaExclusiveLanguages() const
 }
 
 
+vector<string> LaTeXFeatures::getPolyglossiaExclusiveLanguages() const
+{
+	vector<string> result;
+	// first the main language
+	if (params_.language->isPolyglossiaExclusive())
+		result.push_back(params_.language->display());
+	// now the secondary languages
+	LanguageList::const_iterator const begin = UsedLanguages_.begin();
+	for (LanguageList::const_iterator cit = begin;
+	     cit != UsedLanguages_.end();
+	     ++cit) {
+		if ((*cit)->isPolyglossiaExclusive())
+			result.push_back((*cit)->display());
+	}
+	return result;
+}
+
+
+vector<string> LaTeXFeatures::getBabelExclusiveLanguages() const
+{
+	vector<string> result;
+	// first the main language
+	if (params_.language->isBabelExclusive())
+		result.push_back(params_.language->display());
+	// now the secondary languages
+	LanguageList::const_iterator const begin = UsedLanguages_.begin();
+	for (LanguageList::const_iterator cit = begin;
+	     cit != UsedLanguages_.end();
+	     ++cit) {
+		if ((*cit)->isBabelExclusive())
+			result.push_back((*cit)->display());
+	}
+	return result;
+}
+
+
 string LaTeXFeatures::getBabelLanguages() const
 {
 	ostringstream languages;
@@ -757,15 +829,16 @@ string LaTeXFeatures::getBabelLanguages() const
 }
 
 
-std::map<std::string, std::string> LaTeXFeatures::getPolyglossiaLanguages() const
+set<string> LaTeXFeatures::getPolyglossiaLanguages() const
 {
-	std::map<std::string, std::string> languages;
+	set<string> languages;
 
 	LanguageList::const_iterator const begin = UsedLanguages_.begin();
 	for (LanguageList::const_iterator cit = begin;
 	     cit != UsedLanguages_.end();
 	     ++cit) {
-		languages[(*cit)->polyglossia()] = (*cit)->polyglossiaOpts();
+		// We do not need the variants here
+		languages.insert((*cit)->polyglossia());
 	}
 	return languages;
 }
@@ -877,7 +950,7 @@ char const * simplefeatures[] = {
 	"fixme",
 	"todonotes",
 	"forest",
-	"varwidth"
+	"varwidth",
 };
 
 char const * bibliofeatures[] = {
@@ -1236,7 +1309,7 @@ TexString LaTeXFeatures::getMacros() const
 		macros << lyxarrow_def << '\n';
 
 	if (!usePolyglossia() && mustProvide("textgreek")) {
-	        // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
+	    // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
 	   	if (params_.font_encoding() == "default")
 			macros << textgreek_LGR_def;
 		macros << textgreek_def << '\n';
@@ -1249,7 +1322,7 @@ TexString LaTeXFeatures::getMacros() const
 		macros << textcyr_def << '\n';
 	}
 
-        // non-standard text accents:
+	// non-standard text accents:
 	if (mustProvide("textcommaabove") || mustProvide("textcommaaboveright") ||
 	    mustProvide("textcommabelow") || mustProvide("textbaltic"))
 		macros << lyxaccent_def;
@@ -1266,6 +1339,13 @@ TexString LaTeXFeatures::getMacros() const
 	if (mustProvide("textbaltic"))
 		macros << textbaltic_def << '\n';
 
+	// split-level fractions
+	if (mustProvide("xfrac") || mustProvide("smallLetterFrac"))
+		macros << xfrac_def << '\n';
+
+	if (mustProvide("smallLetterFrac"))
+		macros << smallLetterFrac_def << '\n';
+
 	if (mustProvide("lyxmathsym"))
 		macros << lyxmathsym_def << '\n';
 
@@ -1312,6 +1392,20 @@ TexString LaTeXFeatures::getMacros() const
 		macros << guillemotleft_def << '\n';
 	if (mustProvide("guillemotright"))
 		macros << guillemotright_def << '\n';
+	if (mustProvide("textquotedbl"))
+		macros << textquotedbl_def << '\n';
+	if (mustProvide("textquotesinglep")) {
+		if (runparams_.flavor == OutputParams::XETEX)
+			macros << textquotesinglep_xetex_def << '\n';
+		else
+			macros << textquotesinglep_luatex_def << '\n';
+	}
+	if (mustProvide("textquotedblp")) {
+		if (runparams_.flavor == OutputParams::XETEX)
+			macros << textquotedblp_xetex_def << '\n';
+		else
+			macros << textquotedblp_luatex_def << '\n';
+	}
 
 	// Math mode
 	if (mustProvide("binom") && !isRequired("amsmath"))