Make it compile when USE_BOOST_FORMAT is unset

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

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index c89f168a5ee617043a5918653e9d93cd2a859572..ce473a29f2a4d72a1a5ccf9323e8c16ca44eddfb 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -1,11 +1,14 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file insetspecialchar.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Asger Alstrup Nielsen
+ * \author Jean-Marc Lasgouttes
+ * \author Lars Gullik Bjønnes
  *
- *         Copyright 1997 Asger Alstrup
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
@@ -18,7 +21,7 @@
 #include "LaTeXFeatures.h"
 #include "BufferView.h"
 #include "frontends/Painter.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
 #include "lyxlex.h"
 #include "lyxfont.h"
 
@@ -37,13 +40,13 @@ InsetSpecialChar::Kind InsetSpecialChar::kind() const
 
 int InsetSpecialChar::ascent(BufferView *, LyXFont const & font) const
 {
-       return lyxfont::maxAscent(font);
+       return font_metrics::maxAscent(font);
 }
 
 
 int InsetSpecialChar::descent(BufferView *, LyXFont const & font) const
 {
-       return lyxfont::maxDescent(font);
+       return font_metrics::maxDescent(font);
 }
 
 
@@ -52,30 +55,30 @@ int InsetSpecialChar::width(BufferView *, LyXFont const & font) const
        switch (kind_) {
        case HYPHENATION:
        {
-               int w = lyxfont::width('-', font);
+               int w = font_metrics::width('-', font);
                if (w > 5)
                        w -= 2; // to make it look shorter
                return w;
        }
        case LIGATURE_BREAK:
        {
-               return lyxfont::width('|', font);
+               return font_metrics::width('|', font);
        }
        case END_OF_SENTENCE:
        {
-               return lyxfont::width('.', font);
+               return font_metrics::width('.', font);
        }
        case LDOTS:
        {
-               return lyxfont::width(". . .", font);
+               return font_metrics::width(". . .", font);
        }
        case MENU_SEPARATOR:
        {
-               return lyxfont::width(" x ", font);
+               return font_metrics::width(" x ", font);
        }
        case PROTECTED_SEPARATOR:
        {
-               return lyxfont::width('x', font);
+               return font_metrics::width('x', font);
        }
 
        }
@@ -121,9 +124,9 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
        case MENU_SEPARATOR:
        {
                // A triangle the width and height of an 'x'
-               int w = lyxfont::width('x', font);
-               int ox = lyxfont::width(' ', font) + int(x);
-               int h = lyxfont::ascent('x', font);
+               int w = font_metrics::width('x', font);
+               int ox = font_metrics::width(' ', font) + int(x);
+               int h = font_metrics::ascent('x', font);
                int xp[4], yp[4];
 
                xp[0] = ox;     yp[0] = baseline;
@@ -138,7 +141,7 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
        case PROTECTED_SEPARATOR:
        {
                float w = width(bv, font);
-               int h = lyxfont::ascent('x', font);
+               int h = font_metrics::ascent('x', font);
                int xp[4], yp[4];
 
                xp[0] = int(x);
@@ -182,7 +185,6 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const
                command = "\\menuseparator";
                break;
        case PROTECTED_SEPARATOR:
-               //command = "\\protected_separator";
                command = "~";
                break;
        }
@@ -206,8 +208,7 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
                kind_ = LDOTS;
        else if (command == "\\menuseparator")
                kind_ = MENU_SEPARATOR;
-       else if (command == "\\protected_separator"
-                || command == "~")
+       else if (command == "~")
                kind_ = PROTECTED_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
@@ -287,7 +288,7 @@ int InsetSpecialChar::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetSpecialChar::docbook(Buffer const *, ostream & os) const
+int InsetSpecialChar::docbook(Buffer const *, ostream & os, bool) const
 {
        switch (kind_) {
        case HYPHENATION: