anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix captions, in accord with observations by Abdel and JMarc.

Browse Source 
Note that we will sometimes use the "caption trick", still in 
listings, for example.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30194 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-06-19 18:32:50 +00:00
parent 1ef0168dd4
commit 83a89711b0
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OutputParams.cpp
View File

@ -26,7 +26,7 @@ OutputParams::OutputParams(Encoding const * enc)
inComment(false), inTableCell(NO), inFloat(NONFLOAT), inComment(false), inTableCell(NO), inFloat(NONFLOAT),
inDeletedInset(0), changeOfDeletedInset(Change::UNCHANGED), inDeletedInset(0), changeOfDeletedInset(Change::UNCHANGED),
par_begin(0), par_end(0), isLastPar(false), par_begin(0), par_end(0), isLastPar(false),
dryrun(false), verbatim(false) dryrun(false), verbatim(false), disable_captions(false)
{ {
// Note: in PreviewLoader::Impl::dumpPreamble // Note: in PreviewLoader::Impl::dumpPreamble
// OutputParams runparams(0); // OutputParams runparams(0);

2
src/OutputParams.h
View File

@ -198,6 +198,8 @@ public:
bool dryrun; bool dryrun;
/// Should we output verbatim or escape LaTeX's special chars? /// Should we output verbatim or escape LaTeX's special chars?
bool verbatim; bool verbatim;
/// Should we output captions? (Used in HTML output.)
bool disable_captions;
}; };

9
src/insets/InsetCaption.cpp
View File

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

2
src/insets/InsetCaption.h
View File

@ -70,7 +70,7 @@ private:
int plaintext(odocstream & os, OutputParams const & runparams) const; int plaintext(odocstream & os, OutputParams const & runparams) const;
/// ///
int docbook(odocstream & os, OutputParams const & runparams) const; int docbook(odocstream & os, OutputParams const & runparams) const;
/// This does nothing here. Instead, it is handled inside the float. ///
docstring xhtml(odocstream & os, OutputParams const & runparams) const; docstring xhtml(odocstream & os, OutputParams const & runparams) const;
/// ///
void setCustomLabel(docstring const & label); void setCustomLabel(docstring const & label);

4
src/insets/InsetFloat.cpp
View File

@ -297,11 +297,7 @@ docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
odocstringstream out; odocstringstream out;
docstring caption = getCaptionHTML(rp);
out << otag; out << otag;
if (!caption.empty())
out << "<div class='float-caption'>" << caption << "</div>\n";
docstring def = InsetText::xhtml(out, rp); docstring def = InsetText::xhtml(out, rp);
out << ctag; out << ctag;

4
src/insets/InsetListings.cpp
View File

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