The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit a834d161d201be873a5bd9777a38378c47082274 Author: Juergen Spitzmueller <[email protected]> Date: Tue Nov 20 19:00:06 2012 +0100 Allow arguments in PassThru environments (bug #7646) (cherry picked from commit 34ef91bb70937c68462fd82fdc9373b0235e0492) diff --git a/src/Text3.cpp b/src/Text3.cpp index 6262468..d0f8981 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -2257,6 +2257,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, FontInfo const & fontinfo = cur.real_current_font.fontInfo(); bool enable = true; + bool allow_in_passthru = false; InsetCode code = NO_CODE; switch (cmd.action()) { @@ -2447,6 +2448,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; case LFUN_ARGUMENT_INSERT: { code = ARG_CODE; + allow_in_passthru = true; Layout const & lay = cur.paragraph().layout(); int const numargs = lay.reqargs + lay.optargs; enable = cur.paragraph().insetList().count(ARG_CODE) < numargs; @@ -2811,7 +2813,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, if (code != NO_CODE && (cur.empty() || !cur.inset().insetAllowed(code) - || cur.paragraph().layout().pass_thru)) + || (cur.paragraph().layout().pass_thru && !allow_in_passthru))) enable = false; flag.setEnabled(enable); diff --git a/status.20x b/status.20x index 6db007a..f0b7cf2 100644 --- a/status.20x +++ b/status.20x @@ -67,6 +67,8 @@ What's new - When selecting text and Insert > Preview, immediately display the preview (bug 8075). + +- Allow arguments in PassThru environments (bug 7646). * DOCUMENTATION AND LOCALIZATION ----------------------------------------------------------------------- Summary of changes: src/Text3.cpp | 4 +++- status.20x | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
