X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdialogs%2Frdf.cpp;h=1e26a79c45d1c1e9507858345a39887e34bc7115;hb=a0df1b8dd5b14367c583ce2f72a2ca6bf1cde799;hp=b123abe829336ec10f7bb53e46e50a8d66a15c6f;hpb=2cc087fef3313b2e93e41b425ae9c660d7e3a1fe;p=inkscape.git

diff --git a/src/dialogs/rdf.cpp b/src/dialogs/rdf.cpp
index b123abe82..1e26a79c4 100644
--- a/src/dialogs/rdf.cpp
+++ b/src/dialogs/rdf.cpp
@@ -28,7 +28,7 @@
 
    Example RDF XML from various places...
  
-<rdf:RDF xmlns="http://web.resource.org/cc/"
+<rdf:RDF xmlns="http://creativecommons.org/ns#"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <Work rdf:about="">
@@ -48,7 +48,7 @@
 </Work>
 
 
-  <rdf:RDF xmlns="http://web.resource.org/cc/"
+  <rdf:RDF xmlns="http://creativecommons.org/ns#"
       xmlns:dc="http://purl.org/dc/elements/1.1/"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <Work rdf:about="">
@@ -57,13 +57,13 @@
         <dc:title>John Cliff</dc:title>
      </Agent></dc:rights>
      <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-     <license rdf:resource="http://web.resource.org/cc/PublicDomain" />
+     <license rdf:resource="http://creativecommons.org/ns#PublicDomain" />
   </Work>
   
-  <License rdf:about="http://web.resource.org/cc/PublicDomain">
-     <permits rdf:resource="http://web.resource.org/cc/Reproduction" />
-     <permits rdf:resource="http://web.resource.org/cc/Distribution" />
-     <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+  <License rdf:about="http://creativecommons.org/ns#PublicDomain">
+     <permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
+     <permits rdf:resource="http://creativecommons.org/ns#Distribution" />
+     <permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
   </License>
   
 </rdf:RDF>
@@ -91,86 +91,89 @@ struct rdf_double_t rdf_license_empty [] = {
 };
 
 struct rdf_double_t rdf_license_cc_a [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
     { NULL, NULL }
 };
 
 struct rdf_double_t rdf_license_cc_a_sa [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
-    { "cc:requires", "http://web.resource.org/cc/ShareAlike", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
+    { "cc:requires", "http://creativecommons.org/ns#ShareAlike", },
     { NULL, NULL }
 };
 
 struct rdf_double_t rdf_license_cc_a_nd [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
     { NULL, NULL }
 };
 
 struct rdf_double_t rdf_license_cc_a_nc [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
-    { "cc:prohibits", "http://web.resource.org/cc/CommercialUse", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
+    { "cc:prohibits", "http://creativecommons.org/ns#CommercialUse", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
     { NULL, NULL }
 };
 
 struct rdf_double_t rdf_license_cc_a_nc_sa [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
-    { "cc:prohibits", "http://web.resource.org/cc/CommercialUse", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
-    { "cc:requires", "http://web.resource.org/cc/ShareAlike", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
+    { "cc:prohibits", "http://creativecommons.org/ns#CommercialUse", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
+    { "cc:requires", "http://creativecommons.org/ns#ShareAlike", },
     { NULL, NULL }
 };
 
 struct rdf_double_t rdf_license_cc_a_nc_nd [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
-    { "cc:prohibits", "http://web.resource.org/cc/CommercialUse", },
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
+    { "cc:prohibits", "http://creativecommons.org/ns#CommercialUse", },
     { NULL, NULL }
 };
 
-struct rdf_double_t rdf_license_gpl [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
-    { "cc:requires", "http://web.resource.org/cc/ShareAlike", },
-    { "cc:requires", "http://web.resource.org/cc/SourceCode", },
+struct rdf_double_t rdf_license_pd [] = {
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
     { NULL, NULL }
 };
 
-struct rdf_double_t rdf_license_pd [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
+struct rdf_double_t rdf_license_freeart [] = {
+    { "cc:permits", "http://creativecommons.org/ns#Reproduction", },
+    { "cc:permits", "http://creativecommons.org/ns#Distribution", },
+    { "cc:permits", "http://creativecommons.org/ns#DerivativeWorks", },
+    { "cc:requires", "http://creativecommons.org/ns#ShareAlike", },
+    { "cc:requires", "http://creativecommons.org/ns#Notice", },
+    { "cc:requires", "http://creativecommons.org/ns#Attribution", },
     { NULL, NULL }
 };
 
-struct rdf_double_t rdf_license_freeart [] = {
-    { "cc:permits", "http://web.resource.org/cc/Reproduction", },
-    { "cc:permits", "http://web.resource.org/cc/Distribution", },
-    { "cc:permits", "http://web.resource.org/cc/DerivativeWorks", },
-    { "cc:requires", "http://web.resource.org/cc/ShareAlike", },
-    { "cc:requires", "http://web.resource.org/cc/Notice", },
-    { "cc:requires", "http://web.resource.org/cc/Attribution", },
+struct rdf_double_t rdf_license_ofl [] = {
+    { "cc:permits", "http://scripts.sil.org/pub/OFL/Reproduction", },
+    { "cc:permits", "http://scripts.sil.org/pub/OFL/Distribution", },
+    { "cc:permits", "http://scripts.sil.org/pub/OFL/Embedding", },
+    { "cc:permits", "http://scripts.sil.org/pub/OFL/DerivativeWorks", },
+    { "cc:requires", "http://scripts.sil.org/pub/OFL/Notice", },
+    { "cc:requires", "http://scripts.sil.org/pub/OFL/Attribution", },
+    { "cc:requires", "http://scripts.sil.org/pub/OFL/ShareAlike", },
+    { "cc:requires", "http://scripts.sil.org/pub/OFL/DerivativeRenaming", },
+    { "cc:requires", "http://scripts.sil.org/pub/OFL/BundlingWhenSelling", },
     { NULL, NULL }
 };
 
@@ -205,16 +208,6 @@ struct rdf_license_t rdf_licenses [] = {
       rdf_license_cc_a_nc_nd,
     },
 
-    { N_("GNU General Public License"), 
-      "http://creativecommons.org/licenses/GPL/2.0/",
-      rdf_license_gpl,
-    },
-
-    { N_("GNU Lesser General Public License"), 
-      "http://creativecommons.org/licenses/LGPL/2.1/",
-      rdf_license_gpl,
-    },
-
     { N_("Public Domain"),
       "http://creativecommons.org/licenses/publicdomain/",
       rdf_license_pd,
@@ -225,6 +218,11 @@ struct rdf_license_t rdf_licenses [] = {
       rdf_license_freeart,
     },
 
+    { N_("Open Font License"),
+      "http://scripts.sil.org/OFL",
+      rdf_license_ofl,
+    },
+
     { NULL, NULL, rdf_license_empty, }
 };
 
@@ -341,7 +339,7 @@ rdf_string(struct rdf_t * rdf)
     gchar *string=NULL;
 
     gchar *rdf_head="\
-<rdf:RDF xmlns=\"http://web.resource.org/cc/\"\
+<rdf:RDF xmlns=\"http://creativecommons.org/ns#\"\
     xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\
     xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\
 ";