change "support/std_sstream.h" to <sstream>

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

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 5442418ef51d83ed0252357a4fdd08b65a09a124..910350243cdc87a3660326791d1b4dc9d4c7f63c 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -25,7 +25,10 @@
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+#include <sstream>
 
 
 using std::string;
@@ -38,17 +41,18 @@ using std::ostringstream;
 void InsetCharStyle::init()
 {
        setInsetName("CharStyle");
-       setButtonLabel();
+       setStatus(Inlined);
 }
 
 
-InsetCharStyle::InsetCharStyle(BufferParams const & bp, 
+InsetCharStyle::InsetCharStyle(BufferParams const & bp,
                                CharStyles::iterator cs)
-       : InsetCollapsable(bp)
+       : InsetCollapsable(bp), has_label_(true)
 {
        params_.type = cs->name;
        params_.latextype = cs->latextype;
        params_.latexname = cs->latexname;
+       params_.latexparam = cs->latexparam;
        params_.font = cs->font;
        params_.labelfont = cs->labelfont;
        init();
@@ -56,7 +60,7 @@ InsetCharStyle::InsetCharStyle(BufferParams const & bp,
 
 
 InsetCharStyle::InsetCharStyle(InsetCharStyle const & in)
-       : InsetCollapsable(in), params_(in.params_)
+       : InsetCollapsable(in), params_(in.params_), has_label_(true)
 {
        init();
 }
@@ -84,24 +88,53 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
        InsetCollapsable::read(buf, lex);
-       setButtonLabel();
+       setStatus(Inlined);
 }
 
 
-void InsetCharStyle::setButtonLabel()
+void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LyXFont font(params_.labelfont);
-       font.realize(LyXFont(LyXFont::ALL_SANE));
-       font.decSize();
-       setLabel("Style: " + params_.type);
-       setLabelFont(font);
+       LyXFont tmpfont = mi.base.font;
+       getDrawFont(mi.base.font);
+       InsetCollapsable::metrics(mi, dim);
+       mi.base.font = tmpfont;
+       dim_ = dim;
+       if (has_label_)
+               dim_.des += ascent();
 }
 
 
-void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
 {
-       InsetCollapsable::metrics(mi, dim);
-       dim_ = dim;
+       setPosCache(pi, x, y);
+
+       // FIXME: setStatus(Inlined); this is not a const operation
+       LyXFont tmpfont = pi.base.font;
+       //setDrawFrame(InsetText::NEVER);
+       getDrawFont(pi.base.font);
+       InsetText::draw(pi, x, y);
+       pi.base.font = tmpfont;
+
+       pi.pain.line(x + 2, y + InsetText::descent() - 4, x + 2,
+               y + InsetText::descent(), params_.labelfont.color());
+       pi.pain.line(x + 2, y + InsetText::descent(), x + dim_.wid - 2,
+               y + InsetText::descent(), params_.labelfont.color());
+       pi.pain.line(x + dim_.wid - 2, y + InsetText::descent(), x + dim_.wid - 2,
+               y + InsetText::descent() - 4, params_.labelfont.color());
+
+       if (has_label_) {
+               LyXFont font(params_.labelfont);
+               font.realize(LyXFont(LyXFont::ALL_SANE));
+               font.decSize();
+               font.decSize();
+               int w = 0;
+               int a = 0;
+               int d = 0;
+               font_metrics::rectText(params_.type, font, w, a, d);
+               pi.pain.rectText(x + (dim_.wid - w) / 2,
+                       y + InsetText::descent() + a,
+                       params_.type, font, LColor::none, LColor::none);
+       }
 }
 
 
@@ -111,23 +144,31 @@ void InsetCharStyle::getDrawFont(LyXFont & font) const
 }
 
 
-DispatchResult
-InsetCharStyle::priv_dispatch(FuncRequest const & cmd,
-                       idx_type & idx, pos_type & pos)
+void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       DispatchResult dr = InsetCollapsable::priv_dispatch(cmd, idx, pos);
-       setButtonLabel();
-       return dr;
+       setStatus(Inlined);
+       switch (cmd.action) {
+               case LFUN_MOUSE_PRESS:
+                       if (cmd.button() == mouse_button::button3)
+                               has_label_ = !has_label_;
+                       else
+                               InsetText::dispatch(cur, cmd);
+                       break;
+
+               default:
+                       InsetCollapsable::priv_dispatch(cur, cmd);
+                       break;
+       }
 }
 
 
 namespace {
 
-int outputVerbatim(std::ostream & os, InsetText inset)
+int outputVerbatim(std::ostream & os, InsetText const & inset)
 {
        int lines = 0;
-       ParagraphList::iterator par = inset.paragraphs.begin();
-       ParagraphList::iterator end = inset.paragraphs.end();
+       ParagraphList::const_iterator par = inset.paragraphs().begin();
+       ParagraphList::const_iterator end = inset.paragraphs().end();
        while (par != end) {
                lyx::pos_type siz = par->size();
                for (lyx::pos_type i = 0; i < siz; ++i) {
@@ -153,8 +194,11 @@ int outputVerbatim(std::ostream & os, InsetText inset)
 int InsetCharStyle::latex(Buffer const &, ostream & os,
                     OutputParams const &) const
 {
-       os << "%\n\\" << params_.latexname << "{";
-       int i = outputVerbatim(os, inset);
+       os << "%\n\\" << params_.latexname;
+       if (!params_.latexparam.empty())
+               os << params_.latexparam;
+       os << "{";
+       int i = outputVerbatim(os, *this);
        os << "}%\n";
                i += 2;
        return i;
@@ -164,8 +208,11 @@ int InsetCharStyle::latex(Buffer const &, ostream & os,
 int InsetCharStyle::linuxdoc(Buffer const &, std::ostream & os,
                             OutputParams const &) const
 {
-       os << "<" << params_.latexname << ">";
-       int const i = outputVerbatim(os, inset);
+       os << "<" << params_.latexname;
+       if (!params_.latexparam.empty())
+               os << " " << params_.latexparam;
+       os << ">";
+       int const i = outputVerbatim(os, *this);
        os << "</" << params_.latexname << ">";
        return i;
 }
@@ -174,17 +221,20 @@ int InsetCharStyle::linuxdoc(Buffer const &, std::ostream & os,
 int InsetCharStyle::docbook(Buffer const &, std::ostream & os,
                            OutputParams const &) const
 {
-       os << "<" << params_.latexname << ">";
-       int const i = outputVerbatim(os, inset);
+       os << "<" << params_.latexname;
+       if (!params_.latexparam.empty())
+               os << " " << params_.latexparam;
+       os << ">";
+       int const i = outputVerbatim(os, *this);
        os << "</" << params_.latexname << ">";
        return i;
 }
 
 
 int InsetCharStyle::plaintext(Buffer const &, std::ostream & os,
-                             OutputParams const & runparams) const
+                             OutputParams const & /*runparams*/) const
 {
-       return outputVerbatim(os, inset);
+       return outputVerbatim(os, *this);
 }
 
 
@@ -196,7 +246,7 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 
 void InsetCharStyleParams::write(ostream & os) const
 {
-       os << type << "\n";
+       os << "CharStyle " << type << "\n";
 }
 
 
@@ -212,4 +262,3 @@ void InsetCharStyleParams::read(LyXLex & lex)
                type = lex.getString();
        }
 }
-