Don't output default papersize

[lyx.git] / src / OutputParams.cpp

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index 20c3a657ab536d732684bf30eaec1de05a53eed2..de4b893728455e7f5756e73351175e594d4645cd 100644 (file)
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -20,11 +20,13 @@ 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),
+         moving_arg(false), intitle(false), inbranch(false), inulemcmd(0),
+         local_font(0),master_language(0), encoding(enc), free_spacing(false),
+         use_babel(false), use_polyglossia(false), use_CJK(false),
          use_indices(false), use_japanese(false), linelen(0), depth(0),
-         exportdata(new ExportData),
-         inComment(false), inTableCell(NO), inFloat(NONFLOAT),
+         exportdata(new ExportData), postpone_fragile_stuff(false), 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),
@@ -37,6 +39,8 @@ OutputParams::OutputParams(Encoding const * enc)
        // OutputParams runparams(0);
        if (enc && enc->package() == Encoding::japanese)
                use_japanese = true;
+       if (enc && enc->package() == Encoding::CJK)
+               use_CJK = true;
 }
 
 
@@ -53,7 +57,13 @@ bool OutputParams::isLaTeX() const
 
 bool OutputParams::isFullUnicode() const
 {
-       return flavor == LUATEX|| flavor == DVILUATEX || flavor == XETEX;
+       return flavor == LUATEX || flavor == DVILUATEX || flavor == XETEX;
+}
+
+
+bool OutputParams::useBidiPackage() const
+{
+       return use_polyglossia && flavor == XETEX;
 }
 
 } // namespace lyx