[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-419-gc46c916

[Ville Skyttä]

The following commit has been merged in the master branch:
commit c46c916077e29f9661c763af2af045b097ae51ae
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Aug 16 11:08:54 2011 +0300

    asciidoc, a2x: New completions.

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 21d564e..0ded57a 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -5,6 +5,7 @@ bashcomp_DATA = abook \
 		apt \
 		apt-build \
 		aptitude \
+		asciidoc \
 		aspell \
 		autoconf \
 		automake \
diff --git a/completions/asciidoc b/completions/asciidoc
new file mode 100644
index 0000000..19f8e84
--- /dev/null
+++ b/completions/asciidoc
@@ -0,0 +1,96 @@
+have asciidoc || have a2x || return
+
+_asciidoc_doctype()
+{
+    COMPREPLY+=( $( compgen -W 'article book manpage' -- "$cur" ) )
+}
+
+_asciidoc()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    case $prev in
+        --attribute|-a)
+            return
+            ;;
+        --backend|-b)
+            COMPREPLY=( $( compgen -W 'docbook html4 xhtml11' -- "$cur" ) )
+            return
+            ;;
+        --conf-file|-f)
+            _filedir conf
+            return
+            ;;
+        --doctype|-d)
+            _asciidoc_doctype
+            return
+            ;;
+        --help|-h)
+            COMPREPLY=( $( compgen -W 'manpage syntax topics' -- "$cur" ) )
+            return
+            ;;
+        --out-file|-o)
+            _filedir
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" "--help manpage" )' \
+            -- "$cur" ) )
+        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        return
+    fi
+
+    _filedir
+} &&
+complete -F _asciidoc asciidoc asciidoc.py
+
+
+_a2x()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    case $prev in
+        -a|--attribute|--asciidoc-opts|--dblatex-opts|--fop-opts|-h|--help|\
+        --version|--xsltproc-opts)
+            return
+            ;;
+        -D|--destination-dir|--icons-dir)
+            _filedir -d
+            return
+            ;;
+        --doctype|-d)
+            _asciidoc_doctype
+            return
+            ;;
+        --stylesheet)
+            _filedir css
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" --help )' \
+            -- "$cur" ) )
+        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        return
+    fi
+
+    _filedir
+} &&
+complete -F _a2x a2x
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/a2x.exp b/test/completion/a2x.exp
new file mode 100644
index 0000000..5d4098f
--- /dev/null
+++ b/test/completion/a2x.exp
@@ -0,0 +1 @@
+assert_source_completions a2x
diff --git a/test/completion/asciidoc.exp b/test/completion/asciidoc.exp
new file mode 100644
index 0000000..05b3f1f
--- /dev/null
+++ b/test/completion/asciidoc.exp
@@ -0,0 +1 @@
+assert_source_completions asciidoc
diff --git a/test/lib/completions/c++.exp b/test/lib/completions/a2x.exp
similarity index 81%
copy from test/lib/completions/c++.exp
copy to test/lib/completions/a2x.exp
index c899de2..e1ca884 100644
--- a/test/lib/completions/c++.exp
+++ b/test/lib/completions/a2x.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "c++ "
+assert_complete_any "a2x "
 
 
 sync_after_int
diff --git a/test/lib/completions/a2ps.exp b/test/lib/completions/asciidoc.exp
similarity index 78%
copy from test/lib/completions/a2ps.exp
copy to test/lib/completions/asciidoc.exp
index 77cd07f..86e7609 100644
--- a/test/lib/completions/a2ps.exp
+++ b/test/lib/completions/asciidoc.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "a2ps "
+assert_complete_any "asciidoc "
 
 
 sync_after_int

-- 
bash-completion