diff --git a/xml/relaxng/resources/resources/html5-schema/html5/form-datatypes.rnc b/xml/relaxng/resources/resources/html5-schema/html5/form-datatypes.rnc
index 76fa0567f501..a6a6da684746 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/form-datatypes.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/form-datatypes.rnc
@@ -5,30 +5,30 @@ datatypes w = "http://whattf.org/datatype-draft"
 # #####################################################################
 
 ## MIME types
-		
-	form.data.mimetypelist = 
+
+	form.data.mimetypelist =
 		w:mime-type-list
-		
+
 
 ## ECMAScript Regular Expression
-		
-	form.data.pattern = 
+
+	form.data.pattern =
 		string
-		
+
 ## Temporal
-		
+
 	form.data.datetime-local =
 		w:datetime-local
-	
+
 	form.data.date =
 		w:date
-	
+
 	form.data.month =
 		w:month
-	
+
 	form.data.week =
 		w:week
-	
+
 	form.data.time =
 		w:time
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5exclusions.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5exclusions.rnc
index 1fa0915fbe09..523f0b27e0ae 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5exclusions.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/html5exclusions.rnc
@@ -4,7 +4,7 @@ default namespace = "http://www.w3.org/1999/xhtml"
 # #####################################################################
 
   ## This file is unmaintained. Please use assertions.sch instead.
-  
+
 # #####################################################################
 ## Schema Framework & Parameters
 
@@ -51,7 +51,7 @@ dfn.elem.exclude-self =
 	}
 
 # FIXME this part was cut off -- hsivonen
-wildcard.elem.exclude-all = 
+wildcard.elem.exclude-all =
 	notAllowed
 
 #FIXME no nested forms in HTML-serializable docs
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc
index 22bf9e834440..aca26cfded7b 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc
@@ -122,13 +122,13 @@ its-locQualityIssueType.type = w:string "terminology" | w:string "mistranslation
 
 its-locQualityIssueComment.type = string
 
-its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" }
 
 its-locQualityIssueProfileRef.type = w:iri-ref
 
 its-locQualityIssueEnabled.type = w:string "yes" | w:string "no"
 
-its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" }
 
 its-locQualityRatingVote.type = xsd:integer
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc
index 6417334245c2..33da35d8252d 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc
@@ -81,7 +81,7 @@ its-attribute.provenanceRecordsRef.html = attribute its-provenance-records-ref {
 
 its-attribute.locQualityIssuesRef.html = attribute its-loc-quality-issues-ref { its-locQualityIssuesRef.type }
 
-its-attribute.locQualityIssueType.html = attribute its-loc-quality-issue-type { its-locQualityIssueType.type } 
+its-attribute.locQualityIssueType.html = attribute its-loc-quality-issue-type { its-locQualityIssueType.type }
 
 its-attribute.locQualityIssueComment.html = attribute its-loc-quality-issue-comment { its-locQualityIssueComment.type }
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/media.rnc b/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
index 2fd90699bc55..8b9cde06ec4c 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
@@ -7,7 +7,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 ## Attributes Common to Media Elements
 
 	# src not included
-	media.attrs = 
+	media.attrs =
 		(	media.attrs.autoplay?
 		&	media.attrs.preload?
 		&	media.attrs.controls?
@@ -35,7 +35,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute muted {
 				w:string "muted" | w:string ""
 			}
-		
+
 ## Source: <source>
 
 	source.elem =
@@ -58,7 +58,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 ## Media Source
 
-	media.source = 
+	media.source =
 		(	media.attrs.src
 		|	source.elem*
 		)
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc b/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
index 5ab308b53b1d..a4941d41301b 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
@@ -146,13 +146,13 @@
 		(	common.attrs
 		&	common.attrs.aria?
 		)
-	address.inner = 
+	address.inner =
 		( common.inner.flow )
 
 	common.elem.flow |= address.elem
 
 # #####################################################################
-## Quotations	
+## Quotations
 
 ## Block Quotes: <blockquote>
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc b/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
index c5c62e2b6b21..f942699fd4aa 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
@@ -12,7 +12,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 #	tables.data.multilen =
 #		(	common.data.integer.positive
 #		|	common.data.percent
-#		|	xsd:token { pattern = "[0-9]+\*" } #REVISIT should this one be string? 
+#		|	xsd:token { pattern = "[0-9]+\*" } #REVISIT should this one be string?
 #		)
 
 ## Table Alignment Attributes
@@ -24,7 +24,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		)
 		tables.attrs.align =
 			attribute align {
-				(	w:string "left" 
+				(	w:string "left"
 				|	w:string "center"
 				|	w:string "right"
 				|	w:string "justify"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-forms-scripting.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-forms-scripting.rnc
index 63fe1c4dfa6d..6beef2732e4e 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-forms-scripting.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-forms-scripting.rnc
@@ -22,6 +22,6 @@
 		scripting.attr.form.submit =
 			attribute onsubmit { string }
 		scripting.attr.form.reset =
-			attribute onreset { string } 
-		
-		
+			attribute onreset { string }
+
+
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
index 60d2e4f164b3..087aedfa0981 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
@@ -10,53 +10,53 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common-form.attrs.name?
 		&	common-form.attrs.disabled?
 		)
-		
-	common-form.attrs.name = 
+
+	common-form.attrs.name =
 		attribute name {
 			form.data.nonemptystring
 		}
 
-	common-form.attrs.disabled = 
+	common-form.attrs.disabled =
 		attribute disabled {
 			w:string "disabled" | w:string ""
 		}
 
-	shared-form.attrs.readonly = 
+	shared-form.attrs.readonly =
 		attribute readonly {
 			w:string "readonly" | w:string ""
 		}
 
-	shared-form.attrs.maxlength = 
+	shared-form.attrs.maxlength =
 		attribute maxlength {
 			common.data.integer.non-negative
 		}
 
-	shared-form.attrs.size = 
+	shared-form.attrs.size =
 		attribute size {
 			common.data.integer.positive
 		}
-	
+
 	# REVISIT tabindex goes in common.attrs
 
 ## Shared attributes for <input>
-	
-	input.attrs.checked = 
+
+	input.attrs.checked =
 		attribute checked {
 			w:string "checked" | w:string ""
 		}
 
 ## Text Field: <input type='text'>
 
-	input.text.elem = 
+	input.text.elem =
 		element input { input.text.attrs }
-	input.text.attrs = 
+	input.text.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.text.attrs.type?
-		&	shared-form.attrs.maxlength? 
+		&	shared-form.attrs.maxlength?
 		&	shared-form.attrs.readonly?
 		&	shared-form.attrs.size?
-		&	input.text.attrs.value? 
+		&	input.text.attrs.value?
 		&	(	common.attrs.aria.implicit.textbox
 			|	common.attrs.aria.role.textbox
 			|	common.attrs.aria.role.combobox
@@ -64,7 +64,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.spinbutton
 			)?
 		)
-		input.text.attrs.type = 
+		input.text.attrs.type =
 			attribute type {
 				w:string "text"
 			}
@@ -72,23 +72,23 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				form.data.stringwithoutlinebreaks
 			}
-		
+
 	input.elem = input.text.elem
 
 ## Password Field: <input type='password'>
 
-	input.password.elem = 
+	input.password.elem =
 		element input { input.password.attrs }
-	input.password.attrs = 
+	input.password.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.password.attrs.type
-		&	shared-form.attrs.maxlength? 
-		&	shared-form.attrs.readonly? 
+		&	shared-form.attrs.maxlength?
+		&	shared-form.attrs.readonly?
 		&	shared-form.attrs.size?
-		&	input.password.attrs.value? 
+		&	input.password.attrs.value?
 		)
-		input.password.attrs.type = 
+		input.password.attrs.type =
 			attribute type {
 				w:string "password"
 			}
@@ -96,19 +96,19 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				form.data.stringwithoutlinebreaks
 			}
-		
+
 	input.elem |= input.password.elem
-		
+
 ## Checkbox: <input type='checkbox'>
 
-	input.checkbox.elem = 
+	input.checkbox.elem =
 		element input { input.checkbox.attrs }
-	input.checkbox.attrs = 
+	input.checkbox.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.checkbox.attrs.type
-		&	input.attrs.checked? 
-		&	input.checkbox.attrs.value? 
+		&	input.attrs.checked?
+		&	input.checkbox.attrs.value?
 		&	(	common.attrs.aria.implicit.checkbox
 			|	common.attrs.aria.role.checkbox
 			|	common.attrs.aria.role.button
@@ -117,7 +117,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.switch-checked-not-required
 			)?
 		)
-		input.checkbox.attrs.type = 
+		input.checkbox.attrs.type =
 			attribute type {
 				w:string "checkbox"
 			}
@@ -125,25 +125,25 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string #REVISIT require non-empty value?
 			}
-		
+
 	input.elem |= input.checkbox.elem
-	
+
 ## Radiobutton: <input type='radio'>
 
-	input.radio.elem = 
+	input.radio.elem =
 		element input { input.radio.attrs }
-	input.radio.attrs = 
+	input.radio.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.radio.attrs.type
-		&	input.attrs.checked? 
-		&	input.radio.attrs.value? 
+		&	input.attrs.checked?
+		&	input.radio.attrs.value?
 		&	(	common.attrs.aria.implicit.radio
 			|	common.attrs.aria.role.radio
 			|	common.attrs.aria.role.menuitemradio-checked-not-required
 			)?
 		)
-		input.radio.attrs.type = 
+		input.radio.attrs.type =
 			attribute type {
 				w:string "radio"
 			}
@@ -151,18 +151,18 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string #REVISIT require non-empty value?
 			}
-		
+
 	input.elem |= input.radio.elem
-	
+
 ## Scripting Hook Button: <input type='button'>
 
-	input.button.elem = 
+	input.button.elem =
 		element input { input.button.attrs }
-	input.button.attrs = 
+	input.button.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.button.attrs.type
-		&	input.button.attrs.value? 
+		&	input.button.attrs.value?
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
@@ -178,7 +178,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.tab
 			)?
 		)
-		input.button.attrs.type = 
+		input.button.attrs.type =
 			attribute type {
 				w:string "button"
 			}
@@ -186,25 +186,25 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string #REVISIT require non-empty value?
 			}
-		
+
 	input.elem |= input.button.elem
 	#REVISIT should this be enabled by a scripting module only?
-	
+
 ## Submit Button: <input type='submit'>
 
-	input.submit.elem = 
+	input.submit.elem =
 		element input { input.submit.attrs }
-	input.submit.attrs = 
+	input.submit.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.submit.attrs.type
-		&	input.submit.attrs.value? 
+		&	input.submit.attrs.value?
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
 			)?
 		)
-		input.submit.attrs.type = 
+		input.submit.attrs.type =
 			attribute type {
 				w:string "submit"
 			}
@@ -212,24 +212,24 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string #REVISIT require non-empty value?
 			}
-		
+
 	input.elem |= input.submit.elem
-		
+
 ## Reset Button: <input type='reset'>
 
