bool Buffer::makeLaTeXFile(FileName const & fname,
- string const & original_path,
OutputParams const & runparams_in,
bool output_preamble, bool output_body) const
{
otexstream os(ofs, d->texrow);
try {
os.texrow().reset();
- writeLaTeXSource(os, original_path,
- runparams, output_preamble, output_body);
+ writeLaTeXSource(os, runparams, output_preamble, output_body);
}
catch (EncodingException & e) {
odocstringstream ods;
void Buffer::writeLaTeXSource(otexstream & os,
- string const & original_path,
OutputParams const & runparams_in,
bool const output_preamble, bool const output_body) const
{
// macros will be put in the prefix anyway.
updateMacroInstances(OutputUpdate);
- // There are a few differences between nice LaTeX and usual files:
- // usual is \batchmode and has a
- // special input@path to allow the including of figures
- // with either \input or \includegraphics (what figinsets do).
- // input@path is set when the actual parameter
- // original_path is set. This is done for usual tex-file, but not
- // for nice-latex-file. (Matthias 250696)
- // Note that input@path is only needed for something the user does
- // in the preamble, included .tex files or ERT, files included by
- // LyX work without it.
+ // With respect to nice LaTeX, usual files have \batchmode
if (output_preamble) {
if (!runparams.nice) {
// code for usual, NOT nice-latex-file
os << "\\batchmode\n"; // changed from \nonstopmode
}
- if (!original_path.empty()) {
- // FIXME UNICODE
- // We don't know the encoding of inputpath
- docstring const inputpath = from_utf8(support::latex_path(original_path));
- docstring uncodable_glyphs;
- Encoding const * const enc = runparams.encoding;
- if (enc) {
- for (size_t n = 0; n < inputpath.size(); ++n) {
- docstring const glyph =
- docstring(1, inputpath[n]);
- if (enc->latexChar(inputpath[n], true) != glyph) {
- LYXERR0("Uncodable character '"
- << glyph
- << "' in input path!");
- uncodable_glyphs += glyph;
- }
- }
- }
-
- // warn user if we found uncodable glyphs.
- if (!uncodable_glyphs.empty()) {
- frontend::Alert::warning(_("Uncodable character in file path"),
- support::bformat(_("The path of your document\n"
- "(%1$s)\n"
- "contains glyphs that are unknown in the\n"
- "current document encoding (namely %2$s).\n"
- "This will likely result in incomplete output.\n\n"
- "Choose an appropriate document encoding (such as utf8)\n"
- "or change the file path name."), inputpath, uncodable_glyphs));
- } else {
- os << "\\makeatletter\n"
- << "\\def\\input@path{{"
- << inputpath << "/}}\n"
- << "\\makeatother\n";
- }
- }
// get parent macros (if this buffer has a parent) which will be
// written at the document begin further down.
// get LaTeX-Filename
FileName const path(temppath());
string const name = addName(path.absFileName(), latexName());
- string const org_path = filePath();
PathChanger p(path); // path to LaTeX file
message(_("Running chktex..."));
runparams.flavor = OutputParams::LATEX;
runparams.nice = false;
runparams.linelen = lyxrc.plaintext_linelen;
- makeLaTeXFile(FileName(name), org_path, runparams);
+ makeLaTeXFile(FileName(name), runparams);
TeXErrors terr;
Chktex chktex(lyxrc.chktex_command, onlyFileName(name), filePath());
else {
// latex or literate
otexstream ots(os, d->texrow);
- writeLaTeXSource(ots, string(), runparams, true, true);
+ writeLaTeXSource(ots, runparams, true, true);
}
} else {
runparams.par_begin = par_begin;
// LaTeX backend
else if (backend_format == format) {
runparams.nice = true;
- if (!makeLaTeXFile(FileName(filename), string(), runparams)) {
+ if (!makeLaTeXFile(FileName(filename), runparams)) {
if (d->cloned_buffer_) {
d->cloned_buffer_->d->errorLists["Export"] =
d->errorLists["Export"];
return false;
} else {
runparams.nice = false;
- if (!makeLaTeXFile(FileName(filename), filePath(), runparams)) {
+ if (!makeLaTeXFile(FileName(filename), runparams)) {
if (d->cloned_buffer_) {
d->cloned_buffer_->d->errorLists["Export"] =
d->errorLists["Export"];
formats.extension(inc_format)));
// FIXME: handle non existing files
- // FIXME: Second argument is irrelevant!
- // since only_body is true, makeLaTeXFile will not look at second
- // argument. Should we set it to string(), or should makeLaTeXFile
- // make use of it somehow? (JMarc 20031002)
// The included file might be written in a different encoding
// and language.
Encoding const * const oldEnc = runparams.encoding;
runparams.master_language = buffer().params().language;
runparams.par_begin = 0;
runparams.par_end = tmp->paragraphs().size();
- if (!tmp->makeLaTeXFile(tmpwritefile, masterFileName(buffer()).
- onlyPath().absFileName(), runparams, false)) {
+ if (!tmp->makeLaTeXFile(tmpwritefile, runparams, false)) {
docstring msg = bformat(_("Included file `%1$s' "
"was not exported correctly.\nWarning: "
"LaTeX export is probably incomplete."),
// In this case, it's not a LyX file, so we copy the file
// to the temp dir, so that .aux files etc. are not created
// in the original dir. Files included by this file will be
- // found via input@path, see ../Buffer.cpp.
+ // found via the environment variable TEXINPUTS, which may be
+ // set in preferences and by default includes the original dir.
unsigned long const checksum_in = included_file.checksum();
unsigned long const checksum_out = writefile.checksum();