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

tex2lyx: support alignment pseudo-environments.

Browse Source 
Fixes: #7857
(cherry picked from commit 7a22ce7c09)
This commit is contained in:
Juergen Spitzmueller 2018-03-06 17:54:32 +01:00
parent afeb5acb0f
commit 30cb99503f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tex2lyx/text.cpp
View File

@ -1896,12 +1896,18 @@ void parse_environment(Parser & p, ostream & os, bool outer,
// Alignment and spacing settings // Alignment and spacing settings
// FIXME (bug xxxx): These settings can span multiple paragraphs and // FIXME (bug xxxx): These settings can span multiple paragraphs and
// therefore are totally broken! // therefore are totally broken!
// Note that \centering, raggedright, and raggedleft cannot be handled, as // Note that \centering, \raggedright, and \raggedleft cannot be handled, as
// they are commands not environments. They are furthermore switches that // they are commands not environments. They are furthermore switches that
// can be ended by another switches, but also by commands like \footnote or // can be ended by another switches, but also by commands like \footnote or
// \parbox. So the only safe way is to leave them untouched. // \parbox. So the only safe way is to leave them untouched.
// However, we support the pseudo-environments
// \begin{centering} ... \end{centering}
// \begin{raggedright} ... \end{raggedright}
// \begin{raggedleft} ... \end{raggedleft}
// since they are used by LyX in floats (for spacing reasons)
else if (name == "center" || name == "centering" || else if (name == "center" || name == "centering" ||
name == "flushleft" || name == "flushright" || name == "flushleft" || name == "raggedright" ||
name == "flushright" || name == "raggedleft" ||
name == "singlespace" || name == "onehalfspace" || name == "singlespace" || name == "onehalfspace" ||
name == "doublespace" || name == "spacing") { name == "doublespace" || name == "spacing") {
eat_whitespace(p, os, parent_context, false); eat_whitespace(p, os, parent_context, false);
@ -1910,9 +1916,9 @@ void parse_environment(Parser & p, ostream & os, bool outer,
parent_context.check_end_layout(os); parent_context.check_end_layout(os);
parent_context.new_paragraph(os); parent_context.new_paragraph(os);
} }
if (name == "flushleft") if (name == "flushleft" || name == "raggedright")
parent_context.add_extra_stuff("\\align left\n"); parent_context.add_extra_stuff("\\align left\n");
else if (name == "flushright") else if (name == "flushright" || name == "raggedleft")
parent_context.add_extra_stuff("\\align right\n"); parent_context.add_extra_stuff("\\align right\n");
else if (name == "center" || name == "centering") else if (name == "center" || name == "centering")
parent_context.add_extra_stuff("\\align center\n"); parent_context.add_extra_stuff("\\align center\n");

3
status.23x
View File

@ -107,6 +107,9 @@ What's new
- Add support for biblatex. - Add support for biblatex.
- Add support for alignment pseudo-environments as used inside floats
(bug 7857).
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE