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

The default tag for an InsetLayout should depend upon MultiPar.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32104 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-11-19 22:41:31 +00:00
parent fa2f219d92
commit b8743dd2ed
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/configure.py
View File

@ -513,9 +513,9 @@ def checkFormatEntries(dtl_tools):
\Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "document"''' ]) \Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "document"''' ])
# #
path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'], path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format xhtml xhtml "LyX HTML" "" "%%" "" "document"']) rc_entry = [r'\Format xhtml xhtml "LyX HTML" X "%%" "" "document"'])
if xhtmlview == "": if xhtmlview == "":
addToRC(r'\Format xhtml xhtml "LyX HTML" "" "" "" "document"') addToRC(r'\Format xhtml xhtml "LyX HTML" X "" "" "document"')
# #
checkEditor('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \ checkEditor('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \
'pybliographic', 'bibdesk', 'gbib', 'kbib', \ 'pybliographic', 'bibdesk', 'gbib', 'kbib', \

5
lib/layouts/stdinsets.inc
View File

@ -77,7 +77,6 @@ InsetLayout Marginal
EndFont EndFont
MultiPar true MultiPar true
NeedProtect true NeedProtect true
HTMLTag div
HTMLStyle HTMLStyle
div.marginal { div.marginal {
border: 2px solid black; border: 2px solid black;
@ -107,7 +106,6 @@ InsetLayout Foot
Size Small Size Small
EndFont EndFont
MultiPar true MultiPar true
HTMLTag div
HTMLLabel \arabic{footnote} HTMLLabel \arabic{footnote}
HTMLInnerTag div HTMLInnerTag div
HTMLStyle HTMLStyle
@ -153,7 +151,6 @@ InsetLayout Note:Note
Size Small Size Small
EndFont EndFont
MultiPar true MultiPar true
HTMLTag div
HTMLIsBlock false HTMLIsBlock false
# FIXME HTML Need CSS # FIXME HTML Need CSS
End End
@ -176,7 +173,6 @@ InsetLayout Note:Greyedout
padding-right: 1ex; padding-right: 1ex;
} }
EndHTMLStyle EndHTMLStyle
HTMLTag div
HTMLIsBlock false HTMLIsBlock false
End End
@ -286,7 +282,6 @@ InsetLayout Float
Size Small Size Small
EndFont EndFont
MultiPar true MultiPar true
HTMLTag div
End End
InsetLayout Wrap InsetLayout Wrap

2
src/insets/InsetLayout.cpp
View File

@ -354,7 +354,7 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
string const & InsetLayout::htmltag() const string const & InsetLayout::htmltag() const
{ {
if (htmltag_.empty()) if (htmltag_.empty())
htmltag_ = "span"; htmltag_ = multipar_ ? "div" : "span";
return htmltag_; return htmltag_;
} }

6
src/output_xhtml.cpp
View File

@ -619,15 +619,9 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
} }
if (labelfirst) if (labelfirst)
openItemTag(xs, style); openItemTag(xs, style);
else
// FIXME This should probalby be put into the layout file rather
// than hardcoded.
xs << StartTag("span", "class='" + to_utf8(style.name()) + "_inneritem'");
} }
par->simpleLyXHTMLOnePar(buf, xs, runparams, par->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, par)), sep); text.outerFont(distance(begin, par)), sep);
if (!isNormalEnv(style) && !labelfirst)
xs << EndTag("span");
++par; ++par;
// We may not want to close the tag yet, in particular, // We may not want to close the tag yet, in particular,
// if we're not at the end... // if we're not at the end...