19486ee · typeable/pandoc

html2markdown+13−6

compare with master

unifiedsplit

@@ -23,14 +23,21 @@ for p in pandoc tidy; do

23done

24

25ALL="$*"

26−ARGS=${ALL%%-- *}

26+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant

27−REST=${ALL#$ARGS}

27+set -- $ARGS

28

29−REST=${REST#--}

29+REST=${ALL#$ARGS}; REST=${REST#--}

30PANDOC_OPTS=${REST:-$PANDOC_OPTS}

31

32+infile=$1

33+shift

34+

35+if [ -n "$@" ]; then

36+ echo >&2 "Warning: extra arguments '$@' will be ignored!"

37+fi

38+

32−if [ -z "$1" ] || [ -f $1 ]; then

39+if [ -z "$infile" ] || [ -f $infile ]; then

33− tidy -utf8 $1 2>/dev/null | \

40+ tidy -utf8 $infile 2>/dev/null | \

34 pandoc $PANDOC_OPTS -r html -w markdown -s | \

41 pandoc $PANDOC_OPTS -r html -w markdown -s | \

35 iconv -f utf-8

42 iconv -f utf-8

36else

43else

@@ -55,7 +62,7 @@ else

55 exit 1 ;;

62 exit 1 ;;

56 esac

63 esac

57 # Fetch and feed to pandoc.

64 # Fetch and feed to pandoc.

58− $DUMPER $OPT $1 2>/dev/null | \

65+ $DUMPER $OPT $infile 2>/dev/null | \

59 tidy -utf8 2>/dev/null | \

66 tidy -utf8 2>/dev/null | \

60 pandoc $PANDOC_OPTS -r html -w markdown -s | \

67 pandoc $PANDOC_OPTS -r html -w markdown -s | \

61 iconv -f utf-8

68 iconv -f utf-8

latex2markdown+4−4

@@ -22,11 +22,11 @@ for p in pandoc; do

22done

23

24ALL="$*"

25−ARGS=${ALL%%-- *}

25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant

26−REST=${ALL#$ARGS}

26+set -- $ARGS

27

28−REST=${REST#--}

28+REST=${ALL#$ARGS}; REST=${REST#--}

29PANDOC_OPTS=${REST:-$PANDOC_OPTS}

30

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 | \

32 iconv -f utf-8

markdown2html+4−4

@@ -22,10 +22,10 @@ for p in pandoc; do

22done

23

24ALL="$*"

25−ARGS=${ALL%%-- *}

25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant

26−REST=${ALL#$ARGS}

26+set -- $ARGS

27

28−REST=${REST#--}

28+REST=${ALL#$ARGS}; REST=${REST#--}

29PANDOC_OPTS=${REST:-$PANDOC_OPTS}

30

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

22done

23

24ALL="$*"

25−ARGS=${ALL%%-- *}

25+ARGS=${ALL%% -- *} # only the part before ' -- ' delimiters is relevant

26−REST=${ALL#$ARGS}

26+set -- $ARGS

27

28−REST=${REST#--}

28+REST=${ALL#$ARGS}; REST=${REST#--}

29PANDOC_OPTS=${REST:-$PANDOC_OPTS}

30

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

21 }

22done

23

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+

24outfile=

31outfile=

25for option; do

32for option; do

26 if [ -n "$prev" ]; then

33 if [ -n "$prev" ]; then

@@ -52,6 +59,12 @@ done

52}

59}

53

60

54infile=$1

61infile=$1

62+shift

63+

64+if [ -n "$@" ]; then

65+ echo >&2 "Warning: extra arguments '$@' will be ignored!"

66+fi

67+

55if [ -z "$outfile" ]; then

68if [ -z "$outfile" ]; then

56 if [ -n "$infile" ]; then

69 if [ -n "$infile" ]; then

57 outfile=${infile%.*}.pdf

70 outfile=${infile%.*}.pdf