Switching to new Mallard cache namespace

2 files changed, 5 insertions, 4 deletions

diff --git a/doc/yelp-xsl/Makefile.am b/doc/yelp-xsl/Makefile.am
index 77dd5646..890107e5 100644
--- a/doc/yelp-xsl/Makefile.am
+++ b/doc/yelp-xsl/Makefile.am
@@ -6,6 +6,7 @@ xsldoc_dirs = 						\
 	$(ABS_SRCDIR)/../../xslt/docbook/common		\
 	$(ABS_SRCDIR)/../../xslt/docbook/html		\
 	$(ABS_SRCDIR)/../../xslt/docbook/omf		\
+	$(ABS_SRCDIR)/../../xslt/mallard/cache		\
 	$(ABS_SRCDIR)/../../xslt/mallard/common		\
 	$(ABS_SRCDIR)/../../xslt/mallard/html
 
@@ -26,7 +27,7 @@ $(xsldoc_pages): $(xsldoc_xsls) xsldoc-scan.awk xsldoc-scan.xsl
 	"$(srcdir)/xsldoc-scan.xsl" -
 
 C/index.cache: $(xsldoc_pages)
-	$(srcdir)/mal2cache "$@" "$(ABS_SRCDIR)/../../xslt/mallard/utils/mal2cache.xsl" C/*.page
+	$(srcdir)/mal2cache "$@" "$(ABS_SRCDIR)/../../xslt/mallard/cache/mal-cache.xsl" C/*.page
 
 .PHONY: yelp-xsl-check-links
 check: yelp-xsl-check-links
diff --git a/doc/yelp-xsl/mal2cache b/doc/yelp-xsl/mal2cache
index e625cf8e..a7a23eec 100755
--- a/doc/yelp-xsl/mal2cache
+++ b/doc/yelp-xsl/mal2cache
@@ -11,7 +11,7 @@ BEGIN {
 {
   for (i = 1; i <= length($0); i++) {
     c = substr($0, i, 1);
-    if (c ~ /[a-zA-Z0-9:_\.\-]/)
+    if (c ~ /[a-zA-Z0-9:_\.\-\/]/)
       printf("%s", c);
     else
       printf("%%%02X", bytes[c]);
@@ -24,7 +24,7 @@ shift
 xsl_file="$1"
 shift
 (
-    echo '<cache:cache xmlns:cache="http://projectmallard.org/1.0/"'
+    echo '<cache:cache xmlns:cache="http://projectmallard.org/cache/1.0/"'
     echo '             xmlns="http://projectmallard.org/1.0/">'
     while [ "$#" != "0" ]; do
         input="$1"
@@ -40,7 +40,7 @@ shift
         fi
     done | while read input; do
         input_esc=$(urlencode "$input" | sed -e 's/\&/\&amp;/g' -e 's/</\&lt;/g' -e "s/'/\&apos;/g")
-        echo "<page href='file://$input_esc'/>"
+        echo "<page cache:href='file://$input_esc'/>"
     done
     echo '</cache:cache>'
 ) | xsltproc -o "$cache_file" "$xsl_file" -