hopefully fix tex2lyx linking.

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index b6944bf746c5c2cb84aa119a5b9a3cf58529f041..fae278648eb63d135638af6dc90562d1a6199a53 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -32,19 +32,18 @@
 #include "pariterator.h"
 #include "lyxvc.h"
 #include "texrow.h"
+#include "TocBackend.h"
 #include "vc-backend.h"
-#include "toc.h"
 
 #include "frontends/Alert.h"
 
 #include "insets/insetbibitem.h"
+#include "insets/insetinclude.h"
 
 #include "support/filetools.h"
 #include "support/fs_extras.h"
 #include "support/lyxlib.h"
 
-#include <iostream>
-
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
 
@@ -235,8 +234,8 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr,
                                                          pos_end);
                } while (found && id_start == id_end && pos_start == pos_end);
 
-               errorList.push_back(ErrorItem(from_utf8(cit->error_desc),
-                       from_utf8(cit->error_text), id_start, pos_start, pos_end));
+               errorList.push_back(ErrorItem(cit->error_desc,
+                       cit->error_text, id_start, pos_start, pos_end));
        }
 }
 
@@ -349,11 +348,9 @@ bool needEnumCounterReset(ParIterator const & it)
 
 
 // set the label of a paragraph. This includes the counters.
-void setLabel(Buffer const & buf, ParIterator & it)
+void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass)
 {
        Paragraph & par = *it;
-       BufferParams const & bufparams = buf.params();
-       LyXTextClass const & textclass = bufparams.getLyXTextClass();
        LyXLayout_ptr const & layout = par.layout();
        Counters & counters = textclass.counters();
 
@@ -376,7 +373,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
 
        if (layout->margintype == MARGIN_MANUAL) {
                if (par.params().labelWidthString().empty())
-                       par.setLabelWidthString(layout->labelstring());
+                       par.setLabelWidthString(buf.translateLabel(layout->labelstring()));
        } else {
                par.setLabelWidthString(docstring());
        }
@@ -395,7 +392,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
                // At some point of time we should do something more
                // clever here, like:
                //   par.params().labelString(
-               //    bufparams.user_defined_bullet(par.itemdepth).getText());
+               //    buf.params().user_defined_bullet(par.itemdepth).getText());
                // for now, use a simple hardcoded label
                docstring itemlabel;
                switch (par.itemdepth) {
@@ -468,8 +465,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
                int number = counters.value(from_ascii("bibitem"));
                if (par.bibitem())
                        par.bibitem()->setCounter(number);
-               // FIXME UNICODE
-               par.params().labelString(buf.B_(to_ascii(layout->labelstring())));
+               par.params().labelString(buf.translateLabel(layout->labelstring()));
                // In biblio should't be following counters but...
        } else if (layout->labeltype == LABEL_SENSITIVE) {
                // Search for the first float or wrap inset in the iterator
@@ -495,16 +491,14 @@ void setLabel(Buffer const & buf, ParIterator & it)
                        s = bformat(_("%1$s #:"), buf.B_(fl.name()));
                } else {
                        // par->SetLayout(0);
-                       // FIXME UNICODE
-                       s = buf.B_(to_ascii(layout->labelstring()));
+                       s = buf.translateLabel(layout->labelstring());
                }
 
                par.params().labelString(s);
        } else if (layout->labeltype == LABEL_NO_LABEL)
                par.params().labelString(docstring());
        else
-               // FIXME UNICODE
-               par.params().labelString(buf.B_(to_ascii(layout->labelstring())));
+               par.params().labelString(buf.translateLabel(layout->labelstring()));
 }
 
 } // anon namespace
@@ -528,7 +522,7 @@ bool updateCurrentLabel(Buffer const & buf,
        case LABEL_CENTERED_TOP_ENVIRONMENT:
        case LABEL_STATIC:
        case LABEL_ITEMIZE:
-               setLabel(buf, it);
+               setLabel(buf, it, buf.params().getLyXTextClass());
                return true;
 
        case LABEL_SENSITIVE:
@@ -544,33 +538,44 @@ bool updateCurrentLabel(Buffer const & buf,
 
 
 void updateLabels(Buffer const & buf,
-       ParIterator & from, ParIterator & to)
+       ParIterator & from, ParIterator & to, bool childonly)
 {
        for (ParIterator it = from; it != to; ++it) {
                if (it.pit() > it.lastpit())
                        return;
                if (!updateCurrentLabel (buf, it)) {
-                       updateLabels(buf);
+                       updateLabels(buf, childonly);
                        return;
                }
        }
 }
 
 
-void updateLabels(Buffer const & buf,
-       ParIterator & iter)
+void updateLabels(Buffer const & buf, ParIterator & iter, bool childonly)
 {
        if (updateCurrentLabel(buf, iter))
                return;
 
-       updateLabels(buf);
+       updateLabels(buf, childonly);
 }
 
 
-void updateLabels(Buffer const & buf)
+void updateLabels(Buffer const & buf, bool childonly)
 {
-       // start over the counters
-       buf.params().getLyXTextClass().counters().reset();
+       // Use the master text class also for child documents
+       LyXTextClass const & textclass = buf.params().getLyXTextClass();
+
+       if (!childonly) {
+               // If this is a child document start with the master
+               Buffer const * const master = buf.getMasterBuffer();
+               if (master != &buf) {
+                       updateLabels(*master);
+                       return;
+               }
+
+               // start over the counters
+               textclass.counters().reset();
+       }
 
        ParIterator const end = par_iterator_end(buf.inset());
 
@@ -584,10 +589,19 @@ void updateLabels(Buffer const & buf)
                        it->params().depth(0);
 
                // set the counter for this paragraph
-               setLabel(buf, it);
+               setLabel(buf, it, textclass);
+
+               // Now included docs
+               InsetList::const_iterator iit = it->insetlist.begin();
+               InsetList::const_iterator end = it->insetlist.end();
+               for (; iit != end; ++iit) {
+                       if (iit->inset->lyxCode() == InsetBase::INCLUDE_CODE)
+                               static_cast<InsetInclude const *>(iit->inset)
+                                       ->updateLabels(buf);
+               }
        }
 
-       toc::updateToc(buf);
+       const_cast<Buffer &>(buf).tocBackend().update();
 }
 
 
@@ -596,9 +610,9 @@ docstring expandLabel(Buffer const & buf,
 {
        LyXTextClass const & tclass = buf.params().getLyXTextClass();
 
-       // FIXME UNICODE
-       docstring fmt = buf.B_(to_ascii(appendix ? layout->labelstring_appendix()
-                                            : layout->labelstring()));
+       docstring fmt = buf.translateLabel(appendix ?
+                       layout->labelstring_appendix() :
+                       layout->labelstring());
 
        // handle 'inherited level parts' in 'fmt',
        // i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'