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

DocBook: don't update counters when generating, as they are not used in DocBook.

Browse Source 
This also removes a warning in the console in some cases where counters are updated when they don't exist...
This commit is contained in:
Thibaut Cuvelier 2020-07-20 02:51:59 +02:00
parent 51939801f5
commit fb45f7b8c9
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/output_docbook.cpp
View File

@ -14,7 +14,6 @@
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferParams.h"
#include "Counters.h"
#include "Font.h"
#include "InsetList.h"
#include "Layout.h"
@ -316,9 +315,6 @@ ParagraphList::const_iterator makeParagraphs(
ParagraphList::const_iterator par = pbegin;
for (; par != pend; ++par) {
Layout const &lay = par->layout();
if (!lay.counter.empty())
buf.masterBuffer()->params().
documentClass().counters().step(lay.counter, OutputUpdate);
// We want to open the paragraph tag if:
// (i) the current layout permits multiple paragraphs
@ -434,19 +430,6 @@ ParagraphList::const_iterator makeEnvironment(
while (par != pend) {
Layout const & style = par->layout();
// the counter only gets stepped if we're in some kind of list,
// or if it's the first time through.
// note that enum, etc, are handled automatically.
// 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.masterBuffer()->params().documentClass().counters();
docstring const & cntr = style.counter;
if (!style.counter.empty()
&& (par == pbegin || !isNormalEnv(style))
&& cnts.hasCounter(cntr)
)
cnts.step(cntr, OutputUpdate);
ParagraphList::const_iterator send;
// Actual content of this paragraph.
@ -575,9 +558,6 @@ void makeCommand(
ParagraphList::const_iterator const & pbegin)
{
Layout const &style = pbegin->layout();
if (!style.counter.empty())
buf.masterBuffer()->params().
documentClass().counters().step(style.counter, OutputUpdate);
// No need for labels, as they are handled by DocBook tags.