From 3306c444f293f739f0c48afaafdb110a1e2a507b Mon Sep 17 00:00:00 2001 From: Marc <12819635+LostInCompilation@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:21:01 +0100 Subject: [PATCH] Switch order of Usage and Description to make it UNIX standard (#1093) When I rewrote the Help formatter (see #866) I mixed up the order of the Usage and Description strings. I flipped the order to make it UNIX style again. All tests pass. --- include/CLI/impl/Formatter_inl.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/CLI/impl/Formatter_inl.hpp b/include/CLI/impl/Formatter_inl.hpp index ab324d6ec..889896afb 100644 --- a/include/CLI/impl/Formatter_inl.hpp +++ b/include/CLI/impl/Formatter_inl.hpp @@ -89,7 +89,7 @@ CLI11_INLINE std::string Formatter::make_description(const App *app) const { desc += " \n[At most " + std::to_string(max_options) + " of the following options are allowed]"; } - return (!desc.empty()) ? desc + "\n" : std::string{}; + return (!desc.empty()) ? desc + "\n\n" : std::string{}; } CLI11_INLINE std::string Formatter::make_usage(const App *app, std::string name) const { @@ -164,9 +164,9 @@ CLI11_INLINE std::string Formatter::make_help(const App *app, std::string name, } } - out << make_usage(app, name); detail::streamOutAsParagraph( - out, make_description(app), description_paragraph_width_, " "); // Format description as paragraph + out, make_description(app), description_paragraph_width_, ""); // Format description as paragraph + out << make_usage(app, name); out << make_positionals(app); out << make_groups(app, mode); out << make_subcommands(app, mode);