anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore XHTML output for InsetFloat.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32246 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-11-30 17:20:37 +00:00
parent aa1f01777e
commit 83df2047c5
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/insets/InsetFloat.cpp
View File

@ -27,6 +27,7 @@
#include "FuncStatus.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "output_xhtml.h"
#include "ParIterator.h"
#include "TextClass.h"
@ -281,31 +282,32 @@ void InsetFloat::validate(LaTeXFeatures & features) const
}
docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
FloatList const & floats = buffer().params().documentClass().floats();
Floating const & ftype = floats.getType(params_.type);
string const & htmltype = ftype.htmlTag();
string const & htmlclass = ftype.htmlClass();
docstring const otag =
from_ascii("<" + htmltype + " class='float " + htmlclass + "'>\n");
docstring const ctag = from_ascii("</" + htmltype + ">\n");
string const attr = "class='float " + ftype.htmlClass() + "'";
odocstringstream out;
out << otag;
docstring def = InsetText::xhtml(out, rp);
out << ctag;
odocstringstream ods;
XHTMLStream newxs(ods);
newxs << StartTag(htmltype, attr);
InsetText::XHTMLOptions const opts =
InsetText::WriteLabel | InsetText::WriteInnerTag;
docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
newxs << EndTag(htmltype);
if (rp.inFloat == OutputParams::NONFLOAT)
// In this case, this float needs to be deferred, but we'll put it
// before anything the text itself deferred.
def = out.str() + '\n' + def;
deferred = ods.str() + '\n' + deferred;
else
// In this case, the whole thing is already being deferred, so
// we can write to the stream.
os << out.str();
return def;
// Note that things will already have been escaped, so we do not
// want to escape them again.
xs << XHTMLStream::NextRaw() << ods.str();
return deferred;
}

2
src/insets/InsetFloat.h
View File

@ -89,7 +89,7 @@ private:
///
int docbook(odocstream &, OutputParams const &) const;
///
docstring xhtml(odocstream &, OutputParams const &) const;
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
bool insetAllowed(InsetCode) const;
/** returns true if, when outputing LaTeX, font changes should