change "support/std_sstream.h" to <sstream>

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 0e1dd01a901e277f4887228ccd02c7904428e792..66eebe04eb15c016a0d0e44005351b670c90175b 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -41,7 +41,6 @@
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
 
@@ -50,6 +49,7 @@
 
 #include <list>
 #include <stack>
+#include <sstream>
 
 using lyx::pos_type;
 
@@ -784,7 +784,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_CENTER:
                if (moving_arg) {
                        os << "\\protect";
-                       column = 8;
+                       column += 8;
                }
                break;
        }
@@ -890,7 +890,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                                BufferParams const & bparams,
                                LyXFont const & outerfont,
                                ostream & os, TexRow & texrow,
-                               OutputParams const & runparams)
+                               OutputParams const & runparams) const
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
@@ -1325,12 +1325,27 @@ void Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
 }
 
 
+string Paragraph::getDocbookId() const
+{
+       for (pos_type i = 0; i < size(); ++i) {
+               if (isInset(i)) {
+                       InsetBase const * inset = getInset(i);
+                       InsetBase::Code lyx_code = inset->lyxCode();
+                       if (lyx_code == InsetBase::LABEL_CODE) {
+                               return static_cast<InsetCommand const *>(inset)->getContents();
+                       }
+               }
+
+       }
+       return string();
+}
+
+
 void Paragraph::simpleDocBookOnePar(Buffer const & buf,
                                    ostream & os,
                                    LyXFont const & outerfont,
                                    OutputParams const & runparams,
-                                   lyx::depth_type depth,
-                                   bool labelid) const
+                                   lyx::depth_type depth) const
 {
        bool emph_flag = false;
 
@@ -1392,15 +1407,11 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
                if (isInset(i)) {
                        InsetBase const * inset = getInset(i);
-                       // don't print the inset in position 0 if desc_on == 3 (label)
-                       //if (i || desc_on != 3) {
-                       if (!labelid) {
-                               if (style->latexparam() == "CDATA")
-                                       os << "]]>";
-                               inset->docbook(buf, os, runparams);
-                               if (style->latexparam() == "CDATA")
-                                       os << "<![CDATA[";
-                       }
+                       if (style->latexparam() == "CDATA")
+                               os << "]]>";
+                       inset->docbook(buf, os, runparams);
+                       if (style->latexparam() == "CDATA")
+                               os << "<![CDATA[";
                } else {
                        char c = getChar(i);
                        bool ws;
@@ -1513,7 +1524,9 @@ bool Paragraph::isLetter(pos_type pos) const
 
 bool Paragraph::isWord(pos_type pos) const
 {
-       unsigned char const c = getChar(pos);
+       if (isInset(pos))
+               return getInset(pos)->isLetter();
+       value_type const c = getChar(pos);
        return !(IsSeparatorChar(c)
                  || IsKommaChar(c)
                  || IsInsetChar(c));
@@ -1570,8 +1583,7 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const
 
 // Convert the paragraph to a string.
 // Used for building the table of contents
-string const Paragraph::asString(Buffer const & buffer,
-                                bool label) const
+string const Paragraph::asString(Buffer const & buffer, bool label) const
 {
        OutputParams runparams;
        return asString(buffer, runparams, label);