]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetSpecialChar.cpp
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Amend 7e121117bb3203
[lyx.git] / src / insets / InsetSpecialChar.cpp
diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 6554cce16e552078a3ad0d01bde208333c01a01f..1267a75b376c499dfb5c80bc50c9e084011e578b 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -84,6 +84,40 @@ int logoWidth(FontInfo const & font, InsetSpecialChar::Kind kind) {
        return width;
 }
 
+} // namespace
+
+docstring InsetSpecialChar::toolTip(BufferView const &, int, int) const
+{
+       docstring message;
+       switch (kind_) {
+               case ALLOWBREAK:
+                       message = from_ascii("Optional Line Break (ZWSP)");
+                       break;
+               case LIGATURE_BREAK:
+                       message = from_ascii("Ligature Break (ZWNJ)");
+                       break;
+               case END_OF_SENTENCE:
+                       message = from_ascii("End of Sentence");
+                       break;
+               case HYPHENATION:
+                       message = from_ascii("Hyphenation Point");
+                       break;
+               case SLASH:
+                       message = from_ascii("Breakable Slash");
+                       break;
+               case NOBREAKDASH:
+                       message = from_ascii("Protected Hyphen (SHY)");
+                       break;
+               case LDOTS:
+               case MENU_SEPARATOR:
+               case PHRASE_LYX:
+               case PHRASE_TEX:
+               case PHRASE_LATEX2E:
+               case PHRASE_LATEX:
+                       // no tooltip for these ones.
+                       break;
+       }
+       return message;
 }
 
 
@@ -97,6 +131,9 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
 
        docstring s;
        switch (kind_) {
+               case ALLOWBREAK:
+                       dim.wid = fm.em() / 8;
+                       break;
                case LIGATURE_BREAK:
                        s = from_ascii("|");
                        break;
@@ -129,18 +166,6 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
        }
        if (dim.wid == 0)
                dim.wid = fm.width(s);
-
-       setDimCache(mi, dim);
-}
-
-
-void InsetSpecialChar::drawBackground(PainterInfo & pi, int x, int y) const
-{
-       if (pi.full_repaint)
-               return;
-       Dimension const dim = dimension(*pi.base.bv);
-       pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
-                             pi.backgroundColor(this));
 }
 
 
@@ -149,8 +174,10 @@ namespace {
 // helper function: draw text and update x.
 void drawChar(PainterInfo & pi, int & x, int const y, char_type ch)
 {
-       pi.pain.text(x, y, ch, pi.base.font);
-       x += theFontMetrics(pi.base.font).width(ch);
+       FontInfo font = pi.base.font;
+       font.setPaintColor(pi.textColor(font.realColor()));
+       pi.pain.text(x, y, ch, font);
+       x += theFontMetrics(font).width(ch);
 }
 
 
@@ -221,7 +248,7 @@ void drawLogo(PainterInfo & pi, int & x, int const y, InsetSpecialChar::Kind kin
        }
 }
 
-}
+} // namespace
 
 void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
 {
@@ -234,6 +261,18 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
                pi.pain.text(x, y, char_type('-'), font);
                break;
        }
