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

\\noindent in a paragraph that starts with \\vspace is possible

Browse Source 
But the \\vspace must precede \\noindent (the latter leaves vmode)
This commit is contained in:
Juergen Spitzmueller 2021-10-31 11:56:53 +01:00
parent 96a4dd235e
commit f0126b9fdf
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/OutputParams.h
View File

@ -283,7 +283,7 @@ public:
/** Whether we are in a table cell.
* For newline, it matters whether its content is aligned or not.
*/
*/
TableCell inTableCell = NO;
/** Whether we are inside a float or subfloat.
@ -422,6 +422,9 @@ public:
/// Explicit output folder, if any is desired
std::string export_folder;
/// A postponed \\noindent (after VSpace)
mutable bool need_noindent = false;
};

25
src/Paragraph.cpp
View File

@ -2355,14 +2355,23 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
// 1. that cannot have indentation or are indented always,
// 2. that are not part of the immediate text sequence (e.g., contain only floats),
// 3. that are PassThru,
// 4. that are centered,
// 5. or start with a vspace.
if (canindent && params_.noindent() && owner_->isPartOfTextSequence()
&& !layout_->pass_thru && curAlign != LYX_ALIGN_CENTER
&& !owner_->empty()
&& (!owner_->isInset(0) || owner_->getInset(0)->lyxCode() != VSPACE_CODE)) {
os << "\\noindent" << termcmd;
column += 10;
// 4. or that are centered.
if (canindent && params_.noindent()
&& owner_->isPartOfTextSequence()
&& !layout_->pass_thru
&& curAlign != LYX_ALIGN_CENTER) {
if (!owner_->empty()
&& (owner_->isInset(0)
&& owner_->getInset(0)->lyxCode() == VSPACE_CODE))
// If the paragraph starts with a vspace, the \\noindent
// needs to come after that (as it leaves vmode).
// If the paragraph consists only of the vspace,
// \\noindent is not needed at all.
runparams.need_noindent = owner_->size() > 1;
else {
os << "\\noindent" << termcmd;
column += 10;
}
}
if (curAlign == layout_->align)

10
src/insets/InsetVSpace.cpp
View File

@ -209,9 +209,15 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
}
void InsetVSpace::latex(otexstream & os, OutputParams const &) const
void InsetVSpace::latex(otexstream & os, OutputParams const & rp) const
{
os << from_ascii(space_.asLatexCommand(buffer().params())) << '\n';
os << from_ascii(space_.asLatexCommand(buffer().params())) << breakln;
if (rp.need_noindent) {
// If the paragraph starts with a vspace and has more than that
// content, the \\noindent needs to come after that
// (as \\noindent leaves vmode).
os << "\\noindent" << termcmd;
}
}