summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJambunathan K <kjambunathan@gmail.com>2012-11-10 21:27:52 +0530
committerBastien Guerry <bzg@altern.org>2012-12-23 12:44:42 +0100
commit293a14d13f58d0e67df712f3c5a23396f26e9db1 (patch)
tree1e8236415ca63f41d585118aab283f4ee905884b
parentd9df7edb18b7d598f10fa4b25c9e7dca415f30c8 (diff)
downloadorg-mode-293a14d13f58d0e67df712f3c5a23396f26e9db1.tar.gz
Update OpenDocument schema files to v1.2 OASIS standard
* etc/schema/od-schema-v1.2-os.rnc: OASIS standard * etc/schema/od-manifest-schema-v1.2-os.rnc: OASIS standard * etc/schema/schemas.xml: Fix uri to rnc files. * lisp/org-odt.el (org-export-odt-schema-dir): Modified to accommodate change in rnc file names. * contrib/lisp/org-e-odt.el (org-e-odt-schema-dir): Modified to accommodate change in rnc file names.
-rw-r--r--contrib/lisp/org-e-odt.el16
-rw-r--r--etc/schema/od-manifest-schema-v1.2-os.rnc (renamed from etc/schema/od-manifest-schema-v1.2-cs01.rnc)4
-rw-r--r--etc/schema/od-schema-v1.2-os.rnc (renamed from etc/schema/od-schema-v1.2-cs01.rnc)4
-rw-r--r--etc/schema/schemas.xml4
-rw-r--r--lisp/org-odt.el16
5 files changed, 22 insertions, 22 deletions
diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el
index 5904fad..c8257d0 100644
--- a/contrib/lisp/org-e-odt.el
+++ b/contrib/lisp/org-e-odt.el
@@ -381,11 +381,11 @@ visually."
(lambda (schema-dir)
(when schema-dir
(message "Debug (org-e-odt): Trying %s..." schema-dir)
- (when (and (file-readable-p
- (expand-file-name "od-manifest-schema-v1.2-cs01.rnc"
+ (when (and (file-expand-wildcards
+ (expand-file-name "od-manifest-schema*.rnc"
schema-dir))
- (file-readable-p
- (expand-file-name "od-schema-v1.2-cs01.rnc"
+ (file-expand-wildcards
+ (expand-file-name "od-schema*.rnc"
schema-dir))
(file-readable-p
(expand-file-name "schemas.xml" schema-dir)))
@@ -425,10 +425,10 @@ Also add it to `rng-schema-locating-files'."
(let ((schema-dir value))
(set var
(if (and
- (file-readable-p
- (expand-file-name "od-manifest-schema-v1.2-cs01.rnc" schema-dir))
- (file-readable-p
- (expand-file-name "od-schema-v1.2-cs01.rnc" schema-dir))
+ (file-expand-wildcards
+ (expand-file-name "od-manifest-schema*.rnc" schema-dir))
+ (file-expand-wildcards
+ (expand-file-name "od-schema*.rnc" schema-dir))
(file-readable-p
(expand-file-name "schemas.xml" schema-dir)))
schema-dir
diff --git a/etc/schema/od-manifest-schema-v1.2-cs01.rnc b/etc/schema/od-manifest-schema-v1.2-os.rnc
index 647828d..bff1c0b 100644
--- a/etc/schema/od-manifest-schema-v1.2-cs01.rnc
+++ b/etc/schema/od-manifest-schema-v1.2-os.rnc
@@ -1,7 +1,7 @@
# Open Document Format for Office Applications (OpenDocument) Version 1.2
-# Committee Specification (CS) 01, 17 March 2011
+# OASIS Standard, 29 September 2011
# Manifest Relax-NG Schema
-#
+# Source: http://docs.oasis-open.org/office/v1.2/os/
# Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
#
# All capitalized terms in the following text have the meanings assigned to them
diff --git a/etc/schema/od-schema-v1.2-cs01.rnc b/etc/schema/od-schema-v1.2-os.rnc
index 83ad017..28ecf34 100644
--- a/etc/schema/od-schema-v1.2-cs01.rnc
+++ b/etc/schema/od-schema-v1.2-os.rnc
@@ -1,7 +1,7 @@
# Open Document Format for Office Applications (OpenDocument) Version 1.2
-# Committee Specification (CS) 01, 17 March 2011
+# OASIS Standard, 29 September 2011
# Relax-NG Schema
-#
+# Source: http://docs.oasis-open.org/office/v1.2/os/
# Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
#
# All capitalized terms in the following text have the meanings assigned to them
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index a319191..f1e0ed7 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -2,6 +2,6 @@
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<documentElement prefix="office" typeId="OpenDocument"/>
<documentElement prefix="manifest" localName="manifest" typeId="OpenDocument Manifest"/>
- <typeId id="OpenDocument" uri="od-schema-v1.2-cs01.rnc"/>
- <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-cs01.rnc"/>
+ <typeId id="OpenDocument" uri="od-schema-v1.2-os.rnc"/>
+ <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-os.rnc"/>
</locatingRules>
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index f9fd6a2..db2a8d6 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -115,11 +115,11 @@ and `org-odt-data-dir'.")
(lambda (schema-dir)
(when schema-dir
(message "Debug (org-odt): Trying %s..." schema-dir)
- (when (and (file-readable-p
- (expand-file-name "od-manifest-schema-v1.2-cs01.rnc"
+ (when (and (file-expand-wildcards
+ (expand-file-name "od-manifest-schema*.rnc"
schema-dir))
- (file-readable-p
- (expand-file-name "od-schema-v1.2-cs01.rnc"
+ (file-expand-wildcards
+ (expand-file-name "od-schema*.rnc"
schema-dir))
(file-readable-p
(expand-file-name "schemas.xml" schema-dir)))
@@ -159,10 +159,10 @@ Also add it to `rng-schema-locating-files'."
(let ((schema-dir value))
(set var
(if (and
- (file-readable-p
- (expand-file-name "od-manifest-schema-v1.2-cs01.rnc" schema-dir))
- (file-readable-p
- (expand-file-name "od-schema-v1.2-cs01.rnc" schema-dir))
+ (file-expand-wildcards
+ (expand-file-name "od-manifest-schema*.rnc" schema-dir))
+ (file-expand-wildcards
+ (expand-file-name "od-schema*.rnc" schema-dir))
(file-readable-p
(expand-file-name "schemas.xml" schema-dir)))
schema-dir