* Get rid of LFUN_TOC_INSERT: we use LFUN_INSET_INSERT "toc".

[lyx.git] / src / sgml.cpp

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 1611f32495ceb0125651af950ef39b4a810a0f5e..985478498a3583dfee1b1325f56a99f39cad55b0 100644 (file)
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author José Matos
+ * \author José Matos
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -28,7 +28,6 @@
 #include "support/textutils.h"
 
 #include <map>
-#include <ostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -201,9 +200,9 @@ void sgml::closeTag(odocstream & os, string const & name)
 void sgml::openTag(Buffer const & buf, odocstream & os,
        OutputParams const & runparams, Paragraph const & par)
 {
-       LayoutPtr const & style = par.layout();
-       string const & name = style->latexname();
-       string param = style->latexparam();
+       Layout const & style = par.layout();
+       string const & name = style.latexname();
+       string param = style.latexparam();
        Counters & counters = buf.params().documentClass().counters();
 
        string id = par.getID(buf, runparams);
@@ -220,10 +219,13 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
        } else {
                if (param.find('#') != string::npos) {
                        // FIXME UNICODE
-                       if (!style->counter.empty())
-                               counters.step(style->counter);
+                       if (!style.counter.empty())
+                               // This uses InternalUpdate at the moment becuase sgml output
+                               // does not do anything with tracked counters, and it would need
+                               // to track layouts if it did want to use them.
+                               counters.step(style.counter, InternalUpdate);
                        else
-                               counters.step(from_ascii(name));
+                               counters.step(from_ascii(name), InternalUpdate);
                        int i = counters.value(from_ascii(name));
                        attribute = subst(param, "#", convert<string>(i));
                } else {
@@ -236,8 +238,8 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
 
 void sgml::closeTag(odocstream & os, Paragraph const & par)
 {
-       LayoutPtr const & style = par.layout();
-       closeTag(os, style->latexname());
+       Layout const & style = par.layout();
+       closeTag(os, style.latexname());
 }