From 49c89d838b181d71bd62a9292a383e48ba6d507f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 18 Jul 2013 09:26:56 +0200 Subject: [PATCH] Fix state of certain language packages (polyglossia, japanese) in children (#8779) --- src/Buffer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 6ef03f6c78..6a3581e641 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1564,7 +1564,9 @@ void Buffer::writeLaTeXSource(otexstream & os, LYXERR(Debug::LATEX, " Validating buffer..."); LaTeXFeatures features(*this, params(), runparams); validate(features); - runparams.use_polyglossia = features.usePolyglossia(); + // This is only set once per document (in master) + if (!runparams.is_child) + runparams.use_polyglossia = features.usePolyglossia(); LYXERR(Debug::LATEX, " Buffer validation done."); bool const output_preamble = @@ -1666,7 +1668,9 @@ void Buffer::writeLaTeXSource(otexstream & os, runparams.use_babel = params().writeLaTeX(os, features, d->filename.onlyPath()); - runparams.use_japanese = features.isRequired("japanese"); + // Japanese might be required only in some children of a document, + // but once required, we must keep use_japanese true. + runparams.use_japanese |= features.isRequired("japanese"); if (!output_body) { // Restore the parenthood if needed -- 2.39.2