X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.cpp;h=dd98c52bbc7a8f4f708b843a5688d81a373d0109;hb=168cbee9ac733b28ed14078fbb4f40b2d74882b1;hp=d10bad490fad80c7bc016be29b21c7b7437817b3;hpb=bedebfc45a895e573557bf4bdfc2a6dc1af5fde7;p=lyx.git

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index d10bad490f..dd98c52bbc 100644
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -19,25 +19,14 @@ namespace lyx {
 
 
 OutputParams::OutputParams(Encoding const * enc)
-	: flavor(LATEX), math_flavor(NotApplicable), nice(false), is_child(false),
-	  moving_arg(false), intitle(false), inulemcmd(0), local_font(0), master_language(0),
-	  encoding(enc), free_spacing(false), use_babel(false), use_polyglossia(false),
-	  use_indices(false), use_japanese(false), linelen(0), depth(0),
-	  exportdata(new ExportData), inDisplayMath(false), wasDisplayMath(false),
-	  inComment(false), openbtUnit(false), only_childbibs(false),
-	  inTableCell(NO), inFloat(NONFLOAT),
-	  inIndexEntry(false), inIPA(false), inDeletedInset(0),
-	  changeOfDeletedInset(Change::UNCHANGED),
-	  par_begin(0), par_end(0), lastid(-1), lastpos(0), isLastPar(false),
-	  dryrun(false), silent(false), pass_thru(false),
-	  html_disable_captions(false), html_in_par(false),
-	  html_make_pars(true), for_toc(false), for_tooltip(false),
-	  for_search(false), for_preview(false), includeall(false)
+	: encoding(enc), exportdata(new ExportData)
 {
 	// Note: in PreviewLoader::Impl::dumpPreamble
 	// OutputParams runparams(0);
 	if (enc && enc->package() == Encoding::japanese)
 		use_japanese = true;
+	if (enc && enc->package() == Encoding::CJK)
+		use_CJK = true;
 }
 
 
@@ -47,14 +36,25 @@ OutputParams::~OutputParams()
 
 bool OutputParams::isLaTeX() const
 {
-	return flavor == LATEX || flavor == LUATEX || flavor == DVILUATEX
-		|| flavor == PDFLATEX || flavor == XETEX;
+	return flavor == Flavor::LaTeX
+			|| flavor == Flavor::LuaTeX
+			|| flavor == Flavor::DviLuaTeX
+			|| flavor == Flavor::PdfLaTeX
+			|| flavor == Flavor::XeTeX;
 }
 
 
 bool OutputParams::isFullUnicode() const
 {
-	return flavor == LUATEX|| flavor == DVILUATEX || flavor == XETEX;
+	return flavor == Flavor::LuaTeX
+			|| flavor == Flavor::DviLuaTeX
+			|| flavor == Flavor::XeTeX;
+}
+
+
+bool OutputParams::useBidiPackage() const
+{
+	return use_polyglossia && flavor == Flavor::XeTeX;
 }
 
 } // namespace lyx