hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetcharstyle.C

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 77bb8698db4b427379ec17ee721885f82202fd70..6d953726c8ed08ec2d0e3413b32808c11071b9aa 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -31,14 +31,15 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/convert.h"
+
 #include <sstream>
 
-using lyx::docstring;
+
+namespace lyx {
 
 using std::string;
 using std::auto_ptr;
@@ -50,10 +51,9 @@ using std::ostringstream;
 
 void InsetCharStyle::init()
 {
-       setInsetName("CharStyle");
+       setInsetName(from_utf8("CharStyle"));
        setInlined();
        setDrawFrame(false);
-       has_label_ = true;
 }
 
 
@@ -103,6 +103,7 @@ void InsetCharStyle::setUndefined()
        params_.font = LyXFont(LyXFont::ALL_INHERIT);
        params_.labelfont = LyXFont(LyXFont::ALL_INHERIT);
        params_.labelfont.setColor(LColor::error);
+       params_.show_label = true;
 }
 
 
@@ -113,6 +114,7 @@ void InsetCharStyle::setDefined(CharStyles::iterator cs)
        params_.latexparam = cs->latexparam;
        params_.font = cs->font;
        params_.labelfont = cs->labelfont;
+       params_.show_label = true;
 }
 
 
@@ -131,6 +133,7 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
+       params_.read(lex);
        InsetCollapsable::read(buf, lex);
        setInlined();
 }
@@ -145,7 +148,7 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        InsetText::metrics(mi, dim);
        mi.base.font = tmpfont;
-       if (has_label_) {
+       if (params_.show_label) {
                // consider width of the inset label
                LyXFont font(params_.labelfont);
                font.realize(LyXFont(LyXFont::ALL_SANE));
@@ -154,12 +157,11 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
                int w = 0;
                int a = 0;
                int d = 0;
-               string s(params_.type);
+               // FIXME UNICODE
+               docstring s(from_utf8(params_.type));
                if (undefined())
-                       // FIXME UNICODE
-                       s = lyx::to_utf8(_("Undef: ")) + s;
-               docstring ds(s.begin(), s.end());
-               theApp->fontLoader().metrics(font).rectText(ds, w, a, d);
+                       s = _("Undef: ") + s;
+               theFontMetrics(font).rectText(s, w, a, d);
                dim.wid = max(dim.wid, w);
        }
        dim.asc += TEXT_TO_INSET_OFFSET;
@@ -167,7 +169,7 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid += 2 * TEXT_TO_INSET_OFFSET;
        mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
        dim_ = dim;
-       if (has_label_)
+       if (params_.show_label)
                dim_.des += ascent();
 }
 
@@ -184,7 +186,7 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
        pi.base.font = tmpfont;
 
        int desc = InsetText::descent();
-       if (has_label_)
+       if (params_.show_label)
                desc -= ascent();
 
        pi.pain.line(x, y + desc - 4, x, y + desc, params_.labelfont.color());
@@ -194,7 +196,7 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                params_.labelfont.color());
 
        // the name of the charstyle. Can be toggled.
-       if (has_label_) {
+       if (params_.show_label) {
                LyXFont font(params_.labelfont);
                font.realize(LyXFont(LyXFont::ALL_SANE));
                font.decSize();
@@ -202,14 +204,13 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
                int w = 0;
                int a = 0;
                int d = 0;
-               string s(params_.type);
+               // FIXME UNICODE
+               docstring s(from_utf8(params_.type));
                if (undefined())
-                       // FIXME UNICODE
-                       s = lyx::to_utf8(_("Undef: ")) + s;
-               docstring ds(s.begin(), s.end());
-               theApp->fontLoader().metrics(font).rectText(ds, w, a, d);
+                       s = _("Undef: ") + s;
+               theFontMetrics(font).rectText(s, w, a, d);
                pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
-                       ds, font, LColor::none, LColor::none);
+                       s, font, LColor::none, LColor::none);
        }
 
        // a visual clue when the cursor is inside the inset
@@ -239,11 +240,23 @@ void InsetCharStyle::doDispatch(LCursor & cur, FuncRequest & cmd)
        
        case LFUN_MOUSE_PRESS:
                        if (cmd.button() == mouse_button::button3)
-                               has_label_ = !has_label_;
+                               params_.show_label = !params_.show_label;
                        else
                                InsetText::doDispatch(cur, cmd);
                        break;
 
+       case LFUN_INSET_TOGGLE:
+               if (cmd.argument() == "open")
+                       params_.show_label = true;
+               else if (cmd.argument() == "close")
+                       params_.show_label = false;
+               else if (cmd.argument() == "toggle" || cmd.argument().empty())
+                       params_.show_label = !params_.show_label;
+               else // if assign or anything else
+                       cur.undispatched();
+               cur.dispatched();
+               break;
+
        default:
                InsetCollapsable::doDispatch(cur, cmd);
                break;
@@ -268,14 +281,15 @@ bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetCharStyle::latex(Buffer const & buf, ostream & os,
+int InsetCharStyle::latex(Buffer const & buf, odocstream & os,
                     OutputParams const & runparams) const
 {
        if (!undefined()) {
-               os << "\\" << params_.latexname;
+               // FIXME UNICODE
+               os << '\\' << from_utf8(params_.latexname);
                if (!params_.latexparam.empty())
-                       os << params_.latexparam;
-               os << "{";
+                       os << from_utf8(params_.latexparam);
+               os << '{';
        }
        int i = InsetText::latex(buf, os, runparams);
        if (!undefined())
@@ -284,7 +298,7 @@ int InsetCharStyle::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
+int InsetCharStyle::docbook(Buffer const & buf, odocstream & os,
                            OutputParams const & runparams) const
 {
        ParagraphList::const_iterator beg = paragraphs().begin();
@@ -292,8 +306,9 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
        ParagraphList::const_iterator end = paragraphs().end();
 
        if (!undefined())
-               sgml::openTag(os, params_.latexname,
-                       par->getID(buf, runparams) + params_.latexparam);
+                // FIXME UNICODE
+                sgml::openTag(os, params_.latexname,
+                              par->getID(buf, runparams) + params_.latexparam);
 
        for (; par != end; ++par) {
                par->simpleDocBookOnePar(buf, os, runparams,
@@ -308,14 +323,14 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCharStyle::plaintext(Buffer const & buf, ostream & os,
+int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os,
                              OutputParams const & runparams) const
 {
        return InsetText::plaintext(buf, os, runparams);
 }
 
 
-int InsetCharStyle::textString(Buffer const & buf, ostream & os,
+int InsetCharStyle::textString(Buffer const & buf, odocstream & os,
                       OutputParams const & op) const
 {
        return plaintext(buf, os, op);
@@ -333,18 +348,32 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 void InsetCharStyleParams::write(ostream & os) const
 {
        os << "CharStyle " << type << "\n";
+       os << "show_label " << convert<string>(show_label) << "\n";
 }
 
 
 void InsetCharStyleParams::read(LyXLex & lex)
 {
-       if (lex.isOK()) {
+       while (lex.isOK()) {
                lex.next();
                string token = lex.getString();
-       }
 
-       if (lex.isOK()) {
-               lex.next();
-               type = lex.getString();
+               if (token == "CharStyle") {
+                       lex.next();
+                       type = lex.getString();
+               }
+
+               else if (token == "show_label") {
+                       lex.next();
+                       show_label = lex.getBool();
+               }
+
+               else if (token == "status") {
+                       lex.pushToken(token);
+                       break;
+               }
        }
 }
+
+
+} // namespace lyx