git.iko.soy/typeable/pandoc
on master help sign in
+ Changed 'web2markdown' to 'html2markdown'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@309 788f1e2b-df1e-0410-8736-df70ead52e1b

commit3491420b53b03dbc24b6001e4f379fd2fbdbea8d authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 29 Dec 2006, 18:50 (20 years ago) parenteea3592
7 files changed+26−26
compare with master
unifiedsplit
Makefile+1−1 README+9−9 man/man1/web2markdown.1 → man/man1/html2markdown.1+10−10 man/man1/pandoc.1+2−2 src/wrappers/web2markdown.in → src/wrappers/html2markdown.in+2−2 web/demos.sh+1−1 web/index.txt+1−1
Makefile+1−1
@@ -25,7 +25,7 @@ EXECSBASE := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL).in)
2525#-------------------------------------------------------------------------------
2626# Install targets
2727#-------------------------------------------------------------------------------
28−WRAPPERS := web2markdown markdown2pdf
28+WRAPPERS := html2markdown markdown2pdf
2929# Add .exe extensions if we're running Windows/Cygwin.
3030EXTENSION := $(shell uname | tr '[:upper:]' '[:lower:]' | \
3131 sed -ne 's/^cygwin.*$$/\.exe/p')
README+9−9
@@ -38,14 +38,14 @@ Requirements
3838The `pandoc` program itself does not depend on any external libraries
3939or programs.
4040
41−The wrapper script `web2markdown` requires
41+The wrapper script `html2markdown` requires
4242
4343 - `pandoc` (which must be in the PATH)
4444 - a POSIX-compliant shell (installed by default on all linux and unix
4545 systems, including Mac OS X, and in [Cygwin] for Windows),
4646 - `HTML Tidy`
4747 - `iconv` (for character encoding conversion). (If `iconv` is absent,
48− `web2markdown` will still work, but it will treat everything as UTF-8.)
48+ `html2markdown` will still work, but it will treat everything as UTF-8.)
4949
5050[Cygwin]: http://www.cygwin.com/
5151[HTML Tidy]: http://tidy.sourceforge.net/
@@ -117,7 +117,7 @@ But for simple documents it should be adequate. The `latex` and `html`
117117readers are also limited in what they can do. Because the `html`
118118reader is picky about the HTML it parses, it is recommended that you
119119pipe HTML through [HTML Tidy] before sending it to `pandoc`, or use the
120−`web2markdown` script described below.
120+`html2markdown` script described below.
121121
122122If you don't specify a reader or writer explicitly, `pandoc` will
123123try to determine the input and output format from the extensions of
@@ -151,10 +151,10 @@ The shell scripts (described below) automatically convert the input
151151from the local encoding to UTF-8 before running them through `pandoc`,
152152then convert the output back to the local encoding.
153153
154−`markdown2pdf` and `web2markdown`
155−=================================
154+`markdown2pdf` and `html2markdown`
155+==================================
156156
157−Two shell scripts, `markdown2pdf` and `web2markdown`, are included in
157+Two shell scripts, `markdown2pdf` and `html2markdown`, are included in
158158the standard Pandoc installation. (They are not included in the Windows
159159binary package, as they require a POSIX shell, but they may be used
160160in Windows under Cygwin.)
@@ -175,19 +175,19 @@ in Windows under Cygwin.)
175175
176176 If no input file is specified, input will be taken from STDIN.
177177
178−2. `web2markdown` grabs a web page from a file or URL and converts
178+2. `html2markdown` grabs a web page from a file or URL and converts
179179 it to markdown-formatted text, using `tidy` and `pandoc`.
180180 Unless input is from STDIN, an attempt is made to determine the
181181 character encoding of the page from the "Content-type" meta tag.
182182 If this is not present, UTF-8 is assumed. Alternatively, a character
183183 encoding may be specified explicitly using the `-e` option.
184184
185− `web2markdown` searches for an available program (`wget`, `curl`,
185+ `html2markdown` searches for an available program (`wget`, `curl`,
186186 or a text-mode browser) to fetch the contents of a URL.
187187 Optionally, the `-g` command may be used to specify the command
188188 to be used:
189189
190− web2markdown -g 'wget --user=foo --password=bar' mysite.com
190+ html2markdown -g 'wget --user=foo --password=bar' mysite.com
191191
192192Command-line options
193193====================
man/man1/web2markdown.1 → man/man1/html2markdown.1renamed+10−10
@@ -1,22 +1,22 @@
1−.TH WEB2MARKDOWN 1 "December 15, 2006" Pandoc "User Manuals"
1+.TH HTML2MARKDOWN 1 "December 15, 2006" Pandoc "User Manuals"
22.SH NAME
3−web2markdown \- converts HTML to markdown-formatted text
3+html2markdown \- converts HTML to markdown-formatted text
44.SH SYNOPSIS
5−\fBweb2markdown\fR [\fIoptions\fR] [\fIinput\-file\fR or \fIURL\fR]
5+\fBhtml2markdown\fR [\fIoptions\fR] [\fIinput\-file\fR or \fIURL\fR]
66.SH DESCRIPTION
7−\fBweb2markdown\fR converts \fIinput\-file\fR or \fIURL\fR (or text
7+\fBhtml2markdown\fR converts \fIinput\-file\fR or \fIURL\fR (or text
88from STDIN) from HTML to markdown\-formatted plain text.
9−If a URL is specified, \fBweb2markdown\fR uses an available program
9+If a URL is specified, \fBhtml2markdown\fR uses an available program
1010(e.g. wget, w3m, lynx or curl) to fetch its contents. Output is sent
1111to STDOUT unless an output file is specified using the \fB\-o\fR
1212option.
1313.PP
14−\fBweb2markdown\fR uses the character encoding specified in the
14+\fBhtml2markdown\fR uses the character encoding specified in the
1515"Content-type" meta tag. If this is not present, or if input comes
1616from STDIN, UTF-8 is assumed. A character encoding may be specified
1717explicitly using the \fB\-e\fR option.
1818.PP
19−\fBweb2markdown\fR is a wrapper for \fBpandoc\fR.
19+\fBhtml2markdown\fR is a wrapper for \fBpandoc\fR.
2020.SH OPTIONS
2121.TP
2222.B \-s, \-\-standalone
@@ -62,17 +62,17 @@ Assume the character encoding \fIencoding\fR in reading HTML.
6262(Note: \fIencoding\fR will be passed to \fBiconv\fR; a list of
6363available encodings may be obtained using `\fBiconv \-l\fR'.)
6464If the \fB\-e\fR option is not specified and input is not from
65−STDIN, \fBweb2markdown\fR will try to extract the character encoding
65+STDIN, \fBhtml2markdown\fR will try to extract the character encoding
6666from the "Content-type" meta tag. If no character encoding is
6767specified in this way, or if input is from STDIN, UTF-8 will be
6868assumed.
6969.TP
7070.B \-g \fIcommand\fR
7171Use \fIcommand\fR to fetch the contents of a URL. (By default,
72−\fBweb2markdown\fR searches for an available program or text-based
72+\fBhtml2markdown\fR searches for an available program or text-based
7373browser to fetch the contents of a URL.) For example:
7474.IP
75−web2markdown \-g 'wget \-\-user=foo \-\-password=bar' mysite.com
75+html2markdown \-g 'wget \-\-user=foo \-\-password=bar' mysite.com
7676
7777.SH "SEE ALSO"
7878\fBpandoc\fR(1),
man/man1/pandoc.1+2−2
@@ -41,7 +41,7 @@ and output through \fBiconv\fR:
4141.PP
4242\fIPandoc\fR's HTML parser is not very forgiving. If your input is
4343HTML, consider running it through \fBtidy\fR(1) before passing it
44−to Pandoc. Or use \fBweb2markdown\fR(1), a wrapper around \fBpandoc\fR.
44+to Pandoc. Or use \fBhtml2markdown\fR(1), a wrapper around \fBpandoc\fR.
4545
4646.SH OPTIONS
4747.TP
@@ -151,7 +151,7 @@ Print version.
151151Show usage message.
152152
153153.SH "SEE ALSO"
154−\fBweb2markdown\fR(1),
154+\fBhtml2markdown\fR(1),
155155\fBmarkdown2pdf\fR(1).
156156The
157157.I README
src/wrappers/web2markdown.in → src/wrappers/html2markdown.inrenamed+2−2
@@ -72,7 +72,7 @@ grabber=
7272while [ $# -gt 0 ]; do
7373 case "$1" in
7474 -h|--help)
75− pandoc -h 2>&1 | sed -e 's/pandoc/web2markdown/' \
75+ pandoc -h 2>&1 | sed -e 's/pandoc/html2markdown/' \
7676 -e '/^[[:space:]]*\(-f\|-t\|-S\|-N\|-m\|-i\|-c\|-T\|-D\|-d\)/,/./d'\
7777 1>&2
7878 err " -e ENCODING, --encoding=ENCODING"
@@ -81,7 +81,7 @@ while [ $# -gt 0 ]; do
8181 err " Specify command to be used to grab contents of URL"
8282 exit 0 ;;
8383 -v|--version)
84− pandoc -v 2>&1 | sed -e 's/pandoc/web2markdown/' 1>&2
84+ pandoc -v 2>&1 | sed -e 's/pandoc/html2markdown/' 1>&2
8585 exit 0 ;;
8686 -e)
8787 shift
web/demos.sh+1−1
@@ -14,7 +14,7 @@ pandoc -s README.tex -o demo0.txt
1414pandoc -s -w rst README -o demo0.txt
1515pandoc -s README -o demo0.rtf
1616pandoc -s -m -i -w s5 S5DEMO -o demo0.html
17−web2markdown http://www.gnu.org/software/make/ -o demo0.txt
17+html2markdown http://www.gnu.org/software/make/ -o demo0.txt
1818markdown2pdf README -o demo0.pdf
1919markdown2pdf -C myheader.tex README -o demo0.pdf'
2020
web/index.txt+1−1
@@ -35,7 +35,7 @@ you should extract from the zip archive and put somewhere in your
3535PATH). See the included file `README-WINDOWS.txt` for instructions
3636on using the program. Note: If you use [Cygwin], we recommend that
3737you compile Pandoc from source. This will give you access to the
38−wrapper scripts `markdown2pdf` and `web2markdown`, which are not
38+wrapper scripts `markdown2pdf` and `html2markdown`, which are not
3939included in the Windows binary package.
4040
4141[`@TARBALL_NAME@`]: http://pandoc.googlecode.com/files/@TARBALL_NAME@