commit 7575ad159b2473666d6df51da45f648c0bf552a8
Author: Richard Heck <[email protected]>
Date: Mon Jul 18 12:59:18 2016 -0400
Revert "Do not crash is release mode if we stumble across an unrealized
font."
This reverts commit c560e6b3a6ae36ad9a333fe98da3b8688dfa2236.
I did not mean to comit the changes to the gmo files.
---
po/de.gmo | Bin 492574 -> 490433 bytes
po/ia.gmo | Bin 475598 -> 444082 bytes
po/sk.gmo | Bin 481868 -> 481868 bytes
src/frontends/qt4/GuiFontLoader.cpp | 23 +++++------------------
src/insets/InsetArgument.cpp | 6 +-----
5 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/po/de.gmo b/po/de.gmo
index 7e3719b..b8d7822 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/ia.gmo b/po/ia.gmo
index 80eb568..eddcba4 100644
Binary files a/po/ia.gmo and b/po/ia.gmo differ
diff --git a/po/sk.gmo b/po/sk.gmo
index 65335df..bdda0b7 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/src/frontends/qt4/GuiFontLoader.cpp
b/src/frontends/qt4/GuiFontLoader.cpp
index 148677b..9a662a8 100644
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -95,24 +95,11 @@ static GuiFontInfo *
fontinfo_[NUM_FAMILIES][NUM_SERIES][NUM_SHAPE][NUM_SIZE];
// if not cached, create it.
GuiFontInfo & fontinfo(FontInfo const & f)
{
- bool const fontIsRealized =
- (f.family() < NUM_FAMILIES) &&
- (f.series() < NUM_SERIES) &&
- (f.realShape() < NUM_SHAPE) &&
- (f.size() < NUM_SIZE);
- if (!fontIsRealized) {
- // We can reset the font to something sensible in release mode.
- LATTEST(false);
- LYXERR0("Unrealized font!");
- // We could be fancier here, if we wanted, and just fix things where
- // there is a problem. But it doesn't seem worth it, since we should
- // not be here in the first place.
- GuiFontInfo * & fi =
-
fontinfo_[sane_font.family()][sane_font.series()][sane_font.realShape()][sane_font.size()];
- if (!fi)
- fi = new GuiFontInfo(f);
- return *fi;
- }
+ // LASSERT: Is there anything we might do here besides crash?
+ LBUFERR(f.family() < NUM_FAMILIES);
+ LBUFERR(f.series() < NUM_SERIES);
+ LBUFERR(f.realShape() < NUM_SHAPE);
+ LBUFERR(f.size() < NUM_SIZE);
// fi is a reference to the pointer type (GuiFontInfo *) in the
// fontinfo_ table.
GuiFontInfo * & fi =
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 13d17bb..da807d2 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -104,11 +104,7 @@ void InsetArgument::updateBuffer(ParIterator const & it,
UpdateType utype)
name_ = convert<string>(ours);
}
}
-
- // FIXME It does not look to me as if this needs to be redone
- // over and over again. All the arguments are coming from the
- // layout. If that changes....
- Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
+ Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
if (lait != args.end()) {
docstring label =
translateIfPossible((*lait).second.labelstring);
docstring striplabel;