Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

netlist: add parameter to split_paragraphs ... (nw)

Browse Source 
to allow passing in a custom line end string.
This commit is contained in:
couriersud 2020-04-18 15:43:06 +02:00
parent 855c37d58a
commit d8fbec6ab4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/netlist/plib/poptions.cpp
View File

@ -169,7 +169,7 @@ namespace plib {
}
pstring options::split_paragraphs(const pstring &text, unsigned width, unsigned indent,
unsigned firstline_indent)
unsigned firstline_indent, const pstring &line_end)
{
auto paragraphs = psplit(text,"\n");
pstring ret("");
@ -181,12 +181,14 @@ namespace plib {
{
if (line.length() + s.length() > width)
{
ret += line + "\n";
ret += line + line_end;
line = plib::rpad(pstring(""), pstring(" "), indent);
}
line += s + " ";
}
ret += line + "\n";
ret += line;
if (p != paragraphs.back())
ret += line_end;
}
return ret;
}
@ -196,7 +198,7 @@ namespace plib {
{
pstring ret;
ret = split_paragraphs(description, width, 0, 0) + "\n";
ret = split_paragraphs(description, width, 0, 0) + "\n\n";
ret += "Usage:\t" + usage + "\n\nOptions:\n\n";
for (const auto & optbase : m_opts )
@ -238,15 +240,15 @@ namespace plib {
{
//ret += "TestGroup abc\n def gef\nxyz\n\n" ;
ret += line + "\n";
ret += split_paragraphs(opt->help(), width, indent, indent);
ret += split_paragraphs(opt->help(), width, indent, indent) + "\n";
}
else
ret += split_paragraphs(line + opt->help(), width, indent, 0);
ret += split_paragraphs(line + opt->help(), width, indent, 0) + "\n";
}
else if (auto *grp = dynamic_cast<option_group *>(optbase))
{
ret += "\n" + grp->group() + ":\n";
if (grp->help() != "") ret += split_paragraphs(grp->help(), width, 4, 4) + "\n";
if (grp->help() != "") ret += split_paragraphs(grp->help(), width, 4, 4) + "\n\n";
}
}
// FIXME: other help ...
@ -255,8 +257,9 @@ namespace plib {
{
if (auto *example = dynamic_cast<option_example *>(optbase))
{
ex += "> " + example->example()+"\n\n";
ex += split_paragraphs(example->help(), width, 4, 4) + "\n";
// help2man doesn't like \\ line continuation in output
ex += split_paragraphs(example->example(), width, 8, 0, "\n") + "\n\n";
ex += split_paragraphs(example->help(), width, 4, 4) + "\n\n";
}
}
if (ex.length() > 0)

2
src/lib/netlist/plib/poptions.h
View File

@ -234,7 +234,7 @@ namespace plib {
private:
static pstring split_paragraphs(const pstring &text, unsigned width, unsigned indent,
unsigned firstline_indent);
unsigned firstline_indent, const pstring &line_end = "\n");
void check_consistency() noexcept(false);