X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=bbc76d18523eb714573fdc7dc874e90baf90e8e5;hb=a7f8fb8c5fe8f99b30e3d507dc20d455c65a4b27;hp=b25332f775df692e5beee59846c3dff013e52d0f;hpb=4950bb5ebc029b91f32369adcaa7703d5debf319;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index b25332f775..bbc76d1852 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -24,6 +24,7 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "Language.h"
+#include "LaTeXFonts.h"
 #include "LaTeXPackages.h"
 #include "Layout.h"
 #include "Lexer.h"
@@ -276,6 +277,42 @@ static docstring const lyxref_def = from_ascii(
 		"  {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n" 
 		"  {}\n");
 
+// Make sure the columns are also outputed as rtl
+static docstring const rtloutputdblcol_def = from_ascii(
+	"\\def\\@outputdblcol{%\n"
+	"  \\if@firstcolumn\n"
+	"    \\global \\@firstcolumnfalse\n"
+	"    \\global \\setbox\\@leftcolumn \\box\\@outputbox\n"
+	"  \\else\n"
+	"    \\global \\@firstcolumntrue\n"
+	"    \\setbox\\@outputbox \\vbox {%\n"
+	"      \\hb@xt@\\textwidth {%\n"
+	"      \\kern\\textwidth \\kern-\\columnwidth %**\n"
+	"      \\hb@xt@\\columnwidth {%\n"
+	"         \\box\\@leftcolumn \\hss}%\n"
+	"      \\kern-\\textwidth %**\n"
+	"      \\hfil\n"
+	"      {\\normalcolor\\vrule \\@width\\columnseprule}%\n"
+	"      \\hfil\n"
+	"      \\kern-\\textwidth  %**\n"
+	"      \\hb@xt@\\columnwidth {%\n"
+	"         \\box\\@outputbox \\hss}%\n"
+	"      \\kern-\\columnwidth \\kern\\textwidth %**\n"
+	"    }%\n"
+	"  }%\n"
+	"  \\@combinedblfloats\n"
+	"  \\@outputpage\n"
+	"  \\begingroup\n"
+	"  \\@dblfloatplacement\n"
+	"  \\@startdblcolumn\n"
+	"  \\@whilesw\\if@fcolmade \\fi\n"
+	"  {\\@outputpage\n"
+	"    \\@startdblcolumn}%\n"
+	"  \\endgroup\n"
+	"  \\fi\n"
+	"}\n"
+	"\\@mparswitchtrue\n");
+
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -317,7 +354,7 @@ LaTeXFeatures::LangPackage LaTeXFeatures::langPackage(bool englishbabel) const
 	bool const polyglossia_required =
 		isRequired("polyglossia")
 		&& isAvailable("polyglossia")
-		&& !params_.documentClass().provides("babel")
+		&& !isProvided("babel")
 		&& this->hasOnlyPolyglossiaLanguages();
 	bool const babel_required = 
 		((englishbabel || bufferParams().language->lang() != "english")
@@ -435,9 +472,39 @@ bool LaTeXFeatures::isRequired(string const & name) const
 }
 
 
+bool LaTeXFeatures::isProvided(string const & name) const
+{
+	if (params_.useNonTeXFonts)
+		return params_.documentClass().provides(name);
+
+	bool const ot1 = (params_.font_encoding() == "default"
+		|| params_.font_encoding() == "OT1");
+	bool const complete = (params_.fonts_sans == "default")
+		&& (params_.fonts_typewriter == "default");
+	bool const nomath = (params_.fonts_math == "default");
+	return params_.documentClass().provides(name)
+		|| theLaTeXFonts().getLaTeXFont(
+			from_ascii(params_.fonts_roman)).provides(name, ot1,
+								  complete,
+								  nomath)
+		|| theLaTeXFonts().getLaTeXFont(
+			from_ascii(params_.fonts_sans)).provides(name, ot1,
+								 complete,
+								 nomath)
+		|| theLaTeXFonts().getLaTeXFont(
+			from_ascii(params_.fonts_typewriter)).provides(name, ot1,
+								       complete,
+								       nomath)
+		|| theLaTeXFonts().getLaTeXFont(
+			from_ascii(params_.fonts_math)).provides(name, ot1,
+								       complete,
+								       nomath);
+}
+
+
 bool LaTeXFeatures::mustProvide(string const & name) const
 {
-	return isRequired(name) && !params_.documentClass().provides(name);
+	return isRequired(name) && !isProvided(name);
 }
 
 
@@ -621,6 +688,7 @@ char const * simplefeatures[] = {
 	"units",
 	"tipa",
 	"tipx",
+	"tone",
 	"framed",
 	"soul",
 	"textcomp",
@@ -720,7 +788,6 @@ string const LaTeXFeatures::getColorOptions() const
 string const LaTeXFeatures::getPackages() const
 {
 	ostringstream packages;
-	DocumentClass const & tclass = params_.documentClass();
 
 	// FIXME: currently, we can only load packages and macros known
 	// to LyX.
@@ -791,9 +858,9 @@ string const LaTeXFeatures::getPackages() const
 
 	// makeidx.sty
 	if (isRequired("makeidx") || isRequired("splitidx")) {
-		if (!tclass.provides("makeidx") && !isRequired("splitidx"))
+		if (!isProvided("makeidx") && !isRequired("splitidx"))
 			packages << "\\usepackage{makeidx}\n";
-		if (!tclass.provides("splitidx") && isRequired("splitidx"))
+		if (mustProvide("splitidx"))
 			packages << "\\usepackage{splitidx}\n";
 		packages << "\\makeindex\n";
 	}
@@ -813,7 +880,7 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage[ps,mover]{lyxskak}\n";
 
 	// setspace.sty
-	if (mustProvide("setspace") && !tclass.provides("SetSpace"))
+	if (mustProvide("setspace") && !isProvided("SetSpace"))
 		packages << "\\usepackage{setspace}\n";
 
 	// esint must be after amsmath and wasysym, since it will redeclare
@@ -826,7 +893,7 @@ string const LaTeXFeatures::getPackages() const
 	// Some classes load natbib themselves, but still allow (or even require)
 	// plain numeric citations (ReVTeX is such a case, see bug 5182).
 	// This special case is indicated by the "natbib-internal" key.
-	if (mustProvide("natbib") && !tclass.provides("natbib-internal")) {
+	if (mustProvide("natbib") && !isProvided("natbib-internal")) {
 		packages << "\\usepackage[";
 		if (params_.citeEngineType() == ENGINE_TYPE_NUMERICAL)
 			packages << "numbers";
@@ -1049,6 +1116,9 @@ docstring const LaTeXFeatures::getMacros() const
 	if (mustProvide("ct-none"))
 		macros << changetracking_none_def;
 
+	if (mustProvide("rtloutputdblcol"))
+		macros << rtloutputdblcol_def;
+
 	return macros.str();
 }
 
@@ -1211,6 +1281,7 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const
 
 
 namespace {
+
 docstring const getFloatI18nPreamble(docstring const & type,
 			docstring const & name, Language const * lang,
 			Encoding const & enc, bool const polyglossia)