* Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
* \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
#include "FontList.h"
-#include <boost/next_prior.hpp>
-
-#include <algorithm>
+#include "support/lyxalgo.h"
using namespace std;
}
-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;
}
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
// in a new kernel. (Asger)
// Next search font table
- iterator beg = list_.begin();
- iterator it = beg;
- iterator endit = list_.end();
- bool found = false;
- for (; it != endit; ++it) {
- if (it->pos() >= pos) {
- found = true;
- break;
- }
- }
+ List::iterator it = fontIterator(pos);
+ bool const found = it != list_.end();
if (found && it->font() == font)
+ // Font is already set.
return;
- size_t const i = distance(beg, it);
+ size_t const i = distance(list_.begin(), it);
- // Is position pos is a beginning of a font block?
- bool begin = pos == 0 || !found
+ // Is position pos a beginning of a font block?
+ bool const begin = pos == 0 || !found
|| (i > 0 && list_[i - 1].pos() == pos - 1);
- // Is position pos is the end of a font block?
- bool end = found && list_[i].pos() == pos;
+ // Is position pos at the end of a font block?
+ bool const end = found && list_[i].pos() == pos;
if (!begin && !end) {
- // The general case: The block is splitted into 3 blocks
+ // The general case: The block is split into 3 blocks
list_.insert(list_.begin() + i,
FontTable(pos - 1, list_[i].font()));
list_.insert(list_.begin() + i + 1,
}
-FontSize FontList::highestInRange
- (pos_type startpos, pos_type endpos, FontSize def_size) const
+FontSize FontList::highestInRange(pos_type startpos, pos_type endpos,
+ FontSize def_size) const
{
if (list_.empty())
return def_size;
- const_iterator end_it = list_.begin();
+ List::const_iterator end_it = fontIterator(endpos);
const_iterator const end = list_.end();
- for (; end_it != end; ++end_it) {
- if (end_it->pos() >= endpos)
- break;
- }
-
if (end_it != end)
++end_it;
- FontList::const_iterator cit = list_.begin();
- for (; cit != end; ++cit) {
- if (cit->pos() >= startpos)
- break;
- }
+ List::const_iterator cit = fontIterator(startpos);
FontSize maxsize = FONT_SIZE_TINY;
for (; cit != end_it; ++cit) {
}
-bool FontList::hasChangeInRange(pos_type pos, int len) const
-{
- // FIXME: can't we use fontIterator(pos) instead?
- const_iterator cit = list_.begin();
- const_iterator end = list_.end();
- for (; cit != end; ++cit) {
- if (cit->pos() >= pos)
- break;
- }
- if (cit != end && pos + len - 1 > cit->pos())
- return false;
-
- return true;
-}
-
-
void FontList::validate(LaTeXFeatures & features) const
{
const_iterator fcit = list_.begin();