anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert most of dd7863b6.

Browse Source 
I did not mean to commit the caption-related stuff.
This commit is contained in:
Richard Heck 2016-07-30 01:42:08 -04:00
parent aad0802b53
commit eeb6b5b153
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/layouts/stdinsets.inc
View File

@ -556,14 +556,13 @@ InsetLayout Caption:Standard
LabelString standard
LaTeXType command
LatexName caption
NeedProtect 1
NeedProtect 1
MultiPar false
Argument 1
LabelString "Short Title|S"
Tooltip "The caption as it appears in the list of figures/tables"
InsertCotext 1
EndArgument
HTMLTag div
HTMLStyle
div.float-caption {
text-align: center;
@ -581,7 +580,6 @@ InsetLayout Caption:Unnumbered
LabelString unlabelled
LatexName caption*
ResetArgs 1
HTMLAttr "class='float-caption float-caption-unnumbered'"
End

14
src/insets/InsetCaption.cpp
View File

@ -293,7 +293,7 @@ int InsetCaption::docbook(odocstream & os,
}
docstring InsetCaption::xhtml(XHTMLStream &, OutputParams const & rp) const
docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
if (rp.html_disable_captions)
return docstring();
@ -308,14 +308,10 @@ docstring InsetCaption::xhtml(XHTMLStream &, OutputParams const & rp) const
else
attr = attr + " class='" + our_class + "'";
}
odocstringstream ods;
XHTMLStream ourxs(ods);
ourxs << html::StartTag(tag, attr) << html::CR();
docstring def = getCaptionAsHTML(ourxs, rp);
ourxs << html::EndTag(tag) << html::CR();
if (!def.empty())
return ods.str() + "\n" + def;
return ods.str();
xs << html::StartTag(tag, attr);
docstring def = getCaptionAsHTML(xs, rp);
xs << html::EndTag(tag);
return def;
}

2
src/insets/InsetFloat.cpp
View File

@ -300,7 +300,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
odocstringstream ods;
XHTMLStream newxs(ods);
newxs << html::StartTag(htmltype, attr) << html::CR();
newxs << html::StartTag(htmltype, attr);
InsetText::XHTMLOptions const opts =
InsetText::WriteLabel | InsetText::WriteInnerTag;
docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);

8
src/insets/InsetText.cpp
View File

@ -621,7 +621,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
InsetLayout const & il = getLayout();
if (opts & WriteOuterTag)
xs << html::StartTag(il.htmltag(), il.htmlattr()) << html::CR();
xs << html::StartTag(il.htmltag(), il.htmlattr());
if ((opts & WriteLabel) && !il.counter().empty()) {
BufferParams const & bp = buffer().masterBuffer()->params();
@ -633,9 +633,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
// FIXME is this check necessary?
if (!lbl.empty()) {
xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr())
<< lbl
<< html::EndTag(il.htmllabeltag());
xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr());
xs << lbl;
xs << html::EndTag(il.htmllabeltag());
}
}
}