Add lfuns doxy.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8686f24db0b7e7bcc93c473a372dd514c1af053d..aeece98bddc6e20b6b0b50b6757fdd69640a45a8 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -250,15 +250,13 @@ bool Paragraph::isChanged(pos_type start, pos_type end) const
 }
 
 
-bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const {
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
        // keep the logic here in sync with the logic of eraseChars()
-
-       if (!trackChanges) {
+       if (!trackChanges)
                return true;
-       }
-
-       Change change = d->changes_.lookup(size());
 
+       Change const change = d->changes_.lookup(size());
        return change.type == Change::INSERTED && change.author == 0;
 }
 
@@ -292,22 +290,17 @@ void Paragraph::setChange(Change const & change)
 void Paragraph::setChange(pos_type pos, Change const & change)
 {
        BOOST_ASSERT(pos >= 0 && pos <= size());
-
        d->changes_.set(change, pos);
 
        // see comment in setChange(Change const &) above
-
-       if (change.type != Change::DELETED &&
-           pos < size() && isInset(pos)) {
+       if (change.type != Change::DELETED && pos < size() && isInset(pos))
                getInset(pos)->setChange(change);
-       }
 }
 
 
 Change const & Paragraph::lookupChange(pos_type pos) const
 {
        BOOST_ASSERT(pos >= 0 && pos <= size());
-
        return d->changes_.lookup(pos);
 }
 
@@ -999,6 +992,13 @@ void Paragraph::Private::validate(LaTeXFeatures & features,
 
        // then the layouts
        features.useLayout(layout.name());
+       if (!layout.requires().empty()) {
+               vector<string> req = layout.requires();
+               for (vector<string>::const_iterator it = req.begin();
+                    it != req.end(); ++it) {
+                       features.require(*it);
+               }
+       }
 
        // then the fonts
        fontlist_.validate(features);
@@ -2025,9 +2025,10 @@ bool Paragraph::latex(Buffer const & buf,
                                        *style, i, column);
                        } catch (EncodingException & e) {
                                if (runparams.dryrun) {
-                                       os << _("<LyX Warning: uncodable character>");
+                                       os << "<" << _("LyX Warning: ")
+                                          << _("uncodable character") << " '";
                                        os.put(c);
-                                       os << _("</LyX Warning>");
+                                       os << "'>";
                                } else {
                                        // add location information and throw again.
                                        e.par_id = id();
@@ -2216,15 +2217,13 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
 bool Paragraph::isHfill(pos_type pos) const
 {
-       return isInset(pos)
-               && getInset(pos)->lyxCode() == HFILL_CODE;
+       return isInset(pos) && getInset(pos)->lyxCode() == HFILL_CODE;
 }
 
 
 bool Paragraph::isNewline(pos_type pos) const
 {
-       return isInset(pos)
-               && getInset(pos)->lyxCode() == NEWLINE_CODE;
+       return isInset(pos) && getInset(pos)->lyxCode() == NEWLINE_CODE;
 }
 
 
@@ -2242,10 +2241,8 @@ bool Paragraph::isLetter(pos_type pos) const
 {
        if (isInset(pos))
                return getInset(pos)->isLetter();
-       else {
-               char_type const c = d->text_[pos];
-               return isLetterChar(c) || isDigit(c);
-       }
+       char_type const c = d->text_[pos];
+       return isLetterChar(c) || isDigit(c);
 }
 
 
@@ -2358,8 +2355,7 @@ Inset * Paragraph::inInset() const
 
 InsetCode Paragraph::ownerCode() const
 {
-       return d->inset_owner_ ?
-               d->inset_owner_->lyxCode() : NO_CODE;
+       return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
 }