*** empty log message ***

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index de4866e3b9b9d6aa9ae4fec9dac6902fe679cb8e..de3fd4f81aea03605af530dc237748e8d67784ae 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -32,8 +32,6 @@
 #include <locale>
 #endif
 
-#include <boost/tuple/tuple.hpp>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -2721,7 +2719,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 }
 
 
-void Buffer::docBookHandleCaption(ostream & os, string & inner_tag,
+void Buffer::docbookHandleCaption(ostream & os, string & inner_tag,
                                  Paragraph::depth_type depth, int desc_on,
                                  Paragraph * & par)
 {
@@ -3342,7 +3340,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
                if (c == Paragraph::META_INSET) {
                        Inset * inset = par->getInset(i);
                        ostringstream ost;
-                       inset->docBook(this, ost);
+                       inset->docbook(this, ost);
                        string tmp_out = ost.str().c_str();
 
                        //
@@ -3576,10 +3574,21 @@ Buffer::Lists const Buffer::getLists() const
 {
        Lists l;
        Paragraph * par = paragraph;
+
+#if 1
+       std::pair<bool, LyXTextClassList::size_type> const tmp =
+               textclasslist.NumberOfLayout(params.textclass, "Caption");
+       bool const found = tmp.first;
+       LyXTextClassList::size_type const cap = tmp.second;
+       
+#else
+       // This is the prefered way to to this, but boost::tie can break
+       // some compilers
        bool found;
        LyXTextClassList::size_type cap;
        boost::tie(found, cap) = textclasslist
                .NumberOfLayout(params.textclass, "Caption");
+#endif
 
        while (par) {
                char const labeltype =