Message ID | 20211207224502.16008-1-duncan_roe@optusnet.com.au |
---|---|
State | Changes Requested |
Delegated to: | Pablo Neira |
Headers | show |
Series | [libnetfilter_queue] build: doc: Update build_man.sh for doxygen 1.9.2 | expand |
A bit more details on this one? It's just a cosmetic issue? On Wed, Dec 08, 2021 at 09:45:02AM +1100, Duncan Roe wrote: > Cater for bold line number in del_def_at_lines() > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > --- > doxygen/build_man.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/doxygen/build_man.sh b/doxygen/build_man.sh > index 852c7b8..c68876c 100755 > --- a/doxygen/build_man.sh > +++ b/doxygen/build_man.sh > @@ -96,7 +96,7 @@ fix_double_blanks(){ > del_def_at_lines(){ > linnum=1 > while [ $linnum -ne 0 ] > - do mygrep "^Definition at line [[:digit:]]* of file" $target > + do mygrep '^Definition at line (\\fB)?[[:digit:]]*(\\fP)? of file' $target > [ $linnum -eq 0 ] || delete_lines $(($linnum - 1)) $linnum > done > } > -- > 2.17.5 >
Hi Pablo, On Thu, Dec 16, 2021 at 12:28:34AM +0100, Pablo Neira Ayuso wrote: > A bit more details on this one? It's just a cosmetic issue? > > On Wed, Dec 08, 2021 at 09:45:02AM +1100, Duncan Roe wrote: > > Cater for bold line number in del_def_at_lines() > > > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > > --- > > doxygen/build_man.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/doxygen/build_man.sh b/doxygen/build_man.sh > > index 852c7b8..c68876c 100755 > > --- a/doxygen/build_man.sh > > +++ b/doxygen/build_man.sh > > @@ -96,7 +96,7 @@ fix_double_blanks(){ > > del_def_at_lines(){ > > linnum=1 > > while [ $linnum -ne 0 ] > > - do mygrep "^Definition at line [[:digit:]]* of file" $target > > + do mygrep '^Definition at line (\\fB)?[[:digit:]]*(\\fP)? of file' $target > > [ $linnum -eq 0 ] || delete_lines $(($linnum - 1)) $linnum > > done > > } > > -- > > 2.17.5 > > No, not cosmetic. The regexp has to be updated to recognise a line with bold line numbering. Without the patch, the unwanted line appears in the man page. I thought that was obvious. Will submit a v2 explaining a bit more, unless you apply the patch in the meantime. Cheers ... Duncan.
On Thu, Dec 16, 2021 at 11:23:56PM +1100, Duncan Roe wrote: > Hi Pablo, > > On Thu, Dec 16, 2021 at 12:28:34AM +0100, Pablo Neira Ayuso wrote: > > A bit more details on this one? It's just a cosmetic issue? > > > > On Wed, Dec 08, 2021 at 09:45:02AM +1100, Duncan Roe wrote: > > > Cater for bold line number in del_def_at_lines() > > > > > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> > > > --- > > > doxygen/build_man.sh | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/doxygen/build_man.sh b/doxygen/build_man.sh > > > index 852c7b8..c68876c 100755 > > > --- a/doxygen/build_man.sh > > > +++ b/doxygen/build_man.sh > > > @@ -96,7 +96,7 @@ fix_double_blanks(){ > > > del_def_at_lines(){ > > > linnum=1 > > > while [ $linnum -ne 0 ] > > > - do mygrep "^Definition at line [[:digit:]]* of file" $target > > > + do mygrep '^Definition at line (\\fB)?[[:digit:]]*(\\fP)? of file' $target > > > [ $linnum -eq 0 ] || delete_lines $(($linnum - 1)) $linnum > > > done > > > } > > > -- > > > 2.17.5 > > > > No, not cosmetic. The regexp has to be updated to recognise a line with bold > line numbering. Without the patch, the unwanted line appears in the man page. I see. > I thought that was obvious. Will submit a v2 explaining a bit more, unless you > apply the patch in the meantime. Thanks for sending v2.
diff --git a/doxygen/build_man.sh b/doxygen/build_man.sh index 852c7b8..c68876c 100755 --- a/doxygen/build_man.sh +++ b/doxygen/build_man.sh @@ -96,7 +96,7 @@ fix_double_blanks(){ del_def_at_lines(){ linnum=1 while [ $linnum -ne 0 ] - do mygrep "^Definition at line [[:digit:]]* of file" $target + do mygrep '^Definition at line (\\fB)?[[:digit:]]*(\\fP)? of file' $target [ $linnum -eq 0 ] || delete_lines $(($linnum - 1)) $linnum done }
Cater for bold line number in del_def_at_lines() Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> --- doxygen/build_man.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)