Merge the remove_wj filter into xhtml_compat.

[homepage.git] / Rules

diff --git a/Rules b/Rules
index 2460c14ba315339e7e4ca55479480101b97a6de1..ebe9cf2f23a67545e868e87e0f54a04567f7e634 100644 (file)
--- a/Rules
+++ b/Rules
@@ -129,13 +129,11 @@ postprocess do
 end
 
 compile '/**/index.lst' do
-    layout '/listing.xhtml'
-    filter :erb
+    layout '/listing.erb'
     layout '/default.xml'
     layout '/default.xsl'
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write item.identifier.without_ext + ".xhtml"
 end
 
@@ -146,7 +144,6 @@ compile '/license/gpl*.md' do
     layout '/default.xsl'
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write to_xhtml
 end
 
@@ -158,7 +155,6 @@ compile '/**/*.md' do
     layout '/default.xsl'
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write to_xhtml
 end
 
@@ -169,7 +165,6 @@ compile '/license/cc*.sgml' do
     layout '/default.xsl', "section-links": "yes"
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write to_xhtml
 end
 
@@ -179,7 +174,6 @@ compile '/license/cc*.xhtml' do
     layout '/default.xsl', "section-links": "yes"
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write to_xhtml
 end
 
@@ -196,7 +190,6 @@ compile '/images/*.jpg', rep: :info do
     layout '/default.xsl'
     filter :relativize_paths, type: :xml
     filter :xhtml_compat
-    filter :remove_wj
     write to_xhtml
 end
 
@@ -211,6 +204,11 @@ compile '/**/*.scss' do
     write @item.identifier.without_ext + '.css'
 end
 
+compile '/**/*.svg' do
+    filter :scour, comment_stripping: true
+    write @item.identifier.to_s
+end
+
 compile '/**/*' do
     filter :copybin if @item.binary?
     write @item.identifier.to_s