Another (IMHO false) fall-through warning silenced

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

diff --git a/src/insets/InsetSpecialChar.h b/src/insets/InsetSpecialChar.h
index 7fff625da0b2a9c8be97ac94dc84923c9a210179..982b1d51a385ffa97f504e470779fe4da50fbc06 100644 (file)
--- a/src/insets/InsetSpecialChar.h
+++ b/src/insets/InsetSpecialChar.h
@@ -30,6 +30,8 @@ public:
        enum Kind {
                /// Optional hyphenation point (\-)
                HYPHENATION,
+               /// Optional line wrap point without hyphen (ZWSP)
+               ALLOWBREAK,
                /// Ligature break point (\textcompwordmark)
                LIGATURE_BREAK,
                /// ... (\ldots)
@@ -42,15 +44,25 @@ public:
                SLASH,
                /// protected dash
                NOBREAKDASH,
+               /// LyX logo
+               PHRASE_LYX,
+               /// TeX logo
+               PHRASE_TEX,
+               /// LaTeX2e logo
+               PHRASE_LATEX2E,
+               /// LaTeX logo
+               PHRASE_LATEX
        };
 
        ///
-       InsetSpecialChar() : Inset(0) {}
+       InsetSpecialChar() : Inset(0), kind_(HYPHENATION) {}
        ///
        explicit InsetSpecialChar(Kind k);
        ///
        Kind kind() const;
        ///
+       docstring toolTip(BufferView const & bv, int x, int y) const;
+       ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
@@ -59,15 +71,20 @@ public:
        /// Will not be used when lyxf3
        void read(Lexer & lex);
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       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;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       ///
+       void toString(odocstream &) const;
+       ///
+       bool isInToc() const { return true; }
+       ///
+       void forOutliner(docstring &, size_t const, bool const) const;
        ///
        InsetCode lyxCode() const { return SPECIALCHAR_CODE; }
        /// We don't need \begin_inset and \end_inset
@@ -75,14 +92,16 @@ public:
        ///
        void validate(LaTeXFeatures &) const;
 
-       // should this inset be handled like a normal charater
-       bool isChar() const { return true; }
+       /// should this inset be handled like a normal character?
+       bool isChar() const;
        /// is this equivalent to a letter?
        bool isLetter() const;
-       // should we break lines after this inset?
+       /// should we break lines after this inset?
        bool isLineSeparator() const;
+       /// Is the content of this inset part of the immediate (visible) text sequence?
+       bool isPartOfTextSequence() const { return isChar(); }
 private:
-       Inset * clone() const { return new InsetSpecialChar(*this); };
+       Inset * clone() const { return new InsetSpecialChar(*this); }
 
        /// And which kind is this?
        Kind kind_;