From 303a045fc8c56d71b00ab816a01c6236af950396 Mon Sep 17 00:00:00 2001 From: Kevin Locke Date: Mon, 28 Jan 2019 12:02:58 -0700 Subject: [PATCH] Checker html/w3: Add support for SVG and XHTML Apply the same changes that were applied to html/validator in vim-syntastic/syntastic#2241 to w3/html so that it can be used to validate SVG and XHTML as well. Add support for `g:syntastic_{type}_w3_doctype` to control the doctype POST parameter sent to the validator. This is necessary for SVG without a DTD (which would otherwise be validated as generic XML) and useful for all the types to control validation. Signed-off-by: Kevin Locke --- doc/syntastic-checkers.txt | 186 +++++++++++++++++++++++++++++++++-- syntax_checkers/html/w3.vim | 55 +++++++++-- syntax_checkers/svg/w3.vim | 23 +++++ syntax_checkers/xhtml/w3.vim | 23 +++++ 4 files changed, 272 insertions(+), 15 deletions(-) create mode 100644 syntax_checkers/svg/w3.vim create mode 100644 syntax_checkers/xhtml/w3.vim diff --git a/doc/syntastic-checkers.txt b/doc/syntastic-checkers.txt index 9f9d8b0f4..c983cee31 100644 --- a/doc/syntastic-checkers.txt +++ b/doc/syntastic-checkers.txt @@ -3175,7 +3175,7 @@ details: https://validator.w3.org/source/ As a syntastic linter, you can validate your files against the online service -(see http://validator.w3.org/), or you can install it from sources and run it +(see https://validator.w3.org/), or you can install it from sources and run it as a local service: https://github.com/w3c/markup-validator/ @@ -3184,17 +3184,37 @@ Requirement~ This checker uses cURL: - http://curl.haxx.se/ + https://curl.haxx.se/ Checker options~ *'g:syntastic_html_w3_api'* Type: string -Default: "http://validator.w3.org/check" +Default: "https://validator.w3.org/check" URL of the service to use for checking. Leave it to the default to -run the checks against "http://validator.w3.org/", or set it to +run the checks against "https://validator.w3.org/", or set it to "http://localhost/w3c-validator/check" if you're running a local service. + *'g:syntastic_html_w3_doctype'* +Type: string +Default: "" +Name of the document type definition to use for checking. If unspecified, the +type is detected from the file content. Currently supported values for HTML: + + - HTML5 + - HTML 4.01 Strict + - HTML 4.01 Transitional + - HTML 4.01 Frameset + - HTML 4.01 + RDFa 1.1 + - HTML 3.2 + - HTML 2.0 + - ISO/IEC 15445:2000 ("ISO HTML") + +References: + + https://github.com/w3c/markup-validator/blob/master/htdocs/doctype-select.html + https://github.com/w3c/markup-validator/blob/master/htdocs/config/types.conf + *'g:syntastic_html_w3_exec'* Type: string Default: "curl" @@ -3210,11 +3230,13 @@ Note~ Non-zero exit codes from "cURL" are typically network errors, and are signaled by syntastic with messages such as: > - syntastic: error: checker html/validator returned abnormal status 26 + syntastic: error: checker html/w3 returned abnormal status 26 < You can lookup the meaning of these codes in cURL's manual: - http://curl.haxx.se/docs/manpage.html#EXIT + https://curl.haxx.se/docs/manpage.html#EXIT + +See also: |syntastic-svg-w3|, |syntastic-xhtml-w3|. ============================================================================== SYNTAX CHECKERS FOR JAVA *syntastic-checkers-java* @@ -6579,6 +6601,7 @@ SYNTAX CHECKERS FOR SVG *syntastic-checkers-svg* The following checkers are available for SVG (filetype "svg"): 1. Validator................|syntastic-svg-validator| + 2. W3.......................|syntastic-svg-w3| ------------------------------------------------------------------------------ 1. Validator *syntastic-svg-validator* @@ -6670,6 +6693,78 @@ Example~ < See also: |syntastic-html-validator|, |syntastic-xhtml-validator|. +------------------------------------------------------------------------------ +2. W3 *syntastic-svg-w3* + +Name: w3 +Maintainer: Martin Grenfell + +"W3" is the W3C Markup Validator for SVG. See the project's page for +details: + + https://validator.w3.org/source/ + +As a syntastic linter, you can validate your files against the online service +(see https://validator.w3.org/), or you can install it from sources and run it +as a local service: + + https://github.com/w3c/markup-validator/ + +Requirement~ + +This checker uses cURL: + + http://curl.haxx.se/ + +Checker options~ + + *'g:syntastic_svg_w3_api'* +Type: string +Default: "https://validator.w3.org/check" +URL of the service to use for checking. Leave it to the default to +run the checks against "https://validator.w3.org/", or set it to +"http://localhost/w3c-validator/check" if you're running a local service. + + *'g:syntastic_svg_w3_doctype'* +Type: string +Default: "SVG 1.1" (if not detected from DTD) +Name of the document type definition to use for checking. If unspecified, the +type is detected from a Document Type Declaration, if present, or "SVG 1.1" is +used. Currently supported values for SVG: + + - SVG 1.0 + - SVG 1.1 + - SVG 1.1 Tiny + - SVG 1.1 Basic + +References: + + https://github.com/w3c/markup-validator/blob/master/htdocs/doctype-select.html + https://github.com/w3c/markup-validator/blob/master/htdocs/config/types.conf + + *'g:syntastic_svg_w3_exec'* +Type: string +Default: "curl" +Path to the "cURL" executable. Override it with a full path if your "cURL" is +not installed in a standard location. + +This checker doesn't call the "makeprgBuild()" function, and thus it ignores +the usual 'g:syntastic_svg_w3_