diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-13 15:22:41 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-13 15:22:41 +0000 |
| commit | 574290c92f0c62298491134458bd98ceba151774 (patch) | |
| tree | e86f4409c4d7cac5395b83339e05263a86eea830 | |
| parent | 2763382dd803916e34e6575904147d7e3594a7f6 (diff) | |
| download | pandoc-574290c92f0c62298491134458bd98ceba151774.tar.gz | |
Modified wrapper scripts to pass all command-line options after --
to pandoc. These options override the environment variable PANDOC_OPTS,
if it is set. (Note: these changes don't include changes to the
documentation or man pages, or to markdown2pdf.)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@95 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | html2markdown | 7 | ||||
| -rw-r--r-- | latex2markdown | 10 | ||||
| -rw-r--r-- | markdown2html | 9 | ||||
| -rw-r--r-- | markdown2latex | 9 |
4 files changed, 32 insertions, 3 deletions
diff --git a/html2markdown b/html2markdown index 4320ce9b1..66370c3fa 100644 --- a/html2markdown +++ b/html2markdown @@ -22,6 +22,13 @@ for p in pandoc tidy; do } done +ALL="$*" +ARGS=${ALL%%-- *} +REST=${ALL#$ARGS} + +REST=${REST#--} +PANDOC_OPTS=${REST:-$PANDOC_OPTS} + if [ -z "$1" ] || [ -f $1 ]; then tidy -utf8 $1 2>/dev/null | \ pandoc $PANDOC_OPTS -r html -w markdown -s | \ diff --git a/latex2markdown b/latex2markdown index 4f5efef83..d6a991307 100644 --- a/latex2markdown +++ b/latex2markdown @@ -21,4 +21,12 @@ for p in pandoc; do } done -iconv -t utf-8 $* | pandoc $PANDOC_OPTS -r latex -w markdown -s | iconv -f utf-8 +ALL="$*" +ARGS=${ALL%%-- *} +REST=${ALL#$ARGS} + +REST=${REST#--} +PANDOC_OPTS=${REST:-$PANDOC_OPTS} + +iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS -r latex -w markdown -s | \ + iconv -f utf-8 diff --git a/markdown2html b/markdown2html index 280c1cf90..04ccf4c49 100644 --- a/markdown2html +++ b/markdown2html @@ -21,4 +21,11 @@ for p in pandoc; do } done -iconv -t utf-8 $* | pandoc $PANDOC_OPTS | iconv -f utf-8 +ALL="$*" +ARGS=${ALL%%-- *} +REST=${ALL#$ARGS} + +REST=${REST#--} +PANDOC_OPTS=${REST:-$PANDOC_OPTS} + +iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS | iconv -f utf-8 diff --git a/markdown2latex b/markdown2latex index 0fc2077cb..4f9e7d8f4 100644 --- a/markdown2latex +++ b/markdown2latex @@ -21,4 +21,11 @@ for p in pandoc; do } done -iconv -t utf-8 $* | pandoc $PANDOC_OPTS -w latex -s | iconv -f utf-8 +ALL="$*" +ARGS=${ALL%%-- *} +REST=${ALL#$ARGS} + +REST=${REST#--} +PANDOC_OPTS=${REST:-$PANDOC_OPTS} + +iconv -t utf-8 $ARGS | pandoc $PANDOC_OPTS -w latex -s | iconv -f utf-8 |