From 7bb691b8ad431625f31430713b1c8f03dc96bcdf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 15 May 2015 03:59:04 +0200 Subject: [PATCH] InsetBox.cpp: code simplification --- src/insets/InsetBox.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 5e8f8d3abc..cf3d791d41 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -351,22 +351,19 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const if (!(separation_string.find(defaultSep) != string::npos) && (thickness_string.find(defaultThick) != string::npos)) os << "{\\fboxsep " << from_ascii(separation_string); - if (!width_string.empty()) { - if (!params_.inner_box) { - os << "\\framebox"; - // Special widths, see usrguide sec. 3.5 - // FIXME UNICODE - if (params_.special != "none") { - os << "[" << params_.width.value() - << '\\' << from_utf8(params_.special) - << ']'; - } else - os << '[' << from_ascii(width_string) - << ']'; - if (params_.hor_pos != 'c') - os << "[" << params_.hor_pos << "]"; + if (!params_.inner_box && !width_string.empty()) { + os << "\\framebox"; + // Special widths, see usrguide sec. 3.5 + // FIXME UNICODE + if (params_.special != "none") { + os << "[" << params_.width.value() + << '\\' << from_utf8(params_.special) + << ']'; } else - os << "\\fbox"; + os << '[' << from_ascii(width_string) + << ']'; + if (params_.hor_pos != 'c') + os << "[" << params_.hor_pos << "]"; } else os << "\\fbox"; os << "{"; -- 2.39.2