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

Revert "Correctly set font decorations for multipar insets"

Browse Source 
This reverts commit 5791b8bff8.
This commit is contained in:
Enrico Forestieri 2020-08-14 18:01:26 +02:00
parent 9b7db11901
commit 836300cd33
3 changed files with 42 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Font.cpp
View File

@ -112,15 +112,6 @@ void Font::setLanguage(Language const * l)
}
void Font::setProperties(FontInfo const & f)
{
bits_.setFamily(f.family());
bits_.setSeries(f.series());
bits_.setShape(f.shape());
bits_.setSize(f.size());
}
/// Updates font settings according to request
void Font::update(Font const & newfont,
Language const * document_language,
@ -237,7 +228,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
Font const & prev,
bool const & multipar_inset,
bool const & non_inherit_inset,
bool const & needs_cprotection) const
{
int count = 0;
@ -352,7 +343,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
}
if (f.family() != INHERIT_FAMILY) {
if (multipar_inset) {
if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
@ -369,7 +360,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
}
}
if (f.series() != INHERIT_SERIES) {
if (multipar_inset) {
if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
@ -386,7 +377,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
}
}
if (f.shape() != INHERIT_SHAPE) {
if (multipar_inset) {
if (non_inherit_inset) {
os << '{';
++count;
os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
@ -402,7 +393,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
}
}
if (f.color() != Color_inherit && f.color() != Color_ignore && !multipar_inset) {
if (f.color() != Color_inherit && f.color() != Color_ignore) {
if (f.color() == Color_none && p.color() != Color_none) {
// Color none: Close previous color, if any
os << '}';
@ -448,7 +439,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 9;
}
}
if (f.emph() == FONT_ON && !multipar_inset) {
if (f.emph() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -457,7 +448,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 6;
}
// \noun{} is a LyX special macro
if (f.noun() == FONT_ON && !multipar_inset) {
if (f.noun() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -468,7 +459,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
// The ulem commands need to be on the deepest nesting level
// because ulem puts every nested group or macro in a box,
// which prevents linebreaks (#8424, #8733)
if (f.underbar() == FONT_ON && !multipar_inset) {
if (f.underbar() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -477,7 +468,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 7;
++runparams.inulemcmd;
}
if (f.uuline() == FONT_ON && !multipar_inset) {
if (f.uuline() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -486,7 +477,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 8;
++runparams.inulemcmd;
}
if (f.strikeout() == FONT_ON && !multipar_inset) {
if (f.strikeout() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -495,7 +486,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 6;
++runparams.inulemcmd;
}
if (f.xout() == FONT_ON && !multipar_inset) {
if (f.xout() == FONT_ON) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
@ -504,7 +495,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
count += 6;
++runparams.inulemcmd;
}
if (f.uwave() == FONT_ON && !multipar_inset) {
if (f.uwave() == FONT_ON) {
if (runparams.inulemcmd) {
// needed with nested uwave in xout
// see https://tex.stackexchange.com/a/263042
@ -531,8 +522,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
Font const & base,
Font const & next,
bool & needPar,
bool const & closeLanguage,
bool const & multipar_inset) const
bool const & closeLanguage) const
{
int count = 0;
@ -542,15 +532,15 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
FontInfo f = bits_;
f.reduce(base.bits_);
if (f.family() != INHERIT_FAMILY && !multipar_inset) {
if (f.family() != INHERIT_FAMILY) {
os << '}';
++count;
}
if (f.series() != INHERIT_SERIES && !multipar_inset) {
if (f.series() != INHERIT_SERIES) {
os << '}';
++count;
}
if (f.shape() != INHERIT_SHAPE && !multipar_inset) {
if (f.shape() != INHERIT_SHAPE) {
os << '}';
++count;
}
@ -568,17 +558,15 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
}
if (f.size() != INHERIT_SIZE) {
// We do not close size group in front of
// insets with allowMultiPar() true (as opposed
// insets with InheritFont() false (as opposed
// to all other font properties) (#8384)
if (!multipar_inset) {
if (needPar && !closeLanguage) {
os << "\\par";
count += 4;
needPar = false;
}
os << '}';
++count;
if (needPar && !closeLanguage) {
os << "\\par";
count += 4;
needPar = false;
}
os << '}';
++count;
}
if (f.underbar() == FONT_ON) {
os << '}';

5
src/Font.h
View File

@ -47,8 +47,6 @@ public:
bool isVisibleRightToLeft() const;
///
void setLanguage(Language const * l);
///
void setProperties(FontInfo const & f);
/// Returns size of font in LaTeX text notation
std::string const latexSize() const;
@ -90,8 +88,7 @@ public:
Font const & base,
Font const & next,
bool & needPar,
bool const & closeLanguage = true,
bool const & multipar_inset = false) const;
bool const & closeLanguage = true) const;
/// Build GUI description of font state

42
src/Paragraph.cpp
View File

@ -1067,10 +1067,9 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
? textinset->hasCProtectContent(runparams.moving_arg)
&& !textinset->text().isMainText()
: false;
bool const multipar_inset = inset->allowMultiPar();
unsigned int count2 = running_font.latexWriteStartChanges(os, bparams,
runparams, basefont,
running_font, multipar_inset,
running_font, true,
cprotect);
column += count2;
// Update the running_font, making sure, however,
@ -2414,11 +2413,10 @@ void Paragraph::latex(BufferParams const & bparams,
pos_type body_pos = beginOfBody();
unsigned int column = 0;
Font real_outerfont = outerfont;
// If we are inside an non inheritFont() inset, the real main
// properties of the outerfont are those of the local_font
if (!inInset().inheritFont() && runparams.local_font != nullptr)
real_outerfont.setProperties(runparams.local_font->fontInfo());
// If we are inside an non inheritFont() inset, the real outerfont is local_font
Font const real_outerfont = (!inInset().inheritFont()
&& runparams.local_font != nullptr)
? Font(runparams.local_font->fontInfo()) : outerfont;
if (body_pos > 0) {
// the optional argument is kept in curly brackets in
@ -2465,8 +2463,6 @@ void Paragraph::latex(BufferParams const & bparams,
// Yes if greater than 0. This has to be static.
THREAD_LOCAL_STATIC int parInline = 0;
bool multipar_inset = false;
for (pos_type i = 0; i < size(); ++i) {
// First char in paragraph or after label?
if (i == body_pos) {
@ -2475,8 +2471,7 @@ void Paragraph::latex(BufferParams const & bparams,
bool needPar = false;
column += running_font.latexWriteEndChanges(
os, bparams, runparams,
basefont, basefont, needPar,
multipar_inset);
basefont, basefont, needPar);
open_font = false;
}
basefont = getLayoutFont(bparams, real_outerfont);
@ -2543,7 +2538,7 @@ void Paragraph::latex(BufferParams const & bparams,
bool needPar = false;
column += running_font.latexWriteEndChanges(
os, bparams, rp, basefont,
basefont, needPar, multipar_inset);
basefont, needPar);
open_font = false;
}
basefont = (body_pos > i) ? getLabelFont(bparams, real_outerfont)
@ -2564,8 +2559,7 @@ void Paragraph::latex(BufferParams const & bparams,
bool needPar = false;
column += running_font.latexWriteEndChanges(
os, bparams, runparams,
basefont, basefont, needPar,
multipar_inset);
basefont, basefont, needPar);
open_font = false;
}
basefont = (body_pos > i) ? getLabelFont(bparams, real_outerfont)
@ -2596,7 +2590,7 @@ void Paragraph::latex(BufferParams const & bparams,
&& runningChange == change
&& change.type == Change::DELETED
&& !os.afterParbreak());
multipar_inset =
bool const multipar_inset =
(c == META_INSET && getInset(i) && getInset(i)->allowMultiPar());
// Do we need to close the previous font?
@ -2623,7 +2617,7 @@ void Paragraph::latex(BufferParams const & bparams,
column += running_font.latexWriteEndChanges(
os, bparams, runparams, basefont,
(i == body_pos-1) ? basefont : current_font,
needPar, multipar_inset);
needPar);
if (in_ct_deletion) {
// We have to close and then reopen \lyxdeleted,
// as strikeout needs to be on lowest level.
@ -2686,7 +2680,7 @@ void Paragraph::latex(BufferParams const & bparams,
OutputParams rp = runparams;
column += running_font.latexWriteEndChanges(
os, bparams, rp, basefont,
basefont, needPar, multipar_inset);
basefont, needPar);
os << '}';
column += 1;
}
@ -2791,16 +2785,16 @@ void Paragraph::latex(BufferParams const & bparams,
incremented = true;
}
}
// We need to restore the main properties of
// these fonts after allowMultiPar() insets
FontInfo const running_font_info = running_font.fontInfo();
FontInfo const basefont_info = basefont.fontInfo();
// We need to restore these after insets with
// allowMultiPar() true
Font const save_running_font = running_font;
Font const save_basefont = basefont;
d->latexInset(bparams, os, rp, running_font,
basefont, real_outerfont, open_font,
runningChange, style, i, column);
if (multipar_inset) {
running_font.setProperties(running_font_info);
basefont.setProperties(basefont_info);
running_font = save_running_font;
basefont = save_basefont;
}
if (incremented)
--parInline;
@ -2923,7 +2917,7 @@ void Paragraph::latex(BufferParams const & bparams,
//FIXME: there as we start another \selectlanguage with the next paragraph if
//FIXME: we are in need of this. This should be fixed sometime (Jug)
running_font.latexWriteEndChanges(os, bparams, runparams,
basefont, basefont, needPar, multipar_inset);
basefont, basefont, needPar);
#endif
if (needPar) {
// The \par could not be inserted at the same nesting