From 994155b2a630fdf81c87c45ba5e5fc9e6b4b240e Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Wed, 21 May 2014 13:12:14 +0200 Subject: [PATCH] Output arguments required by arguments with default or preset arg Fixes: #9128 --- src/output_latex.cpp | 12 ++++++++++++ status.21x | 2 ++ 2 files changed, 14 insertions(+) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 1fd387ccf2..a6df5760bb 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -331,6 +331,18 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX if (argnr == 0) return; + // Default and preset args are always output, so if they require + // other arguments, consider this. + Layout::LaTeXArgMap::const_iterator lit = latexargs.begin(); + Layout::LaTeXArgMap::const_iterator const lend = latexargs.end(); + for (; lit != lend; ++lit) { + Layout::latexarg arg = (*lit).second; + if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + for (unsigned int i = 1; i <= argnr; ++i) { map::const_iterator lit = ilist.find(i); bool inserted = false; diff --git a/status.21x b/status.21x index f36027066e..01e9cf2713 100644 --- a/status.21x +++ b/status.21x @@ -86,6 +86,8 @@ What's new - Fix some nesting problems in reversion of some beamer environments to 2.0 format. +- Output arguments required by arguments with DefaultArg or PresetArg (bug 9128). + * USER INTERFACE -- 2.39.5