Fix for bug 3650. Made changes to the Paragraph::checkBiblio() routine,

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ebe0e840c91f50492315296d9f739dc7b3ebe74f..7afacfabce96b64b855ba92f54d04de59914c0b4 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2176,6 +2176,7 @@ bool Paragraph::emptyTag() const
                            lyx_code != Inset::INCLUDE_CODE &&
                            lyx_code != Inset::GRAPHICS_CODE &&
                            lyx_code != Inset::ERT_CODE &&
+                           lyx_code != Inset::LISTINGS_CODE &&
                            lyx_code != Inset::FLOAT_CODE &&
                            lyx_code != Inset::TABULAR_CODE) {
                                return false;
@@ -2341,7 +2342,8 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->rightToLeft()
-               && ownerCode() != Inset::ERT_CODE;
+               && ownerCode() != Inset::ERT_CODE
+               && ownerCode() != Inset::LISTINGS_CODE;
 }
 
 
@@ -2392,7 +2394,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
                os << params().labelString() << ' ';
 
        for (pos_type i = beg; i < end; ++i) {
-               value_type const c = getUChar(buffer.params(), i);
+               value_type const c = getChar(i);
                if (isPrintable(c))
                        os.put(c);
                else if (c == META_INSET)
@@ -2502,7 +2504,7 @@ bool Paragraph::isFreeSpacing() const
 
        // for now we just need this, later should we need this in some
        // other way we can always add a function to Inset too.
-       return ownerCode() == Inset::ERT_CODE;
+       return ownerCode() == Inset::ERT_CODE || ownerCode() == Inset::LISTINGS_CODE;
 }
 
 
@@ -2510,7 +2512,7 @@ bool Paragraph::allowEmpty() const
 {
        if (layout()->keepempty)
                return true;
-       return ownerCode() == Inset::ERT_CODE;
+       return ownerCode() == Inset::ERT_CODE || ownerCode() == Inset::LISTINGS_CODE;
 }
 
 
@@ -2590,25 +2592,70 @@ bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
 }
 
 
-bool Paragraph::checkBiblio(bool track_changes)
+int Paragraph::checkBiblio(bool track_changes)
 {
+       //FIXME From JS:
+       //This is getting more and more a mess. ...We really should clean 
+       //up this bibitem issue for 1.6. See also bug 2743.
+
        // Add bibitem insets if necessary
        if (layout()->labeltype != LABEL_BIBLIO)
-               return false;
+               return 0;
 
        bool hasbibitem = !insetlist.empty()
                // Insist on it being in pos 0
                && getChar(0) == Paragraph::META_INSET
                && insetlist.begin()->inset->lyxCode() == Inset::BIBITEM_CODE;
 
-       if (hasbibitem)
-               return false;
+       docstring oldkey;
+       docstring oldlabel;
 
+       // remove a bibitem in pos != 0
+       // restore it later in pos 0 if necessary
+       // (e.g. if a user inserts contents _before_ the item)
+       // we're assuming there's only one of these, which there
+       // should be.
+       int erasedInsetPosition = -1;
+       InsetList::iterator it = insetlist.begin();
+       InsetList::iterator end = insetlist.end();
+       for (; it != end; ++it)
+               if (it->inset->lyxCode() == Inset::BIBITEM_CODE
+                   && it->pos > 0) {
+                       InsetBibitem * olditem = static_cast<InsetBibitem *>(it->inset);
+                       oldkey = olditem->getParam("key");
+                       oldlabel = olditem->getParam("label");
+                       erasedInsetPosition = it->pos;
+                       eraseChar(erasedInsetPosition, track_changes);
+                       break;
+       }
+
+       //There was an InsetBibitem at the beginning, and we didn't
+       //have to erase one.
+       if (hasbibitem && erasedInsetPosition < 0)
+                       return 0;
+       
+       //There was an InsetBibitem at the beginning and we did have to 
+       //erase one. So we give its properties to the beginning inset.
+       if (hasbibitem) {
+               InsetBibitem * inset = 
+                       static_cast<InsetBibitem *>(insetlist.begin()->inset);
+               if (!oldkey.empty())
+                       inset->setParam("key", oldkey);
+               inset->setParam("label", oldlabel);
+               return -erasedInsetPosition;
+       }
+       
+       //There was no inset at the beginning, so we need to create one with
+       //the key and label of the one we erased.
        InsetBibitem * inset(new InsetBibitem(InsetCommandParams("bibitem")));
+       // restore values of previously deleted item in this par.
+       if (!oldkey.empty())
+               inset->setParam("key", oldkey);
+       inset->setParam("label", oldlabel);
        insertInset(0, static_cast<Inset *>(inset),
-               Change(track_changes ? Change::INSERTED : Change::UNCHANGED));
+                   Change(track_changes ? Change::INSERTED : Change::UNCHANGED));
 
-       return true;
+       return 1;
 }
 
 } // namespace lyx