rdf-rdfa 0.3.8 → 0.3.9

data/README

@@ -30,7 +30,11 @@ RDFa Profiles were a mechanism added to allow groups of terms and prefixes to be
 #### Vocabulary Expansion
 One of the issues with vocabularies was that they discourage re-use of existing vocabularies when terms from several vocabularies are used at the same time. As it is common (encouraged) for RDF vocabularies to form sub-class and/or sub-property relationships with well defined vocabularies, the RDFa vocabulary expansion mechanism takes advantage of this.
 
-As an optional part of RDFa processing, an RDFa processor will perform limited [RDFS entailment](http://www.w3.org/TR/rdf-mt/#rules), specifically rules rdfs5, 7, 9 and 11. This causes sub-classes and sub-properties of type and property IRIs to be added to the output graph.
+As an optional part of RDFa processing, an RDFa processor will perform limited
+[OWL 2 RL Profile entailment](http://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules),
+specifically rules prp-eqp1, prp-eqp2, cax-sco, cax-eqc1, and
+cax-eqc2. This causes sub-classes and sub-properties of type and property IRIs to be added
+to the output graph.
 
 {RDF::RDFa::Reader} implements this using the `#expand` method, which looks for `rdfa:hasVocabulary` properties within the output graph and performs such expansion. See an example in the usage section.
 
@@ -145,6 +149,18 @@ this results in
 #### Property chaining
 If used without @rel, but with @typeof and a resource attribute, @property will cause chaining to another object just like @rel. The effect of this and other changes is to allow pretty much all RDFa to be marked up using just @property; @rel/@rev is no longer required. Although, @rel and @rev have useful features that @property does not, so it's worth keeping them in your toolkit.
 
+#### Support for HTML5 `time` element
+The `time` element allows the creation of a datatyped-literal based on the lexical scope of either the ``@datetime`` attribute, or the element content. We parse it according to xsd:date, xsd:time, xsd:dateTime, xsd:gYear, xsd:gYearMonth, and xsd:duration. If it matches none of these, a plain literal is emitted.
+
+The `time` element is described in the WHATWG version of the [HTML5 spec](http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-time-element).
+This is related to [RDFa ISSUE-97](http://www.w3.org/2010/02/rdfa/track/issues/97).
+
+#### Support for HTML5 `data` element
+This is an alternate way of adding data using the `@value` property. Similar to `meta`
+
+The `data` element is described in the WHATWG version of the [HTML5 spec](http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-data-element).
+This is related to [RDFa ISSUE-113](http://www.w3.org/2010/02/rdfa/track/issues/113)
+
 ## Usage
 
 ### Reading RDF data in the RDFa format
@@ -189,21 +205,9 @@ To specify an alternative Haml template, consider the following:
 
 The template hash defines four Haml templates:
 
-*   _doc_: Document Template, takes an ordered list of _subject_s and yields each one to be rendered.
-    Described further in {RDF::RDFa::Writer#render_document}.
-
-        !!! XML
-        !!! 5
-        %html{:xmlns => "http://www.w3.org/1999/xhtml", :lang => lang, :prefix => prefix}
-          - if base || title
-            %head
-              - if base
-                %base{:href => base}
-              - if title
-                %title= title
-          %body
-            - subjects.each do |subject|
-              != yield(subject)
+*   _doc_: Document Template, takes an ordered list of _subject_s and yields each one to be rendered. From {RDF::RDFa::Writer#render_document}:
+
+    {include:RDF::RDFa::Writer#render_document}
 
     This template takes locals _lang_, _prefix_, _base_, _title_ in addition to _subjects_
     to create output similar to the following:
@@ -222,67 +226,29 @@ The template hash defines four Haml templates:
     Options passed to the Writer are used to supply _lang_ and _base_ locals.
     _prefix_ is generated based upon prefixes found from the default profiles, as well
     as those provided by a previous Reader. _title_ is taken from the first top-level subject
-    having an appropriate title property (as defined by the _heading_predicates_ option).
+    having an appropriate title property (as defined by the _heading\_predicates_ option).
 
 *   _subject_: Subject Template, take a _subject_ and an ordered list of _predicate_s and yields
-    each _predicate_ to be rendered. Described further in {RDF::RDFa::Writer#render_subject}.
+    each _predicate_ to be rendered. From {RDF::RDFa::Writer#render_subject}:
     
-        - if element == :li
-          %li{:rel => rel, :resource => resource, :inlist => inlist}
-            - if typeof
-              %span{:rel => 'rdf:type', :resource => typeof}.type!= typeof
-            - predicates.each do |predicate|
-              != yield(predicate)
-        - elsif rel && typeof
-          %div{:rel => rel}
-            %div{:about => resource, :typeof => typeof}
-              %span.type!= typeof
-              - predicates.each do |predicate|
-                != yield(predicate)
-        - elsif rel
-          %div{:rel => rel, :resource => resource}
-            - predicates.each do |predicate|
-              != yield(predicate)
-        - else
-          %div{:about => about, :typeof => typeof}
-            - if typeof
-              %span.type!= typeof
-            - predicates.each do |predicate|
-              != yield(predicate)
+    {include:RDF::RDFa::Writer#render_subject}
     
     The template takes locals _rel_ and _typeof_ in addition to _predicates_ and _subject_ to
     create output similar to the following:
     
-        <div about="http://example/">
+        <div resource="http://example/">
           ...
         </div>
 
     Note that if _typeof_ is defined, in this template, it will generate a textual description.
     
 *   _property\_value_: Property Value Template, used for predicates having a single value; takes
-    a _predicate_, and a single-valued Array of _objects_. Described further in {RDF::RDFa::Writer#render\_property}.
-    
-        - if heading_predicates.include?(predicate) && object.literal?
-          %h1{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
-        - else
-          %div.property
-            %span.label
-              = get_predicate_name(predicate)
-            - if res = yield(object)
-              != res
-            - elsif get_curie(object) == 'rdf:nil'
-              %span{:rel => get_curie(predicate), :inlist => ''}
-            - elsif object.node?
-              %span{:resource => get_curie(object), :rel => get_curie(predicate), :inlist => inlist}= get_curie(object)
-            - elsif object.uri?
-              %a{:href => object.to_s, :rel => get_curie(predicate), :inlist => inlist}= object.to_s
-            - elsif object.datatype == RDF.XMLLiteral
-              %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
-            - else
-              %span{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+    a _predicate_, and a single-valued Array of _objects_. From {RDF::RDFa::Writer#render_property}:
+
+    {include:RDF::RDFa::Writer#render_property}
    
     In addition to _predicate_ and _objects_, the template takes _inlist_ to indicate that the
-    property is part of an rdf:List.
+    property is part of an `rdf:List`.
 
     Also, if the predicate is identified as a _heading predicate_ (via _:heading\_predicates_ option),
     it will generate a heading element, and may use the value as the document title.
@@ -297,31 +263,14 @@ The template hash defines four Haml templates:
           <span class='label'>
             xhv:alternate
           </span>
-          <a href='http://rdfa.info/feed/' rel='xhv:alternate'>http://rdfa.info/feed/</a>
+          <a property='xhv:alternate' href='http://rdfa.info/feed/'>http://rdfa.info/feed/</a>
         </div>
     
     Note the use of methods defined in {RDF::RDFa::Writer} useful in rendering the output.
     
 *   _property\_values_: Similar to _property\_value_, but for predicates having more than one value.
-    Locals are identical to _property\_values_, but _objects_ is expected to have more than one value.
+    Locals are identical to _property\_values_, but _objects_ is expected to have more than one value. Described further in {RDF::RDFa::Writer#render_property}.
     
-        %div.property
-          %span.label
-            = get_predicate_name(predicate)
-          %ul
-            - objects.each do |object|
-              - if res = yield(object)
-                != res
-              - elsif object.node?
-                %li{:rel => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
-              - elsif object.uri?
-                %li
-                  %a{:rel => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
-              - elsif object.datatype == RDF.XMLLiteral
-                %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
-              - else
-                %li{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
-  
     In this case, and unordered list is used for output. Creates output similar to the following:
     
         <div class='property'>
@@ -399,7 +348,7 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * [RDF.rb][RDF.rb]
 * [Distiller](http://rdf.greggkellogg.net/distiller)
 * [Documentation][RDFa doc]
-* [History](file:file.History.html)
+* [History]{file:History.markdown}
 * [RDFa 1.1 Core][RDFa 1.1 Core]
 * [XHTML+RDFa 1.1][XHTML+RDFa 1.1]
 * [RDFa-test-suite](http://rdfa.digitalbazaar.com/test-suite/              "RDFa test suite")
@@ -443,6 +392,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [RDFa 1.1 Core]:    http://www.w3.org/TR/2011/WD-rdfa-core-20110331/     "RDFa 1.1 Core"
 [RDFa Lite 1.1]:    http://www.w3.org/2010/02/rdfa/drafts/2011/ED-rdfa-lite-20111030/   "RDFa Lite 1.1"
 [XHTML+RDFa 1.1]:   http://www.w3.org/TR/2011/WD-xhtml-rdfa-20110331/   "XHTML+RDFa 1.1"
+[HTML+RDFa 1.1]:    http://www.w3.org/TR/2011/WD-rdfa-in-html-20110525/ "HTML+RDFa 1.1"
 [RDFa-test-suite]:  http://rdfa.digitalbazaar.com/test-suite/           "RDFa test suite"
 [RDFa doc]:         http://rubydoc.info/github/gkellogg/rdf-rdfa/frames
 [Haml]:             http://haml-lang.com/

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/rdf/rdfa.rb

@@ -18,8 +18,9 @@ module RDF
   # @see http://rdf.rubyforge.org/
   # @see http://www.w3.org/TR/xhtml-rdfa-primer/
   # @see http://www.w3.org/2010/02/rdfa/wiki/Main_Page
-  # @see http://www.w3.org/TR/2011/WD-rdfa-core-20110331/
-  # @see http://www.w3.org/TR/2011/WD-xhtml-rdfa-20110331/
+  # @see http://www.w3.org/TR/2011/WD-rdfa-core-20111215/
+  # @see http://www.w3.org/TR/2011/WD-rdfa-in-html-20110525/
+  # @see http://dev.w3.org/html5/rdfa/
   #
   # @author [Gregg Kellogg](http://kellogg-assoc.com/)
   module RDFa
@@ -32,8 +33,9 @@ module RDF
     autoload :Writer,     'rdf/rdfa/writer'
     autoload :VERSION,    'rdf/rdfa/version'
     
-    XML_RDFA_PROFILE    = "http://www.w3.org/profile/rdfa-1.1"
-    XHTML_RDFA_PROFILE  = "http://www.w3.org/profile/html-rdfa-1.1"
+    HTML_RDFA_CONTEXT   = "http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"
+    XHTML_RDFA_CONTEXT  = "http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"
+    XML_RDFA_CONTEXT    = "http://www.w3.org/2011/rdfa-context/rdfa-1.1"
     
     def self.debug?; @debug; end
     def self.debug=(value); @debug = value; end

data/lib/rdf/rdfa/expansion.rb

@@ -1,6 +1,6 @@
 module RDF::RDFa
   ##
-  # The Expansion module performs a subset of RDFS entailment rules on the base class,
+  # The Expansion module performs a subset of OWL entailment rules on the base class,
   # which implementes RDF::Readable.
   module Expansion
     ##
@@ -10,29 +10,32 @@ module RDF::RDFa
     ##
     # Perform vocabulary expansion on the resulting default graph.
     #
-    #   Vocabulary expansion relies on a sub-set of RDFS [RDF-SCHEMA] entailment to add triples to the default graph
-    #   based on rules and property/class relationships described in referenced vocabularies.
+    #   Vocabulary expansion relies on a sub-set of OWL [OWL2-PROFILES] entailment to add
+    #   triples to the default graph based on rules and property/class relationships
+    #   described in referenced vocabularies.
     #
     # For all objects that are the target of an rdfa:hasVocabulary property, load the IRI into
     # a repository.
     #
-    # Subsequently, perform RDFS expansion using rules rdfs5, rdfs7, rdfs9, and rdfs11 placing
-    # resulting triples into the default graph. Iterate on this step until no more triples are added.
+    # Subsequently, perform OWL expansion using rules prp-spo1, prp-eqp1,
+    # prp-eqp2, cax-sco, cax-eqc1, and cax-eqc2 placing resulting triples into the default
+    # graph. Iterate on this step until no more triples are added.
     #
     # @example
-    #    rdfs5
-    #    {uuu rdfs:subPropertyOf vvv . vvv rdfs:subPropertyOf xxx} => {uuu rdfs:subPropertyOf xxx}
+    #    scm-spo
+    #    {pq rdfs:subPropertyOf pw . pw rdfs:subPropertyOf p3} => {p1 rdfs:subPropertyOf p3}
     #
-    #    rdfs7
-    #    {aaa rdfs:subPropertyOf bbb . uuu aaa yyy} => {uuu bbb yyy}
+    #    rdprp-spo1fs7
+    #    {p1 rdfs:subPropertyOf p2 . x p1 y} => {x p2 y}
     #
-    #    rdfs9
-    #    {uuu rdfs:subClassOf xxx . vvv rdf:type uuu} => {vvv rdf:type xxx}
+    #    cax-sco
+    #    {c1 rdfs:subClassOf c2 . x rdf:type c1} => {x rdf:type c2}
     #
-    #    rdfs11
-    #    {uuu rdfs:subClassOf vvv . vvv rdfs:subClassOf xxx} => {uuu rdfs:subClassOf xxx}
+    #    scm-sco
+    #    {c1 rdfs:subClassOf c2 . c2 rdfs:subClassOf c3} => {c1 rdfs:subClassOf c3}
     #
     # @return [RDF::Graph]
+    # @see [OWL2 PROFILES](http://www.w3.org/TR/2009/REC-owl2-profiles-20091027/#Reasoning_in_OWL_2_RL_and_RDF_Graphs_using_Rules)
     def expand
       repo = RDF::Repository.new
       repo << self  # Add default graph
@@ -67,7 +70,7 @@ module RDF::RDFa
       if repo.count == count
         add_debug("expand", "No vocabularies loaded")
       else
-        repo = rdfs_entailment(repo)
+        repo = owl_entailment(repo)
       end
 
       # Return graph with default context
@@ -97,10 +100,10 @@ module RDF::RDFa
 
       ##
       # @example
-      #   r = Rule.new("rdfs5") do
-      #     antecedent :uuu, RDF::RDFS.subPropertyOf, :vvv
-      #     antecedent :vvv, RDF::RDFS.subPropertyOf, :xxx
-      #     consequent :uuu, RDF::RDFS.subPropertyOf, :xxx, "t-box"
+      #   r = Rule.new("scm-spo") do
+      #     antecedent :p1, RDF::RDFS.subPropertyOf, :p2
+      #     antecedent :p2, RDF::RDFS.subPropertyOf, :p3
+      #     consequent :p1, RDF::RDFS.subPropertyOf, :p3, "t-box"
       #   end
       #
       #   r.execute(queryable) {|statement| puts statement.inspect}
@@ -155,33 +158,43 @@ module RDF::RDFa
   private
 
     RULES = [
-      Rule.new("rdfs5") do
-        antecedent :uuu, RDF::RDFS.subPropertyOf, :vvv
-        antecedent :vvv, RDF::RDFS.subPropertyOf, :xxx
-        consequent :uuu, RDF::RDFS.subPropertyOf, :xxx, "t-box"
+      Rule.new("prp-spo1") do
+        antecedent :p1, RDF::RDFS.subPropertyOf, :p2
+        antecedent :x, :p1, :y
+        consequent :x, :p2, :y
       end,
-      Rule.new("rdfs7") do
-        antecedent :aaa, RDF::RDFS.subPropertyOf, :bbb
-        antecedent :uuu, :aaa, :yyy
-        consequent :uuu, :bbb, :yyy
+      Rule.new("prp-eqp1") do
+        antecedent :p1, RDF::OWL.equivalentProperty, :p2
+        antecedent :x, :p1, :y
+        consequent :x, :p2, :y
       end,
-      Rule.new("rdfs9") do
-        antecedent :uuu, RDF::RDFS.subClassOf, :xxx
-        antecedent :vvv, RDF.type, :uuu
-        consequent :vvv, RDF.type, :xxx
+      Rule.new("prp-eqp2") do
+        antecedent :p1, RDF::OWL.equivalentProperty, :p2
+        antecedent :x, :p2, :y
+        consequent :x, :p1, :y
+      end,
+      Rule.new("cax-sco") do
+        antecedent :c1, RDF::RDFS.subClassOf, :c2
+        antecedent :x, RDF.type, :c1
+        consequent :x, RDF.type, :c2
+      end,
+      Rule.new("cax-eqc1") do
+        antecedent :c1, RDF::OWL.equivalentClass, :c2
+        antecedent :x, RDF.type, :c1
+        consequent :x, RDF.type, :c2
+      end,
+      Rule.new("cax-eqc2") do
+        antecedent :c1, RDF::OWL.equivalentClass, :c2
+        antecedent :x, RDF.type, :c2
+        consequent :x, RDF.type, :c1
       end,
-      Rule.new("rdfs11") do
-        antecedent :uuu, RDF::RDFS.subClassOf, :vvv
-        antecedent :vvv, RDF::RDFS.subClassOf, :xxx
-        consequent :uuu, RDF::RDFS.subClassOf, :xxx, "t-box"
-      end
     ]
 
     ##
-    # Perform RDFS entailment rules on repository
+    # Perform OWL entailment rules on repository
     # @param [RDF::Repository] repo
     # @return [RDF::Repository]
-    def rdfs_entailment(repo)
+    def owl_entailment(repo)
       old_count = 0
 
       while old_count < (count = repo.count)

data/lib/rdf/rdfa/format.rb

@@ -39,6 +39,20 @@ module RDF::RDFa
     end
   end
 
+  # Aliases for RDFa::Format
+  #
+  # This allows the following:
+  #
+  # @example Obtaining an HTML format class
+  #   RDF::Format.for(:lite)         # RDF::RDFa::Lite
+  #   RDF::Format.for(:lite).reader  # RDF::RDFa::Reader
+  #   RDF::Format.for(:lite).writer  # RDF::RDFa::Writer
+  class Lite < RDF::Format
+    content_encoding 'utf-8'
+    reader { RDF::RDFa::Reader }
+    writer { RDF::RDFa::Writer }
+  end
+
   # Aliases for RDFa::Format
   #
   # This allows the following:

data/lib/rdf/rdfa/profile/html.rb

@@ -0,0 +1,20 @@
+# This file is automatically generated by ./script/intern_profile
+# RDFa profile for http://www.w3.org/2011/rdfa-context/html-rdfa-1.1.html
+
+class RDF::RDFa::Profile
+  def self.find_with_html_rdfa_1_1_html(uri)
+    if uri.to_s == "http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"
+      @_html_rdfa_1_1_html_prof ||= RDF::RDFa::Profile.new(RDF::URI("http://www.w3.org/2011/rdfa-context/html-rdfa-1.1"), {
+      })
+    else
+      find_without_html_rdfa_1_1_html(uri)
+    end
+  end
+
+  class << self
+    ##
+    # Override find to return this profile, if matched
+    alias_method :find_without_html_rdfa_1_1_html, :find
+    alias_method :find, :find_with_html_rdfa_1_1_html
+  end
+end

data/lib/rdf/rdfa/profile/xhtml.rb

@@ -1,50 +1,47 @@
-# This file is automatically generated by ./script/intern_vocabulary
-# RDFa vocabulary for http://www.w3.org/profile/html-rdfa-1.1
-
-require 'facets/module'
+# This file is automatically generated by ./script/intern_profile
+# RDFa profile for http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1.html
 
 class RDF::RDFa::Profile
-  def self.find_with_html_rdfa_1_1(uri)
-    if uri.to_s == "http://www.w3.org/profile/html-rdfa-1.1"
-      @_html_rdfa_1_1_prof ||= RDF::RDFa::Profile.new(RDF::URI("http://www.w3.org/profile/html-rdfa-1.1"), {
+  def self.find_with_xhtml_rdfa_1_1_html(uri)
+    if uri.to_s == "http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"
+      @_xhtml_rdfa_1_1_html_prof ||= RDF::RDFa::Profile.new(RDF::URI("http://www.w3.org/2011/rdfa-context/xhtml-rdfa-1.1"), {
         :terms => {
-          :alternate      => "http://www.w3.org/1999/xhtml/vocab#alternate",
-          :appendix       => "http://www.w3.org/1999/xhtml/vocab#appendix",
-          :bookmark       => "http://www.w3.org/1999/xhtml/vocab#bookmark",
-          :chapter        => "http://www.w3.org/1999/xhtml/vocab#chapter",
-          :cite           => "http://www.w3.org/1999/xhtml/vocab#cite",
-          :contents       => "http://www.w3.org/1999/xhtml/vocab#contents",
-          :copyright      => "http://www.w3.org/1999/xhtml/vocab#copyright",
-          :first          => "http://www.w3.org/1999/xhtml/vocab#first",
-          :glossary       => "http://www.w3.org/1999/xhtml/vocab#glossary",
-          :help           => "http://www.w3.org/1999/xhtml/vocab#help",
-          :icon           => "http://www.w3.org/1999/xhtml/vocab#icon",
-          :index          => "http://www.w3.org/1999/xhtml/vocab#index",
-          :itsRules       => "http://www.w3.org/1999/xhtml/vocab#itsRules",
-          :last           => "http://www.w3.org/1999/xhtml/vocab#last",
-          :license        => "http://www.w3.org/1999/xhtml/vocab#license",
-          :meta           => "http://www.w3.org/1999/xhtml/vocab#meta",
-          :next           => "http://www.w3.org/1999/xhtml/vocab#next",
-          :p3pv1          => "http://www.w3.org/1999/xhtml/vocab#p3pv1",
-          :prev           => "http://www.w3.org/1999/xhtml/vocab#prev",
-          :role           => "http://www.w3.org/1999/xhtml/vocab#role",
-          :section        => "http://www.w3.org/1999/xhtml/vocab#section",
-          :start          => "http://www.w3.org/1999/xhtml/vocab#start",
-          :stylesheet     => "http://www.w3.org/1999/xhtml/vocab#stylesheet",
-          :subsection     => "http://www.w3.org/1999/xhtml/vocab#subsection",
-          :top            => "http://www.w3.org/1999/xhtml/vocab#top",
-          :transformation => "http://www.w3.org/2003/g/data-view#transformation",
-          :up             => "http://www.w3.org/1999/xhtml/vocab#up",
+          :alternate  => "http://www.w3.org/1999/xhtml/vocab#alternate",
+          :appendix   => "http://www.w3.org/1999/xhtml/vocab#appendix",
+          :bookmark   => "http://www.w3.org/1999/xhtml/vocab#bookmark",
+          :chapter    => "http://www.w3.org/1999/xhtml/vocab#chapter",
+          :cite       => "http://www.w3.org/1999/xhtml/vocab#cite",
+          :contents   => "http://www.w3.org/1999/xhtml/vocab#contents",
+          :copyright  => "http://www.w3.org/1999/xhtml/vocab#copyright",
+          :first      => "http://www.w3.org/1999/xhtml/vocab#first",
+          :glossary   => "http://www.w3.org/1999/xhtml/vocab#glossary",
+          :help       => "http://www.w3.org/1999/xhtml/vocab#help",
+          :icon       => "http://www.w3.org/1999/xhtml/vocab#icon",
+          :index      => "http://www.w3.org/1999/xhtml/vocab#index",
+          :last       => "http://www.w3.org/1999/xhtml/vocab#last",
+          :license    => "http://www.w3.org/1999/xhtml/vocab#license",
+          :meta       => "http://www.w3.org/1999/xhtml/vocab#meta",
+          :next       => "http://www.w3.org/1999/xhtml/vocab#next",
+          :p3pv1      => "http://www.w3.org/1999/xhtml/vocab#p3pv1",
+          :prev       => "http://www.w3.org/1999/xhtml/vocab#prev",
+          :previous   => "http://www.w3.org/1999/xhtml/vocab#previous",
+          :section    => "http://www.w3.org/1999/xhtml/vocab#section",
+          :start      => "http://www.w3.org/1999/xhtml/vocab#start",
+          :stylesheet => "http://www.w3.org/1999/xhtml/vocab#stylesheet",
+          :subsection => "http://www.w3.org/1999/xhtml/vocab#subsection",
+          :top        => "http://www.w3.org/1999/xhtml/vocab#top",
+          :up         => "http://www.w3.org/1999/xhtml/vocab#up",
         },
       })
     else
-      find_without_html_rdfa_1_1(uri)
+      find_without_xhtml_rdfa_1_1_html(uri)
     end
   end
 
   class << self
     ##
     # Override find to return this profile, if matched
-    alias_method_chain :find, :html_rdfa_1_1
+    alias_method :find_without_xhtml_rdfa_1_1_html, :find
+    alias_method :find, :find_with_xhtml_rdfa_1_1_html
   end
 end