anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add i, ii, iii, iv suffixes to CSS class as well in the case of itemizations

Browse Source
This commit is contained in:
Richard Kimberly Heck 2022-12-04 14:34:29 -05:00
parent 23a997bbf6
commit 5ac560cfa1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Layout.cpp
View File

@ -1825,9 +1825,9 @@ string const & Layout::htmlattr() const
string const & Layout::htmlclass() const
{
// If it's an enumeration, then we recalculate the class each time through
// unless it has been given explicitly. So we do nothing here.
if (htmlclass_.empty() && labeltype != LABEL_ENUMERATE)
// If it's an enumeration or itemize list, then we recalculate the class each
// time through (unless it has been given explicitly). So we do nothing here.
if (htmlclass_.empty() && labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
htmlclass_ = defaultCSSClass();
return htmlclass_;
}

15
src/output_xhtml.cpp
View File

@ -408,16 +408,19 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
depth_type const origdepth = pbegin->params().depth();
// open tag for this environment
if (bstyle.labeltype == LABEL_ENUMERATE && bstyle.htmlclass().empty()) {
if ((bstyle.labeltype == LABEL_ENUMERATE || bstyle.labeltype == LABEL_ITEMIZE)
&& bstyle.htmlclass().empty()) {
// In this case, we have to calculate the CSS class ourselves, each time
// through
// FIXME We assume in these cases that the standard enumeration counter
// is being used. (We also do not deal with 'resume' counters, though I'm
// not sure that can be done at all.)
// FIXME We assume in these cases that the standard counters are being used.
// (We also do not deal with 'resume' counters, though I'm not sure that can
// be done at all in HTML.)
// Code borrowed from Buffer::Impl::setLabel
// Code adapated from Buffer::Impl::setLabel
docstring enumcounter = bstyle.counter.empty() ?
from_ascii("enum") : bstyle.counter;
(bstyle.labeltype == LABEL_ENUMERATE ?
from_ascii("lyxenum") : from_ascii("lyxitem") ) :
bstyle.counter;
switch (par->itemdepth) {
case 2:
enumcounter += 'i';