1
0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-01-19 05:49:14 +02:00

doc: fix egregious markup output

We use '+++' syntax to output a literal '**' for a '--glob' example.
This '+++' syntax is pretty ugly when rendered literally via --help. We
fix this by hackily inserting the '+++' syntax for its one specific case
that we need it during man page generation.

Not ideal but it works. And --help still has some '*foo*' markup, but we
live with that for now.

Fixes #1581
This commit is contained in:
Andrew Gallant 2020-05-13 08:13:05 -04:00
parent 1e9a481a66
commit 1980630f17
No known key found for this signature in database
GPG Key ID: B2E3A4923F8B0D44
3 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,13 @@
TBD
===
Unreleased changes. Release notes have not yet been written.
Bug fixes:
* [BUG #1581](https://github.com/BurntSushi/ripgrep/issues/1581):
Corrects some egregious markup output in `--help`.
12.1.0 (2020-05-09) 12.1.0 (2020-05-09)
=================== ===================
ripgrep 12.1.0 is a small minor version release that mostly includes bug fixes ripgrep 12.1.0 is a small minor version release that mostly includes bug fixes

View File

@ -217,6 +217,10 @@ fn formatted_doc_txt(arg: &RGArg) -> io::Result<String> {
.doc_long .doc_long
.replace("{", "&#123;") .replace("{", "&#123;")
.replace("}", r"&#125;") .replace("}", r"&#125;")
// Hack to render ** literally in man page correctly. We can't put
// these crazy +++ in the help text directly, since that shows
// literally in --help output.
.replace("*-g 'foo/**'*", "*-g +++'foo/**'+++*")
.split("\n\n") .split("\n\n")
.map(|s| s.to_string()) .map(|s| s.to_string())
.collect(); .collect();

View File

@ -1354,7 +1354,7 @@ command line takes precedence.
When this flag is set, every file and directory is applied to it to test for When this flag is set, every file and directory is applied to it to test for
a match. So for example, if you only want to search in a particular directory a match. So for example, if you only want to search in a particular directory
'foo', then *-g foo* is incorrect because 'foo/bar' does not match the glob 'foo', then *-g foo* is incorrect because 'foo/bar' does not match the glob
'foo'. Instead, you should use *-g +++'foo/**'+++*. 'foo'. Instead, you should use *-g 'foo/**'*.
" "
); );
let arg = RGArg::flag("glob", "GLOB") let arg = RGArg::flag("glob", "GLOB")