From 6e2061aa6dfe53a930825ab0d6b7f6194d0c04e6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 2 Dec 2013 23:24:39 -0500
Subject: v5: xmlns xlink using xl

---
 lib/sisu/v5/relaxng.rb | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'lib/sisu/v5/relaxng.rb')

diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/v5/relaxng.rb
index 39d6bde9..f6426f54 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -500,7 +500,7 @@ RELAXNG
       @relaxng =<<RELAXNG
 #% sax output model, part of SiSU and distributed under the same license
 default namespace = ""
-namespace xlink = "http://www.w3.org/1999/xlink"
+namespace xl = "http://www.w3.org/1999/xlink"
 start =
   element document {
     element head {
@@ -510,8 +510,8 @@ start =
            attribute class { xsd:NCName },
            (text
             | element link {
-                attribute xlink:href { xsd:anyURI },
-                attribute xlink:type { xsd:NCName },
+                attribute xl:href { xsd:anyURI },
+                attribute xl:type { xsd:NCName },
                 xsd:anyURI
               })+
          }
@@ -603,10 +603,10 @@ start =
                attribute alt { text }?,
                attribute height { xsd:integer }?,
                attribute width { xsd:integer }?,
-               attribute xlink:actuate { xsd:NCName },
-               attribute xlink:href { text },
-               attribute xlink:show { xsd:NCName },
-               attribute xlink:type { xsd:NCName }
+               attribute xl:actuate { xsd:NCName },
+               attribute xl:href { text },
+               attribute xl:show { xsd:NCName },
+               attribute xl:type { xsd:NCName }
              })+
         }?,
         element table {
@@ -654,8 +654,8 @@ sub = element sub { xsd:NCName }
 sup = element sup { xsd:NCName }
 link =
   element link {
-    attribute xlink:href { xsd:anyURI },
-    attribute xlink:type { xsd:NCName },
+    attribute xl:href { xsd:anyURI },
+    attribute xl:type { xsd:NCName },
     (xsd:anyURI | text | b | i | sup)+
   }
 u = element u { (text | b | i)+ }
@@ -666,7 +666,7 @@ RELAXNG
       @relaxng =<<RELAXNG
 #% dom output model, part of SiSU and distributed under the same license
 default namespace = ""
-namespace xlink = "http://www.w3.org/1999/xlink"
+namespace xl = "http://www.w3.org/1999/xlink"
 start =
   element document {
     element head {
@@ -770,10 +770,10 @@ object =
           | element image {
               attribute height { xsd:integer },
               attribute width { xsd:integer },
-              attribute xlink:actuate { xsd:NCName },
-              attribute xlink:href { text },
-              attribute xlink:show { xsd:NCName },
-              attribute xlink:type { xsd:NCName }
+              attribute xl:actuate { xsd:NCName },
+              attribute xl:href { text },
+              attribute xl:show { xsd:NCName },
+              attribute xl:type { xsd:NCName }
             }
           | element sub { text })+
        })
@@ -786,8 +786,8 @@ sup = element sup { xsd:NCName }
 del = element del { (text | b | i | link)+ }
 link =
   element link {
-    attribute xlink:href { xsd:anyURI },
-    attribute xlink:type { xsd:NCName },
+    attribute xl:href { xsd:anyURI },
+    attribute xl:type { xsd:NCName },
     xsd:anyURI
   }
 endnote =
@@ -814,7 +814,7 @@ RELAXNG
       @relaxng =<<RELAXNG
 #% xhtml output model, part of SiSU and distributed under the same license
 default namespace = ""
-namespace xlink = "http://www.w3.org/1999/xlink"
+namespace xl = "http://www.w3.org/1999/xlink"
 start =
   element document {
     element head {
@@ -823,8 +823,8 @@ start =
            attribute class { xsd:NCName },
            (text
             | element link {
-                attribute xlink:href { xsd:anyURI },
-                attribute xlink:type { xsd:NCName },
+                attribute xl:href { xsd:anyURI },
+                attribute xl:type { xsd:NCName },
                 xsd:anyURI
               })+
          }
@@ -923,10 +923,10 @@ start =
                   attribute alt { text }?,
                   attribute height { xsd:integer }?,
                   attribute width { xsd:integer }?,
-                  attribute xlink:actuate { xsd:NCName },
-                  attribute xlink:href { text },
-                  attribute xlink:show { xsd:NCName },
-                  attribute xlink:type { xsd:NCName }
+                  attribute xl:actuate { xsd:NCName },
+                  attribute xl:href { text },
+                  attribute xl:show { xsd:NCName },
+                  attribute xl:type { xsd:NCName }
                 }
               | element sub { text })+
            })+,
@@ -954,8 +954,8 @@ sup = element sup { xsd:NCName }
 i = element i { (text | b | br | sup)+ }
 link =
   element link {
-    attribute xlink:href { xsd:anyURI },
-    attribute xlink:type { xsd:NCName },
+    attribute xl:href { xsd:anyURI },
+    attribute xl:type { xsd:NCName },
     (text | b | i | sup)+
   }
 b = element b { (text | en | i | link | sup)+ }
-- 
cgit v1.2.3


From 3d4ec6deee066dec01b9445f9b54f844d9443aae Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 2 Dec 2013 23:59:06 -0500
Subject: v5: some renaming to ao from dal continued

---
 lib/sisu/v5/relaxng.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v5/relaxng.rb')

diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/v5/relaxng.rb
index f6426f54..ef632308 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -327,9 +327,9 @@ element-external_space =
   }
 RELAXNG
     end
-    def rnc_sisu_object_dal
+    def rnc_sisu_object_ao
       @relaxng =<<RELAXNG
-#%% sisu object model: dal
+#%% sisu object model: ao
 #{gpl3_or_later}
 #%% definitions
 # dublin core:
-- 
cgit v1.2.3