-	input.reset.elem = 
+	input.reset.elem =
 		element input { input.reset.attrs }
-	input.reset.attrs = 
+	input.reset.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.reset.attrs.type
-		&	input.reset.attrs.value? 
+		&	input.reset.attrs.value?
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
 			)?
 		)
-		input.reset.attrs.type = 
+		input.reset.attrs.type =
 			attribute type {
 				w:string "reset"
 			}
@@ -237,42 +237,42 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string #REVISIT require non-empty value?
 			}
-		
+
 	input.elem |= input.reset.elem
 	# REVISIT does reset make sense outside a form?
-		
+
 ## File Upload: <input type='file'>
 
-	input.file.elem = 
+	input.file.elem =
 		element input { input.file.attrs }
-	input.file.attrs = 
+	input.file.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.file.attrs.type
 		&	input.file.attrs.accept?
 		)
-		input.file.attrs.type = 
+		input.file.attrs.type =
 			attribute type {
 				w:string "file"
 			}
-		input.file.attrs.accept = 
+		input.file.attrs.accept =
 			attribute accept {
 				form.data.mimetypelist
 			}
 
 	input.elem |= input.file.elem
-	
+
 ## Hidden String: <input type='hidden'>
 
-	input.hidden.elem = 
+	input.hidden.elem =
 		element input { input.hidden.attrs }
-	input.hidden.attrs = 
+	input.hidden.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.hidden.attrs.type
-		&	input.hidden.attrs.value? 
+		&	input.hidden.attrs.value?
 		)
-		input.hidden.attrs.type = 
+		input.hidden.attrs.type =
 			attribute type {
 				w:string "hidden"
 			}
@@ -280,19 +280,19 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				string
 			}
-		
+
 	input.elem |= input.hidden.elem
-		
+
 ## Image Submit Button: <input type='image'>
 
-	input.image.elem = 
+	input.image.elem =
 		element input { input.image.attrs }
-	input.image.attrs = 
+	input.image.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.image.attrs.type
-		&	input.image.attrs.alt 
-		&	input.image.attrs.src? 
+		&	input.image.attrs.alt
+		&	input.image.attrs.src?
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
@@ -303,22 +303,22 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.radio
 			|	common.attrs.aria.role.switch
 			)?
-		)	
-		input.image.attrs.type = 
+		)
+		input.image.attrs.type =
 			attribute type {
 				w:string "image"
 			}
-		input.image.attrs.alt = 
+		input.image.attrs.alt =
 			attribute alt {
 				form.data.nonemptystring
 			}
-		input.image.attrs.src = 
+		input.image.attrs.src =
 			attribute src {
 				common.data.uri.non-empty
 			}
-	
+
 	input.elem |= input.image.elem
-	
+
 	common.elem.phrasing |= input.elem
 
 ## Text Area: <textarea>
@@ -335,18 +335,18 @@ datatypes w = "http://whattf.org/datatype-draft"
 			)?
 		#FIXME onfocus, onblur, onselect,onchange
 		)
-		# This is ugly. 
-		textarea.attrs.rows-and-cols-wf1 = 
-			textarea.attrs.rows-and-cols-wf1.inner	
+		# This is ugly.
+		textarea.attrs.rows-and-cols-wf1 =
+			textarea.attrs.rows-and-cols-wf1.inner
 		textarea.attrs.rows-and-cols-wf1.inner =
 			(	textarea.attrs.cols
 			&	textarea.attrs.rows
 			)
-		textarea.attrs.cols = 
+		textarea.attrs.cols =
 			attribute cols {
 				common.data.integer.positive
 			}
-		textarea.attrs.rows = 
+		textarea.attrs.rows =
 			attribute rows {
 				common.data.integer.positive
 			}
@@ -380,11 +380,11 @@ datatypes w = "http://whattf.org/datatype-draft"
 		option.attrs.label =
 			attribute label {
 				form.data.nonemptystring
-			}		
+			}
 		option.attrs.value =
 			attribute value {
 				string
-			}		
+			}
 	option.inner =
 		( text )
 
@@ -392,7 +392,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 	optgroup.elem =
 		element optgroup { optgroup.inner & optgroup.attrs }
-	optgroup.attrs = 
+	optgroup.attrs =
 		(	common.attrs
 		&	optgroup.attrs.label
 		&	common-form.attrs.disabled?
@@ -441,9 +441,9 @@ datatypes w = "http://whattf.org/datatype-draft"
 		)
 
 	common.elem.phrasing |= select.elem
-	
+
 ## Shared Definitions for Complex Button
-	
+
 	button.attrs.value =
 		attribute value {
 			string
@@ -460,13 +460,13 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute popovertargetaction {
 			w:string "hide" | w:string "show" | w:string "toggle"
 		}
-	button.inner = 
+	button.inner =
 		( common.inner.phrasing )
-	
+
 ## Complex Submit Button: <button type='submit'>
 
 	button.submit.elem =
-		element button { button.inner & button.submit.attrs }	
+		element button { button.inner & button.submit.attrs }
 	button.submit.attrs =
 		(	common.attrs
 		&	common-form.attrs
@@ -492,11 +492,11 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 
 	button.elem = button.submit.elem
-	
+
 ## Complex Reset Button: <button type='reset'>
 
 	button.reset.elem =
-		element button { button.inner & button.reset.attrs }	
+		element button { button.inner & button.reset.attrs }
 	button.reset.attrs =
 		(	common.attrs
 		&	common-form.attrs
@@ -521,11 +521,11 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 
 	button.elem |= button.reset.elem
-	
+
 ## Complex Push Button: <button type='button'>
 
 	button.button.elem =
-		element button { button.inner & button.button.attrs }	
+		element button { button.inner & button.button.attrs }
 	button.button.attrs =
 		(	common.attrs
 		&	common-form.attrs
@@ -579,7 +579,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute method {
 				form.attrs.method.data
 			}
-			form.attrs.method.data = 
+			form.attrs.method.data =
 				( w:string "get"
 				| w:string "post"
 				| w:string "dialog"
@@ -588,14 +588,14 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute enctype {
 				form.attrs.enctype.data
 			}
-			form.attrs.enctype.data = 
-				(	w:string "application/x-www-form-urlencoded" 
+			form.attrs.enctype.data =
+				(	w:string "application/x-www-form-urlencoded"
 				|	w:string "multipart/form-data"
 				)
 		form.attrs.accept-charset =
 			attribute accept-charset {
 				string
-			}	
+			}
 	form.inner =
 		( common.inner.flow )
 
@@ -617,7 +617,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		legend.elem?, common.inner.flow
 
 	common.elem.flow |= fieldset.elem
-	
+
 ## Label: <label>
 
 	label.elem =
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
index 79182f52ac50..b96264bb1dfa 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
@@ -9,7 +9,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 	common-form.attrs &=
 		( common-form.attrs.form? )
 
-	common-form.attrs.form |= 
+	common-form.attrs.form |=
 		attribute form {
 			common.data.idref
 		}
@@ -23,8 +23,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute formenctype {
 			shared-form.attrs.formenctype.data
 		}
-		shared-form.attrs.formenctype.data = 
-			(	w:string "application/x-www-form-urlencoded" 
+		shared-form.attrs.formenctype.data =
+			(	w:string "application/x-www-form-urlencoded"
 			|	w:string "multipart/form-data"
 			|	w:string "text/plain"
 			)
@@ -33,43 +33,43 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute formmethod {
 			shared-form.attrs.formmethod.data
 		}
-		shared-form.attrs.formmethod.data = 
+		shared-form.attrs.formmethod.data =
 			( w:string "get"
 			| w:string "post"
 			| w:string "dialog"
 			)
 
-	shared-form.attrs.formtarget = 
+	shared-form.attrs.formtarget =
 		attribute formtarget {
 			common.data.browsing-context-or-keyword
 		}
 
-	shared-form.attrs.formnovalidate = 
+	shared-form.attrs.formnovalidate =
 		attribute formnovalidate {
 			w:string "formnovalidate" | w:string ""
 		}
 
-	shared-form.attrs.pattern = 
+	shared-form.attrs.pattern =
 		attribute pattern {
 			form.data.pattern
 		}
 
-	shared-form.attrs.template = 
+	shared-form.attrs.template =
 		attribute template {
 			common.data.idref
 		}
 
-	shared-form.attrs.required = 
+	shared-form.attrs.required =
 		attribute required {
 			w:string "required" | w:string ""
 		}
 
-	shared-form.attrs.placeholder = 
+	shared-form.attrs.placeholder =
 		attribute placeholder {
 			form.data.stringwithoutlinebreaks
 		}
 
-	shared-form.attrs.dirname = 
+	shared-form.attrs.dirname =
 		attribute dirname {
 			form.data.nonemptystring
 		}
@@ -80,7 +80,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		}
 
 ## Shared attributes for <input>
-		
+
 	shared-input-no-size.attrs =
 		(	input.attrs.autocomplete?
 		&	input.attrs.list?
@@ -110,22 +110,22 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.size?
 		)
 
-	input.attrs.list = 
+	input.attrs.list =
 		attribute list {
 			common.data.idref
 		}
-	
-	input.attrs.step.float = 
+
+	input.attrs.step.float =
 		attribute step {
 			w:string "any" | common.data.float.positive
 		}
-	
-	input.attrs.step.integer = 
+
+	input.attrs.step.integer =
 		attribute step {
-			w:string "any" | common.data.integer.positive 
+			w:string "any" | common.data.integer.positive
 		}
-	
-	input.attrs.multiple = 
+
+	input.attrs.multiple =
 		attribute multiple {
 			w:string "multiple" | w:string ""
 		}
@@ -234,7 +234,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.formnovalidate?
 		&	input.image.attrs.height?
 		&	input.image.attrs.width?
-		)	
+		)
 		input.image.attrs.height =
 			attribute height {
 				common.data.integer.non-negative
@@ -246,9 +246,9 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 ## Date and Time with No Time Zone Information: <input type='datetime-local'>
 
-	input.datetime-local.elem = 
+	input.datetime-local.elem =
 		element input { input.datetime-local.attrs }
-	input.datetime-local.attrs = 
+	input.datetime-local.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -260,8 +260,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	input.attrs.step.float?
 		&	aria.prop.required?
 		&	input.datetime-local.attrs.value?
-		)	
-		input.datetime-local.attrs.type = 
+		)
+		input.datetime-local.attrs.type =
 			attribute type {
 				w:string "datetime-local"
 			}
@@ -271,20 +271,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.datetime-local.attrs.max =
 			attribute max {
-				form.data.datetime-local			
-			}	
+				form.data.datetime-local
+			}
 		input.datetime-local.attrs.value =
 			attribute value {
 				w:string "" | form.data.datetime-local
 			}
-		
+
 	input.elem |= input.datetime-local.elem
 
 ## Date: <input type='date'>
 
-	input.date.elem = 
+	input.date.elem =
 		element input { input.date.attrs }
-	input.date.attrs = 
+	input.date.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -296,8 +296,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	aria.prop.required?
 		&	input.attrs.step.integer?
 		&	input.date.attrs.value?
-		)	
-		input.date.attrs.type = 
+		)
+		input.date.attrs.type =
 			attribute type {
 				w:string "date"
 			}
