listerrors.lyx : Update a link.

[lyx.git] / src / insets / InsetQuotes.cpp

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 0c272ffb098fa7f69c20a0c527419697e8428495..8586ce18d5372382689ae1cbcacbb93ddede55f5 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -114,7 +114,7 @@ InsetQuotes::InsetQuotes(Buffer * buf, char_type c, QuoteTimes t)
 }
 
 
-docstring InsetQuotes::name() const
+docstring InsetQuotes::layoutName() const
 {
        return from_ascii("Quotes");
 }
@@ -261,7 +261,7 @@ void InsetQuotes::read(Lexer & lex)
 }
 
 
-int InsetQuotes::latex(odocstream & os, OutputParams const & runparams) const
+void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
 {
        const int quoteind = quote_index[side_][language_];
        string qstr;
@@ -287,11 +287,13 @@ int InsetQuotes::latex(odocstream & os, OutputParams const & runparams) const
        }
 
        // Always guard against unfortunate ligatures (!` ?`)
-       if (prefixIs(qstr, "`"))
-               qstr.insert(0, "{}");
+       if (prefixIs(qstr, "`")) {
+               char_type const lastchar = os.lastChar();
+               if (lastchar == '!' || lastchar == '?')
+                       qstr.insert(0, "{}");
+       }
 
        os << from_ascii(qstr);
-       return 0;
 }
 
 
@@ -333,6 +335,12 @@ void InsetQuotes::toString(odocstream & os) const
 }
 
 
+void InsetQuotes::forToc(docstring & os, size_t) const
+{
+       os += displayString();
+}
+
+
 void InsetQuotes::validate(LaTeXFeatures & features) const
 {
        bool const use_babel = features.useBabel();