Record and use equation numbers. This is towards getting equation

numbering in XHTML output, but it's just as easy to fix this in the LyX
display.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37177 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/eqs-within-sections.module b/lib/layouts/eqs-within-sections.module
index b16bd877656ce42e8d8ffee8138f5b35cdad0f5d..70e51fa1153452a04184505f3d02ea716e2a30f7 100644 (file)
--- a/lib/layouts/eqs-within-sections.module
+++ b/lib/layouts/eqs-within-sections.module
@@ -11,3 +11,8 @@ Requires amsmath
 AddToPreamble
        \numberwithin{equation}{section}
 EndPreamble
+
+Counter equation
+       Within section
+       LabelString "\thesection.\arabic{equation}"
+End

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 511ebc77a68e102efdcaaade3565f490483dbcd7..062935197df642e698c4048c8af10703702cf8ce 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -28,11 +28,15 @@
 #include "Exporter.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "MacroTable.h"
 #include "output_xhtml.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TextPainter.h"
 #include "TocBackend.h"
 
@@ -46,6 +50,7 @@
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/convert.h"
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
@@ -143,7 +148,8 @@ static InsetLabel * dummy_pointer = 0;
 
 InsetMathHull::InsetMathHull(Buffer * buf)
        : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, true),
-         label_(1, dummy_pointer), preview_(new RenderPreview(this))
+    numbers_(1, empty_docstring()), label_(1, dummy_pointer),
+    preview_(new RenderPreview(this))
 {
        //lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
        //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
@@ -157,7 +163,8 @@ InsetMathHull::InsetMathHull(Buffer * buf)
 
 InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
        : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, true),
-         label_(1, dummy_pointer), preview_(new RenderPreview(this))
+    numbers_(1, empty_docstring()), label_(1, dummy_pointer),
+    preview_(new RenderPreview(this))
 {
        buffer_ = buf;
        initMath();
@@ -191,6 +198,7 @@ InsetMathHull & InsetMathHull::operator=(InsetMathHull const & other)
        InsetMathGrid::operator=(other);
        type_  = other.type_;
        numbered_ = other.numbered_;
+       numbers_ = other.numbers_;
        buffer_ = other.buffer_;
        for (size_t i = 0; i < label_.size(); ++i)
                delete label_[i];
@@ -224,7 +232,18 @@ void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
                // MathParser.cpp).
                return;
        }
+
+       BufferParams const & bp = buffer_->params();
+       string const & lang = it->getParLanguage(bp)->code();
+       Counters & cnts = bp.documentClass().counters();
+       // so we don't have to write it ten times...
+       docstring const eqstr = from_ascii("equation");
+
        for (size_t i = 0; i != label_.size(); ++i) {
+               if (numbered(i) && cnts.hasCounter(eqstr)) {
+                       cnts.step(eqstr, utype);
+                       numbers_[i] = cnts.theCounter(eqstr, lang);
+               }
                if (label_[i])
                        label_[i]->updateBuffer(it, utype);
        }
@@ -823,6 +842,7 @@ void InsetMathHull::addRow(row_type row)
        }
 
        numbered_.insert(numbered_.begin() + row + 1, numbered);
+       numbers_.insert(numbers_.begin() + row + 1, empty_docstring());
        label_.insert(label_.begin() + row + 1, dummy_pointer);
        if (!lab.empty())
                label(row + 1, lab);
@@ -844,6 +864,7 @@ void InsetMathHull::swapRow(row_type row)
        bool const b = numbered_[row];
        numbered_[row] = numbered_[row + 1];
        numbered_[row + 1] = b;
+       swap(numbers_[row], numbers_[row + 1]);
        swap(label_[row], label_[row + 1]);
        InsetMathGrid::swapRow(row);
 }
@@ -857,6 +878,7 @@ void InsetMathHull::delRow(row_type row)
                bool const b = numbered_[row - 1];
                numbered_[row - 1] = numbered_[row];
                numbered_[row] = b;
+               swap(numbers_[row - 1], numbers_[row]);
                swap(label_[row - 1], label_[row]);
                InsetMathGrid::delRow(row);
                return;
@@ -867,6 +889,7 @@ void InsetMathHull::delRow(row_type row)
        if (row == nrows() + 1)
                row--;
        numbered_.erase(numbered_.begin() + row);
+       numbers_.erase(numbers_.begin() + row);
        delete label_[row];
        label_.erase(label_.begin() + row);
 }
@@ -892,9 +915,10 @@ docstring InsetMathHull::nicelabel(row_type row) const
 {
        if (!numbered_[row])
                return docstring();
+       docstring const & val = numbers_[row];
        if (!label_[row])
-               return from_ascii("(#)");
-       return '(' + label_[row]->screenLabel() + from_ascii(", #)");
+               return '(' + val + ')';
+       return '(' + val + ',' + label_[row]->screenLabel() + ')';
 }
 
 
@@ -1173,6 +1197,7 @@ void InsetMathHull::infoize(odocstream & os) const
 void InsetMathHull::check() const
 {
        LASSERT(numbered_.size() == nrows(), /**/);
+       LASSERT(numbers_.size() == nrows(), /**/);
        LASSERT(label_.size() == nrows(), /**/);
 }
 

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 35df332b07ee78698878f4b58bbed1706d3c2832..2fd936916af9a34837b4c90034ec1017992edc0e 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -224,6 +224,8 @@ private:
        ///
        std::vector<bool> numbered_;
        ///
+       std::vector<docstring> numbers_;
+       ///
        std::vector<InsetLabel *> label_;
        ///
        boost::scoped_ptr<RenderPreview> preview_;