Merge branch 'release/0.3.2'

Author: Zachary Elliott

Makefile.am

@@ -1 +1 @@
-SUBDIRS = src doc
+SUBDIRS = src doc extra

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([pdf2laser], [0.3.1], [https://github.com/zellio/pdf2laser/issues], [pdf2laser])
+AC_INIT([pdf2laser], [0.3.2], [https://github.com/zellio/pdf2laser/issues], [pdf2laser])
 AM_INIT_AUTOMAKE([-Wall])
 AC_CONFIG_SRCDIR([src/pdf2laser.c])
 AC_CONFIG_HEADERS([config.h])
@@ -28,6 +28,10 @@ AC_CHECK_FUNCS([alarm gethostname inet_ntoa socket sqrt strchr strdup strncasecm
 
 AC_CONFIG_FILES([src/Makefile
 doc/Makefile
+extra/Makefile
+extra/completion/Makefile
+extra/completion/bash/Makefile
+extra/completion/zsh/Makefile
 Makefile])
 
 AC_OUTPUT

extra/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = completion

extra/completion/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = bash zsh

extra/completion/bash/Makefile.am

@@ -0,0 +1,2 @@
+bash_completion_dir = $(sysconfdir)/bash_completion.d
+bash_completion__DATA = pdf2laser

extra/completion/bash/pdf2laser

@@ -0,0 +1,45 @@
+#compdef pdf2laser
+
+_pdf2laser()
+{
+	local cur prev opts
+
+	COMPREPLY=()
+
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+	short_opts="-a -n -p -P -d -m -r -R -s -O -f -v -V -D -h"
+	long_opts="--autofocus --job --printer --preset --dpi --mode \
+		--raster-speed --raster-power --screen-size --no-optimize --frequency \
+		--vector-speed --vector-power --debug --help --version"
+
+	case "${prev}" in
+		-j|--job|-p|--printer|-P|--preset|-d|--dpi|-r|--raster-speed|\
+			-R|--raster-power|-s|--screen-size|-f|--frequency|\
+			-v|--vector-speed|-V|--vector-power)
+
+			# Stop completion on the flags that need arguments.
+
+			return 0
+			;;
+		-m|--mode)
+			COMPREPLY=( $(compgen -W "mono grey colour" -- ${cur}) )
+			return 0
+			;;
+		*)
+			if [[ ${cur} == --* ]]; then
+				COMPREPLY=( $(compgen -W "${long_opts}" -- ${cur}) )
+				return 0
+			elif [[ ${cur} == -* ]]; then
+				COMPREPLY=( $(compgen -W "${short_opts}" -- ${cur}) )
+				return 0
+			fi
+
+			COMPREPLY=( $(compgen -f -d -- "${cur}") )
+			return 0
+			;;
+	esac
+}
+
+ complete -F _pdf2laser pdf2laser

extra/completion/zsh/Makefile.am

@@ -0,0 +1,2 @@
+zsh_completion_dir = $(datarootdir)/zsh/site-functions
+zsh_completion__DATA = _pdf2laser

extra/completion/zsh/_pdf2laser

@@ -0,0 +1,23 @@
+#compdef pdf2laser
+
+local args
+args=(
+	'(autofocus)'{--autofocus,-a}'[Enable autofocus]'
+	'(job)'{--job=,-n+}'[Set display name of print job]'
+	'(printer)'{--printer=,-p+}'[IP Address of target printer]'
+	'(preset)'{--preset=,-P+}'[Select a default preset]'
+	'(dpi)'{--dpi=,-d+}'[Resolution of the raster]'
+ 	'(mode)'{--mode=,-m+}'[Mode of the raster (default mono)]':'raster mode':'(mono grey colour)'
+	'(raster-speed)'{--raster-speed=,-r+}'[Raster speed (0-100)]'
+	'(raster-power)'{--raster-power=,-R+}'[Raster power (0-100)]'
+	'(screen-size)'{--size=,-s+}'[Photograph screen size (default 8)]'
+	'(optimize)'{--no-optimize,-O}'[Disable vector optimization]'
+	'(frequency)'{--frequency=,-f+}'[Vector frequency]'
+	'(vector-speed)'{--vector-speed=,-v+}'[Vector speed (0-100)]'
+	'(vector-power)'{--vector-power=,-V+}'[Vector power (0-100)]'
+	'(debug)'{--debug,-D}'[Enable debugging]'
+	'(help)'{--help,-h}'[Output usage message and exit]'
+	'--version[Output the version number and exit]'
+)
+
+_arguments -Ss $args[@]

src/pdf2laser.c

@@ -11,7 +11,7 @@
 //          Trammell Hudson <[email protected]>
 //          Zachary Elliott <[email protected]>
 // URL: https://github.com/zellio/pdf2laser
-// Version: 0.3.1
+// Version: 0.3.2
 
 /// Commentary: