Rename one output param and add a new one.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31752 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-10-26 20:47:12 +00:00
parent 331d8060b5
commit 9a19a312ba
4 changed files with 8 additions and 5 deletions

View File

@ -28,7 +28,8 @@ OutputParams::OutputParams(Encoding const * enc)
inIndexEntry(false), inDeletedInset(0),
changeOfDeletedInset(Change::UNCHANGED),
par_begin(0), par_end(0), isLastPar(false),
dryrun(false), verbatim(false), disable_captions(false)
dryrun(false), verbatim(false),
html_disable_captions(false), html_in_par(false)
{
// Note: in PreviewLoader::Impl::dumpPreamble
// OutputParams runparams(0);

View File

@ -209,8 +209,10 @@ public:
bool dryrun;
/// Should we output verbatim or escape LaTeX's special chars?
bool verbatim;
/// Should we output captions? (Used in HTML output.)
bool disable_captions;
/// Should we output captions?
bool html_disable_captions;
/// Are we already in a paragraph?
bool html_in_par;
};

View File

@ -253,7 +253,7 @@ int InsetCaption::docbook(odocstream & os,
docstring InsetCaption::xhtml(odocstream & os,
OutputParams const & rp) const
{
if (rp.disable_captions)
if (rp.html_disable_captions)
return docstring();
os << "<div class='float-caption'>\n";
docstring def = getCaptionAsHTML(os, rp);

View File

@ -283,7 +283,7 @@ docstring InsetListings::xhtml(odocstream & os, OutputParams const & rp) const
out << "<pre>\n";
OutputParams newrp = rp;
newrp.disable_captions = true;
newrp.html_disable_captions = true;
docstring def = InsetText::xhtml(out, newrp);
out << "\n</pre>\n";