diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-01 06:33:47 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-01 06:33:47 +0000 |
| commit | a4a2792dc11df1a5d2b523261de09118ca8e5262 (patch) | |
| tree | 5379af59007a14326a893f06d704caa5a304a0a8 | |
| parent | b8d960d1b9e09d4104f79d4c1ff0fc427391be33 (diff) | |
| download | pandoc-a4a2792dc11df1a5d2b523261de09118ca8e5262.tar.gz | |
Use iconv on output as well as input in wrapper scripts.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@58 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | html2markdown | 4 | ||||
| -rw-r--r-- | latex2markdown | 2 | ||||
| -rw-r--r-- | markdown2html | 2 | ||||
| -rw-r--r-- | markdown2latex | 2 | ||||
| -rw-r--r-- | markdown2pdf | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/html2markdown b/html2markdown index 931c74b74..8bae3a3bf 100644 --- a/html2markdown +++ b/html2markdown @@ -12,7 +12,7 @@ } if [ -z "$1" ] || [ -f $1 ]; then - tidy -utf8 $1 2>/dev/null | pandoc -r html -w markdown -s + tidy -utf8 $1 2>/dev/null | pandoc -r html -w markdown -s | iconv -f utf-8 else # Treat given argument as an URL. Locate a # sensible text based browser (note the order). @@ -35,5 +35,5 @@ else exit 1 ;; esac # Fetch and feed to pandoc. - $DUMPER $OPT $1 2>/dev/null | tidy -utf8 2>/dev/null | pandoc -r html -w markdown -s + $DUMPER $OPT $1 2>/dev/null | tidy -utf8 2>/dev/null | pandoc -r html -w markdown -s | iconv -f utf-8 fi diff --git a/latex2markdown b/latex2markdown index ce75ac117..d55c69268 100644 --- a/latex2markdown +++ b/latex2markdown @@ -4,4 +4,4 @@ echo >&2 "You need 'pandoc' to use this program!" exit 1 } -iconv -t utf-8 $* | pandoc -r latex -w markdown -s +iconv -t utf-8 $* | pandoc -r latex -w markdown -s | iconv -f utf-8 diff --git a/markdown2html b/markdown2html index 50d7a7e2a..d1475f4b6 100644 --- a/markdown2html +++ b/markdown2html @@ -4,4 +4,4 @@ echo >&2 "You need 'pandoc' to use this program!" exit 1 } -iconv -t utf-8 $* | pandoc +iconv -t utf-8 $* | pandoc | iconv -f utf-8 diff --git a/markdown2latex b/markdown2latex index 76d24dc10..a93aca7cd 100644 --- a/markdown2latex +++ b/markdown2latex @@ -4,4 +4,4 @@ echo >&2 "You need 'pandoc' to use this program!" exit 1 } -iconv -t utf-8 $* | pandoc -w latex -s +iconv -t utf-8 $* | pandoc -w latex -s | iconv -f utf-8 diff --git a/markdown2pdf b/markdown2pdf index 6ca931fdd..b7b728807 100644 --- a/markdown2pdf +++ b/markdown2pdf @@ -58,7 +58,7 @@ TEMP=${TMPDIR-/tmp}/markdown2pdf.$$ trap "status=$?; rm -rf $TEMP; exit $status" 0 INT mkdir -p $TEMP -iconv -t utf-8 $infile | pandoc -w latex -s > $TEMP/$BASE.tex +iconv -t utf-8 $infile | pandoc -w latex -s | iconv -f utf-8 > $TEMP/$BASE.tex ( cd $TEMP if ! pdflatex -interaction=batchmode $BASE.tex >/dev/null 2>&1; then |