Renaming leftovers

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8686f24db0b7e7bcc93c473a372dd514c1af053d..498c5c1c2c1eda23071bf0a826c66b300e612a86 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -999,6 +999,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 +2032,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();