mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

42983: Address misc. feedback re: _man

Browse source
This commit is contained in:
dana 2018-06-11 16:52:38 -05:00
parent 6b4e78dce6
commit 684db0f9fe
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,7 +1,9 @@
2018-06-11 dana <dana@dana.is> 2018-06-11 dana <dana@dana.is>
* 42983: dana: Completion/Unix/Command/_man: Address misc. feedback
* 42984: dana: Completion/Unix/Type/_files, * 42984: dana: Completion/Unix/Type/_files,
Completion/Unix/Type/_object_files: fix argument pass-through to compadd Completion/Unix/Type/_object_files: Fix argument pass-through to compadd
2018-06-10 Oliver Kiddle <okiddle@yahoo.co.uk> 2018-06-10 Oliver Kiddle <okiddle@yahoo.co.uk>

22
Completion/Unix/Command/_man
View file

@ -109,7 +109,7 @@ _man() {
'--warnings=[enable specified groff warnings]:groff warnings' '--warnings=[enable specified groff warnings]:groff warnings'
'(-a --all --regex)--wildcard[treat page name as shell glob]' '(-a --all --regex)--wildcard[treat page name as shell glob]'
# @todo Could enumerate these # @todo Could enumerate these
'(-X --gxditview)'{-X-,--gxditview=-}'[display output in gxditview using specified DPI (default: 75)]::DPI' '(-X --gxditview)'{-X-,--gxditview=-}'[display output in gxditview using specified DPI]::resolution (DPI) [75]'
# @todo Post-process how? # @todo Post-process how?
'(-t --troff -Z --ditroff)'{-Z,--ditroff}'[post-process output for chosen device]' '(-t --troff -Z --ditroff)'{-Z,--ditroff}'[post-process output for chosen device]'
) )
@ -232,7 +232,7 @@ _man() {
if [[ $sect = (<->*|[lnopx]) || $sect = *\|* ]]; then if [[ $sect = (<->*|[lnopx]) || $sect = *\|* ]]; then
sects=( ${(s.|.)sect} ) sects=( ${(s.|.)sect} )
dirs=( $^_manpath/(sman|man|cat)${^sects}/ ) dirs=( $^_manpath/(sman|man|cat)${^sects}(|.*)/ )
sect=${(j<|>)sects} sect=${(j<|>)sects}
[[ $sect == *'|'* ]] && sect="($sect)" [[ $sect == *'|'* ]] && sect="($sect)"
awk="\$2 == \"$sect\" {print \$1}" awk="\$2 == \"$sect\" {print \$1}"
@ -247,7 +247,7 @@ _man() {
# Solaris 11 and on have a man-index directory that doesn't contain manpages # Solaris 11 and on have a man-index directory that doesn't contain manpages
dirs=( ${dirs:#*/man-index/} ) dirs=( ${dirs:#*/man-index/} )
sects=( ${(o)${dirs##*(man|cat)}%/} ) sects=( ${(o)${${dirs##*(man|cat)}%.*}%/} )
# If we've got this far, we can build our look-up table for descriptions of # If we've got this far, we can build our look-up table for descriptions of
# the more common sections. Unless otherwise labelled, the more specific ones # the more common sections. Unless otherwise labelled, the more specific ones
@ -297,6 +297,11 @@ _man() {
# Add OS-specific stuff that's too risky for or overrides the general list # Add OS-specific stuff that's too risky for or overrides the general list
[[ $OSTYPE == darwin* ]] && sect_descs+=( n 'Tcl/Tk features' ) [[ $OSTYPE == darwin* ]] && sect_descs+=( n 'Tcl/Tk features' )
[[ $OSTYPE == openbsd* ]] && sect_descs+=( 3p 'Perl features' ) [[ $OSTYPE == openbsd* ]] && sect_descs+=( 3p 'Perl features' )
# @todo Oracle Solaris 11.4 adopts the BSD/Linux structure, making many of
# these inaccurate — this should be handled accordingly in the future. If
# OSTYPE isn't helpful (since other Solaris descendants may not follow
# suit), we could perhaps use the presence of SysV-style sections under
# _manpath as the determinant
[[ $OSTYPE == solaris* ]] && sect_descs+=( [[ $OSTYPE == solaris* ]] && sect_descs+=(
1t 'Tcl/Tk features' 1t 'Tcl/Tk features'
3m 'mathematical library functions' 3m 'mathematical library functions'
@ -320,21 +325,22 @@ _man() {
local -a specs local -a specs
(( $#sects )) || { (( $#sects )) || {
_message 'manual section' _message -e sections 'manual section'
return 1 return 1
} }
# Build specs from descriptions # Build specs from descriptions
for s in $sects; do for s in $sects; do
specs+=( "${s}[${(b)sect_descs[$s]}]" ) specs+=( "${s}:${(b)sect_descs[$s]}" )
done done
specs=( ${specs%:} )
if [[ $variant == (darwin|dragonfly|freebsd|linux)* ]]; then if [[ $variant == (darwin|dragonfly|freebsd|linux)* ]]; then
_values -s : 'manual section' $specs _sequence -s : _describe -t sections 'manual section' specs
elif [[ $variant == solaris* ]]; then elif [[ $variant == solaris* ]]; then
_values -s , 'manual section' $specs _sequence -s , _describe -t sections 'manual section' specs
else else
_values 'manual section' $specs _describe -t sections 'manual section' specs
fi fi
return return
} }