@@ -307,20 +307,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.date.attrs.max =
 			attribute max {
-				form.data.date			
-			}	
+				form.data.date
+			}
 		input.date.attrs.value =
 			attribute value {
 				w:string "" | form.data.date
 			}
-		
+
 	input.elem |= input.date.elem
 
 ## Year and Month: <input type='month'>
 
-	input.month.elem = 
+	input.month.elem =
 		element input { input.month.attrs }
-	input.month.attrs = 
+	input.month.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -332,8 +332,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	aria.prop.required?
 		&	input.attrs.step.integer?
 		&	input.month.attrs.value?
-		)	
-		input.month.attrs.type = 
+		)
+		input.month.attrs.type =
 			attribute type {
 				w:string "month"
 			}
@@ -343,20 +343,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.month.attrs.max =
 			attribute max {
-				form.data.month			
-			}	
+				form.data.month
+			}
 		input.month.attrs.value =
 			attribute value {
 				w:string "" | form.data.month
 			}
-		
+
 	input.elem |= input.month.elem
 
 ## Time without Time Zone Information: <input type='time'>
 
-	input.time.elem = 
+	input.time.elem =
 		element input { input.time.attrs }
-	input.time.attrs = 
+	input.time.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -368,8 +368,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	aria.prop.required?
 		&	input.attrs.step.float?
 		&	input.time.attrs.value?
-		)	
-		input.time.attrs.type = 
+		)
+		input.time.attrs.type =
 			attribute type {
 				w:string "time"
 			}
@@ -379,20 +379,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.time.attrs.max =
 			attribute max {
-				form.data.time			
-			}	
+				form.data.time
+			}
 		input.time.attrs.value =
 			attribute value {
 				w:string "" | form.data.time
 			}
-		
+
 	input.elem |= input.time.elem
 
 ## Year and Week: <input type='week'>
 
-	input.week.elem = 
+	input.week.elem =
 		element input { input.week.attrs }
-	input.week.attrs = 
+	input.week.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -404,8 +404,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	aria.prop.required?
 		&	input.attrs.step.integer?
 		&	input.week.attrs.value?
-		)	
-		input.week.attrs.type = 
+		)
+		input.week.attrs.type =
 			attribute type {
 				w:string "week"
 			}
@@ -415,20 +415,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.week.attrs.max =
 			attribute max {
-				form.data.week			
-			}	
+				form.data.week
+			}
 		input.week.attrs.value =
 			attribute value {
 				w:string "" | form.data.week
 			}
-		
+
 	input.elem |= input.week.elem
 
 ## Number: <input type='number'>
 
-	input.number.elem = 
+	input.number.elem =
 		element input { input.number.attrs }
-	input.number.attrs = 
+	input.number.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-size.attrs
@@ -440,8 +440,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	(	common.attrs.aria.implicit.spinbutton
 			|	common.attrs.aria.role.spinbutton
 			)?
-		)	
-		input.number.attrs.type = 
+		)
+		input.number.attrs.type =
 			attribute type {
 				w:string "number"
 			}
@@ -451,20 +451,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.number.attrs.max =
 			attribute max {
-				common.data.float			
-			}	
+				common.data.float
+			}
 		input.number.attrs.value =
 			attribute value {
 				w:string "" | common.data.float
 			}
-		
+
 	input.elem |= input.number.elem
 
 ## Imprecise Number: <input type='range'>
 
-	input.range.elem = 
+	input.range.elem =
 		element input { input.range.attrs }
-	input.range.attrs = 
+	input.range.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-size.attrs
@@ -476,8 +476,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	(	common.attrs.aria.implicit.slider
 			|	common.attrs.aria.role.slider
 			)?
-		)	
-		input.range.attrs.type = 
+		)
+		input.range.attrs.type =
 			attribute type {
 				w:string "range"
 			}
@@ -487,20 +487,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		input.range.attrs.max =
 			attribute max {
-				common.data.float			
-			}	
+				common.data.float
+			}
 		input.range.attrs.value =
 			attribute value {
 				common.data.float
 			}
-		
+
 	input.elem |= input.range.elem
 
 ## Email Address: <input type='email'>
 
-	input.email.elem = 
-		element input { input.email.attrs }	
-	input.email.attrs = 
+	input.email.elem =
+		element input { input.email.attrs }
+	input.email.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
@@ -520,8 +520,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 					)?
 				)?
 			)
-		)	
-		input.email.attrs.type = 
+		)
+		input.email.attrs.type =
 			attribute type {
 				w:string "email"
 			}
@@ -533,14 +533,14 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				form.data.emailaddresslist
 			}
-		
+
 	input.elem |= input.email.elem
 
 ## IRI: <input type='url'>
 
-	input.url.elem = 
+	input.url.elem =
 		element input { input.url.attrs }
-	input.url.attrs = 
+	input.url.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
@@ -557,7 +557,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 				)?
 			)
 		)
-		input.url.attrs.type = 
+		input.url.attrs.type =
 			attribute type {
 				w:string "url"
 			}
@@ -565,14 +565,14 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				w:string "" | common.data.uri.absolute
 			}
-		
+
 	input.elem |= input.url.elem
 
 ## Search: <input type='search'>
 
-	input.search.elem = 
+	input.search.elem =
 		element input { input.search.attrs }
-	input.search.attrs = 
+	input.search.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input.attrs
@@ -582,8 +582,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	(	common.attrs.aria.implicit.searchbox
 			|	common.attrs.aria.role.searchbox
 			)?
-		)	
-		input.search.attrs.type = 
+		)
+		input.search.attrs.type =
 			attribute type {
 				w:string "search"
 			}
@@ -591,14 +591,14 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				form.data.stringwithoutlinebreaks
 			}
-		
+
 	input.elem |= input.search.elem
 
 ## Telephone Number: <input type='tel'>
 
-	input.tel.elem = 
-		element input { input.tel.attrs }	
-	input.tel.attrs = 
+	input.tel.elem =
+		element input { input.tel.attrs }
+	input.tel.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
@@ -615,7 +615,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 				)?
 			)
 		)
-		input.tel.attrs.type = 
+		input.tel.attrs.type =
 			attribute type {
 				w:string "tel"
 			}
@@ -623,21 +623,21 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				form.data.stringwithoutlinebreaks
 			}
-		
+
 	input.elem |= input.tel.elem
 
 ## Color: <input type='color'>
 
-	input.color.elem = 
-		element input { input.color.attrs }	
-	input.color.attrs = 
+	input.color.elem =
+		element input { input.color.attrs }
+	input.color.attrs =
 		(	common.attrs
 		&	common-form.attrs
 		&	input.color.attrs.type
 		&	input.color.attrs.value?
 		&	shared-input.attrs
-		)	
-		input.color.attrs.type = 
+		)
+		input.color.attrs.type =
 			attribute type {
 				w:string "color"
 			}
@@ -645,7 +645,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				w:string "" | form.data.color
 			}
-		
+
 	input.elem |= input.color.elem
 
 ## Form Output: <output>
@@ -661,7 +661,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria
 			)?
 		)
-		output.attrs.for = 
+		output.attrs.for =
 			attribute for {
 				common.data.idrefs #REVISIT spec says space--not whitespace
 			}
@@ -674,17 +674,17 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 	textarea.attrs.rows-and-cols-wf1.inner &=
 		notAllowed
