git.iko.soy/typeable/pandoc
on master help sign in
* Add PANDOC_OPTS support to 'markdown2pdf'.

* Sanitize comand line handling a bit in all wrappers: + Correct delimiters syntax should be ' -- '. + Print warning for extra arguments which are ignored. + Instead of positional arguments use named variables whenever appropriate. git-svn-id: https://pandoc.googlecode.com/svn/trunk@97 788f1e2b-df1e-0410-8736-df70ead52e1b

commit19486ee0e17b12ed5a0c800c8cd8e43fe3522065 authorroktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> dateMon 13 Nov 2006, 16:34 (20 years ago) parent5a66fa0
5 files changed+38−18
compare with master
unifiedsplit
html2markdown+13−6 latex2markdown+4−4 markdown2html+4−4 markdown2latex+4−4 markdown2pdf+13
html2markdown+13−6
@@ -23,14 +23,21 @@ for p in pandoc tidy; do
2323done
2424
2525ALL="$*"
26−ARGS=${ALL%%-- *}
27−REST=${ALL#$ARGS}
26+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant
27+set -- $ARGS
2828
29−REST=${REST#--}
29+REST=${ALL#$ARGS}; REST=${REST#--}
3030PANDOC_OPTS=${REST:-$PANDOC_OPTS}
3131
32−if [ -z "$1" ] || [ -f $1 ]; then
33− tidy -utf8 $1 2>/dev/null | \
32+infile=$1
33+shift
34+
35+if [ -n "$@" ]; then
36+ echo >&2 "Warning: extra arguments '$@' will be ignored!"
37+fi
38+
39+if [ -z "$infile" ] || [ -f $infile ]; then
40+ tidy -utf8 $infile 2>/dev/null | \
3441 pandoc $PANDOC_OPTS -r html -w markdown -s | \
3542 iconv -f utf-8
3643else
@@ -55,7 +62,7 @@ else
5562 exit 1 ;;
5663 esac
5764 # Fetch and feed to pandoc.
58− $DUMPER $OPT $1 2>/dev/null | \
65+ $DUMPER $OPT $infile 2>/dev/null | \
5966 tidy -utf8 2>/dev/null | \
6067 pandoc $PANDOC_OPTS -r html -w markdown -s | \
6168 iconv -f utf-8
latex2markdown+4−4
@@ -22,11 +22,11 @@ for p in pandoc; do
2222done
2323
2424ALL="$*"
25−ARGS=${ALL%%-- *}
26−REST=${ALL#$ARGS}
25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant
26+set -- $ARGS
2727
28−REST=${REST#--}
28+REST=${ALL#$ARGS}; REST=${REST#--}
2929PANDOC_OPTS=${REST:-$PANDOC_OPTS}
3030
31−iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS -r latex -w markdown -s | \
31+iconv -t utf-8 $* | pandoc $PANDOC_OPTS -r latex -w markdown -s | \
3232 iconv -f utf-8
markdown2html+4−4
@@ -22,10 +22,10 @@ for p in pandoc; do
2222done
2323
2424ALL="$*"
25−ARGS=${ALL%%-- *}
26−REST=${ALL#$ARGS}
25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant
26+set -- $ARGS
2727
28−REST=${REST#--}
28+REST=${ALL#$ARGS}; REST=${REST#--}
2929PANDOC_OPTS=${REST:-$PANDOC_OPTS}
3030
31−iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS | iconv -f utf-8
31+iconv -t utf-8 $* | pandoc $PANDOC_OPTS | iconv -f utf-8
markdown2latex+4−4
@@ -22,10 +22,10 @@ for p in pandoc; do
2222done
2323
2424ALL="$*"
25−ARGS=${ALL%%-- *}
26−REST=${ALL#$ARGS}
25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant
26+set -- $ARGS
2727
28−REST=${REST#--}
28+REST=${ALL#$ARGS}; REST=${REST#--}
2929PANDOC_OPTS=${REST:-$PANDOC_OPTS}
3030
31−iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS -w latex -s | iconv -f utf-8
31+iconv -t utf-8 $* | pandoc $PANDOC_OPTS -w latex -s | iconv -f utf-8
markdown2pdf+13
@@ -21,6 +21,13 @@ for p in pandoc pdflatex; do
2121 }
2222done
2323
24+ALL="$*"
25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant
26+set -- $ARGS
27+
28+REST=${ALL#$ARGS}; REST=${REST#--}
29+PANDOC_OPTS=${REST:-$PANDOC_OPTS}
30+
2431outfile=
2532for option; do
2633 if [ -n "$prev" ]; then
@@ -52,6 +59,12 @@ done
5259}
5360
5461infile=$1
62+shift
63+
64+if [ -n "$@" ]; then
65+ echo >&2 "Warning: extra arguments '$@' will be ignored!"
66+fi
67+
5568if [ -z "$outfile" ]; then
5669 if [ -n "$infile" ]; then
5770 outfile=${infile%.*}.pdf