X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontList.cpp;h=1bfab761fd8d7cace97377056fed300f2909eb64;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=7d46e8bf0ccd04876595ccde67bb7a31223ee060;hpb=17321b90ad29227eb5969b231f135d3fd745f976;p=lyx.git diff --git a/src/FontList.cpp b/src/FontList.cpp index 7d46e8bf0c..1bfab761fd 100644 --- a/src/FontList.cpp +++ b/src/FontList.cpp @@ -4,13 +4,13 @@ * 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. @@ -20,55 +20,45 @@ #include "FontList.h" -#include +#include "support/lyxalgo.h" -#include - -using std::distance; -using std::endl; -using std::string; -using std::ostream; +using namespace std; namespace lyx { -namespace { - -class matchFT -{ -public: - /// used by lower_bound and upper_bound - int operator()(FontTable const & a, FontTable const & b) const { - return a.pos() < b.pos(); - } -}; - -} // anon namespace FontList::iterator FontList::fontIterator(pos_type pos) { - static Font dummy; - FontTable search_elem(pos, dummy); - return lower_bound(list_.begin(), list_.end(), search_elem, - matchFT()); + FontList::iterator it = list_.begin(); + FontList::iterator end = list_.end(); + for (; it != end; ++it) { + if (it->pos() >= pos) + break; + } + return it; } FontList::const_iterator FontList::fontIterator(pos_type pos) const { - static Font dummy; - FontTable search_elem(pos, dummy); - return lower_bound(list_.begin(), list_.end(), search_elem, - matchFT()); + FontList::const_iterator it = list_.begin(); + FontList::const_iterator end = list_.end(); + for (; it != end; ++it) { + if (it->pos() >= pos) + break; + } + return it; } -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; } @@ -80,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 @@ -122,31 +112,46 @@ void FontList::decreasePosAfterPos(pos_type pos) } +void FontList::setRange(pos_type startpos, pos_type endpos, Font const & font) +{ + // FIXME: Optimize!!! + for (pos_type pos = startpos; pos != endpos; ++pos) + set(pos, font); +} + + void FontList::set(pos_type pos, Font const & font) { // No need to simplify this because it will disappear // in a new kernel. (Asger) // Next search font table - iterator beg = list_.begin(); - iterator it = beg; - iterator endit = list_.end(); - for (; it != endit; ++it) { - if (it->pos() >= pos) - break; - } - size_t const i = distance(beg, it); - bool notfound = (it == endit); + 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(list_.begin(), it); + + // Is position pos a beginning of a font block? + bool const begin = pos == 0 || !found + || (i > 0 && list_[i - 1].pos() == pos - 1); - if (!notfound && list_[i].font() == font) + // 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 split into 3 blocks + list_.insert(list_.begin() + i, + FontTable(pos - 1, list_[i].font())); + list_.insert(list_.begin() + i + 1, + FontTable(pos, font)); return; + } - bool begin = pos == 0 || notfound || - (i > 0 && list_[i - 1].pos() == pos - 1); - // Is position pos is a beginning of a font block? - bool end = !notfound && list_[i].pos() == pos; - // Is position pos is the end of a font block? - if (begin && end) { // A single char block + if (begin && end) { + // A single char block if (i + 1 < list_.size() && list_[i + 1].font() == font) { // Merge the singleton block with the next block @@ -171,62 +176,7 @@ void FontList::set(pos_type pos, Font const & font) list_[i + 1].font() == font)) list_.insert(list_.begin() + i + 1, FontTable(pos, font)); - } else { // The general case. The block is splitted into 3 blocks - list_.insert(list_.begin() + i, - FontTable(pos - 1, list_[i].font())); - list_.insert(list_.begin() + i + 1, - FontTable(pos, font)); - } -} - - -Font_size FontList::highestInRange - (pos_type startpos, pos_type endpos, Font_size def_size) const -{ - if (list_.empty()) - return def_size; - - const_iterator end_it = list_.begin(); - 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; - } - - Font::FONT_SIZE maxsize = Font::SIZE_TINY; - for (; cit != end_it; ++cit) { - Font::FONT_SIZE size = cit->font().size(); - if (size == Font::INHERIT_SIZE) - size = def_size; - if (size > maxsize && size <= Font::SIZE_HUGER) - maxsize = size; - } - return maxsize; -} - - -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; }