Account for old versions of Pygments

[lyx.git] / src / FontList.cpp

diff --git a/src/FontList.cpp b/src/FontList.cpp
index efe1208f2f59ba5f0895efef18fd36d170b3e902..1bfab761fd8d7cace97377056fed300f2909eb64 100644 (file)
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -20,9 +20,7 @@
 
 #include "FontList.h"
 
-#include <boost/next_prior.hpp>
-
-#include <algorithm>
+#include "support/lyxalgo.h"
 
 using namespace std;
 
@@ -53,13 +51,14 @@ FontList::const_iterator FontList::fontIterator(pos_type pos) const
 }
 
 
-Font & FontList::get(pos_type pos)
+Font const & FontList::get(pos_type pos)
 {
        iterator end = list_.end();
        iterator it = fontIterator(pos);
        if (it != end && it->pos() == pos)
                return it->font_;
-       static Font dummy;
+
+       static Font const dummy;
        return dummy;
 }
 
@@ -71,7 +70,7 @@ void FontList::erase(pos_type pos)
        iterator beg = list_.begin();
        if (it != list_.end() && it->pos() == pos
                && (pos == 0 
-                       || (it != list_.begin() && boost::prior(it)->pos() == pos - 1))) {
+                       || (it != list_.begin() && prev(it, 1)->pos() == pos - 1))) {
 
                // If it is a multi-character font
                // entry, we just make it smaller
@@ -181,38 +180,6 @@ void FontList::set(pos_type pos, Font const & font)
 }
 
 
-FontSize FontList::highestInRange(pos_type startpos, pos_type endpos,
-       FontSize def_size) const
-{
-       if (list_.empty())
-               return def_size;
-
-       List::const_iterator end_it = fontIterator(endpos);
-       const_iterator const end = list_.end();
-       if (end_it != end)
-               ++end_it;
-
-       List::const_iterator cit = fontIterator(startpos);
-
-       FontSize maxsize = FONT_SIZE_TINY;
-       for (; cit != end_it; ++cit) {
-               FontSize size = cit->font().fontInfo().size();
-               if (size == FONT_SIZE_INHERIT)
-                       size = def_size;
-               if (size > maxsize && size <= FONT_SIZE_HUGER)
-                       maxsize = size;
-       }
-       return maxsize;
-}
-
-
-bool FontList::hasChangeInRange(pos_type pos, int len) const
-{
-       List::const_iterator cit = fontIterator(pos);
-       return cit == list_.end() || pos + len - 1 <= cit->pos();
-}
-
-
 void FontList::validate(LaTeXFeatures & features) const
 {
        const_iterator fcit = list_.begin();