Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 293c3861e1a0458b261ad0b29f0c0e957a8462c7..b1c4e08d1a4b1a9c0b51763c16c95db3ff32ff61 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -65,7 +65,7 @@ void InsetCaption::write(ostream & os) const
 }
 
 
-docstring InsetCaption::name() const
+docstring InsetCaption::layoutName() const
 {
        if (type_.empty())
                return from_ascii("Caption");
@@ -73,18 +73,6 @@ docstring InsetCaption::name() const
 }
 
 
-void InsetCaption::read(Lexer & lex)
-{
-#if 0
-       // We will enably this check again when the compability
-       // code is removed from Buffer::Read (Lgb)
-       lex.setContext("InsetCaption::Read: consistency check");
-       lex >> "Caption";
-#endif
-       InsetText::read(lex);
-}
-
-
 void InsetCaption::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
@@ -209,7 +197,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        switch (cmd.action()) {
 
-       case LFUN_BREAK_PARAGRAPH:
+       case LFUN_PARAGRAPH_BREAK:
                status.setEnabled(false);
                return true;
 
@@ -228,12 +216,12 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetCaption::latex(otexstream & os,
-                       OutputParams const & runparams_in) const
+void InsetCaption::latex(otexstream & os,
+                        OutputParams const & runparams_in) const
 {
        if (runparams_in.inFloat == OutputParams::SUBFLOAT)
                // caption is output as an optional argument
-               return 0;
+               return;
        // This is a bit too simplistic to take advantage of
        // caption options we must add more later. (Lgb)
        // This code is currently only able to handle the simple
@@ -244,12 +232,11 @@ int InsetCaption::latex(otexstream & os,
        // optional argument.
        runparams.moving_arg = true;
        os << "\\caption";
-       int l = latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
+       latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
        os << '{';
-       l += InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
        os << "}\n";
        runparams_in.encoding = runparams.encoding;
-       return l + 1;
 }
 
 
@@ -290,17 +277,17 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 }
 
 
-int InsetCaption::getArgument(otexstream & os,
+void InsetCaption::getArgument(otexstream & os,
                        OutputParams const & runparams) const
 {
-       return InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
 }
 
 
-int InsetCaption::getOptArg(otexstream & os,
+void InsetCaption::getOptArg(otexstream & os,
                        OutputParams const & runparams) const
 {
-       return latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
+       latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
 }