diff options
| author | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-13 16:34:07 +0000 |
|---|---|---|
| committer | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-13 16:34:07 +0000 |
| commit | 19486ee0e17b12ed5a0c800c8cd8e43fe3522065 (patch) | |
| tree | 5eaab59c602d3d0ac8abd1db09f967f1992cbf0b /html2markdown | |
| parent | 5a66fa030d6ffd09d82b612f2b97bc737ec753a5 (diff) | |
* 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
Diffstat (limited to 'html2markdown')
| -rw-r--r-- | html2markdown | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/html2markdown b/html2markdown index 66370c3fa..bd248ca1f 100644 --- a/html2markdown +++ b/html2markdown @@ -23,14 +23,21 @@ for p in pandoc tidy; do done ALL="$*" -ARGS=${ALL%%-- *} -REST=${ALL#$ARGS} +ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant +set -- $ARGS -REST=${REST#--} +REST=${ALL#$ARGS}; REST=${REST#--} PANDOC_OPTS=${REST:-$PANDOC_OPTS} -if [ -z "$1" ] || [ -f $1 ]; then - tidy -utf8 $1 2>/dev/null | \ +infile=$1 +shift + +if [ -n "$@" ]; then + echo >&2 "Warning: extra arguments '$@' will be ignored!" +fi + +if [ -z "$infile" ] || [ -f $infile ]; then + tidy -utf8 $infile 2>/dev/null | \ pandoc $PANDOC_OPTS -r html -w markdown -s | \ iconv -f utf-8 else @@ -55,7 +62,7 @@ else exit 1 ;; esac # Fetch and feed to pandoc. - $DUMPER $OPT $1 2>/dev/null | \ + $DUMPER $OPT $infile 2>/dev/null | \ tidy -utf8 2>/dev/null | \ pandoc $PANDOC_OPTS -r html -w markdown -s | \ iconv -f utf-8 |