#include "Language.h"
#include "Dimension.h"
-#include "support/unicode.h"
+#include "insets/Inset.h"
-#include <boost/assert.hpp>
+#include "support/lassert.h"
-using std::string;
+using namespace std;
namespace lyx {
namespace frontend {
*/
static inline QChar const ucs4_to_qchar(char_type const ucs4)
{
- BOOST_ASSERT(is_utf16(ucs4));
+ LASSERT(is_utf16(ucs4), /**/);
return QChar(static_cast<unsigned short>(ucs4));
}
if (!is_utf16(c))
// FIXME: QFontMetrics::leftBearingdoes not support the
// full unicode range. Once it does, we could use:
- //return metrics_.leftBearing(toqstr(docstring(1,c)));
+ //return metrics_.leftBearing(toqstr(docstring(1, c)));
return 0;
return metrics_.leftBearing(ucs4_to_qchar(c));
if (is_utf16(c)) {
QChar sc = ucs4_to_qchar(c);
value = width(c) - metrics_.rightBearing(sc);
- } else
- // FIXME: QFontMetrics::leftBearingdoes not support the
+ } else {
+ // FIXME: QFontMetrics::leftBearing does not support the
// full unicode range. Once it does, we could use:
- // metrics_.rightBearing(toqstr(docstring(1,c)));
+ // metrics_.rightBearing(toqstr(docstring(1, c)));
value = width(c);
+ }
rbearing_cache_.insert(c, value);
else
return metrics_.width(qc);
} else {
- QString const s = toqstr(docstring(1,c));
+ QString const s = toqstr(docstring(1, c));
QString const us = s.toUpper();
if (s != us)
return smallcaps_metrics_.width(us);
void GuiFontMetrics::rectText(docstring const & str,
int & w, int & ascent, int & descent) const
{
- static int const d = 2;
- w = width(str) + d * 2 + 2;
+ static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+
+ w = width(str) + Inset::TEXT_TO_INSET_OFFSET;
ascent = metrics_.ascent() + d;
descent = metrics_.descent() + d;
}
void GuiFontMetrics::buttonText(docstring const & str,
int & w, int & ascent, int & descent) const
{
- static int const d = 3;
- w = width(str) + d * 2 + 2;
- ascent = metrics_.ascent() + d;
- descent = metrics_.descent() + d;
+ rectText(str, w, ascent, descent);
+ w += Inset::TEXT_TO_INSET_OFFSET;
}
if (is_utf16(c))
r = metrics_.boundingRect(ucs4_to_qchar(c));
else
- r = metrics_.boundingRect(toqstr(docstring(1,c)));
+ r = metrics_.boundingRect(toqstr(docstring(1, c)));
AscendDescend ad = { -r.top(), r.bottom() + 1};
// We could as well compute the width but this is not really
return value.descent;
}
-} // frontend
-} // lyx
+} // namespace frontend
+} // namespace lyx