33467: correct return status on functions and numerous other minor fixes

1 files changed, 20 insertions, 25 deletions

diff --git a/Completion/Unix/Command/_rubber b/Completion/Unix/Command/_rubber
index 09e289aa2..f66540a9f 100644
--- a/Completion/Unix/Command/_rubber
+++ b/Completion/Unix/Command/_rubber
@@ -15,24 +15,24 @@ else
 fi
 
 _rubber_args=(
-      \*{-c,--command}'=[run the directive CMD before parsing]:command'
-      \*{-e,--epilogue}'=[run the directive CMD after parsing]:command'
-      {-z,--gzip}'[compress the final document]'
-      '(- *)'{-h,--help}'[show help]'
-      '--into=[go to directory DIR before compiling]:directory:_files -/'
-      {-l,--landscape}'[change paper orientation (if relevant)]'
-      {-n,--maxerr}'=[display at most NUM errors]:num'
-      \*{-m,--module}'=[use module]:module:($_rubber_modules)'
-      '--only=[only include the specified SOURCES]:sources'
-      \*{-o,--post}'=[postprocess with module]:postprocessor:($_rubber_modules)'
-      {-d,--pdf}'[produce PDF output instead of DVI]'
-      {-p,--ps}'[produce a PostScript document]'
-      {-q,--quiet}'[suppress messages]'
-      \*{-r,--read}'[read additional directives from a file]:directives files:_files'
-      {-s,--short}'[display errors in a compact form]'
-      \*{-I,--texpath}'=[add DIR to the search path for LaTeX]:tex path:_files -/'
-      \*{-v,--verbose}'[increase verbosity]'
-      '--version[print version information and exit]'
+  \*{-c,--command}'=[run specified directive command before parsing]:command'
+  \*{-e,--epilogue}'=[run specified directive command after parsing]:command'
+  '(-z --gzip)'{-z,--gzip}'[compress the final document]'
+  '(- *)'{-h,--help}'[show help information]'
+  '--into=[go to specified directory before compiling]:directory:_files -/'
+  '(-l --landscape)'{-l,--landscape}'[change paper orientation (if relevant)]'
+  '(-n --maxerr)'{-n,--maxerr}'=[display at most specified number of errors]:number'
+  \*{-m,--module}'=[use module]:module:($_rubber_modules)'
+  '--only=[only include the specified sources]:sources'
+  \*{-o,--post}'=[postprocess with module]:postprocessor:($_rubber_modules)'
+  '(-d --pdf -p -ps)'{-d,--pdf}'[produce PDF output instead of DVI]'
+  '(-p -ps -d --pdf)'{-p,--ps}'[produce a PostScript document]'
+  {-q,--quiet}'[suppress messages]'
+  \*{-r,--read}'[read additional directives from a file]:directives files:_files'
+  {-s,--short}'[display errors in compact form]'
+  \*{-I,--texpath}'=[add directory to the search path for LaTeX]:tex path:_files -/'
+  \*{-v,--verbose}'[increase verbosity]'
+  '--version[print version information and exit]'
 )
 
 case "$service" in
@@ -42,17 +42,15 @@ case "$service" in
       '--clean[remove produced files instead of compiling]' \
       {-f,--force}'[force at least one compilation]' \
       '--inplace[compile the documents from their source directory]' \
-      \*{-W,--warn}'=[report warnings of the given TYPE]:warnings:(all boxes misc refs)' \
+      \*{-W,--warn}'=[report warnings of the given type]:warnings:(all boxes misc refs)' \
       '*:LaTeX files:_files -g "*.(tex|dtx|lhs|w)(-.)"'
-      return 0
 	;;
 	
   rubber-pipe)
     _arguments -s \
       "$_rubber_args[@]" \
       {-k,--keep}'[keep the temporary files after compiling]' \
-      \*{-W,--warn}'=[report warnings of the given TYPE]:warnings:(all boxes misc refs)'
-      return 0
+      \*{-W,--warn}'=[report warnings of the given type]:warnings:(all boxes misc refs)'
 	;;
 	
   rubber-info)
@@ -65,8 +63,5 @@ case "$service" in
       '--refs[show the list of undefined references]' \
       '--warnings[show all LaTeX warnings]' \
       ':LaTeX file:_files -g "*.(tex|dtx|lhs|w)(-.)"'
-      return 0
   ;;
 esac
-
-return 1