Fix typo.

[lyx.git] / src / Buffer.cpp
diff --git a/src/Buffer.cpp b/src/Buffer.cpp

index d9dc38f800734ce1331746cb8186133b338967e0..5df91ec8532cb20b23ee6bfdd3a417202efd5f2e 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1660,9 +1660,11 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
  {
         OutputParams runparams = runparams_in;
  
-       // XeTeX with TeX fonts is only safe with ASCII encoding,
-       // but the "flavor" is not known in BufferParams::encoding().
-       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+       // XeTeX with TeX fonts is only safe with ASCII encoding (see also #9740),
+       // Check here, because the "flavor" is not known in BufferParams::encoding()
+       // (power users can override this safety measure selecting "utf8-plain").
+       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX)
+           && (runparams.encoding->name() != "utf8-plain"))
                 runparams.encoding = encodings.fromLyXName("ascii");
  
         string const encoding = runparams.encoding->iconvName();
@@ -1748,8 +1750,10 @@ void Buffer::writeLaTeXSource(otexstream & os,
         OutputParams runparams = runparams_in;
  
         // XeTeX with TeX fonts is only safe with ASCII encoding,
-       // but the "flavor" is not known in BufferParams::encoding().
-       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+       // Check here, because the "flavor" is not known in BufferParams::encoding()
+       // (power users can override this safety measure selecting "utf8-plain").
+       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX)
+           && (runparams.encoding->name() != "utf8-plain"))
                 runparams.encoding = encodings.fromLyXName("ascii");
         // FIXME: when only the current paragraph is shown, this is ignored
         //        (or not reached) and characters encodable in the current
@@ -2147,7 +2151,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
         if (output_body) {
                 bool const output_body_tag = (output != IncludedFile);
                 if (output_body_tag)
-                       os << "<body>\n";
+                       os << "<body dir=\"auto\">\n";
                 XHTMLStream xs(os);
                 if (output != IncludedFile)
                         // if we're an included file, the counters are in the master.
@@ -4311,26 +4315,22 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
         ExportStatus const status = doExport(format, true, false, result_file);
         FileName const previewFile(result_file);
  
-       LATTEST (isClone());
-       d->cloned_buffer_->d->preview_file_ = previewFile;
-       d->cloned_buffer_->d->preview_format_ = format;
-       d->cloned_buffer_->d->preview_error_ = (status != ExportSuccess);
+       Impl * theimpl = isClone() ? d->cloned_buffer_->d : d;
+       theimpl->preview_file_ = previewFile;
+       theimpl->preview_format_ = format;
+       theimpl->preview_error_ = (status != ExportSuccess);
  
         if (status != ExportSuccess)
                 return status;
-       if (previewFile.exists()) {
-               if (!formats.view(*this, previewFile, format))
-                       return PreviewError;
-               else
-                       return PreviewSuccess;
-       }
-       else {
-               // Successful export but no output file?
-               // Probably a bug in error detection.
-               LATTEST (status != ExportSuccess);
  
-               return status;
-       }
+       if (previewFile.exists())
+               return formats.view(*this, previewFile, format) ?
+                       PreviewSuccess : PreviewError;
+
+       // Successful export but no output file?
+       // Probably a bug in error detection.
+       LATTEST(status != ExportSuccess);
+       return status;
  }