-	textarea.attrs.rows-and-cols-wf1 |= 
+	textarea.attrs.rows-and-cols-wf1 |=
 		empty
 	textarea.attrs &=
 		(	shared-form.attrs.maxlength?
 		&	shared-form.attrs.minlength?
-		&	shared-form.attrs.required? 
+		&	shared-form.attrs.required?
 		&	textarea.attrs.placeholder?
 		&	aria.prop.placeholder?
 		&	shared-form.attrs.dirname?
 		&	textarea.attrs.rows?
-		&	(	(	textarea.attrs.wrap.hard 
+		&	(	(	textarea.attrs.wrap.hard
 				&	textarea.attrs.cols
 				)
 			|	(	textarea.attrs.wrap.soft?
@@ -716,41 +716,41 @@ datatypes w = "http://whattf.org/datatype-draft"
 		( option.elem* & common.inner.phrasing )
 	datalist.attrs =
 		(	common.attrs
-		)	
+		)
 
 	common.elem.phrasing |= datalist.elem
 
 ## Complex Submit Button: <button type='submit'>, extensions
 
 	button.submit.attrs &=
-		(	shared-form.attrs.formaction? 
-		&	shared-form.attrs.formenctype? 
-		&	shared-form.attrs.formmethod? 
-		&	shared-form.attrs.formtarget? 
-		&	shared-form.attrs.formnovalidate? 
+		(	shared-form.attrs.formaction?
+		&	shared-form.attrs.formenctype?
+		&	shared-form.attrs.formmethod?
+		&	shared-form.attrs.formtarget?
+		&	shared-form.attrs.formnovalidate?
 		)
-	
+
 
 ## Form: <form>, extensions
-	form.attrs &= 
+	form.attrs &=
 		(	form.attrs.novalidate?
 		&	form.attrs.target?
 		&	form.attrs.autocomplete?
 		)
-		form.attrs.novalidate = 
+		form.attrs.novalidate =
 			attribute novalidate {
 				w:string "novalidate" | w:string ""
 			}
-		form.attrs.target = 
+		form.attrs.target =
 			attribute target {
 				common.data.browsing-context-or-keyword
 			}
-		form.attrs.autocomplete = 
+		form.attrs.autocomplete =
 			attribute autocomplete {
 				w:string "on" | w:string "off"
 			}
 		# REVISIT should this be case-insensitive in conforming XHTML documents?
-		form.attrs.enctype.data |= 
+		form.attrs.enctype.data |=
 			( w:string "text/plain" )
 
 ## Fieldset: <fieldset>, extensions
@@ -761,6 +761,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 ## Selection Menu: <select>, Extensions
 
 	select.attrs &=
-		(	shared-form.attrs.required? 
+		(	shared-form.attrs.required?
 		&	input.attrs.autocomplete.any?
 		)
diff --git a/xml/relaxng/resources/resources/html5-schema/its2/its20-html5-types.rnc b/xml/relaxng/resources/resources/html5-schema/its2/its20-html5-types.rnc
index 22bf9e834440..aca26cfded7b 100644
--- a/xml/relaxng/resources/resources/html5-schema/its2/its20-html5-types.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/its2/its20-html5-types.rnc
@@ -122,13 +122,13 @@ its-locQualityIssueType.type = w:string "terminology" | w:string "mistranslation
 
 its-locQualityIssueComment.type = string
 
-its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" }
 
 its-locQualityIssueProfileRef.type = w:iri-ref
 
 its-locQualityIssueEnabled.type = w:string "yes" | w:string "no"
 
-its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" } 
+its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" }
 
 its-locQualityRatingVote.type = xsd:integer
 
diff --git a/xml/relaxng/resources/resources/html5-schema/its2/its20-html5.rnc b/xml/relaxng/resources/resources/html5-schema/its2/its20-html5.rnc
index 6417334245c2..33da35d8252d 100644
--- a/xml/relaxng/resources/resources/html5-schema/its2/its20-html5.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/its2/its20-html5.rnc
@@ -81,7 +81,7 @@ its-attribute.provenanceRecordsRef.html = attribute its-provenance-records-ref {
 
 its-attribute.locQualityIssuesRef.html = attribute its-loc-quality-issues-ref { its-locQualityIssuesRef.type }
 
-its-attribute.locQualityIssueType.html = attribute its-loc-quality-issue-type { its-locQualityIssueType.type } 
+its-attribute.locQualityIssueType.html = attribute its-loc-quality-issue-type { its-locQualityIssueType.type }
 
 its-attribute.locQualityIssueComment.html = attribute its-loc-quality-issue-comment { its-locQualityIssueComment.type }
 
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-common.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-common.rnc
index a67e712da82b..b5f0b7c6cbeb 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-common.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-common.rnc
@@ -21,7 +21,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 math = element math {math.attributes,MathExpression*}
 MathExpression = semantics
 
-NonMathMLAtt = attribute (* - (local:*|m:*)) {xsd:string} 
+NonMathMLAtt = attribute (* - (local:*|m:*)) {xsd:string}
 
 CommonDeprecatedAtt = attribute other {text}?
 
@@ -60,7 +60,7 @@ cd = attribute cd {xsd:NCName}
 src = attribute src {xsd:anyURI}?
 
 annotation = element annotation {annotation.attributes,text}
-                     
+
 # changed content model of annotation-xml -- mike
 annotation-xml =
     ( annotation-xml.xhtml
@@ -78,7 +78,7 @@ annotation-xml =
         element annotation-xml {
             annotation-xml.model, annotation-xml.attributes, att-encoding.xhtml?
         }
-        annotation-xml.model.xhtml = 
+        annotation-xml.model.xhtml =
           notAllowed
         att-encoding.xhtml =
           attribute encoding {
@@ -88,7 +88,7 @@ annotation-xml =
         element annotation-xml {
             annotation-xml.model, annotation-xml.attributes, att-encoding.svg?
         }
-        annotation-xml.model.svg = 
+        annotation-xml.model.svg =
           notAllowed
         att-encoding.svg =
           attribute encoding {
@@ -98,7 +98,7 @@ annotation-xml =
         element annotation-xml {
             annotation-xml.model, annotation-xml.attributes, att-encoding.mathml?
         }
-        annotation-xml.model.mathml = 
+        annotation-xml.model.mathml =
           math
         att-encoding.mathml =
           attribute encoding {
@@ -117,13 +117,13 @@ DefEncAtt = attribute encoding {xsd:string}?,
             attribute definitionURL {xsd:anyURI}?
 
 semantics = element semantics {semantics.attributes,
-                               MathExpression, 
+                               MathExpression,
                               (annotation|annotation-xml)*}
 semantics.attributes = CommonAtt,DefEncAtt,cd?,name?
 
 
 
 length = xsd:string {
-  pattern = '\s*((-?[0-9]*(\.[0-9]*)?(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*' 
+  pattern = '\s*((-?[0-9]*(\.[0-9]*)?(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*'
 }
 
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-content.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-content.rnc
index 9dd1006feeae..df98dc360f74 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-content.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-content.rnc
@@ -14,15 +14,15 @@
 #     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 include "mathml3-strict-content.rnc"{
-  cn.content = (text | mglyph | sep | PresentationExpression)* 
+  cn.content = (text | mglyph | sep | PresentationExpression)*
   cn.attributes = CommonAtt, DefEncAtt, attribute type {text}?, math-base?
 
   ci.attributes = CommonAtt, DefEncAtt, ci.type?
   ci.type = attribute type {text}
-  ci.content = (text | mglyph | PresentationExpression)* 
+  ci.content = (text | mglyph | PresentationExpression)*
 
   csymbol.attributes = CommonAtt, DefEncAtt, attribute type {text}?,cd?
-  csymbol.content = (text | mglyph | PresentationExpression)* 
+  csymbol.content = (text | mglyph | PresentationExpression)*
 
   bvar = element bvar { (ci | semantics-ci) & degree?}
 
@@ -78,7 +78,7 @@ declare = element declare {attribute type {xsd:string}?,
                            attribute scope {xsd:string}?,
                            attribute nargs {xsd:nonNegativeInteger}?,
                            attribute occurrence {"prefix"|"infix"|"function-model"}?,
-                           DefEncAtt, 
+                           DefEncAtt,
                            ContExp+}
 
 
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-inc.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-inc.rnc
index 84fe4db393f8..9ec5c8a5cbff 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-inc.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-inc.rnc
@@ -1,9 +1,9 @@
 # This is the Mathematical Markup Language (MathML) 2.0, an XML
 # application for describing mathematical notation and capturing
 # both its structure and content.
-# 
+#
 # Copyright 1998-2009 W3C (MIT, ERCIM, Keio)
-# 
+#
 # Use and distribution of this code are permitted under the terms
 # W3C Software Notice and License
 # http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-presentation.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-presentation.rnc
index ed6839d3aa3a..1c3ce56c0dfa 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-presentation.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-presentation.rnc
@@ -8,7 +8,7 @@
 #
 #     Copyright 1998-2010 W3C (MIT, ERCIM, Keio)
 #     Copyright 2012 Mozilla Foundation
-# 
+#
 #     Use and distribution of this code are permitted under the terms
 #     W3C Software Notice and License
 #     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
@@ -84,21 +84,21 @@ TokenExpression = mi|mn|mo|mtext|mspace|ms
 token.content = mglyph|malignmark|text
 
 mi = element mi {mi.attributes, token.content*}
-mi.attributes = 
+mi.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt
 
 
 mn = element mn {mn.attributes, token.content*}
-mn.attributes = 
+mn.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt
 
 
 mo = element mo {mo.attributes, token.content*}
-mo.attributes = 
+mo.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt,
@@ -131,7 +131,7 @@ mo.attributes =
 # token.content, because we want to handle mtext differently than other
 # MathML "token elements" -- mike
 mtext = element mtext { mtext.attributes, mtext.content* }
-mtext.attributes = 
+mtext.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt
@@ -139,7 +139,7 @@ mtext.attributes =
 mtext.content = mglyph | malignmark | text
 
 mspace = element mspace {mspace.attributes, empty}
-mspace.attributes = 
+mspace.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt,
@@ -157,7 +157,7 @@ mspace.attributes =
 
 
 ms = element ms {ms.attributes, token.content*}
-ms.attributes = 
+ms.attributes =
   CommonAtt,
   CommonPresAtt,
   TokenAtt,
@@ -166,7 +166,7 @@ ms.attributes =
 
 
 mglyph = element mglyph {mglyph.attributes,mglyph.deprecatedattributes,empty}
-mglyph.attributes = 
+mglyph.attributes =
   CommonAtt,  CommonPresAtt,
   attribute src {xsd:anyURI}?,
   attribute width {length}?,
@@ -180,7 +180,7 @@ mglyph.deprecatedattributes =
   DeprecatedTokenAtt
 
 msline = element msline {msline.attributes,empty}
-msline.attributes = 
+msline.attributes =
   CommonAtt,  CommonPresAtt,
   attribute position {integer}?,
   attribute length {unsigned-integer}?,
@@ -189,27 +189,27 @@ msline.attributes =
   attribute mslinethickness {length | "thin" | "medium" | "thick"}?
 
 none = element none {none.attributes,empty}
-none.attributes = 
+none.attributes =
   CommonAtt,
   CommonPresAtt
 
 mprescripts = element mprescripts {mprescripts.attributes,empty}
-mprescripts.attributes = 
+mprescripts.attributes =
   CommonAtt,
   CommonPresAtt
 
 
-CommonPresAtt = 
+CommonPresAtt =
   attribute mathcolor {color}?,
   attribute mathbackground {color | "transparent"}?
 
-TokenAtt = 
+TokenAtt =
   attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
   attribute mathsize {"small" | "normal" | "big" | length}?,
   attribute dir {"ltr" | "rtl"}?,
   DeprecatedTokenAtt
 
-DeprecatedTokenAtt = 
+DeprecatedTokenAtt =
   attribute fontfamily {text}?,
   attribute fontweight {"normal" | "bold"}?,
   attribute fontstyle {"normal" | "italic"}?,
@@ -220,13 +220,13 @@ DeprecatedTokenAtt =
 MalignExpression = maligngroup|malignmark
 
 malignmark = element malignmark {malignmark.attributes, empty}
-malignmark.attributes = 
+malignmark.attributes =
   CommonAtt, CommonPresAtt,
   attribute edge {"left" | "right"}?
 
 
 maligngroup = element maligngroup {maligngroup.attributes, empty}
-maligngroup.attributes = 
+maligngroup.attributes =
   CommonAtt, CommonPresAtt,
   attribute groupalign {"left" | "center" | "right" | "decimalpoint"}?
 
@@ -239,13 +239,13 @@ PresentationExpression = TokenExpression|MalignExpression|
 
 
 mrow = element mrow {mrow.attributes, MathExpression*}
-mrow.attributes = 
+mrow.attributes =
   CommonAtt, CommonPresAtt,
   attribute dir {"ltr" | "rtl"}?
 
 
 mfrac = element mfrac {mfrac.attributes, MathExpression, MathExpression}
-mfrac.attributes = 
+mfrac.attributes =
   CommonAtt, CommonPresAtt,
   attribute linethickness {length | "thin" | "medium" | "thick"}?,
   attribute numalign {"left" | "center" | "right"}?,
@@ -254,17 +254,17 @@ mfrac.attributes =
 
 
 msqrt = element msqrt {msqrt.attributes, ImpliedMrow}
-msqrt.attributes = 
+msqrt.attributes =
   CommonAtt, CommonPresAtt
 
 
 mroot = element mroot {mroot.attributes, MathExpression, MathExpression}
-mroot.attributes = 
+mroot.attributes =
   CommonAtt, CommonPresAtt
 
 
 mstyle = element mstyle {mstyle.attributes, ImpliedMrow}
-mstyle.attributes = 
+mstyle.attributes =
   CommonAtt, CommonPresAtt,
   mstyle.specificattributes,
   mstyle.generalattributes,
@@ -373,12 +373,12 @@ math.attributes &= mstyle.generalattributes
 
 
 merror = element merror {merror.attributes, ImpliedMrow}
-merror.attributes = 
+merror.attributes =
   CommonAtt, CommonPresAtt
 
 
 mpadded = element mpadded {mpadded.attributes, ImpliedMrow}
-mpadded.attributes = 
+mpadded.attributes =
   CommonAtt, CommonPresAtt,
   attribute height {mpadded-length}?,
   attribute depth {mpadded-length}?,
@@ -388,12 +388,12 @@ mpadded.attributes =
 
 
 mphantom = element mphantom {mphantom.attributes, ImpliedMrow}
-mphantom.attributes = 
+mphantom.attributes =
   CommonAtt, CommonPresAtt
 
 
 mfenced = element mfenced {mfenced.attributes, MathExpression*}
-mfenced.attributes = 
+mfenced.attributes =
   CommonAtt, CommonPresAtt,
   attribute open {text}?,
   attribute close {text}?,
@@ -401,46 +401,46 @@ mfenced.attributes =
 
 
 menclose = element menclose {menclose.attributes, ImpliedMrow}
-menclose.attributes = 
+menclose.attributes =
   CommonAtt, CommonPresAtt,
   attribute notation {text}?
 
 
 msub = element msub {msub.attributes, MathExpression, MathExpression}
-msub.attributes = 
+msub.attributes =
   CommonAtt, CommonPresAtt,
   attribute subscriptshift {length}?
 
 
 msup = element msup {msup.attributes, MathExpression, MathExpression}
-msup.attributes = 
+msup.attributes =
   CommonAtt, CommonPresAtt,
   attribute superscriptshift {length}?
 
 
 msubsup = element msubsup {msubsup.attributes, MathExpression, MathExpression, MathExpression}
-msubsup.attributes = 
+msubsup.attributes =
   CommonAtt, CommonPresAtt,
   attribute subscriptshift {length}?,
   attribute superscriptshift {length}?
 
 
 munder = element munder {munder.attributes, MathExpression, MathExpression}
-munder.attributes = 
+munder.attributes =
   CommonAtt, CommonPresAtt,
   attribute accentunder {"true" | "false"}?,
   attribute align {"left" | "right" | "center"}?
 
 
 mover = element mover {mover.attributes, MathExpression, MathExpression}
-mover.attributes = 
+mover.attributes =
   CommonAtt, CommonPresAtt,
   attribute accent {"true" | "false"}?,
   attribute align {"left" | "right" | "center"}?
 
 
 munderover = element munderover {munderover.attributes, MathExpression, MathExpression, MathExpression}
-munderover.attributes = 
+munderover.attributes =
   CommonAtt, CommonPresAtt,
   attribute accent {"true" | "false"}?,
   attribute accentunder {"true" | "false"}?,
@@ -448,12 +448,12 @@ munderover.attributes =
 
 
 mmultiscripts = element mmultiscripts {mmultiscripts.attributes, MathExpression,MultiScriptExpression*,(mprescripts,MultiScriptExpression*)?}
-mmultiscripts.attributes = 
+mmultiscripts.attributes =
   msubsup.attributes
 
 
 mtable = element mtable {mtable.attributes, TableRowExpression*}
-mtable.attributes = 
+mtable.attributes =
   CommonAtt, CommonPresAtt,
   attribute align {xsd:string {
     pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
@@ -477,12 +477,12 @@ mtable.attributes =
 
 
 mlabeledtr = element mlabeledtr {mlabeledtr.attributes, TableCellExpression+}
-mlabeledtr.attributes = 
+mlabeledtr.attributes =
   mtr.attributes
 
 
 mtr = element mtr {mtr.attributes, TableCellExpression*}
-mtr.attributes = 
+mtr.attributes =
   CommonAtt, CommonPresAtt,
   attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
   attribute columnalign {list {columnalignstyle+} }?,
@@ -490,7 +490,7 @@ mtr.attributes =
 
 
 mtd = element mtd {mtd.attributes, ImpliedMrow}
-mtd.attributes = 
+mtd.attributes =
   CommonAtt, CommonPresAtt,
   attribute rowspan {positive-integer}?,
   attribute columnspan {positive-integer}?,
@@ -500,7 +500,7 @@ mtd.attributes =
 
 
 mstack = element mstack {mstack.attributes, MstackExpression*}
-mstack.attributes = 
+mstack.attributes =
   CommonAtt, CommonPresAtt,
   attribute align {xsd:string {
     pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
@@ -510,26 +510,26 @@ mstack.attributes =
 
 
 mlongdiv = element mlongdiv {mlongdiv.attributes, MstackExpression,MstackExpression,MstackExpression+}
-mlongdiv.attributes = 
+mlongdiv.attributes =
   msgroup.attributes,
   attribute longdivstyle {"lefttop" | "stackedrightright" | "mediumstackedrightright" | "shortstackedrightright" | "righttop" | "left/\right" | "left)(right" | ":right=right" | "stackedleftleft" | "stackedleftlinetop"}?
 
 
 msgroup = element msgroup {msgroup.attributes, MstackExpression*}
-msgroup.attributes = 
+msgroup.attributes =
   CommonAtt, CommonPresAtt,
   attribute position {integer}?,
   attribute shift {integer}?
 
 
 msrow = element msrow {msrow.attributes, MsrowExpression*}
-msrow.attributes = 
+msrow.attributes =
   CommonAtt, CommonPresAtt,
   attribute position {integer}?
 
 
 mscarries = element mscarries {mscarries.attributes, (MsrowExpression|mscarry)*}
-mscarries.attributes = 
+mscarries.attributes =
   CommonAtt, CommonPresAtt,
   attribute position {integer}?,
   attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
@@ -538,14 +538,14 @@ mscarries.attributes =
 
 
 mscarry = element mscarry {mscarry.attributes, MsrowExpression*}
-mscarry.attributes = 
+mscarry.attributes =
   CommonAtt, CommonPresAtt,
   attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
   attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?
 
 
 maction = element maction {maction.attributes, MathExpression+}
-maction.attributes = 
+maction.attributes =
   CommonAtt, CommonPresAtt,
   attribute actiontype {text},
   attribute selection {positive-integer}?
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-strict-content.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-strict-content.rnc
index 919a12f689dc..b4569275bb76 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-strict-content.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3-strict-content.rnc
@@ -3,7 +3,7 @@
 #     both its structure and content.
 #
 #     Copyright 1998-2010 W3C (MIT, ERCIM, Keio)
-# 
+#
 #     Use and distribution of this code are permitted under the terms
 #     W3C Software Notice and License
 #     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
@@ -17,10 +17,10 @@ cn = element cn {cn.attributes,cn.content}
 cn.content = text
 cn.attributes = attribute type {"integer" | "real" | "double" | "hexdouble"}
 
-semantics-ci = element semantics {semantics.attributes,(ci|semantics-ci), 
+semantics-ci = element semantics {semantics.attributes,(ci|semantics-ci),
   (annotation|annotation-xml)*}
 
-semantics-contexp = element semantics {semantics.attributes,ContExp, 
+semantics-contexp = element semantics {semantics.attributes,ContExp,
   (annotation|annotation-xml)*}
 
 ci = element ci {ci.attributes, ci.content}
diff --git a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3.rnc b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3.rnc
index eec136f7e550..45b918882629 100644
--- a/xml/relaxng/resources/resources/html5-schema/mml3/mathml3.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/mml3/mathml3.rnc
@@ -7,7 +7,7 @@
 #
 #     Copyright 1998-2010 W3C (MIT, ERCIM, Keio)
 #     Copyright 2012 Mozilla Foundation
-# 
+#
 #     Use and distribution of this code are permitted under the terms
 #     W3C Software Notice and License
 #     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/xml/relaxng/resources/resources/html5-schema/rdf/rdf.rnc b/xml/relaxng/resources/resources/html5-schema/rdf/rdf.rnc
index 36a15124e397..2fc7b0852d1d 100644
--- a/xml/relaxng/resources/resources/html5-schema/rdf/rdf.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/rdf/rdf.rnc
@@ -1,16 +1,16 @@
 # Copyright (c) 2005-2007 Elika J. Etemad (fantasai) and Henri Sivonen (hsivonen)
 # Copyright (c) 2007 Mozilla Foundation
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
 # the Software without restriction, including without limitation the rights to
 # use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 # of the Software, and to permit persons to whom the Software is furnished to do
 # so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		( rdf.attr.anything )
 	rdf.inner =
 		( rdf.inner.anything )
-	
+
 ## Anything
 
 ## Any attribute from any namespace
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/inkscape-draft.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/inkscape-draft.rnc
index 58b9004aa9e4..55e4b97020ba 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/inkscape-draft.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/inkscape-draft.rnc
@@ -1,15 +1,15 @@
 # Copyright (c) 2007 Mozilla Foundation
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
 # the Software without restriction, including without limitation the rights to
 # use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 # of the Software, and to permit persons to whom the Software is furnished to do
 # so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/inkscape.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/inkscape.rnc
index d4aa3ce278ae..470277a4d028 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/inkscape.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/inkscape.rnc
@@ -1,15 +1,15 @@
 # Copyright (c) 2007 Mozilla Foundation
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
 # the Software without restriction, including without limitation the rights to
 # use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 # of the Software, and to permit persons to whom the Software is furnished to do
 # so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -59,10 +59,10 @@ namespace none = ""
 			attribute inkscape:* { string }
 		sodipodi.anyattr =
 			attribute sodipodi:* { string }
-	
-	inkscape.nonamespace.anyattr = 
+
+	inkscape.nonamespace.anyattr =
 		attribute none:* { string }
-		
+
 SVG.Core.extra.attrib &= inkscape.attrs
 SVG.defs.content &= inkscape.elem*
 SVG.g.content &= inkscape.elem*
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-animation.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-animation.rnc
index b34476f451ca..ff4432513efd 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-animation.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-animation.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Animation Module
 ##     file: svg-animation.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Animation
-## 
+##
 ##         animate, set, animateMotion, animateColor, animateTransform, mpath
-## 
+##
 ##     This module declares markup to provide support for animation.
-##   
+##
 
-## 
+##
 ##     SVG.Animation.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Animation.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-animevents-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-animevents-attrib.rnc
index f3d7a114a987..7c05a43888ae 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-animevents-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-animevents-attrib.rnc
@@ -1,25 +1,25 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Animation Events Attribute Module
 ##     file: svg-animevents-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Animation Events Attribute
-## 
+##
 ##         onbegin, onend, onrepeat, onload
-## 
+##
 ##     This module defines the AnimationEvents attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.onbegin.attrib = attribute onbegin { Script.datatype }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-clip.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-clip.rnc
index a3ee2c1b8ca7..3430507861c5 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-clip.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-clip.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Basic Clip Module
 ##     file: svg-basic-clip.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Clip
-## 
+##
 ##         clipPath
-## 
+##
 ##     This module declares markup to provide support for clipping.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     ClipPathValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-filter.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-filter.rnc
index 275e36f9425f..b9500dc1b7df 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-filter.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-filter.rnc
@@ -2,31 +2,31 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Basic Filter Module
 ##     file: svg-basic-filter.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Filter
-## 
+##
 ##         filter, feBlend, feColorMatrix, feComponentTransfer, feComposite,
 ##         feFlood, feGaussianBlur, feImage, feMerge, feMergeNode, feOffset,
 ##         feTile, feFuncR, feFuncG, feFuncB, feFuncA
-## 
+##
 ##     This module declares markup to provide support for filter effect.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     FilterValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-font.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-font.rnc
index f3d4f3b39042..8e2f9d8207f1 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-font.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-font.rnc
@@ -2,30 +2,30 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Basic Font Module
 ##     file: svg-basic-font.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Font
-## 
+##
 ##         font, font-face, glyph, missing-glyph, hkern, vkern, font-face-src,
 ##         font-face-uri, font-face-name
-## 
+##
 ##     This module declares markup to provide support for template.
-##   
+##
 
-## 
+##
 ##     SVG.Font.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Font.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
index 77bbd43de889..5cc2cf85f5ba 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
@@ -1,25 +1,25 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Basic Graphics Attribute Module
 ##     file: svg-basic-graphics-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Graphics Attribute
-## 
+##
 ##         display, visibility
-## 
+##
 ##     This module defines the Graphics attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.display.attrib =
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-structure.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-structure.rnc
index 60d833a82260..5285bb723c59 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-structure.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-structure.rnc
@@ -1,43 +1,43 @@
 default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
-## 
+##
 ##     SVG 1.1 Basic Structure Module
 ##     file: svg-basic-structure.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Structure
-## 
+##
 ##         svg, g, defs, desc, title, metadata, use
-## 
+##
 ##     This module declares the major structural elements and their attributes.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
+
     # removed start = -- hsivonen
 
-    ## 
+    ##
     ##       Include core set of modules
-    ##     
+    ##
     div {
-        
-        ## 
+
+        ##
         ##         Datatypes Module
-        ##       
+        ##
         include "svg-datatypes.rnc"
-        
-        ## 
+
+        ##
         ##         Core Attribute Module
-        ##       
+        ##
         include "svg-core-attrib.rnc"
     }
     a:documentation [
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-text.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-text.rnc
index 8b70b36ed5fd..f724c18f0707 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-text.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-text.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Basic Text Module
 ##     file: svg-basic-text.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Basic Text
-## 
+##
 ##         text, altGlyph, altGlyphDef, glyphRef
-## 
+##
 ##     This module declares markup to provide support for text.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     FontFamilyValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-clip.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-clip.rnc
index a168471a8579..35bfce493bec 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-clip.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-clip.rnc
@@ -2,31 +2,31 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace svg = "http://www.w3.org/2000/svg"
 
 
-## 
+##
 ##     SVG 1.1 Clip Module
 ##     file: svg-clip.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Clip
-## 
+##
 ##         clipPath
-## 
+##
 ##     This module declares markup to provide support for clipping.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-clip.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       extend content model of clipPath
-    ##     
+    ##
     SVG.clipPath.class |= SVG.Shape.class | SVG.Text.class
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-conditional.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-conditional.rnc
index ecb3e154aded..f7aa57a0cb71 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-conditional.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-conditional.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Conditional Processing Module
 ##     file: svg-conditional.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Conditional Processing
-## 
+##
 ##         switch
-## 
+##
 ##     This module declares markup to provide support for conditional processing.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     ExtensionList.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-container-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-container-attrib.rnc
index 263fecd99b70..7205f23ec43b 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-container-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-container-attrib.rnc
@@ -1,31 +1,31 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Container Attribute Module
 ##     file: svg-container-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Container Attribute
-## 
+##
 ##         enable-background
-## 
+##
 ##     This module defines the Container attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       'enable-background' property/attribute value (e.g., 'new', 'accumulate')
-    ##     
+    ##
     EnableBackgroundValue.datatype = xsd:string
     SVG.enable-background.attrib =
         attribute enable-background { EnableBackgroundValue.datatype }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-core-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-core-attrib.rnc
index cff2127b2fc5..262dc46bb7a5 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-core-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-core-attrib.rnc
@@ -2,26 +2,26 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 datatypes w = "http://whattf.org/datatype-draft"
 
 
-## 
+##
 ##     SVG 1.1 Core Attribute Module
 ##     file: svg-core-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007-2008 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Core Attribute
-## 
+##
 ##         id, xml:base, xml:lang, xml:space
-## 
+##
 ##     This module defines the core set of attributes that can be present on
 ##     any element.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.id.attrib = attribute id { w:xml-name }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-cursor.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-cursor.rnc
index c3051d5584b1..d26efc6f20af 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-cursor.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-cursor.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Cursor Module
 ##     file: svg-cursor.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Cursor
-## 
+##
 ##         cursor
-## 
+##
 ##     This module declares markup to provide support for cursor.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     CursorValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-datatypes.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-datatypes.rnc
index cb567eee1706..f8ca7db43df2 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-datatypes.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-datatypes.rnc
@@ -2,137 +2,137 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 datatypes w = "http://whattf.org/datatype-draft"
 
 
-## 
+##
 ##     SVG 1.1 Datatypes Module
 ##     file: svg-datatypes.mod
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007-2012 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Datatypes
-## 
+##
 ##     This module declares common data types for properties and attributes.
-##   
+##
 
-## 
+##
 ##     feature specification
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     Boolean.datatype = "false" | "true"
-    
-    ## 
+
+    ##
     ##       'clip-rule' or 'fill-rule' property/attribute value
-    ##     
+    ##
     ClipFillRule.datatype = "nonzero" | "evenodd" | "inherit"
-    
-    ## 
+
+    ##
     ##       media type, as per [RFC2045]
-    ##     
+    ##
     ContentType.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a <coordinate>
-    ##     
+    ##
     Coordinate.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a list of <coordinate>s
-    ##     
+    ##
     Coordinates.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a <color> value
-    ##     
+    ##
     Color.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a <integer>
-    ##     
+    ##
     Integer.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a language code, as per [RFC3066]
-    ##     
+    ##
     LanguageCode.datatype = ( xsd:language | string "" )
-    
-    ## 
+
+    ##
     ##       comma-separated list of language codes, as per [RFC3066]
-    ##     
+    ##
     LanguageCodes.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a <ength>
-    ##     
+    ##
     Length.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a list of <length>s
-    ##     
+    ##
     Lengths.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a <number>
-    ##     
+    ##
     Number.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a list of <number>s
-    ##     
+    ##
     Numbers.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       opacity value (e.g., <number>)
-    ##     
+    ##
     OpacityValue.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a path data specification
-    ##     
+    ##
     PathData.datatype = w:svg-pathdata
-    
-    ## 
+
+    ##
     ##       'preserveAspectRatio' attribute specification
-    ##     
+    ##
     PreserveAspectRatioSpec.datatype =
         xsd:string {
             pattern =
                 "([ \t\r\n])*(defer([ \t\r\n])+)?(none|xMinYMin|xMidYMin|xMaxYMin|xMinYMid|xMidYMid|xMaxYMid|xMinYMax|xMidYMax|xMaxYMax)(([ \t\r\n])+(meet|slice))?([ \t\r\n])*"
         }
-    
-    ## 
+
+    ##
     ##       script expression
-    ##     
+    ##
     Script.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       An SVG color value (RGB plus optional ICC)
-    ##     
+    ##
     SVGColor.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       arbitrary text string
-    ##     
+    ##
     Text.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       list of transforms
-    ##     
+    ##
     TransformList.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       a Uniform Resource Identifier, see [URI]
-    ##     
+    ##
     URI.datatype = xsd:anyURI
-    
-    ## 
+
+    ##
     ##       'viewBox' attribute specification
-    ##     
+    ##
     ViewBoxSpec.datatype = xsd:string
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-docevents-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-docevents-attrib.rnc
index 3e106ce1cd64..528495f561a8 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-docevents-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-docevents-attrib.rnc
@@ -1,25 +1,25 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Document Events Attribute Module
 ##     file: svg-docevents-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Document Events Attribute
-## 
+##
 ##         onunload, onabort, onerror, onresize, onscroll, onzoom
-## 
+##
 ##     This module defines the DocumentEvents attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.onunload.attrib = attribute onunload { Script.datatype }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
index 90e002c230e8..55517678d866 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
@@ -49,9 +49,9 @@ attlist.foreignObject &=
     attribute height { Length.datatype },
     attribute transform { TransformList.datatype }?
 
-## 
+##
 ##       any element in foreign namespace
-##     
+##
 foreignElement =
     element * - svg:* {
         (attribute * - svg:* { text }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extresources-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extresources-attrib.rnc
index e75a53aff1f2..ab072e2eeb3b 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extresources-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extresources-attrib.rnc
@@ -1,25 +1,25 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 External Resources Attribute Module
 ##     file: svg-extresources-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     External Resources Attribute
-## 
+##
 ##         externalResourcesRequired
-## 
+##
 ##     This module defines the External attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.externalResourcesRequired.attrib =
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-filter.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-filter.rnc
index eaab681a5cb9..b1c942bbc039 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-filter.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-filter.rnc
@@ -2,36 +2,36 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Filter Module
 ##     file: svg-filter.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Filter
-## 
+##
 ##         filter, feBlend, feColorMatrix, feComponentTransfer, feComposite,
 ##         feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feFlood,
 ##         feGaussianBlur, feImage, feMerge, feMergeNode, feMorphology, feOffset,
 ##         feSpecularLighting, feTile, feTurbulence, feDistantLight, fePointLight,
 ##         feSpotLight, feFuncR, feFuncG, feFuncB, feFuncA
-## 
+##
 ##     This module declares markup to provide support for filter effect.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-filter.rnc"
-    
-    ## 
+
+    ##
     ##       extend SVG.FilterPrimitive.class
-    ##     
+    ##
     SVG.FilterPrimitive.class |=
         feConvolveMatrix
         | feDiffuseLighting
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-font.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-font.rnc
index a111a676dea7..157559798d35 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-font.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-font.rnc
@@ -2,26 +2,26 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Font Module
 ##     file: svg-font.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Font
-## 
+##
 ##         font, font-face, glyph, missing-glyph, hkern, vkern, font-face-src,
 ##         font-face-uri, font-face-format, font-face-name, definition-src
-## 
+##
 ##     This module declares markup to provide support for template.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-font.rnc" {
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-gradient.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-gradient.rnc
index 64e6562c78ce..01933a3ca9ab 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-gradient.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-gradient.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Gradient Module
 ##     file: svg-gradient.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Gradient
-## 
+##
 ##         linearGradient, radialGradient, stop
-## 
+##
 ##     This module declares markup to provide support for gradient fill.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     NumberOrPercentage.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphevents-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphevents-attrib.rnc
index 1bd0f1291d05..310a3a758409 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphevents-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphevents-attrib.rnc
@@ -1,26 +1,26 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Graphical Element Events Attribute Module
 ##     file: svg-graphevents-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Graphical Element Events Attribute
-## 
+##
 ##         onfocusin, onfocusout, onactivate, onclick, onmousedown, onmouseup,
 ##         onmouseover, onmousemove, onmouseout, onload
-## 
+##
 ##     This module defines the GraphicalEvents attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.onfocusin.attrib = attribute onfocusin { Script.datatype }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphics-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphics-attrib.rnc
index 4f8eca443b3a..270390db3a72 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphics-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-graphics-attrib.rnc
@@ -2,26 +2,26 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace svg = "http://www.w3.org/2000/svg"
 
 
-## 
+##
 ##     SVG 1.1 Graphics Attribute Module
 ##     file: svg-graphics-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Graphics Attribute
-## 
+##
 ##         display, image-rendering, pointer-events, shape-rendering,
 ##         text-rendering, visibility
-## 
+##
 ##     This module defines the Graphics attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-graphics-attrib.rnc" inherit = svg
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-hyperlink.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-hyperlink.rnc
index 15a396fad497..143e051a191d 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-hyperlink.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-hyperlink.rnc
@@ -2,31 +2,31 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Hyperlinking Module
 ##     file: svg-hyperlink.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Hyperlinking
-## 
+##
 ##         a
-## 
+##
 ##     This module declares markup to provide support for hyper linking.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       link to this target
-    ##     
+    ##
     LinkTarget.datatype = xsd:NMTOKEN
     a:documentation [ "\x{a}" ~ "    SVG.Hyperlink.class\x{a}" ~ "  " ]
     SVG.Hyperlink.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
index def2d4b59e01..258958ce4bbf 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Image Module
 ##     file: svg-image.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Image
-## 
+##
 ##         image
-## 
+##
 ##     This module declares markup to provide support for image.
-##   
+##
 
-## 
+##
 ##     SVG.Image.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Image.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-marker.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-marker.rnc
index b34487625bee..0b88d24aaeeb 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-marker.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-marker.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Marker Module
 ##     file: svg-marker.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Marker
-## 
+##
 ##         marker
-## 
+##
 ##     This module declares markup to provide support for marker.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     MarkerValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-mask.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-mask.rnc
index 4f1774627a1c..e4d63b9dd27b 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-mask.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-mask.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Mask Module
 ##     file: svg-mask.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Mask
-## 
+##
 ##         mask
-## 
+##
 ##     This module declares markup to provide support for masking.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     MaskValue.datatype = xsd:string
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-opacity-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-opacity-attrib.rnc
index d783c608e500..4154d59b8057 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-opacity-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-opacity-attrib.rnc
@@ -1,25 +1,25 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Paint Opacity Attribute Module
 ##     file: svg-opacity-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Paint Opacity Attribute
-## 
+##
 ##         opacity, fill-opacity, stroke-opacity
-## 
+##
 ##     This module defines the Opacity attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.opacity.attrib = attribute opacity { OpacityValue.datatype }?
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
index 4e9635d612f3..914ba3eb5eae 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
@@ -1,54 +1,54 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Paint Attribute Module
 ##     file: svg-paint-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Paint Attribute
-## 
+##
 ##         fill, fill-rule, stroke, stroke-dasharray, stroke-dashoffset,
 ##         stroke-linecap, stroke-linejoin, stroke-miterlimit, stroke-width, color,
 ##         color-interpolation, color-rendering
-## 
+##
 ##     This module defines the Paint and Color attribute sets.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       a 'fill' or 'stroke' property/attribute value: <paint>
-    ##     
+    ##
     Paint.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       'stroke-dasharray' property/attribute value
     ##       (e.g., 'none', list of <number>s)
-    ##     
+    ##
     StrokeDashArrayValue.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       'stroke-dashoffset' property/attribute value (e.g., 'none', <legnth>)
-    ##     
+    ##
     StrokeDashOffsetValue.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       'stroke-miterlimit' property/attribute value (e.g., <number>)
-    ##     
+    ##
     StrokeMiterLimitValue.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       'stroke-width' property/attribute value (e.g., <length>)
-    ##     
+    ##
     StrokeWidthValue.datatype = xsd:string
     SVG.fill.attrib = attribute fill { Paint.datatype }?
     SVG.fill-rule.attrib =
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-pattern.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-pattern.rnc
index 2600829ba184..400bdb710a68 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-pattern.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-pattern.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Pattern Module
 ##     file: svg-pattern.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##    Pattern
-## 
+##
 ##         pattern
-## 
+##
 ##     This module declares markup to provide support for pattern fill.
-##   
+##
 
-## 
+##
 ##     SVG.Pattern.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Pattern.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-profile.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-profile.rnc
index 406ce6b784ca..701941857017 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-profile.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-profile.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Color Profile Module
 ##     file: svg-profile.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Color Profile
-## 
+##
 ##         color-profile
-## 
+##
 ##     This module declares markup to provide support for color profile.
-##   
+##
 
-## 
+##
 ##     SVG.Profile.attrib
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Profile.extra.attrib = empty
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-qname.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-qname.rnc
index e8587b57a76c..de56337e6e15 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-qname.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-qname.rnc
@@ -6,29 +6,29 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 # SVG 1.1 Qualified Name Module .........................................
 
 # file: svg-qname.mod
-# 
+#
 # This is SVG, a language for describing two-dimensional graphics in XML.
 # Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 #
 # Modifications Copyright 2007 Mozilla Foundation
-# 
+#
 # Revision: $Id$
-# 
+#
 # This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-# 
+#
 #    PUBLIC "-//W3C//ENTITIES SVG 1.1 Qualified Name//EN"
 #    SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg-qname.mod"
-# 
+#
 # .......................................................................
 
 # Qualified Name
-# 
+#
 # This module is contained in two parts, labeled Section 'A' and 'B':
-# 
+#
 #    Section A declares parameter entities to support namespace-
 #    qualified names, namespace declarations, and name prefixing
 #    for SVG and extensions.
-# 
+#
 #    Section B declares parameter entities used to provide
 #    namespace-qualified names for all SVG element types:
 
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-script.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-script.rnc
index 23fb9ff6dcb1..b76764e73128 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-script.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-script.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Scripting Module
 ##     file: svg-script.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Scripting
-## 
+##
 ##         script
-## 
+##
 ##     This module declares markup to provide support for scripting.
-##   
+##
 
-## 
+##
 ##     SVG.Script.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.Script.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
index aa3ff5cf036d..a6ccd197cf8a 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
@@ -2,31 +2,31 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Shape Module
 ##     file: svg-shape.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Shape
-## 
+##
 ##         path, rect, circle, line, ellipse, polyline, polygon
-## 
+##
 ##     This module declares markup to provide support for graphical shapes.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       a list of points
-    ##     
+    ##
     Points.datatype = xsd:string
     a:documentation [ "\x{a}" ~ "    SVG.Shape.class\x{a}" ~ "  " ]
     SVG.Shape.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-structure.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-structure.rnc
index 9245c01c7add..736d68e09486 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-structure.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-structure.rnc
@@ -2,32 +2,32 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Structure Module
 ##     file: svg-structure.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Structure
-## 
+##
 ##         svg, g, defs, desc, title, metadata, symbol, use
-## 
+##
 ##     This module declares the major structural elements and their attributes.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-structure.rnc"
-    
-    ## 
+
+    ##
     ##       extend SVG.Structure.class
-    ##     
+    ##
     SVG.Structure.class |= symbol
     a:documentation [
         "\x{a}" ~
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-style.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-style.rnc
index 4084f052bf06..502690dda22b 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-style.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-style.rnc
@@ -2,37 +2,37 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Style Module
 ##     file: svg-style.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007-2014 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Style
-## 
+##
 ##         style
-## 
+##
 ##     This module declares markup to provide support for stylesheet.
-##   
+##
 
-## 
+##
 ##     Datatypes
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     ClassList.datatype = xsd:string
     StyleSheet.datatype = xsd:string
-    
-    ## 
+
+    ##
     ##       comma-separated list of media descriptors.
-    ##     
+    ##
     MediaDesc.datatype = xsd:string
     a:documentation [ "\x{a}" ~ "    SVG.Style.attrib\x{a}" ~ "  " ]
     SVG.Style.extra.attrib = empty
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-text.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-text.rnc
index d2409ca3b362..5b1463716492 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-text.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-text.rnc
@@ -2,26 +2,26 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Text Module
 ##     file: svg-text.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Text
-## 
+##
 ##         text, tspan, tref, textPath, altGlyph, altGlyphDef, altGlyphItem,
 ##         glyphRef
-## 
+##
 ##     This module declares markup to provide support for alternate glyph.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     include "svg-basic-text.rnc"
@@ -113,15 +113,15 @@ grammar {
             | string "inherit"
         }?,
         attribute font-variant { string "normal" | string "small-caps" | string "inherit" }?
-    
-    ## 
+
+    ##
     ##       extend SVG.Text.class
-    ##     
+    ##
     SVG.Text.class |= altGlyphDef
-    
-    ## 
+
+    ##
     ##       extend SVG.TextContent.class
-    ##     
+    ##
     SVG.TextContent.class |= tspan | tref | textPath
     a:documentation [ "\x{a}" ~ "    text: Text Element\x{a}" ~ "  " ]
     SVG.text.class |= SVG.TextContent.class
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-view.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-view.rnc
index 86a6fb3a66f1..dfb3e44d3028 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-view.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-view.rnc
@@ -2,29 +2,29 @@ default namespace = "http://www.w3.org/2000/svg"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 View Module
 ##     file: svg-view.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     View
-## 
+##
 ##         view
-## 
+##
 ##     This module declares markup to provide support for view.
-##   
+##
 
-## 
+##
 ##     SVG.View.class
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.View.extra.class = notAllowed
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-viewport-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-viewport-attrib.rnc
index 5972b406ad82..2207de7a6653 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-viewport-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-viewport-attrib.rnc
@@ -1,31 +1,31 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 
-## 
+##
 ##     SVG 1.1 Viewport Attribute Module
 ##     file: svg-viewport-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     Viewport Attribute
-## 
+##
 ##         clip, overflow
-## 
+##
 ##     This module defines the Viewport attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       'clip' property/attribute value (e.g., 'auto', rect(...))
-    ##     
+    ##
     ClipValue.datatype = xsd:string
     SVG.clip.attrib = attribute clip { ClipValue.datatype }?
     SVG.overflow.attrib =
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-xlink-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-xlink-attrib.rnc
index cf46bddca4f7..605c40c2a699 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-xlink-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-xlink-attrib.rnc
@@ -2,26 +2,26 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     SVG 1.1 XLink Attribute Module
 ##     file: svg-xlink-attrib.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
 ##     Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     $Id$
-##   
+##
 
-## 
+##
 ##     XLink Attribute
-## 
+##
 ##        type, href, role, arcrole, title, show, actuate
-## 
+##
 ##     This module defines the XLink, XLinkRequired, XLinkEmbed, and
 ##     XLinkReplace attribute set.
-##   
+##
 [ xml:lang = "en" ]
 grammar {
     SVG.XLink.extra.attrib = empty
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic-inc.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic-inc.rnc
index eb4f24740a90..ba6d6f0417de 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic-inc.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic-inc.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1 Basic
 ##     file: svg11-basic.rng
-## 
+##
 ##     This is SVG Basic, a proper subset of SVG.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,171 +16,171 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id: svg11-basic.rnc 121 2007-12-15 18:35:39Z hsivonen $
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG Basic RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Viewport Attribute Module
-    ##     
+    ##
     include "svg-viewport-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Paint Attribute Module
-    ##     
+    ##
     include "svg-paint-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Opacity Attribute Module
-    ##     
+    ##
     include "svg-opacity-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Graphics Attribute Module
-    ##     
+    ##
     include "svg-graphics-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Document Events Attribute Module
-    ##     
+    ##
     include "svg-docevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Graphical Element Events Attribute Module
-    ##     
+    ##
     include "svg-graphevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Events Attribute Module
-    ##     
+    ##
     include "svg-animevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       XLink Attribute Module
-    ##     
+    ##
     include "svg-xlink-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       External Resources Attribute Module
-    ##     
+    ##
     include "svg-extresources-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Structure Module (required)
-    ##     
+    ##
     include "svg-structure.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Conditional Processing Module
-    ##     
+    ##
     include "svg-conditional.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Image Module
-    ##     
+    ##
     include "svg-image.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Style Module
-    ##     
+    ##
     include "svg-style.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Shape Module
-    ##     
+    ##
     include "svg-shape.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Text Module
-    ##     
+    ##
     include "svg-text.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Color Profile Module
-    ##     
+    ##
     include "svg-profile.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Gradient Module
-    ##     
+    ##
     include "svg-gradient.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Pattern Module
-    ##     
+    ##
     include "svg-pattern.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Clip Module
-    ##     
+    ##
     include "svg-basic-clip.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Mask Module
-    ##     
+    ##
     include "svg-mask.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Filter Module
-    ##     
+    ##
     include "svg-basic-filter.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Cursor Module
-    ##     
+    ##
     include "svg-cursor.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Hyperlinking Module
-    ##     
+    ##
     include "svg-hyperlink.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       View Module
-    ##     
+    ##
     include "svg-view.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Scripting Module
-    ##     
+    ##
     include "svg-script.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Module
-    ##     
+    ##
     include "svg-animation.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Font Module
-    ##     
+    ##
     include "svg-font.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Extensibility Module
-    ##     
+    ##
     include "svg-extensibility.rnc" inherit = svg
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic.rnc
index 31dc47bb7ace..51228cc7f54d 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-basic.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1 Basic
 ##     file: svg11-basic.rng
-## 
+##
 ##     This is SVG Basic, a proper subset of SVG.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,42 +16,42 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id$
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG Basic RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Includes
-    ##     
+    ##
     include "svg11-basic-inc.rnc" inherit = svg
 
     # Moved start = here -- hsivonen
-    ## 
+    ##
     ##       The root element is "svg".
-    ##     
+    ##
     start = svg
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-inc.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-inc.rnc
index c2237e2d33e3..e37a555c8855 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-inc.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-inc.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1
 ##     file: svg11.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,181 +16,181 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id: svg11.rnc 121 2007-12-15 18:35:39Z hsivonen $
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Container Attribute Module
-    ##     
+    ##
     include "svg-container-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Viewport Attribute Module
-    ##     
+    ##
     include "svg-viewport-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Paint Attribute Module
-    ##     
+    ##
     include "svg-paint-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Paint Opacity Attribute Module
-    ##     
+    ##
     include "svg-opacity-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Graphics Attribute Module
-    ##     
+    ##
     include "svg-graphics-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Document Events Attribute Module
-    ##     
+    ##
     include "svg-docevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Graphical Element Events Attribute Module
-    ##     
+    ##
     include "svg-graphevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Events Attribute Module
-    ##     
+    ##
     include "svg-animevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       XLink Attribute Module
-    ##     
+    ##
     include "svg-xlink-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       External Resources Attribute Module
-    ##     
+    ##
     include "svg-extresources-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Structure Module (required)
-    ##     
+    ##
     include "svg-structure.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Conditional Processing Module
-    ##     
+    ##
     include "svg-conditional.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Image Module
-    ##     
+    ##
     include "svg-image.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Style Module
-    ##     
+    ##
     include "svg-style.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Shape Module
-    ##     
+    ##
     include "svg-shape.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Text Module
-    ##     
+    ##
     include "svg-text.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Marker Module
-    ##     
+    ##
     include "svg-marker.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Color Profile Module
-    ##     
+    ##
     include "svg-profile.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Gradient Module
-    ##     
+    ##
     include "svg-gradient.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Pattern Module
-    ##     
+    ##
     include "svg-pattern.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Clip Module
-    ##     
+    ##
     include "svg-clip.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Mask Module
-    ##     
+    ##
     include "svg-mask.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Filter Module
-    ##     
+    ##
     include "svg-filter.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Cursor Module
-    ##     
+    ##
     include "svg-cursor.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Hyperlinking Module
-    ##     
+    ##
     include "svg-hyperlink.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       View Module
-    ##     
+    ##
     include "svg-view.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Scripting Module
-    ##     
+    ##
     include "svg-script.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Module
-    ##     
+    ##
     include "svg-animation.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Font Module
-    ##     
+    ##
     include "svg-font.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Extensibility Module
-    ##     
+    ##
     include "svg-extensibility.rnc" inherit = svg
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny-inc.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny-inc.rnc
index 86c1bbb4000d..c39657168128 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny-inc.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny-inc.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1 Tiny
 ##     file: svg11-tiny.rng
-## 
+##
 ##     This is SVG Tiny, a proper subset of SVG.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,126 +16,126 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id: svg11-tiny.rnc 121 2007-12-15 18:35:39Z hsivonen $
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG Tiny RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Paint Attribute Module
-    ##     
+    ##
     include "svg-paint-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Graphics Attribute Module
-    ##     
+    ##
     include "svg-basic-graphics-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Document Events Attribute Module
-    ##     
+    ##
     include "svg-docevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Graphical Element Events Attribute Module
-    ##     
+    ##
     include "svg-graphevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Events Attribute Module
-    ##     
+    ##
     include "svg-animevents-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       XLink Attribute Module
-    ##     
+    ##
     include "svg-xlink-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       External Resources Attribute Module
-    ##     
+    ##
     include "svg-extresources-attrib.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Structure Module (required)
-    ##     
+    ##
     include "svg-basic-structure.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Conditional Processing Module
-    ##     
+    ##
     include "svg-conditional.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Image Module
-    ##     
+    ##
     include "svg-image.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Style Module
-    ##     
+    ##
     include "svg-style.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Shape Module
-    ##     
+    ##
     include "svg-shape.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Text Module
-    ##     
+    ##
     include "svg-basic-text.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Hyperlinking Module
-    ##     
+    ##
     include "svg-hyperlink.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       View Module
-    ##     
+    ##
     include "svg-view.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Scripting Module
-    ##     
+    ##
     include "svg-script.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Animation Module
-    ##     
+    ##
     include "svg-animation.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Basic Font Module
-    ##     
+    ##
     include "svg-basic-font.rnc" inherit = svg
-    
-    ## 
+
+    ##
     ##       Extensibility Module
-    ##     
+    ##
     include "svg-extensibility.rnc" inherit = svg
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny.rnc
index 969baee5ad30..8b6dce320de6 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11-tiny.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1 Tiny
 ##     file: svg11-tiny.rng
-## 
+##
 ##     This is SVG Tiny, a proper subset of SVG.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,42 +16,42 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id$
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG Tiny RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Extensibility Module
-    ##     
+    ##
     include "svg11-tiny-inc.rnc" inherit = svg
 
     # Moved start = here -- hsivonen
-    ## 
+    ##
     ##       The root element is "svg".
-    ##     
+    ##
     start = svg
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg11.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg11.rnc
index 3100e26a0329..d079c234b9e3 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg11.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg11.rnc
@@ -3,12 +3,12 @@ namespace svg = "http://www.w3.org/2000/svg"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-## 
+##
 ##     RELAX NG schema for SVG 1.1
 ##     file: svg11.rng
-## 
+##
 ##     This is SVG, a language for describing two-dimensional graphics in XML.
-## 
+##
 ##     The Scalable Vector Graphics (SVG)
 ##     Copyright 2001, 2002 World Wide Web Consortium
 ##        (Massachusetts Institute of Technology, Institut National de
@@ -16,42 +16,42 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 ##         All Rights Reserved.
 ##
 ##     Modifications Copyright 2007 Mozilla Foundation
-## 
+##
 ##     Permission to use, copy, modify and distribute this RELAX NG schema
 ##     for SVG and its accompanying documentation for any purpose and without
 ##     fee is hereby granted in perpetuity, provided that the above copyright
 ##     notice and this paragraph appear in all copies.  The copyright holders
 ##     nor the author make no representation about the suitability of this
 ##     RELAX NG schema for any purpose.
-## 
+##
 ##     It is provided "as is" without expressed or implied warranty.
-## 
+##
 ##         Author: Masayasu Ishikawa (mimasa@w3.org)
 ##         Modified by: Henri Sivonen (hsivonen@iki.fi)
 ##         $Id$
-## 
+##
 ##     This is the driver file for version 1.1 of the SVG RELAX NG schema.
-## 
+##
 ##     The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-## 
+##
 ##         PUBLIC "-//W3C//DTD SVG 1.1//EN"
 ##         SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
-## 
+##
 ##     Use this URI to identify the default namespace:
-## 
+##
 ##         "http://www.w3.org/2000/svg"
-##   
+##
 [ xml:lang = "en" ]
 grammar {
-    
-    ## 
+
+    ##
     ##       Includes
-    ##     
+    ##
     include "svg11-inc.rnc" inherit = svg
-    
+
     # Moved start = here -- hsivonen
-    ## 
+    ##
     ##       The root element is "svg".
-    ##     
+    ##
     start = svg
 }
diff --git a/xml/relaxng/scripts/update_html5_schema.sh b/xml/relaxng/scripts/update_html5_schema.sh
index 4277edba2e62..132e4513176b 100755
--- a/xml/relaxng/scripts/update_html5_schema.sh
+++ b/xml/relaxng/scripts/update_html5_schema.sh
@@ -3,9 +3,9 @@
 set -o errexit
 
 ROOT=$PWD
-PATCHES="$ROOT/../src/resources/patches"
+PATCHES="$ROOT/../resources/resources/patches"
 
-cd ../src/resources
+cd ../resources/resources
 
 rm -rf temp
 rm -rf result
@@ -35,6 +35,10 @@ rm -rf result/xhtml10
 pwd
 ruby ../../scripts/html5charref.rb > result/html5chars.ent
 
+echo
+echo ">>>>> Trimming line endings in result directory"
+find result -type f -name "*.rnc" -exec sh -c "sed -i.bak 's/[[:space:]]*$//' {} && rm {}.bak" _ {} \;
+
 echo
 echo ">>>>> Patching html5 schema"
 cp patches/*.rnc result/html5