X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetoptarg.h;h=6e4546c3a278d7a07f8d217b14a80617b0b24422;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=5821665b3e0bb0bcbea731571118e6beddabc076;hpb=e1940902fe50ec523fe540f6e11f2ee4045cdfac;p=lyx.git

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 5821665b3e..6e4546c3a2 100644
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -6,17 +6,19 @@
  *
  * \author Martin Vermeer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETOPTARG_H
 #define INSETOPTARG_H
 
 
-#include "insettext.h"
 #include "insetcollapsable.h"
 
 
+namespace lyx {
+
+
 /**
  * InsetOptArg. Used to insert a short version of sectioning header etc.
  * automatically, or other optional LaTeX arguments
@@ -25,27 +27,37 @@ class InsetOptArg : public InsetCollapsable {
 public:
 	InsetOptArg(BufferParams const &);
 
-	InsetOptArg(InsetOptArg const &, bool same_id = false);
-
-	/// make a duplicate of this inset
-	Inset * clone(Buffer const &, bool same_id = false) const;
-
-	/// this inset is editable
-	EDITABLE editable() const { return IS_EDITABLE; }
 	/// code of the inset
-	Inset::Code lyxCode() const { return Inset::OPTARG_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::OPTARG_CODE; }
 	/// return an message upon editing
-	string const editMessage() const;
+	virtual docstring const editMessage() const;
 
 	/// Standard LaTeX output -- short-circuited
-	int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-		  bool fp) const;
+	int latex(Buffer const &, odocstream &,
+		  OutputParams const &) const;
+	/// Standard DocBook output -- short-circuited
+	int docbook(Buffer const &, odocstream &,
+		  OutputParams const &) const;
+
+	/// Standard plain text output -- short-circuited
+	int plaintext(Buffer const &, odocstream &,
+		  OutputParams const &) const;
+
 	/// Outputting the optional parameter of a LaTeX command
-	int latexOptional(Buffer const *, std::ostream &,
-			  LatexRunParams const &,
-			  bool fp) const;
-	/// Write out tothe .lyx file
-	void write(Buffer const * buf, std::ostream & os) const;
+	int latexOptional(Buffer const &, odocstream &,
+			  OutputParams const &) const;
+	/// Write out to the .lyx file
+	void write(Buffer const & buf, std::ostream & os) const;
+
+	/// should paragraph indendation be ommitted in any case?
+	virtual bool neverIndent(Buffer const &) const { return true; }
+protected:
+	InsetOptArg(InsetOptArg const &);
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
 };
 
+
+} // namespace lyx
+
 #endif // INSETOPTARG_H