From 0d342f0aee3f2f800e486c0051dabe718a7b2841 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 23 Mar 2011 11:14:27 +0100 Subject: I don't like nxhtml --- .../nxhtml/etc/schema/FDA-2009-N-0392-0396.1.doc | Bin 47104 -> 0 bytes emacs.d/nxhtml/etc/schema/genshi-old.rnc | 27 ------ emacs.d/nxhtml/etc/schema/genshi-schemas.xml | 3 - emacs.d/nxhtml/etc/schema/genshi.rnc | 84 ------------------ emacs.d/nxhtml/etc/schema/mjt.rnc | 74 ---------------- emacs.d/nxhtml/etc/schema/nxml-erb.patch | 37 -------- emacs.d/nxhtml/etc/schema/old-genshi.rnc | 31 ------- emacs.d/nxhtml/etc/schema/old-qtmstr-xhtml.rnc | 61 ------------- emacs.d/nxhtml/etc/schema/old-xinclude.rnc | 11 --- emacs.d/nxhtml/etc/schema/qtmstr-xhtml-old.rnc | 58 ------------- emacs.d/nxhtml/etc/schema/qtmstr-xhtml.rnc | 66 -------------- emacs.d/nxhtml/etc/schema/schema-path-patch.el | 95 --------------------- emacs.d/nxhtml/etc/schema/xinclude.rnc | 35 -------- 13 files changed, 582 deletions(-) delete mode 100644 emacs.d/nxhtml/etc/schema/FDA-2009-N-0392-0396.1.doc delete mode 100644 emacs.d/nxhtml/etc/schema/genshi-old.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/genshi-schemas.xml delete mode 100644 emacs.d/nxhtml/etc/schema/genshi.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/mjt.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/nxml-erb.patch delete mode 100644 emacs.d/nxhtml/etc/schema/old-genshi.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/old-qtmstr-xhtml.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/old-xinclude.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/qtmstr-xhtml-old.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/qtmstr-xhtml.rnc delete mode 100644 emacs.d/nxhtml/etc/schema/schema-path-patch.el delete mode 100644 emacs.d/nxhtml/etc/schema/xinclude.rnc (limited to 'emacs.d/nxhtml/etc/schema') diff --git a/emacs.d/nxhtml/etc/schema/FDA-2009-N-0392-0396.1.doc b/emacs.d/nxhtml/etc/schema/FDA-2009-N-0392-0396.1.doc deleted file mode 100644 index aa2eff3..0000000 Binary files a/emacs.d/nxhtml/etc/schema/FDA-2009-N-0392-0396.1.doc and /dev/null differ diff --git a/emacs.d/nxhtml/etc/schema/genshi-old.rnc b/emacs.d/nxhtml/etc/schema/genshi-old.rnc deleted file mode 100644 index 5384fe1..0000000 --- a/emacs.d/nxhtml/etc/schema/genshi-old.rnc +++ /dev/null @@ -1,27 +0,0 @@ -namespace py = "http://genshi.edgewall.org/" - -genshi.expr-type = xsd:string { minLength = "1" } -genshi.with-type = xsd:string { minLength = "1" } -genshi.choose-type = xsd:string -genshi.def-type = xsd:string -genshi.xpath-type = xsd:anyURI - -genshi.attrib = attribute py:if { genshi.expr-type }?, - attribute py:choose { genshi.choose-type }?, - attribute py:when { genshi.expr-type }?, - attribute py:otherwise { genshi.expr-type }?, - attribute py:for { genshi.expr-type }?, - attribute py:def { genshi.def-type }?, - attribute py:match { genshi.xpath-type }?, - attribute py:with { genshi.with-type }?, - attribute py:attrs { genshi.expr-type }?, - attribute py:content { genshi.expr-type }?, - attribute py:replace { genshi.expr-type }?, - attribute py:strip { genshi.expr-type }? - -genshi.if.attlist = attribute expr { genshi.expr-type } -genshi.for.attlist = attribute each { genshi.expr-type } -genshi.def.attlist = attribute each { genshi.expr-type } -genshi.with.attlist = attribute vars { genshi.with-type } - - diff --git a/emacs.d/nxhtml/etc/schema/genshi-schemas.xml b/emacs.d/nxhtml/etc/schema/genshi-schemas.xml deleted file mode 100644 index 89fe05f..0000000 --- a/emacs.d/nxhtml/etc/schema/genshi-schemas.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/emacs.d/nxhtml/etc/schema/genshi.rnc b/emacs.d/nxhtml/etc/schema/genshi.rnc deleted file mode 100644 index b9ddf76..0000000 --- a/emacs.d/nxhtml/etc/schema/genshi.rnc +++ /dev/null @@ -1,84 +0,0 @@ -default namespace = "http://genshi.edgewall.org/" -namespace py = "http://genshi.edgewall.org/" - -include "xinclude.rnc" - -# There's no way to just match the text part against a Genshi Python expression -# See: http://relaxng.org/compact-tutorial-20030326.html#id2814737 -python.expression = text - -genshi.expr-type = xsd:string { minLength = "1" } -genshi.xpath-type = xsd:anyURI - -genshi.attrib = - attribute py:if { genshi.expr-type }?, - attribute py:choose { text }?, - attribute py:when { genshi.expr-type }?, - attribute py:otherwise { text }?, - attribute py:for { genshi.expr-type }?, - attribute py:def { genshi.expr-type }?, - attribute py:match { genshi.xpath-type}?, - attribute py:with { genshi.expr-type }?, - attribute py:attrs { genshi.expr-type }?, - attribute py:content { text }?, - attribute py:replace { genshi.expr-type }?, - attribute py:strip { text }? - -genshi.if.attlist = attribute test { genshi.expr-type } -genshi.choose.attlist = attribute test { text } -genshi.when.attlist = attribute test { genshi.expr-type } -genshi.for.attlist = attribute each { genshi.expr-type } -genshi.def.attlist = attribute function { genshi.expr-type } -genshi.with.attlist = attribute vars { genshi.expr-type } -genshi.replace.attlist = attribute value { genshi.expr-type } -genshi.match.attlist = - attribute path { genshi.xpath-type }, - attribute buffer { "true" | "false" }?, - attribute once { "true" | "false" }?, - attribute recursive { "true" | "false" }? - -genshi.choose = - element py:choose { genshi.choose.attlist, - genshi.model - } -genshi.when = - element py:when { genshi.when.attlist, - genshi.model - } -genshi.otherwise = - element py:otherwise { - genshi.model - } -genshi.if = - element py:if { genshi.if.attlist, - genshi.model - } -genshi.for = - element py:for { genshi.for.attlist, - genshi.model - } -genshi.def = - element py:def { genshi.def.attlist, - genshi.model - } -genshi.with = - element py:with { genshi.with.attlist, - genshi.model - } -genshi.match = - element py:match { genshi.match.attlist, - genshi.model - } -genshi.replace = - element py:replace { genshi.replace.attlist, - genshi.model - } - -genshi.allowed.children = text - -genshi.class = genshi.if | genshi.choose | genshi.when | genshi.otherwise - | genshi.for | genshi.def | genshi.with | genshi.match | genshi.replace - | python.expression - | xi.include - -genshi.model = genshi.class* | genshi.allowed.children* \ No newline at end of file diff --git a/emacs.d/nxhtml/etc/schema/mjt.rnc b/emacs.d/nxhtml/etc/schema/mjt.rnc deleted file mode 100644 index b37f01a..0000000 --- a/emacs.d/nxhtml/etc/schema/mjt.rnc +++ /dev/null @@ -1,74 +0,0 @@ -include "xhtml-loader.rnc" - -MjtAll.attrib = - attribute mjt.def { Text.datatype }?, - attribute mjt.when { Text.datatype }?, - attribute mjt.otherwise { Text.datatype }?, - attribute mjt.for { Text.datatype }?, - attribute mjt.if { Text.datatype }?, - attribute mjt.elif { Text.datatype }?, - attribute mjt.else { Text.datatype }?, - attribute mjt.script { Text.datatype }?, - attribute mjt.choose { Text.datatype }?, - attribute mjt.replace { Text.datatype }?, - attribute mjt.content { Text.datatype }?, - attribute mjt.strip { Text.datatype }?, - attribute mjt.src { Text.datatype }?, - attribute mjt.style { Text.datatype }?, - attribute mjt.class { Text.datatype }?, - attribute mjt.id { Text.datatype }?, - attribute mjt.attrs { Text.datatype }?, - attribute mjt.task { Text.datatype }? - - -a.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }? -area.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }? -form.attlist &= - attribute mjt.onreset { Script.datatype }?, - attribute mjt.onsubmit { Script.datatype }? -body.attlist &= - attribute mjt.onload { Script.datatype }?, - attribute mjt.onunload { Script.datatype }? -label.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }? -input.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onchange { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }?, - attribute mjt.onselect { Script.datatype }? -select.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onchange { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }? -textarea.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onchange { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }?, - attribute mjt.onselect { Script.datatype }? -button.attlist &= - attribute mjt.onblur { Script.datatype }?, - attribute mjt.onfocus { Script.datatype }? - -MjtEvents.attrib = - attribute mjt.onclick { Script.datatype }?, - attribute mjt.ondblclick { Script.datatype }?, - attribute mjt.onmousedown { Script.datatype }?, - attribute mjt.onmouseup { Script.datatype }?, - attribute mjt.onmouseover { Script.datatype }?, - attribute mjt.onmousemove { Script.datatype }?, - attribute mjt.onmouseout { Script.datatype }?, - attribute mjt.onkeypress { Script.datatype }?, - attribute mjt.onkeydown { Script.datatype }?, - attribute mjt.onkeyup { Script.datatype }? - - -Common.attrib &= MjtAll.attrib -CommonIdRequired.attrib &= MjtAll.attrib - -Common.attrib &= MjtEvents.attrib -CommonIdRequired.attrib &= MjtEvents.attrib diff --git a/emacs.d/nxhtml/etc/schema/nxml-erb.patch b/emacs.d/nxhtml/etc/schema/nxml-erb.patch deleted file mode 100644 index 362913b..0000000 --- a/emacs.d/nxhtml/etc/schema/nxml-erb.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- nxml-mode-orig/xmltok.el 2005-10-16 15:32:53.000000000 -0400 -+++ nxml-mode-erb/xmltok.el 2006-09-01 01:02:55.000000000 -0400 -@@ -496,6 +496,9 @@ - (xmltok+ (xmltok-g markup-declaration "!") - (xmltok-g comment-first-dash "-" - (xmltok-g comment-open "-") opt) opt)) -+ (erb-section -+ (xmltok+ "%" -+ (xmltok-g erb-section-open "[^%]") opt)) - (cdata-section - (xmltok+ "!" - (xmltok-g marked-section-open "\\[") -@@ -526,6 +529,7 @@ - ;; by default - or cdata-section - or comment -+ or erb-section - or processing-instruction)) - (xmltok-defregexp - xmltok-attribute -@@ -693,6 +697,16 @@ - nil - "]]>") - 'not-well-formed))) -+ ((xmltok-after-lt start erb-section-open) -+ (setq xmltok-type -+ (if (re-search-forward "[^%]%>" nil t) -+ 'erb-section -+ (xmltok-add-error "No closing %>") -+ (xmltok-add-dependent 'xmltok-unclosed-reparse-p -+ nil -+ nil -+ "%>") -+ 'not-well-formed))) - ((xmltok-after-lt start processing-instruction-question) - (xmltok-scan-after-processing-instruction-open)) - ((xmltok-after-lt start comment-open) diff --git a/emacs.d/nxhtml/etc/schema/old-genshi.rnc b/emacs.d/nxhtml/etc/schema/old-genshi.rnc deleted file mode 100644 index 5a50385..0000000 --- a/emacs.d/nxhtml/etc/schema/old-genshi.rnc +++ /dev/null @@ -1,31 +0,0 @@ -namespace py = "http://genshi.edgewall.org/" - -genshi.expr-type = xsd:string { minLength = "1" } -genshi.with-type = xsd:string { minLength = "1" } -genshi.choose-type = xsd:string -genshi.def-type = xsd:string -genshi.xpath-type = xsd:anyURI - -genshi.attrib = attribute py:if { genshi.expr-type }?, - attribute py:choose { genshi.choose-type }?, - attribute py:when { genshi.expr-type }?, - attribute py:otherwise { genshi.expr-type }?, - attribute py:for { genshi.expr-type }?, - attribute py:def { genshi.def-type }?, - attribute py:match { genshi.xpath-type }?, - attribute py:with { genshi.with-type }?, - attribute py:attrs { genshi.expr-type }?, - attribute py:content { genshi.expr-type }?, - attribute py:replace { genshi.expr-type }?, - attribute py:strip { genshi.expr-type }? - -genshi.if.attlist = attribute test { genshi.expr-type } -genshi.for.attlist = attribute each { genshi.expr-type } -genshi.def.attlist = attribute function { genshi.expr-type } -genshi.with.attlist = attribute vars { genshi.with-type } -genshi.match.attlist = attribute path { genshi.xpath-type }, - attribute buffer { genshi.expr-type }?, - attribute once { genshi.expr-type }?, - attribute recursive { genshi.expr-type }? - - diff --git a/emacs.d/nxhtml/etc/schema/old-qtmstr-xhtml.rnc b/emacs.d/nxhtml/etc/schema/old-qtmstr-xhtml.rnc deleted file mode 100644 index b5f84bd..0000000 --- a/emacs.d/nxhtml/etc/schema/old-qtmstr-xhtml.rnc +++ /dev/null @@ -1,61 +0,0 @@ -namespace py = "http://genshi.edgewall.org/" -namespace xi = "http://www.w3.org/2001/XInclude" - -include "genshi.rnc" -include "xinclude.rnc" -include "xhtml-loader.rnc" - -start |= head|body|p|\div|h1|h2|h3|h4|h5|h6|hr|pre|dl|ol|ul|table|form - -Common.attrib &= genshi.attrib -head.attlist &= genshi.attrib -html.attlist &= genshi.attrib - -Head.class = base | isindex | link | meta | script | title | style | - if-head | for-head | def-head | with-head - -Head.model = Head.class* - -head.content &= Head.model* - -if-inline = element py:if { genshi.if.attlist, Inline.model } -if-block = element py:if { genshi.if.attlist, Block.model } -if-head = element py:if { genshi.if.attlist, Head.model } -for-inline = element py:for { genshi.for.attlist, Inline.model } -for-block = element py:for { genshi.for.attlist, Block.model } -for-head = element py:for { genshi.for.attlist, Head.model } -def-inline = element py:def { genshi.def.attlist, Inline.model } -def-block = element py:def { genshi.def.attlist, Block.model } -def-head = element py:def { genshi.def.attlist, Head.model } -with-inline = element py:with { genshi.with.attlist, Inline.model } -with-block = element py:with { genshi.with.attlist, Block.model } -with-head = element py:with { genshi.with.attlist, Head.model } -match-inline = element py:match { genshi.match.attlist, Inline.model } -match-block = element py:match { genshi.match.attlist, Block.model } -match-head = element py:match { genshi.match.attlist, Head.model } - -Inline.class |= if-inline | for-inline | def-inline | with-inline | match-inline -Block.class |= if-block | for-block | def-block | with-block | match-block - -xi-inline = element xi:include { - xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-inline | Inline.model)* - }? - } - -xi-block = element xi:include { xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-block | Block.model)* - }? - } - -xi-head = element xi:include { xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-head | Head.model)* - }? - } - -Inline.class |= xi-inline -Block.class |= xi-block -Head.class |= xi-head diff --git a/emacs.d/nxhtml/etc/schema/old-xinclude.rnc b/emacs.d/nxhtml/etc/schema/old-xinclude.rnc deleted file mode 100644 index c45cf0c..0000000 --- a/emacs.d/nxhtml/etc/schema/old-xinclude.rnc +++ /dev/null @@ -1,11 +0,0 @@ -namespace xi = "http://www.w3.org/2001/XInclude" -namespace local = "" - -xinclude.include.attlist = - attribute href { xsd:anyURI }?, - attribute parse { xsd:string }?, - attribute xpointer { xsd:string }?, - attribute encoding { xsd:string }?, - attribute accept { xsd:string }?, - attribute accept-language { xsd:string }? - diff --git a/emacs.d/nxhtml/etc/schema/qtmstr-xhtml-old.rnc b/emacs.d/nxhtml/etc/schema/qtmstr-xhtml-old.rnc deleted file mode 100644 index 61ab89e..0000000 --- a/emacs.d/nxhtml/etc/schema/qtmstr-xhtml-old.rnc +++ /dev/null @@ -1,58 +0,0 @@ -namespace py = "http://genshi.edgewall.org/" -namespace xi = "http://www.w3.org/2001/XInclude" - -include "genshi.rnc" -include "xinclude.rnc" -include "xhtml-loader.rnc" - -start |= head|body|p|\div|h1|h2|h3|h4|h5|h6|hr|pre|dl|ol|ul|table|form - -Common.attrib &= genshi.attrib -head.attlist &= genshi.attrib -html.attlist &= genshi.attrib - -Head.class = base | isindex | link | meta | script | title | style | - if-head | for-head | def-head | with-head - -Head.model = Head.class* - -head.content &= Head.model* - -if-inline = element py:if { genshi.if.attlist, Inline.model } -if-block = element py:if { genshi.if.attlist, Block.model } -if-head = element py:if { genshi.if.attlist, Head.model } -for-inline = element py:for { genshi.for.attlist, Inline.model } -for-block = element py:for { genshi.for.attlist, Block.model } -for-head = element py:for { genshi.for.attlist, Head.model } -def-inline = element py:def { genshi.def.attlist, Inline.model } -def-block = element py:def { genshi.def.attlist, Block.model } -def-head = element py:def { genshi.def.attlist, Head.model } -with-inline = element py:with { genshi.with.attlist, Inline.model } -with-block = element py:with { genshi.with.attlist, Block.model } -with-head = element py:with { genshi.with.attlist, Head.model } - -Inline.class |= if-inline | for-inline | def-inline | with-inline -Block.class |= if-block | for-block | def-block | with-block - -xi-inline = element xi:include { - xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-inline | Inline.model)* - }? - } - -xi-block = element xi:include { xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-block | Block.model)* - }? - } - -xi-head = element xi:include { xinclude.include.attlist, - element xi:fallback { genshi.attrib, - (xi-head | Head.model)* - }? - } - -Inline.class |= xi-inline -Block.class |= xi-block -Head.class |= xi-head diff --git a/emacs.d/nxhtml/etc/schema/qtmstr-xhtml.rnc b/emacs.d/nxhtml/etc/schema/qtmstr-xhtml.rnc deleted file mode 100644 index ff5d0a9..0000000 --- a/emacs.d/nxhtml/etc/schema/qtmstr-xhtml.rnc +++ /dev/null @@ -1,66 +0,0 @@ -default namespace = "http://www.w3.org/1999/xhtml" - -include "genshi.rnc" -include "xhtml-loader.rnc" { - start = html | head | head.content | body | frameset | frame | noframes | - Block.class | Inline.class | Table.class | Form.extra.class | genshi.class - html = element html { html.attlist, (genshi.model | (head, (body | frameset | genshi.model))) } - frameset = - element frameset { - frameset.attlist, - (((frameset | frame)+ & noframes?) | genshi.model) - } - noframes = element noframes { noframes.attlist, (body | genshi.model) } - title = element title { title.attlist, (text | genshi.model)* } - script = element script { script.attlist, (text | genshi.model)* } - style = element style { style.attlist, (text | genshi.model)* } - dl = element dl { dl.attlist, ((dt | dd)+ | genshi.model) } - ol = element ol { ol.attlist, (li+ | genshi.model) } - ul = element ul { ul.attlist, (li+ | genshi.model) } - dir = element dir { dir.attlist, (li.noblock+ | genshi.model) } - menu = element menu { menu.attlist, (li.noblock+ | genshi.model) } - select = element select { select.attlist, ((option | optgroup)+ | genshi.model) } - option = - element option { - Common.attrib, - attribute selected { "selected" }?, - attribute value { text }?, - (text | genshi.model)* - } - textarea = element textarea { textarea.attlist, (text & genshi.model)* } - optgroup = element optgroup { optgroup.attlist, (option+ | genshi.model) } - table = - element table { - table.attlist, - (caption? | genshi.model), - (col* | colgroup* | genshi.model), - (((thead? | genshi.model), - (tfoot? | genshi.model), - (tbody+ | genshi.model)) | (tr+ | genshi.model)) - } - colgroup = element colgroup { colgroup.attlist, (col* | genshi.model) } - tr = element tr { tr.attlist, ((th | td)+ | genshi.model) } - tbody = element tbody { tbody.attlist, (tr+ | genshi.model) } - thead = element thead { thead.attlist, (tr+ | genshi.model) } - tfoot = element tfoot { tfoot.attlist, (tr+ | genshi.model) } -} - -Table.class = caption | colgroup | col | tbody | thead | tfoot | th | tr | td -Form.extra.class = option | optgroup | legend - -Block.class |= genshi.class -Inline.class |= genshi.class -head.content &= genshi.class - -Core.attrib &= genshi.attrib -html.attlist &= genshi.attrib -head.attlist &= genshi.attrib -title.attlist &= genshi.attrib -base.attlist &= genshi.attrib -meta.attlist &= genshi.attrib -script.attlist &= genshi.attrib -param.attlist &= genshi.attrib -Edit.attrib &= genshi.attrib - -genshi.allowed.children |= html | head | head.content | body | frameset | frame - | noframes | Inline.class | Block.class | Table.class | Form.extra.class diff --git a/emacs.d/nxhtml/etc/schema/schema-path-patch.el b/emacs.d/nxhtml/etc/schema/schema-path-patch.el deleted file mode 100644 index a6d59fc..0000000 --- a/emacs.d/nxhtml/etc/schema/schema-path-patch.el +++ /dev/null @@ -1,95 +0,0 @@ -;;; schema-path-patch.el --- Patch schema paths -;; -;; Author: Lennart Borgman (lennart O borgman A gmail O com) -;; Created: 2008-08-08T20:21:31+0200 Fri -;; Version: 0.2 -;; Last-Updated: 2008-08-19T00:21:25+0200 Mon -;; URL: -;; Keywords: -;; Compatibility: -;; -;; Features that might be required by this library: -;; -;; Cannot open load file: schema-path-patch. -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;;; Commentary: -;; -;; Schemas here may include parts from nxml and need to know the path. -;; This file can be used to patch the paths. -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;;; Change log: -;; -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 2, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth -;; Floor, Boston, MA 02110-1301, USA. -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;;; Code: - -(defvar rncpp-this-dir - (file-name-as-directory - (file-name-directory - (if load-file-name load-file-name buffer-file-name)))) - -(defun rncpp-get-nxml-schema-dir () - ;; First look for nxml-mode included with Emacs - (let ((schema-dir (file-name-as-directory - (expand-file-name "schema" data-directory)))) - (unless (file-directory-p schema-dir) - ;; This is an old nxml-mode, look for its schemas dir. - (let ((nxml-mode-dir (file-name-as-directory - (file-name-directory (locate-library "nxml-mode"))))) - (setq schema-dir (file-name-as-directory - (expand-file-name "schema" nxml-mode-dir))))) - (unless (file-directory-p schema-dir) - (error "Can't find schema-dir=%s" schema-dir)) - schema-dir)) - -;; Use xhtml-loader.rnc (an idea from Bryan Waite): -(defun rncpp-patch-xhtml-loader () - "Patch xhtml-loader.rnc so genshi and mjt rnc files works." - ;;(interactive) - (let* ((default-directory rncpp-this-dir) - (loader-path (expand-file-name "xhtml-loader.rnc")) - (loader-buf (find-buffer-visiting loader-path)) - (schema-dir (rncpp-get-nxml-schema-dir)) - (schema-relative-dir (file-relative-name schema-dir)) - (loader-string (concat "include \"" - schema-relative-dir - "xhtml.rnc\"\n"))) - (when loader-buf (kill-buffer loader-buf)) - (setq loader-buf (find-file-noselect loader-path)) - (with-current-buffer loader-buf - (unless (file-exists-p loader-path) - (insert loader-string)) - ;; Test if correct - (if (string= (buffer-substring-no-properties (point-min) (point-max)) - loader-string) - (message "xhtml-loader.rnc was ok") - (message "Patching xhtml-loader.rnc") - (delete-region (point-min) (point-max)) - (insert loader-string)) - (basic-save-buffer) - (kill-buffer (current-buffer))))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; schema-path-patch.el ends here diff --git a/emacs.d/nxhtml/etc/schema/xinclude.rnc b/emacs.d/nxhtml/etc/schema/xinclude.rnc deleted file mode 100644 index cbda979..0000000 --- a/emacs.d/nxhtml/etc/schema/xinclude.rnc +++ /dev/null @@ -1,35 +0,0 @@ -default namespace = "http://www.w3.org/2001/XInclude" -namespace xi = "http://www.w3.org/2001/XInclude" - -xi.include.attlist = - attribute href { xsd:anyURI }?, - attribute parse { "xml" | "text" }?, - attribute xpointer { xsd:string }?, - attribute encoding { xsd:string }?, - attribute accept { xsd:string }?, - attribute accept-language { xsd:string }? - -xi.include.attlist.extra = - attribute * - xi.include.attlist { text }* - -xi.include = - element xi:include { - xi.include.attlist, - xi.include.attlist.extra, - (xi.fallback? | xi.include.extra)* - } - -xi.include.extra = notAllowed - -xi.fallback.attlist = - attribute * { text }* - -xi.fallback = - element xi:fallback { - xi.fallback.attlist, - (xi.include | xi.fallback.extra)* - } - -xi.fallback.extra = notAllowed - -xi.class = xi.include | xi.fallback \ No newline at end of file -- cgit v1.2.3-54-g00ecf