Account for old versions of Pygments

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.h

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index 1a6fdfa408d59f88cd50587d40a82ee4c17341b2..3f50dfe5d29902d0516e2b27c3ca2ec32fa4d4e4 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,32 +9,38 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
 
 #include "frontends/FontMetrics.h"
 
+#include "support/Cache.h"
 #include "support/docstring.h"
 
+#include <QFont>
 #include <QFontMetrics>
 #include <QHash>
+#include <QTextLayout>
 
+#include <memory>
 
 namespace lyx {
 namespace frontend {
 
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
 {
 public:
-
        GuiFontMetrics(QFont const & font);
-       GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
        virtual ~GuiFontMetrics() {}
 
        virtual int maxAscent() const;
        virtual int maxDescent() const;
        virtual Dimension const defaultDimension() const;
+       virtual int em() const;
+       virtual int lineWidth() const;
+       virtual int underlinePos() const;
+       virtual int strikeoutPos() const;
        virtual int width(char_type c) const;
        virtual int ascent(char_type c) const;
        virtual int descent(char_type c) const;
@@ -42,6 +48,9 @@ public:
        virtual int rbearing(char_type c) const;
        virtual int width(docstring const & s) const;
        virtual int signedWidth(docstring const & s) const;
+       virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const;
+       virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const;
+       virtual bool breakAt(docstring & s, int & x, bool rtl, bool force) const;
        virtual Dimension const dimension(char_type c) const;
 
        virtual void rectText(docstring const & str,
@@ -49,27 +58,43 @@ public:
                int & ascent,
                int & descent) const;
        virtual void buttonText(docstring const & str,
+               const int offset,
                int & width,
                int & ascent,
                int & descent) const;
+
+       int countExpanders(docstring const & str) const;
        ///
        int width(QString const & str) const;
 
+       /// Return a pointer to a cached QTextLayout object
+       std::shared_ptr<QTextLayout const>
+       getTextLayout(docstring const & s, bool const rtl,
+                     double const wordspacing) const;
+
 private:
-       int smallcapsWidth(char_type c) const;
+
+       std::pair<int, int> breakAt_helper(docstring const & s, int const x,
+                                          bool const rtl, bool const force) const;
+
+       /// The font
+       QFont font_;
 
        /// Metrics on the font
        QFontMetrics metrics_;
-       QFontMetrics smallcaps_metrics_;
-
-       bool smallcaps_shape_;
 
        /// Cache of char widths
        mutable QHash<char_type, int> width_cache_;
+       /// Cache of string widths
+       mutable Cache<docstring, int> strwidth_cache_;
+       /// Cache for breakAt
+       mutable Cache<docstring, std::pair<int, int>> breakat_cache_;
+       /// Cache for QTextLayout
+       mutable Cache<docstring, std::shared_ptr<QTextLayout>> qtextlayout_cache_;
 
        struct AscendDescend {
-               short int ascent;
-               short int descent;
+               int ascent;
+               int descent;
        };
        /// Cache of char ascends and descends
        mutable QHash<char_type, AscendDescend> metrics_cache_;
@@ -78,9 +103,10 @@ private:
 
        /// Cache of char right bearings
        mutable QHash<char_type, int> rbearing_cache_;
+
 };
 
 } // namespace frontend
 } // namespace lyx
 
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H