diff options
| -rwxr-xr-x | htdocs/docs/install.html | 14 | ||||
| -rw-r--r-- | htdocs/docs/install_win.html | 15 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 10 | ||||
| -rw-r--r-- | misc/bundle/META.yml | 1 | ||||
| -rw-r--r-- | misc/bundle/Makefile.PL | 1 | ||||
| -rw-r--r-- | misc/bundle/lib/Bundle/W3C/Validator.pm | 1 |
6 files changed, 26 insertions, 16 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index 9550cb8..3a082de 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install.html,v 1.44 2009-01-07 22:19:31 ville Exp $" ---><!--#set var="date" value="\$Date: 2009-01-07 22:19:31 $" +<!--#set var="revision" value="\$Id: install.html,v 1.45 2009-02-04 20:01:39 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-02-04 20:01:39 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -132,7 +132,8 @@ install Bundle::W3C::Validator <dd> Configuration file handling. </dd> - <dt><a href="http://search.cpan.org/dist/Encode/">Encode</a>, <a href="http://search.cpan.org/dist/Encode-HanExtra/">Encode-HanExtra</a> and <a href="http://search.cpan.org/dist/Encode-JIS2K/">Encode-JIS2k</a></dt> + <dt><a href="http://search.cpan.org/dist/Encode/">Encode</a> and + <a href="http://search.cpan.org/dist/Encode-HanExtra/">Encode-HanExtra</a></dt> <dd> Support for multiple character encodings. </dd> @@ -190,6 +191,13 @@ install Bundle::W3C::Validator </p> <dl> + <dt><a href="http://search.cpan.org/dist/Encode-JIS2K/">Encode-JIS2K</a></dt> + <dd> + Support for additional Japanese character encodings. + </dd> + </dl> + + <dl> <dt><a href="http://search.cpan.org/dist/HTML-Tidy/">HTML-Tidy</a></dt> <dd> HTML-Tidy is used for generating a cleaned up version of the diff --git a/htdocs/docs/install_win.html b/htdocs/docs/install_win.html index 90806a0..731e42d 100644 --- a/htdocs/docs/install_win.html +++ b/htdocs/docs/install_win.html @@ -1,5 +1,5 @@ -<!--#set var="revision" value="\$Id: install_win.html,v 1.16 2007-09-30 14:53:11 dtibbe Exp $" ---><!--#set var="date" value="\$Date: 2007-09-30 14:53:11 $" +<!--#set var="revision" value="\$Id: install_win.html,v 1.17 2009-02-04 20:01:39 ville Exp $" +--><!--#set var="date" value="\$Date: 2009-02-04 20:01:39 $" --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service (Windows, Apache)" --><!--#set var="relroot" value="../" --><!--#include virtual="../header.html" --> @@ -61,11 +61,9 @@ At <a href="http://ppm.activestate.com/">Active State</a>, <ul> <li>Class-Accessor</li> <li>Config-General</li> - <li>Encode::HanExtra</li> - <li>Encode::JIS2K</li> + <li>Encode-HanExtra</li> <li>HTML-Encoding</li> <li>HTML-Template</li> - <li>HTML-Tidy</li> <li>Net-IP</li> <li>SGML-Parser-OpenSP</li> <li>XML-LibXML</li> @@ -73,6 +71,11 @@ At <a href="http://ppm.activestate.com/">Active State</a>, <li>XML-SAX</li> <li>XML-LibXML-Common</li> </ul> +<p>...and the following are optional:</p> +<ul> + <li>Encode-JIS2K</li> + <li>HTML-Tidy</li> +</ul> <p>You can get each of them in a single package at ActiveState. They are also packed ready-to-install <a href="http://www.myhpi.de/~dtibbe/download/ppm.zip">in a single zip-file</a>, (courtesy of the guide's author).</p> @@ -265,7 +268,7 @@ Include conf/extra/httpd-manual.conf <pre># # Main Configuration File for the W3C Markup Validation Service. # -# $Id: install_win.html,v 1.16 2007-09-30 14:53:11 dtibbe Exp $ +# $Id: install_win.html,v 1.17 2009-02-04 20:01:39 ville Exp $ # # See 'perldoc Config::General' for the syntax, and be aware that the # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*', diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index c0513aa..1da6f50 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.642 2009-02-03 00:43:36 ot Exp $ +# $Id: check,v 1.643 2009-02-04 20:01:39 ville Exp $ # # Disable buffering on STDOUT! @@ -52,7 +52,6 @@ use Encode qw(); use Encode::Alias qw(); use Encode::HanExtra qw(); # for some chinese character encodings, # e.g gb18030 -use Encode::JIS2K qw(); # ditto extra japanese encodings use File::Spec::Functions qw(catfile); use HTML::Encoding 0.52 qw(); use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref) @@ -199,7 +198,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.642 $; + $VERSION = q$Revision: 1.643 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -223,7 +222,10 @@ $rsrc{msg}{0} ||= }; $RSRC = \%rsrc; - +eval { + local $SIG{__DIE__}; + require Encode::JIS2K; # for optional extra Japanese encodings +}; } # end of BEGIN block. diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml index da67bd7..468e662 100644 --- a/misc/bundle/META.yml +++ b/misc/bundle/META.yml @@ -12,7 +12,6 @@ requires: Config::General: 2.31 Encode: 0 Encode::HanExtra: 0 - Encode::JIS2K: 0 File::Spec::Functions: 0 HTML::Encoding: 0.52 HTML::Parser: 3.24 diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index cc04879..5305d75 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -11,7 +11,6 @@ WriteMakefile( Config::General => 2.31, Encode => 0, Encode::HanExtra => 0, - Encode::JIS2K => 0, File::Spec::Functions => 0, HTML::Encoding => 0.52, HTML::Parser => 3.24, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index 8a12751..468559d 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -24,7 +24,6 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> Config::General 2.31 Encode Encode::HanExtra - Encode::JIS2K File::Spec::Functions HTML::Encoding 0.52 HTML::Parser 3.24 |