Merge branch 'master' into biblatex2

[lyx.git] / src / insets / InsetIPAMacro.h

diff --git a/src/insets/InsetIPAMacro.h b/src/insets/InsetIPAMacro.h
index d89d17a6740def0efa086dca0d5095e5c66827af..c29fc49c91e06b8eb560a8fd844a27516cdf0361 100644 (file)
--- a/src/insets/InsetIPAMacro.h
+++ b/src/insets/InsetIPAMacro.h
@@ -76,7 +76,8 @@ private:
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
@@ -130,7 +131,7 @@ public:
        };
 
        ///
-       InsetIPAChar() : Inset(0) {}
+       InsetIPAChar() : Inset(0), kind_(TONE_FALLING) {}
        ///
        explicit InsetIPAChar(Kind k);
        ///
@@ -146,7 +147,8 @@ public:
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
@@ -154,7 +156,7 @@ public:
        ///
        void toString(odocstream &) const;
        ///
-       void forToc(docstring &, size_t) const;
+       void forOutliner(docstring &, size_t const, bool const) const;
        ///
        InsetCode lyxCode() const { return IPACHAR_CODE; }
        /// We don't need \begin_inset and \end_inset
@@ -165,11 +167,9 @@ public:
        /// should this inset be handled like a normal character?
        bool isChar() const { return true; }
        /// is this equivalent to a letter?
-       bool isLetter() const;
-       /// should we break lines after this inset?
-       bool isLineSeparator() const;
+       bool isLetter() const { return true; }
 private:
-       Inset * clone() const { return new InsetIPAChar(*this); };
+       Inset * clone() const { return new InsetIPAChar(*this); }
 
        /// And which kind is this?
        Kind kind_;