anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hyphen conversion in passThru insets

Browse Source 
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.
This commit is contained in:
Georg Baum 2015-02-26 22:55:20 +01:00
parent 93be0e08a1
commit d49051d99f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Text.cpp
View File

@ -504,7 +504,8 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
Layout const & layout(par.layout()); Layout const & layout(par.layout());
FontInfo info = font.fontInfo(); FontInfo info = font.fontInfo();
info.realize(layout.resfont); 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") if (token == "\\twohyphens")
par.insert(par.size(), from_ascii("--"), font, change); par.insert(par.size(), from_ascii("--"), font, change);
else else