Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 9447583ccf2223730ad06261139cfb3877176457..0c3be7102aab6459b00188504c15de7a9bf7a932 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -16,21 +16,22 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "Color.h"
+#include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "BufferView.h"
+#include "Dimension.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "InsetList.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
+#include "TextClass.h"
 #include "TocBackend.h"
 
 #include "frontends/FontMetrics.h"
@@ -40,11 +41,8 @@
 
 #include <sstream>
 
-
-using std::endl;
-using std::string;
-using std::ostream;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -54,7 +52,7 @@ InsetCaption::InsetCaption(InsetCaption const & ic)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
-       setFrameColor(Color::captionframe);
+       setFrameColor(Color_captionframe);
 }
 
 InsetCaption::InsetCaption(BufferParams const & bp)
@@ -62,7 +60,7 @@ InsetCaption::InsetCaption(BufferParams const & bp)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
-       setFrameColor(Color::captionframe);
+       setFrameColor(Color_captionframe);
 }
 
 
@@ -104,7 +102,7 @@ void InsetCaption::cursorPos(BufferView const & bv,
 
 void InsetCaption::setCustomLabel(docstring const & label)
 {
-       if (!support::isAscii(label) || label.empty())
+       if (!isAscii(label) || label.empty())
                // This must be a user defined layout. We cannot translate
                // this, since gettext accepts only ascii keys.
                custom_label_ = label;
@@ -128,8 +126,8 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstItera
 
 void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Font tmpfont = mi.base.font;
-       mi.base.font = mi.base.bv->buffer().params().getFont();
+       FontInfo tmpfont = mi.base.font;
+       mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
        labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
        // add some space to separate the label from the inset text
        labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
@@ -140,7 +138,7 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
        InsetText::metrics(mi, textdim);
        mi.base.font = tmpfont;
        mi.base.textwidth += dim.wid;
-       dim.des = std::max(dim.des - textdim.asc + dim.asc, textdim.des);
+       dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
        dim.asc = textdim.asc;
        dim.wid += textdim.wid;
 }
@@ -156,8 +154,8 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
        // Answer: the text inset (in buffer_funcs.cpp: setCaption).
 
-       Font tmpfont = pi.base.font;
-       pi.base.font = pi.base.bv->buffer().params().getFont();
+       FontInfo tmpfont = pi.base.font;
+       pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
        pi.pain.text(x, y, full_label_, pi.base.font);
        InsetText::draw(pi, x + labelwidth_, y);
        pi.base.font = tmpfont;
@@ -185,7 +183,8 @@ bool InsetCaption::insetAllowed(InsetCode code) const
        case TABULAR_CODE:
        case WRAP_CODE:
        case CAPTION_CODE:
-       case PAGEBREAK_CODE:
+       case NEWPAGE_CODE:
+       case MATHMACRO_CODE:
                return false;
        default:
                return InsetText::insetAllowed(code);
@@ -273,7 +272,6 @@ int InsetCaption::getOptArg(Buffer const & buf, odocstream & os,
 
 void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 {
-       using support::bformat;
        TextClass const & tclass = buf.params().getTextClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();