From d49051d99fbd2a462378c0cb5159899500cdc00d Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 26 Feb 2015 22:55:20 +0100 Subject: [PATCH] Fix hyphen conversion in passThru insets The old hyphen replacement code did not convert hyphens if the condition style.pass_thru || runparams.pass_thru was met. style.pass_thru got set from inset owner (isPassThru()). Therefore we have to consider this for the new replacement code as well. --- src/Text.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Text.cpp b/src/Text.cpp index cfb4f5c42a..526a1b5323 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -504,7 +504,8 @@ void Text::readParToken(Paragraph & par, Lexer & lex, Layout const & layout(par.layout()); FontInfo info = font.fontInfo(); info.realize(layout.resfont); - if (layout.pass_thru || info.family() == TYPEWRITER_FAMILY) { + if (layout.pass_thru || inset().isPassThru() || + info.family() == TYPEWRITER_FAMILY) { if (token == "\\twohyphens") par.insert(par.size(), from_ascii("--"), font, change); else