anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #8598. We need to use the masterBuffer's counters in the

Browse Source 
XHTML output routines.
(cherry picked from commit b3ceb89efc)
This commit is contained in:
Richard Heck 2013-03-18 18:45:09 -04:00
parent 7833f02b88
commit dd10053a6e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output_xhtml.cpp
View File

@ -684,7 +684,8 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
for (; par != pend; ++par) {
Layout const & lay = par->layout();
if (!lay.counter.empty())
buf.params().documentClass().counters().step(lay.counter, OutputUpdate);
buf.masterBuffer()->params().
documentClass().counters().step(lay.counter, OutputUpdate);
// FIXME We should see if there's a label to be output and
// do something with it.
if (par != pbegin)
@ -778,7 +779,7 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
// FIXME There may be a bug here about user defined enumeration
// types. If so, then we'll need to take the counter and add "i",
// "ii", etc, as with enum.
Counters & cnts = buf.params().documentClass().counters();
Counters & cnts = buf.masterBuffer()->params().documentClass().counters();
docstring const & cntr = style.counter;
if (!style.counter.empty()
&& (par == pbegin || !isNormalEnv(style))
@ -902,7 +903,8 @@ void makeCommand(Buffer const & buf,
{
Layout const & style = pbegin->layout();
if (!style.counter.empty())
buf.params().documentClass().counters().step(style.counter, OutputUpdate);
buf.masterBuffer()->params().
documentClass().counters().step(style.counter, OutputUpdate);
openTag(xs, style, pbegin->params());

2
status.20x
View File

@ -114,6 +114,8 @@ What's new
- Fix lyx2lyx bug with non-ASCII layout file names (Debian bug 700828).
- Reset counters properly when outputting included XHTML files (bug 8598).
* USER INTERFACE