From: Jean-Marc Lasgouttes Date: Mon, 25 Jul 2022 22:47:28 +0000 (+0200) Subject: Revert "Implement on screen numbering for Subequation module" X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f5c7acb140230dd0b6d96118ebab0ec364e2951c;p=features.git Revert "Implement on screen numbering for Subequation module" This reverts commit c6f35b6ad66e57fef3f7833430b828d5f936a35a. --- diff --git a/src/Counters.cpp b/src/Counters.cpp index 0133f76bca..519cb27346 100644 --- a/src/Counters.cpp +++ b/src/Counters.cpp @@ -421,16 +421,6 @@ void Counters::reset(docstring const & match) } -bool Counters::copy(docstring const & cnt, docstring const & newcnt) -{ - auto const it = counterList_.find(cnt); - if (it == counterList_.end()) - return false; - counterList_[newcnt] = it->second; - return true; -} - - bool Counters::remove(docstring const & cnt) { bool retval = counterList_.erase(cnt); diff --git a/src/Counters.h b/src/Counters.h index 57fff35fae..7a82df4301 100644 --- a/src/Counters.h +++ b/src/Counters.h @@ -162,8 +162,6 @@ public: void reset(); /// Reset counters matched by match string. void reset(docstring const & match); - /// Copy counter \p cnt to \p newcnt. - bool copy(docstring const & cnt, docstring const & newcnt); /// Remove counter \p cnt. bool remove(docstring const & cnt); /** returns the expanded string representation of counter \c diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp index 1f6cfc02b6..e6076102f6 100644 --- a/src/insets/InsetFlex.cpp +++ b/src/insets/InsetFlex.cpp @@ -24,7 +24,6 @@ #include "ParIterator.h" #include "TextClass.h" -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -150,29 +149,6 @@ void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype, bool cons docstring custom_label = translateIfPossible(il.labelstring()); Counters & cnts = bp.documentClass().counters(); - - // Special case for `subequations' module. - if (il.latextype() == InsetLaTeXType::ENVIRONMENT && - il.latexname() == "subequations") { - docstring equation(from_ascii("equation")); - docstring parentequation(from_ascii("parentequation")); - cnts.step(equation, utype); - // save a copy of the equation counter definition - cnts.copy(equation, parentequation); - // redefine the equation counter definition - docstring const eqlabel = - cnts.theCounter(equation, it->getParLanguage(bp)->code()); - cnts.newCounter(equation, parentequation, - eqlabel + from_ascii("\\alph{equation}"), - eqlabel + from_ascii("\\alph{equation}"), - cnts.guiName(parentequation)); - InsetCollapsible::updateBuffer(it, utype, deleted); - // reset equation counter as it was. - cnts.copy(parentequation, equation); - cnts.remove(parentequation); - return; - } - docstring const & count = il.counter(); bool const have_counter = cnts.hasCounter(count); if (have_counter) {