Alfredo's second patch

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index acfb00f15d16de8cd816f97b2d276a387b978603..3e1841f0e39e2799afde65f34200f37be0277b99 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -36,6 +36,7 @@
 #include "lyxtextclasslist.h"
 #include "sgml.h"
 #include "paragraph_funcs.h"
+#include "messages.h"
 #include "author.h"
 
 #include "frontends/LyXView.h"
@@ -434,7 +435,7 @@ Buffer::readParagraph(LyXLex & lex, string const & token,
 
 
 // needed to insert the selection
-void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
+void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
                                 LyXFont const & fn,string const & str)
 {
        LyXLayout_ptr const & layout = par->layout();
@@ -452,7 +453,7 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
                        if (autobreakrows && (!par->empty() || layout->keepempty)) {
                                breakParagraph(params, paragraphs, par, pos,
                                               layout->isEnvironment());
-                               par = par->next();
+                               ++par;
                                pos = 0;
                                space_inserted = true;
                        } else {
@@ -494,12 +495,20 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
 
 bool Buffer::readFile(LyXLex & lex, string const & filename)
 {
-       return readFile(lex, filename, paragraphs.begin());
+       bool ret = readFile(lex, filename, paragraphs.begin());
+
+       // After we have read a file, we must ensure that the buffer
+       // language is set and used in the gui.
+       // If you know of a better place to put this, please tell me. (Lgb)
+       updateDocLang(params.language);
+
+       return ret;
 }
 
 
 // FIXME: all the below Alerts should give the filename..
-bool Buffer::readFile(LyXLex & lex, string const & filename, ParagraphList::iterator pit)
+bool Buffer::readFile(LyXLex & lex, string const & filename,
+                     ParagraphList::iterator pit)
 {
        if (!lex.isOK()) {
                Alert::error(_("Document could not be read"),
@@ -1433,7 +1442,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
                PAR_TAG tag_close = NONE;
                list < PAR_TAG > tag_open;
 
-               LyXFont const font = par->getFont(params, i, outerFont(par));
+               LyXFont const font = par->getFont(params, i, outerFont(par, paragraphs));
 
                if (font_old.family() != font.family()) {
                        switch (family_type) {
@@ -1596,7 +1605,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
 
 
 // Print an error message.
-void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
+void Buffer::sgmlError(ParagraphList::iterator /*par*/, int /*pos*/,
        string const & /*message*/) const
 {
 #ifdef WITH_WARNINGS
@@ -1631,11 +1640,8 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 #endif
                Alert::error(_("Could not save document"), text);
                return;
-               return;
        }
 
-       Paragraph * par = &*(paragraphs.begin());
-
        niceFile = nice; // this will be used by Insetincludes.
 
        LaTeXFeatures features(params);
@@ -1689,7 +1695,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
        string item_name;
        string command_name;
 
-       while (par) {
+       ParagraphList::iterator par = paragraphs.begin();
+       ParagraphList::iterator pend = paragraphs.end();
+
+       for (; par != pend; ++par) {
                string sgmlparam;
                string c_depth;
                string c_params;
@@ -1843,7 +1852,6 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
                simpleDocBookOnePar(ofs, par, desc_on,
                                    depth + 1 + command_depth);
-               par = par->next();
 
                string end_tag;
                // write closing SGML tags
@@ -1907,7 +1915,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
 
 void Buffer::simpleDocBookOnePar(ostream & os,
-                                Paragraph * par, int & desc_on,
+                                ParagraphList::iterator par, int & desc_on,
                                 Paragraph::depth_type depth) const
 {
        bool emph_flag = false;
@@ -1922,7 +1930,7 @@ void Buffer::simpleDocBookOnePar(ostream & os,
 
        // parsing main loop
        for (pos_type i = 0; i < par->size(); ++i) {
-               LyXFont font = par->getFont(params, i, outerFont(par));
+               LyXFont font = par->getFont(params, i, outerFont(par, paragraphs));
 
                // handle <emphasis> tag
                if (font_old.emph() != font.emph()) {
@@ -2206,6 +2214,10 @@ void Buffer::redraw()
 
 void Buffer::changeLanguage(Language const * from, Language const * to)
 {
+       lyxerr << "Changing Language!" << endl;
+
+       // Take care of l10n/i18n
+       updateDocLang(to);
 
        ParIterator end = par_iterator_end();
        for (ParIterator it = par_iterator_begin(); it != end; ++it)
@@ -2213,6 +2225,12 @@ void Buffer::changeLanguage(Language const * from, Language const * to)
 }
 
 
+void Buffer::updateDocLang(Language const * nlang)
+{
+       messages_.reset(new Messages(nlang->code()));
+}
+
+
 bool Buffer::isMultiLingual()
 {
        ParIterator end = par_iterator_end();
@@ -2250,22 +2268,24 @@ Inset * Buffer::getInsetFromID(int id_arg) const
 }
 
 
-Paragraph * Buffer::getParFromID(int id) const
+ParagraphList::iterator Buffer::getParFromID(int id) const
 {
-       if (id < 0)
-               return 0;
-
-       // why should we allow < 0 ??
-       //lyx::Assert(id >= 0);
+#warning FIXME: const correctness! (Andre)
+       ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
+       ParIterator end(const_cast<Buffer*>(this)->par_iterator_end());
 
-       ParConstIterator it(par_iterator_begin());
-       ParConstIterator end(par_iterator_end());
+#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
+       if (id < 0) {
+               // John says this is called with id == -1 from undo
+               lyxerr << "getParFromID(), id: " << id << endl;
+               return 0;
+       }
 
        for (; it != end; ++it) {
                // go on then, show me how to remove
                // the cast
                if ((*it)->id() == id) {
-                       return const_cast<Paragraph*>(*it);
+                       return *it;
                }
        }
 
@@ -2315,6 +2335,16 @@ Language const * Buffer::getLanguage() const
 }
 
 
+string const Buffer::B_(string const & l10n) const
+{
+       if (messages_.get()) {
+               return messages_->get(l10n);
+       }
+
+       return _(l10n);
+}
+
+
 bool Buffer::isClean() const
 {
        return lyx_clean;