anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Indentation fixes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-02-07 16:03:56 +01:00
parent 59fa0b2592
commit 4fd4310ea7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/DocIterator.cpp
View File

@ -745,8 +745,7 @@ Encoding const * DocIterator::getEncoding() const
CursorSlice const & sl = innerTextSlice();
Text const & text = *sl.text();
Language const * lang =
text.getPar(sl.pit()).getFont(bp, sl.pos(),
text.outerFont(sl.pit())).language();
text.getPar(sl.pit()).getFont(bp, sl.pos(), text.outerFont(sl.pit())).language();
// If we have a custom encoding for the buffer, we don't switch
// encodings (see output_latex::switchEncoding())
bool const customenc = bp.inputenc != "auto-legacy" && bp.inputenc != "auto-legacy-plain";
@ -761,7 +760,7 @@ Encoding const * DocIterator::getEncoding() const
Text const & otext = *slices_[i].text();
Language const * olang =
otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
otext.outerFont(slices_[i].pit())).language();
otext.outerFont(slices_[i].pit())).language();
Encoding const * oenc = olang->encoding();
if (oenc->name() != "inherit")
return inset().forcedEncoding(enc, oenc);
@ -778,11 +777,10 @@ Encoding const * DocIterator::getEncoding() const
Text const & otext = *slices_[i].text();
Language const * olang =
otext.getPar(slices_[i].pit()).getFont(bp, slices_[i].pos(),
otext.outerFont(slices_[i].pit())).language();
otext.outerFont(slices_[i].pit())).language();
// Again, if we have a custom encoding, this is used
// instead of the language's.
Encoding const * oenc = customenc
? &bp.encoding() : olang->encoding();
Encoding const * oenc = customenc ? &bp.encoding() : olang->encoding();
if (olang->encoding()->name() != "inherit")
return oenc;
}