// try previous macro if there is one
if (it == nameIt->second.begin())
break;
- it--;
+ --it;
}
}
}
convert<docstring>(par_end - 1))
<< "\n\n";
}
- TexRow texrow;
- texrow.reset();
- texrow.newline();
- texrow.newline();
// output paragraphs
- if (runparams.flavor == OutputParams::HTML) {
+ if (runparams.flavor == OutputParams::LYX) {
+ Paragraph const & par = text().paragraphs()[par_begin];
+ ostringstream ods;
+ depth_type dt = par.getDepth();
+ par.write(ods, params(), dt);
+ os << from_utf8(ods.str());
+ } else if (runparams.flavor == OutputParams::HTML) {
XHTMLStream xs(os);
setMathFlavor(runparams);
xhtmlParagraphs(text(), *this, xs, runparams);
} else if (params().isDocBook()) {
docbookParagraphs(text(), *this, os, runparams);
} else {
+ TexRow texrow;
+ texrow.reset();
+ texrow.newline();
+ texrow.newline();
// latex or literate
otexstream ots(os, texrow);
latexParagraphs(*this, text(), ots, runparams);
else if (output == OnlyBody)
os << _("Preview body");
os << "\n\n";
- d->texrow.reset();
- d->texrow.newline();
- d->texrow.newline();
- if (runparams.flavor == OutputParams::HTML) {
+ if (runparams.flavor == OutputParams::LYX) {
+ ostringstream ods;
+ if (output == FullSource)
+ write(ods);
+ else if (output == OnlyPreamble)
+ params().writeFile(ods);
+ else if (output == OnlyBody)
+ text().write(ods);
+ os << from_utf8(ods.str());
+ } else if (runparams.flavor == OutputParams::HTML) {
writeLyXHTMLSource(os, runparams, output);
} else if (runparams.flavor == OutputParams::TEXT) {
if (output == OnlyPreamble) {
writeDocBookSource(os, absFileName(), runparams, output);
} else {
// latex or literate
+ d->texrow.reset();
+ d->texrow.newline();
+ d->texrow.newline();
otexstream ots(os, d->texrow);
writeLaTeXSource(ots, string(), runparams, output);
}
runparams.includeall = includeall;
vector<string> backs = params().backends();
Converters converters = theConverters();
+ bool need_nice_file = false;
if (find(backs.begin(), backs.end(), format) == backs.end()) {
// Get shortest path to format
converters.buildGraph();
return ExportNoPathToFormat;
}
runparams.flavor = converters.getFlavor(path, this);
+ Graph::EdgePath::const_iterator it = path.begin();
+ Graph::EdgePath::const_iterator en = path.end();
+ for (; it != en; ++it)
+ if (theConverters().get(*it).nice) {
+ need_nice_file = true;
+ break;
+ }
} else {
backend_format = format;
makeDocBookFile(FileName(filename), runparams);
}
// LaTeX backend
- else if (backend_format == format) {
+ else if (backend_format == format || need_nice_file) {
runparams.nice = true;
bool const success = makeLaTeXFile(FileName(filename), string(), runparams);
if (d->cloned_buffer_)
// we need to check that the locations of child buffers
// are still valid.
checkChildBuffers();
+ checkMasterBuffer();
return true;
} else {
// save failed
d->position_to_children.clear();
}
+
+// If a child has been saved under a different name/path, it might have been
+// orphaned. Therefore the master needs to be reset (bug 8161).
+void Buffer::checkMasterBuffer()
+{
+ Buffer const * const master = masterBuffer();
+ if (master == this)
+ return;
+
+ // necessary to re-register the child (bug 5873)
+ // FIXME: clean up updateMacros (here, only
+ // child registering is needed).
+ master->updateMacros();
+ // (re)set master as master buffer, but only
+ // if we are a real child
+ if (master->isChild(this))
+ setParent(master);
+ else
+ setParent(0);
+}
+
} // namespace lyx