+       case ALLOWBREAK:
+       {
+               // A small vertical line
+               int const asc = theFontMetrics(pi.base.font).ascent('x');
+               int const desc = theFontMetrics(pi.base.font).descent('g');
+               int const x0 = x; // x + 1; // FIXME: incline,
+               int const x1 = x; // x - 1; // similar to LibreOffice?
+               int const y0 = y + desc;
+               int const y1 = y - asc / 3;
+               pi.pain.line(x0, y1, x1, y0, Color_special);
+               break;
+       }
        case LIGATURE_BREAK:
        {
                font.setColor(Color_special);
@@ -295,7 +334,6 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-// In lyxf3 this will be just LaTeX
 void InsetSpecialChar::write(ostream & os) const
 {
        string command;
@@ -303,6 +341,9 @@ void InsetSpecialChar::write(ostream & os) const
        case HYPHENATION:
                command = "softhyphen";
                break;
+       case ALLOWBREAK:
+               command = "allowbreak";
+               break;
        case LIGATURE_BREAK:
                command = "ligaturebreak";
                break;
@@ -338,7 +379,6 @@ void InsetSpecialChar::write(ostream & os) const
 }
 
 
-// This function will not be necessary when lyx3
 void InsetSpecialChar::read(Lexer & lex)
 {
        lex.next();
@@ -346,6 +386,8 @@ void InsetSpecialChar::read(Lexer & lex)
 
        if (command == "softhyphen")
                kind_ = HYPHENATION;
+       else if (command == "allowbreak")
+               kind_ = ALLOWBREAK;
        else if (command == "ligaturebreak")
                kind_ = LIGATURE_BREAK;
        else if (command == "endofsentence")
@@ -378,23 +420,27 @@ void InsetSpecialChar::latex(otexstream & os,
        case HYPHENATION:
                os << "\\-";
                break;
+       case ALLOWBREAK:
+               os << "\\LyXZeroWidthSpace" << termcmd;
+               break;
        case LIGATURE_BREAK:
-               os << "\\textcompwordmark{}";
+               os << "\\textcompwordmark" << termcmd;
                break;
        case END_OF_SENTENCE:
                os << "\\@.";
                break;
        case LDOTS:
-               os << "\\ldots{}";
+               os << "\\ldots" << termcmd;
                break;
        case MENU_SEPARATOR:
                if (rp.local_font->isRightToLeft())
-                       os << "\\lyxarrow*{}";
+                       os << "\\lyxarrow*";
                else
-                       os << "\\lyxarrow{}";
+                       os << "\\lyxarrow";
+               os << termcmd;
                break;
        case SLASH:
-               os << "\\slash{}";
+               os << "\\slash" << termcmd;
                break;
        case NOBREAKDASH:
                if (rp.moving_arg)
@@ -404,22 +450,22 @@ void InsetSpecialChar::latex(otexstream & os,
        case PHRASE_LYX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LyX{}";
+               os << "\\LyX" << termcmd;
                break;
        case PHRASE_TEX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\TeX{}";
+               os << "\\TeX" << termcmd;
                break;
        case PHRASE_LATEX2E:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LaTeXe{}";
+               os << "\\LaTeXe" << termcmd;
                break;
        case PHRASE_LATEX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LaTeX{}";
+               os << "\\LaTeX" << termcmd;
                break;
        }
 }
@@ -431,6 +477,9 @@ int InsetSpecialChar::plaintext(odocstringstream & os,
        switch (kind_) {
        case HYPHENATION:
                return 0;
+       case ALLOWBREAK:
+               os.put(0x200b);
+               return 1;
        case LIGATURE_BREAK:
                os.put(0x200c);
                return 1;
@@ -471,6 +520,10 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
+               break;
+       case ALLOWBREAK:
+               os.put(0x200b);
+               break;
        case LIGATURE_BREAK:
                break;
        case END_OF_SENTENCE:
@@ -511,6 +564,9 @@ docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
        switch (kind_) {
        case HYPHENATION:
                break;
+       case ALLOWBREAK:
+               xs << XHTMLStream::ESCAPE_NONE << "&#8203;";
+               break;
        case LIGATURE_BREAK:
                xs << XHTMLStream::ESCAPE_NONE << "&#8204;";
                break;
@@ -549,8 +605,9 @@ docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 void InsetSpecialChar::toString(odocstream & os) const
 {
        switch (kind_) {
+       case ALLOWBREAK:
        case LIGATURE_BREAK:
-               // Do not output ZERO WIDTH NON JOINER here
+               // Do not output ZERO WIDTH SPACE and ZERO WIDTH NON JOINER here
                // Spell checker would choke on it.
                return;
        default:
@@ -573,6 +630,8 @@ void InsetSpecialChar::forOutliner(docstring & os, size_t const,
 
 void InsetSpecialChar::validate(LaTeXFeatures & features) const
 {
+       if (kind_ == ALLOWBREAK)
+               features.require("lyxzerowidthspace");
        if (kind_ == MENU_SEPARATOR)
                features.require("lyxarrow");
        if (kind_ == NOBREAKDASH)
@@ -582,6 +641,12 @@ void InsetSpecialChar::validate(LaTeXFeatures & features) const
 }
 
 
+bool InsetSpecialChar::isChar() const
+{
+       return kind_ != HYPHENATION && kind_ != LIGATURE_BREAK;
+}
+
+
 bool InsetSpecialChar::isLetter() const
 {
        return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK
@@ -596,8 +661,8 @@ bool InsetSpecialChar::isLineSeparator() const
        // Paragraph::stripLeadingSpaces nukes the characters which
        // have this property. I leave the code here, since it should
        // eventually be made to work. (JMarc 20020327)
-       return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR
-               || kind_ == SLASH;
+       return kind_ == HYPHENATION || kind_ == ALLOWBREAK
+           || kind_ == MENU_SEPARATOR || kind_ == SLASH;
 #else
        return false;
 #endif
The LyX Source Repository