* new function to set border around selection

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 39300ba3f71160275004e73252326683b25c3c67..3ba4f84d558cde1e9bd2459d975260ca88e6ce9c 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -75,17 +75,17 @@ bool Text::isMainText(Buffer const & buffer) const
 
 FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
 {
-       LayoutPtr const & layout = pars_[pit].layout();
+       Layout const & layout = pars_[pit].layout();
 
        if (!pars_[pit].getDepth())  {
-               FontInfo lf = layout->resfont;
+               FontInfo lf = layout.resfont;
                // In case the default family has been customized
-               if (layout->font.family() == INHERIT_FAMILY)
+               if (layout.font.family() == INHERIT_FAMILY)
                        lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       FontInfo font = layout->font;
+       FontInfo font = layout.font;
        // Realize with the fonts of lesser depth.
        //font.realize(outerFont(pit, paragraphs()));
        font.realize(buffer.params().getFont().fontInfo());
@@ -96,17 +96,17 @@ FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
 
 FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
 {
-       LayoutPtr const & layout = par.layout();
+       Layout const & layout = par.layout();
 
        if (!par.getDepth()) {
-               FontInfo lf = layout->reslabelfont;
+               FontInfo lf = layout.reslabelfont;
                // In case the default family has been customized
-               if (layout->labelfont.family() == INHERIT_FAMILY)
+               if (layout.labelfont.family() == INHERIT_FAMILY)
                        lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       FontInfo font = layout->labelfont;
+       FontInfo font = layout.labelfont;
        // Realize with the fonts of lesser depth.
        font.realize(buffer.params().getFont().fontInfo());
 
@@ -118,15 +118,15 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
                pos_type pos, Font const & fnt, Font const & display_font)
 {
        Font font = fnt;
-       LayoutPtr const & layout = pars_[pit].layout();
+       Layout const & layout = pars_[pit].layout();
 
        // Get concrete layout font to reduce against
        FontInfo layoutfont;
 
        if (pos < pars_[pit].beginOfBody())
-               layoutfont = layout->labelfont;
+               layoutfont = layout.labelfont;
        else
-               layoutfont = layout->font;
+               layoutfont = layout.font;
 
        // Realize against environment font information
        if (pars_[pit].getDepth()) {
@@ -136,7 +136,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
                       pars_[tp].getDepth()) {
                        tp = outerHook(tp, paragraphs());
                        if (tp != pit_type(paragraphs().size()))
-                               layoutfont.realize(pars_[tp].layout()->font);
+                               layoutfont.realize(pars_[tp].layout().font);
                }
        }
 
@@ -199,14 +199,14 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end,
        BOOST_ASSERT(start != end);
 
        BufferParams const & bufparams = buffer.params();
-       LayoutPtr const & lyxlayout = bufparams.textClass()[layout];
+       Layout const & lyxlayout = bufparams.documentClass()[layout];
 
        for (pit_type pit = start; pit != end; ++pit) {
                Paragraph & par = pars_[pit];
                par.applyLayout(lyxlayout);
-               if (lyxlayout->margintype == MARGIN_MANUAL)
+               if (lyxlayout.margintype == MARGIN_MANUAL)
                        par.setLabelWidthString(par.translateIfPossible(
-                               lyxlayout->labelstring(), buffer.params()));
+                               lyxlayout.labelstring(), buffer.params()));
        }
 }
 
@@ -218,14 +218,14 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
        // special handling of new environment insets
        BufferView & bv = cur.bv();
        BufferParams const & params = bv.buffer().params();
-       LayoutPtr const & lyxlayout = params.textClass()[layout];
-       if (lyxlayout->is_environment) {
+       Layout const & lyxlayout = params.documentClass()[layout];
+       if (lyxlayout.is_environment) {
                // move everything in a new environment inset
                LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout));
                lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
                lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
                lyx::dispatch(FuncRequest(LFUN_CUT));
-               Inset * inset = new InsetEnvironment(params, layout);
+               Inset * inset = new InsetEnvironment(bv.buffer(), layout);
                insertInset(cur, inset);
                //inset->edit(cur, true);
                //lyx::dispatch(FuncRequest(LFUN_PASTE));
@@ -244,7 +244,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 static bool changeDepthAllowed(Text::DEPTH_CHANGE type,
                        Paragraph const & par, int max_depth)
 {
-       if (par.layout()->labeltype == LABEL_BIBLIO)
+       if (par.layout().labeltype == LABEL_BIBLIO)
                return false;
        int const depth = par.params().depth();
        if (type == Text::INC_DEPTH && depth < max_depth)
@@ -452,7 +452,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
                Paragraph & par = pars_[pit];
                ParagraphParameters params = par.params();
                params.read(argument, merge);
-               par.params().apply(params, *par.layout());
+               par.params().apply(params, par.layout());
        }
 }
 
@@ -470,8 +470,7 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
        for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
             pit <= end; ++pit) {
                Paragraph & par = pars_[pit];
-               Layout const & layout = *(par.layout());
-               par.params().apply(p, layout);
+               par.params().apply(p, par.layout());
        }       
 }