From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E050138334 for ; Tue, 17 Dec 2019 19:07:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F255E0871; Tue, 17 Dec 2019 19:07:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 397DBE086E for ; Tue, 17 Dec 2019 19:07:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAFE934D9DF for ; Tue, 17 Dec 2019 19:07:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E89D18D8 for ; Tue, 17 Dec 2019 19:07:34 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1576608877.d3e9d92465e27ff616178012151bf77aa3927a66.ulm@gentoo> Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / X-VCS-Repository: proj/nxml-gentoo-schemas X-VCS-Files: Makefile book.rnc common.rnc funnychars.rnc guide.rnc schemas.xml X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: d3e9d92465e27ff616178012151bf77aa3927a66 X-VCS-Branch: master Date: Tue, 17 Dec 2019 19:07:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8e86a3ca-44f5-4233-88d0-af89408ba3c2 X-Archives-Hash: 6ba8bbd476b420c0acf55468373bdcdf commit: d3e9d92465e27ff616178012151bf77aa3927a66 Author: Ulrich Müller gentoo org> AuthorDate: Tue Dec 17 18:54:37 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Dec 17 18:54:37 2019 +0000 URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=d3e9d924 Update list of DTDs. The remaining GuideXML DTDs (book.dtd, guide.dtd) and their dependencies (common.dtd, funnychars.dtd) are gone. Signed-off-by: Ulrich Müller gentoo.org> Makefile | 2 +- book.rnc | 46 ---------------- common.rnc | 140 ------------------------------------------------ funnychars.rnc | 164 --------------------------------------------------------- guide.rnc | 84 ----------------------------- schemas.xml | 2 - 6 files changed, 1 insertion(+), 437 deletions(-) diff --git a/Makefile b/Makefile index 915719d..5fe156f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DTDS = book.dtd devbook.dtd glsa.dtd guide.dtd metadata.dtd mirrors.dtd \ +DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \ projects.dtd repositories.dtd DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS)) diff --git a/book.rnc b/book.rnc deleted file mode 100644 index bcffc69..0000000 --- a/book.rnc +++ /dev/null @@ -1,46 +0,0 @@ -include "common.rnc" -book = - element book { - book.attlist, - title, - values?, - author+, - abstract, - license?, - version, - date, - part+ - } -book.attlist &= - attribute link { text }?, - attribute disclaimer { - "articles" | "oldbook" | "draft" | "obsolete" - }?, - attribute redirect { text }?, - attribute lang { text }? -part = element part { part.attlist, title, abstract, chapter+ } -part.attlist &= attribute id { text }? -chapter = - element chapter { chapter.attlist, title, abstract?, \include } -chapter.attlist &= attribute id { text }? -sections = - element sections { - sections.attlist, abstract?, version, date, section+ - } -sections.attlist &= empty -section = - element section { - section.attlist, - (\include - | (title, (body+ | subsection+))) - } -subsection = - element subsection { - subsection.attlist, - (\include | (title?, body+)) - } -subsection.attlist &= - attribute id { text }?, - attribute test { text }? -body = element body { body.attlist, (\include | block.class+) } -start = sections | book | included | summary | glepindex diff --git a/common.rnc b/common.rnc deleted file mode 100644 index 5373e73..0000000 --- a/common.rnc +++ /dev/null @@ -1,140 +0,0 @@ -# Import funny characters - -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" - -inline.class = - sup | sub | b | brite | c | e | path | img | br | mail | uri | keyval -pre.class = - comment | i | keyword | ident | const | stmt | var | keyval | uri -lists.class = ul | ol | dl -ti.class = inline.class | lists.class | fig -block.class = - figure | fig | note | impo | warn | pre | p | table | lists.class -title = element title { title.attlist, text } -title.attlist &= empty -values = element values { values.attlist, key+ } -values.attlist &= empty -key = element key { key.attlist, text } -key.attlist &= attribute id { text }? -author = element author { author.attlist, (text | mail)* } -author.attlist &= attribute title { text }? -mail = element mail { mail.attlist, text } -mail.attlist &= attribute link { text }? -uri = element uri { uri.attlist, (text | img)* } -uri.attlist &= attribute link { text }? -date = element date { date.attlist, text } -date.attlist &= empty -abstract = element abstract { abstract.attlist, text } -abstract.attlist &= empty -summary = element summary { summary.attlist, text } -summary.attlist &= empty -license = element license { license.attlist, empty } -license.attlist &= attribute version { text }? -version = element version { version.attlist, text } -version.attlist &= empty -figure = element figure { figure.attlist, empty } -figure.attlist &= - attribute caption { text }?, - attribute short { text }?, - attribute link { text } -fig = element fig { fig.attlist, empty } -fig.attlist &= - attribute short { text }?, - attribute linkto { text }?, - attribute link { text } -img = element img { img.attlist, empty } -img.attlist &= attribute src { text } -br = element br { br.attlist, empty } -br.attlist &= empty -note = element note { note.attlist, (text | inline.class)* } -note.attlist &= attribute test { text }? -impo = element impo { impo.attlist, (text | inline.class)* } -impo.attlist &= attribute test { text }? -warn = element warn { warn.attlist, (text | inline.class)* } -warn.attlist &= attribute test { text }? -pre = element pre { pre.attlist, (text | pre.class)* } -pre.attlist &= - attribute caption { text }, - attribute test { text }? -comment = element comment { comment.attlist, (text | pre.class | b)* } -comment.attlist &= empty -i = element i { i.attlist, (text | pre.class)* } -i.attlist &= empty -keyword = element keyword { keyword.attlist, (text | pre.class)* } -keyword.attlist &= empty -ident = element ident { ident.attlist, (text | pre.class)* } -ident.attlist &= empty -const = element const { const.attlist, (text | pre.class)* } -const.attlist &= empty -stmt = element stmt { stmt.attlist, (text | pre.class)* } -stmt.attlist &= empty -var = element var { var.attlist, (text | pre.class)* } -var.attlist &= empty -glepindex = element glepindex { glepindex.attlist, empty } -glepindex.attlist &= - attribute status { text }?, - [ a:defaultValue = "/proj/en/glep/gleps.xml" ] - attribute index { text }? -body.attlist &= attribute test { text }? -p = element p { p.attlist, (text | inline.class)* } -p.attlist &= - attribute by { text }?, - attribute test { text }? -table = element table { table.attlist, tcolumn*, tr+ } -table.attlist &= attribute test { text }? -tcolumn = element tcolumn { tcolumn.attlist, empty } -tcolumn.attlist &= attribute width { text } -tr = element tr { tr.attlist, (th | ti)+ } -tr.attlist &= - attribute id { text }?, - attribute test { text }? -th = element th { th.attlist, (text | inline.class)* } -th.attlist &= - attribute colspan { text }?, - attribute rowspan { text }?, - [ a:defaultValue = "left" ] - attribute align { "left" | "center" | "right" }? -ti = element ti { ti.attlist, (text | ti.class)* } -ti.attlist &= - attribute colspan { text }?, - attribute rowspan { text }?, - [ a:defaultValue = "left" ] - attribute align { "left" | "center" | "right" }? -dl = element dl { dl.attlist, (dt | dd)+ } -dl.attlist &= empty -dt = element dt { dt.attlist, (text | inline.class)* } -dt.attlist &= empty -dd = element dd { dd.attlist, (text | inline.class | ul | ol)* } -dd.attlist &= empty -ul = element ul { ul.attlist, li+ } -ul.attlist &= attribute test { text }? -ol = element ol { ol.attlist, li+ } -ol.attlist &= attribute test { text }? -li = element li { li.attlist, (text | inline.class | ul | ol)* } -li.attlist &= attribute test { text }? -sup = element sup { sup.attlist, (text | inline.class)* } -sup.attlist &= empty -sub = element sub { sub.attlist, (text | inline.class)* } -sub.attlist &= empty -b = element b { b.attlist, (text | inline.class)* } -b.attlist &= empty -brite = element brite { brite.attlist, (text | inline.class)* } -brite.attlist &= empty -c = element c { c.attlist, (text | inline.class)* } -c.attlist &= empty -e = element e { e.attlist, (text | inline.class)* } -e.attlist &= empty -path = element path { path.attlist, (text | inline.class)* } -path.attlist &= empty -keyval = element keyval { keyval.attlist, empty } -keyval.attlist &= attribute id { text } -section.attlist &= - attribute id { text }?, - attribute test { text }? -included = - element included { - included.attlist, version, date, (chapter | section | body)+ - } -included.attlist &= empty -\include = element include { include.attlist, empty } -include.attlist &= attribute href { text } diff --git a/funnychars.rnc b/funnychars.rnc deleted file mode 100644 index a76b2cd..0000000 --- a/funnychars.rnc +++ /dev/null @@ -1,164 +0,0 @@ - -# VULGAR FRACTION ONE HALF - -# VULGAR FRACTION ONE HALF - -# VULGAR FRACTION ONE QUARTER - -# VULGAR FRACTION THREE QUARTERS - -# - -# - -# - -# - -# SUPERSCRIPT ONE - -# SUPERSCRIPT TWO - -# SUPERSCRIPT THREE - -# PLUS SIGN - -# PLUS-MINUS SIGN - -# LESS-THAN SIGN - -# EQUALS SIGN - -# GREATER-THAN SIGN - -# DIVISION SIGN - -# MULTIPLICATION SIGN - -# CURRENCY SIGN - -# POUND SIGN - -# DOLLAR SIGN - -# CENT SIGN - -# YEN SIGN - -# NUMBER SIGN - -# PERCENT SIGN - -# AMPERSAND - -# ASTERISK OPERATOR - -# COMMERCIAL AT - -# LEFT SQUARE BRACKET - -# REVERSE SOLIDUS - -# RIGHT SQUARE BRACKET - -# LEFT CURLY BRACKET - -# HORIZONTAL BAR - -# VERTICAL LINE - -# RIGHT CURLY BRACKET - -# MICRO SIGN - -# OHM SIGN - -# DEGREE SIGN - -# MASCULINE ORDINAL INDICATOR - -# FEMININE ORDINAL INDICATOR - -# SECTION SIGN - -# PILCROW SIGN - -# MIDDLE DOT - -# LEFTWARDS DOUBLE ARROW - -# RIGHTWARDS DOUBLE ARROW - -# UPWARDS ARROW - -# DOWNWARDS ARROW - -# COPYRIGHT SIGN - -# REG TRADE MARK SIGN - -# TRADE MARK SIGN - -# BROKEN BAR - -# NOT SIGN - -# - -# EXCLAMATION MARK - -# INVERTED EXCLAMATION MARK - -# QUOTATION MARK - -# APOSTROPHE - -# LEFT PARENTHESIS - -# RIGHT PARENTHESIS - -# COMMA - -# LOW LINE - -# - -# FULL STOP - -# SOLIDUS - -# COLON - -# SEMICOLON - -# QUESTION MARK - -# INVERTED QUESTION MARK - -# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - -# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK - -# - -# RIGHT SINGLE QUOTATION MARK - -# - -# RIGHT DOUBLE QUOTATION MARK - -# NO-BREAK SPACE - -# SOFT HYPHEN - -# CIRCONFLEXEd a - -# UMLAUTED e - -# ACUTEd e - -# CIRCONFLEXEd i - -# CIRCONFLEXEd u - -# GRAVEd u diff --git a/guide.rnc b/guide.rnc deleted file mode 100644 index 523af1c..0000000 --- a/guide.rnc +++ /dev/null @@ -1,84 +0,0 @@ -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" - -include "common.rnc" -mainpage = - element mainpage { - mainpage.attlist, - title, - author+, - abstract?, - license?, - version, - date?, - (devmap? | newsitems? | (mirrorlist | chapter)+) - } -mainpage.attlist &= - attribute redirect { text }?, - attribute lang { text }? -newsitems = element newsitems { newsitems.attlist, empty } -newsitems.attlist &= empty -devmap = element devmap { devmap.attlist, empty } -devmap.attlist &= empty -guide = - element guide { - guide.attlist, - title, - subtitle?, - values?, - author+, - abstract, - summary?, - license?, - version, - date, - faqindex?, - chapter+ - } -guide.attlist &= - attribute type { text }?, - attribute disclaimer { - "articles" | "oldbook" | "draft" | "obsolete" - }?, - attribute redirect { text }?, - attribute lang { text }? -news = - element news { news.attlist, poster, date, title, summary?, body } -news.attlist &= - [ a:defaultValue = "no" ] attribute gentoo { "yes" | "no" }?, - attribute category { - "gentoo" | "main" | "linux" | "moo" | "plans" | "birthday" - } -subtitle = element subtitle { subtitle.attlist, text } -subtitle.attlist &= empty -poster = element poster { poster.attlist, text } -poster.attlist &= empty -faqindex = element faqindex { faqindex.attlist, title, section? } -faqindex.attlist &= empty -chapter = - element chapter { - chapter.attlist, - (\include | (title, section+)) - } -chapter.attlist &= attribute id { text }? -section = - element section { - section.attlist, - (\include | (title?, body+)) - } -body = - element body { - body.attlist, - (mirrorlist - | \include - | (block.class | glsa-latest | glsaindex | glepindex)+) - } -glsaindex = element glsaindex { glsaindex.attlist, empty } -glsaindex.attlist &= empty -glsa-latest = element glsa-latest { glsa-latest.attlist, empty } -glsa-latest.attlist &= empty -mirrorlist = element mirrorlist { mirrorlist.attlist, empty } -mirrorlist.attlist &= - [ a:defaultValue = "full" ] attribute select { "full" | "partial" }? -mirrorlist.attlist &= - [ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }? -start = guide | mainpage | included | news diff --git a/schemas.xml b/schemas.xml index 590e4ce..d9c7753 100644 --- a/schemas.xml +++ b/schemas.xml @@ -6,9 +6,7 @@ - -