insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 5442418ef51d83ed0252357a4fdd08b65a09a124..bee8b2bc4bd7500e394457cb55451d561ad9080a 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -24,8 +24,13 @@
 #include "lyxtext.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
+#include "paragraph_funcs.h"
+#include "sgml.h"
 
-#include "support/std_sstream.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+#include <sstream>
 
 
 using std::string;
@@ -38,17 +43,20 @@ using std::ostringstream;
 void InsetCharStyle::init()
 {
        setInsetName("CharStyle");
-       setButtonLabel();
+       setStatus(Inlined);
+       setDrawFrame(false);
+       has_label_ = true;
 }
 
 
-InsetCharStyle::InsetCharStyle(BufferParams const & bp, 
+InsetCharStyle::InsetCharStyle(BufferParams const & bp,
                                CharStyles::iterator cs)
        : InsetCollapsable(bp)
 {
        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();
@@ -84,24 +92,53 @@ void InsetCharStyle::write(Buffer const & buf, ostream & os) const
 void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
 {
        InsetCollapsable::read(buf, lex);
-       setButtonLabel();
-}
-
-
-void InsetCharStyle::setButtonLabel()
-{
-       LyXFont font(params_.labelfont);
-       font.realize(LyXFont(LyXFont::ALL_SANE));
-       font.decSize();
-       setLabel("Style: " + params_.type);
-       setLabelFont(font);
+       setStatus(Inlined);
 }
 
 
 void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       InsetCollapsable::metrics(mi, dim);
+       LyXFont tmpfont = mi.base.font;
+       getDrawFont(mi.base.font);
+       InsetText::metrics(mi, dim);
+       mi.base.font = tmpfont;
        dim_ = dim;
+       if (has_label_)
+               dim_.des += ascent();
+}
+
+
+void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
+{
+       setPosCache(pi, x, y);
+
+       LyXFont tmpfont = pi.base.font;
+       getDrawFont(pi.base.font);
+       InsetText::draw(pi, x, y);
+       pi.base.font = tmpfont;
+
+       int desc = InsetText::descent();
+       if (has_label_)
+               desc -= ascent();
+       
+       pi.pain.line(x, y + desc - 4, x, y + desc, params_.labelfont.color());
+       pi.pain.line(x, y + desc, x + dim_.wid - 2, y + desc, 
+               params_.labelfont.color());
+       pi.pain.line(x + dim_.wid - 2, y + desc, x + dim_.wid - 2, y + desc - 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 + desc + a,
+                       params_.type, font, LColor::none, LColor::none);
+       }
 }
 
 
@@ -111,80 +148,70 @@ 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::priv_dispatch(cur, cmd);
+                       break;
 
-namespace {
-
-int outputVerbatim(std::ostream & os, InsetText inset)
-{
-       int lines = 0;
-       ParagraphList::iterator par = inset.paragraphs.begin();
-       ParagraphList::iterator end = inset.paragraphs.end();
-       while (par != end) {
-               lyx::pos_type siz = par->size();
-               for (lyx::pos_type i = 0; i < siz; ++i) {
-                       if (par->isNewline(i)) {
-                               os << '\n';
-                               ++lines;
-                       } else {
-                               os << par->getChar(i);
-                       }
-               }
-               ++par;
-               if (par != end) {
-                       os << "\n";
-                       lines ++;
-               }
+               default:
+                       InsetCollapsable::priv_dispatch(cur, cmd);
+                       break;
        }
-       return lines;
 }
 
-} // namespace anon
 
-
-int InsetCharStyle::latex(Buffer const &, ostream & os,
-                    OutputParams const &) const
+int InsetCharStyle::latex(Buffer const & buf, ostream & os,
+                    OutputParams const & runparams) const
 {
-       os << "%\n\\" << params_.latexname << "{";
-       int i = outputVerbatim(os, inset);
-       os << "}%\n";
-               i += 2;
+       os << "\\" << params_.latexname;
+       if (!params_.latexparam.empty())
+               os << params_.latexparam;
+       os << "{";
+       int i = InsetText::latex(buf, os, runparams);
+       os << "}";
        return i;
 }
 
 
-int InsetCharStyle::linuxdoc(Buffer const &, std::ostream & os,
-                            OutputParams const &) const
+int InsetCharStyle::linuxdoc(Buffer const & buf, ostream & os,
+                            OutputParams const & runparams) const
 {
-       os << "<" << params_.latexname << ">";
-       int const i = outputVerbatim(os, inset);
-       os << "</" << params_.latexname << ">";
+       sgml::openTag(os, params_.latexname, params_.latexparam);
+       int i = InsetText::linuxdoc(buf, os, runparams);
+       sgml::closeTag(os, params_.latexname);
        return i;
 }
 
 
-int InsetCharStyle::docbook(Buffer const &, std::ostream & os,
-                           OutputParams const &) const
+int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
+                           OutputParams const & runparams) const
 {
-       os << "<" << params_.latexname << ">";
-       int const i = outputVerbatim(os, inset);
-       os << "</" << params_.latexname << ">";
-       return i;
+       ParagraphList::const_iterator par = paragraphs().begin();
+        ParagraphList::const_iterator end = paragraphs().end();
+
+       sgml::openTag(os, params_.latexname, par->getID() + params_.latexparam);
+
+        for (; par != end; ++par) {
+               par->simpleDocBookOnePar(buf, os, runparams,
+                                        outerFont(par - paragraphs().begin(),
+                                                  paragraphs()));
+        }
+
+       sgml::closeTag(os, params_.latexname);
+       return 0;
 }
 
 
-int InsetCharStyle::plaintext(Buffer const &, std::ostream & os,
+int InsetCharStyle::plaintext(Buffer const & buf, ostream & os,
                              OutputParams const & runparams) const
 {
-       return outputVerbatim(os, inset);
+       return InsetText::plaintext(buf, os, runparams);
 }
 
 
@@ -196,7 +223,7 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 
 void InsetCharStyleParams::write(ostream & os) const
 {
-       os << type << "\n";
+       os << "CharStyle " << type << "\n";
 }
 
 
@@ -212,4 +239,3 @@ void InsetCharStyleParams::read(LyXLex & lex)
                type = lex.getString();
        }
 }
-