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 9AF62138334 for ; Wed, 11 Dec 2019 06:55:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89D99E0828; Wed, 11 Dec 2019 06:55:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5923FE0828 for ; Wed, 11 Dec 2019 06:55:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2C04234D4D8 for ; Wed, 11 Dec 2019 06:55:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A24478C6 for ; Wed, 11 Dec 2019 06:55:08 +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: <1575930023.522fcdedc74fe32ae8cc6c80bea41ccd647ac4fc.ulm@gentoo> Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / X-VCS-Repository: proj/nxml-gentoo-schemas X-VCS-Files: Makefile gleps.rnc metadoc.rnc project.rnc schemas.xml userinfo.rnc X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 522fcdedc74fe32ae8cc6c80bea41ccd647ac4fc X-VCS-Branch: master Date: Wed, 11 Dec 2019 06:55:08 +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: dfcb38b3-350b-4afa-ad6d-252287fb888e X-Archives-Hash: 20de3a81668fa83794503afae80b7e1d commit: 522fcdedc74fe32ae8cc6c80bea41ccd647ac4fc Author: Ulrich Müller gentoo org> AuthorDate: Mon Dec 9 22:20:23 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Dec 9 22:20:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=522fcded Update list of DTDs. gleps.dtd, metadoc.dtd, project.dtd, and userinfo.dtd are gone. Signed-off-by: Ulrich Müller gentoo.org> Makefile | 3 +- gleps.rnc | 14 ------- metadoc.rnc | 80 -------------------------------------- project.rnc | 123 ----------------------------------------------------------- schemas.xml | 4 -- userinfo.rnc | 44 --------------------- 6 files changed, 1 insertion(+), 267 deletions(-) diff --git a/Makefile b/Makefile index 04db712..58802fe 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -DTDS = book.dtd gleps.dtd glsa.dtd guide.dtd metadata.dtd metadoc.dtd \ - project.dtd projects.dtd repositories.dtd userinfo.dtd +DTDS = book.dtd glsa.dtd guide.dtd metadata.dtd projects.dtd repositories.dtd DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS)) RNCS = $(patsubst %.dtd,%.rnc,$(DTDS)) diff --git a/gleps.rnc b/gleps.rnc deleted file mode 100644 index 19d90c0..0000000 --- a/gleps.rnc +++ /dev/null @@ -1,14 +0,0 @@ -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" - -gleps = element gleps { attlist.gleps, glep+ } -attlist.gleps &= empty -glep = element glep { attlist.glep, (text | uri)* } -attlist.glep &= - attribute id { text }, - attribute file { text }, - [ a:defaultValue = "S" ] attribute type { "S" | "I" }?, - [ a:defaultValue = "D" ] - attribute status { "D" | "d" | "A" | "F" | "R" | "W" | "M" }? -uri = element uri { attlist.uri, text } -attlist.uri &= attribute link { text } -start = gleps diff --git a/metadoc.rnc b/metadoc.rnc deleted file mode 100644 index 481587c..0000000 --- a/metadoc.rnc +++ /dev/null @@ -1,80 +0,0 @@ -include "common.rnc" -metadoc = - element metadoc { - metadoc.attlist, version, members, categories, files, docs - } -metadoc.attlist &= - attribute lang { text }, - attribute parent { text }? -members = element members { members.attlist, lead*, member* } -members.attlist &= empty -lead = element lead { lead.attlist, text* } -lead.attlist &= empty -# nickname -member = element member { member.attlist, text* } -member.attlist &= - attribute mail { text }?, - attribute fullname { text }? -categories = element categories { categories.attlist, cat* } -categories.attlist &= empty -cat = element cat { cat.attlist, text* } -cat.attlist &= - attribute id { text }, - attribute parent { text }? -files = element files { files.attlist, file* } -files.attlist &= empty -file = element file { file.attlist, text* } -file.attlist &= attribute id { xsd:ID } -docs = element docs { docs.attlist, doc* } -docs.attlist &= empty -doc = element doc { doc.attlist, memberof*, bookref?, bugs? } -doc.attlist &= attribute fileid { text } -memberof = element memberof { memberof.attlist, text* } -memberof.attlist &= empty -bookref = element bookref { bookref.attlist, empty } -bookref.attlist &= - attribute vpart { text }?, - attribute vchap { text }? -bugs = element bugs { bugs.attlist, bug* } -bugs.attlist &= empty -bug = element bug { bug.attlist, text* } -bug.attlist &= - attribute stopper { "yes" | "no" }?, - attribute arch { text }? -dynamic = - element dynamic { - dynamic.attlist, - version?, - title, - intro?, - (listing | catid* | overview) - } -dynamic.attlist &= attribute metadoc { text } -intro = element intro { intro.attlist, section* } -intro.attlist &= empty -# Section stuff copy/pasted from guide.dtd -listing = element listing { listing.attlist, \list* } -listing.attlist &= empty -\list = element list { list.attlist, text* } -list.attlist &= empty -catid = element catid { catid.attlist, text* } -catid.attlist &= empty -overview = element overview { overview.attlist, empty } -overview.attlist &= empty -section = - element section { - section.attlist, - (\include | (title?, body+)) - } -body = element body { body.attlist, (\include | block.class+) } -chapter |= notAllowed -start = - dynamic - | author - | license - | values - | included - | summary - | metadoc - | abstract - | glepindex diff --git a/project.rnc b/project.rnc deleted file mode 100644 index 6a885a5..0000000 --- a/project.rnc +++ /dev/null @@ -1,123 +0,0 @@ -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" - -include "common.rnc" -body.class = block.class | glepindex -body = element body { body.attlist, body.class* } -project = - element project { - project.attlist, - name, - longname?, - date?, - author*, - description, - longdescription, - goals?, - recruitment?, - (dev - | resource - | subproject - | plannedproject - | extraproject - | extrachapter - | herd - | task - | author)* - } -project.attlist &= - attribute disclaimer { "draft" | "obsolete" }?, - attribute redirect { text }? -name = element name { name.attlist, text } -name.attlist &= empty -longname = element longname { longname.attlist, text } -longname.attlist &= empty -description = element description { description.attlist, text } -description.attlist &= empty -longdescription = - element longdescription { longdescription.attlist, body.class* } -longdescription.attlist &= empty -goals = element goals { goals.attlist, body.class* } -goals.attlist &= empty -recruitment = element recruitment { recruitment.attlist, job+ } -recruitment.attlist &= empty -job = - element job { job.attlist, summary, details, requirements, contact+ } -job.attlist &= empty -details = element details { details.attlist, (text | inline.class)* } -details.attlist &= empty -requirements = - element requirements { requirements.attlist, (text | inline.class)* } -requirements.attlist &= empty -contact = element contact { contact.attlist, text } -contact.attlist &= empty -dev = element dev { dev.attlist, text } -dev.attlist &= - [ a:defaultValue = "member" ] attribute role { text }?, - attribute description { text }? -resource = element resource { resource.attlist, text } -resource.attlist &= attribute link { text }? -subproject = element subproject { subproject.attlist, empty } -subproject.attlist &= - attribute ref { text }, - [ a:defaultValue = "no" ] attribute inheritmembers { "yes" | "no" }?, - [ a:defaultValue = "no" ] attribute inheritresources { "yes" | "no" }? -extraproject = - element extraproject { extraproject.attlist, (text | inline.class)* } -extraproject.attlist &= - attribute name { text }, - attribute lead { text }?, - attribute link { text }? -plannedproject = - element plannedproject { - plannedproject.attlist, (text | inline.class)* - } -plannedproject.attlist &= attribute name { text } -extrachapter = - element extrachapter { extrachapter.attlist, title, section+ } -section = element section { section.attlist, title?, body+ } -extrachapter.attlist &= - [ a:defaultValue = "bottom" ] - attribute position { - "top" - | "bottom" - | "subproject" - | "goals" - | "resources" - | "devs" - | "recruitment" - | "tasks" - }? -herd = element herd { herd.attlist, empty } -herd.attlist &= attribute name { text } -# TASK tags declaration -task = - element task { - task.attlist, - name, - description, - longdescription?, - startdate, - enddate?, - (reference | milestone | dev | depends)* - } -task.attlist &= - attribute id { xsd:ID }?, - attribute lead { text }, - [ a:defaultValue = "no" ] attribute finished { "yes" | "no" }? -startdate = element startdate { startdate.attlist, text } -startdate.attlist &= empty -enddate = element enddate { enddate.attlist, text } -enddate.attlist &= empty -reference = - element reference { reference.attlist, (text | bug | mail | uri)* } -reference.attlist &= empty -bug = element bug { bug.attlist, text } -bug.attlist &= attribute no { text } -milestone = - element milestone { milestone.attlist, enddate, description } -milestone.attlist &= - [ a:defaultValue = "no" ] attribute finished { "yes" | "no" }? -depends = element depends { depends.attlist, text } -depends.attlist &= attribute ref { xsd:IDREF } -chapter |= notAllowed -start = project | license | values | included | \include | abstract diff --git a/schemas.xml b/schemas.xml index 6bd96a0..14927b1 100644 --- a/schemas.xml +++ b/schemas.xml @@ -1,14 +1,10 @@ - - - - diff --git a/userinfo.rnc b/userinfo.rnc deleted file mode 100644 index 54a1305..0000000 --- a/userinfo.rnc +++ /dev/null @@ -1,44 +0,0 @@ -userlist = element userlist { attlist.userlist, user+ } -attlist.userlist &= empty -user = - element user { - attlist.user, - realname, - pgpkey+, - alias*, - email+, - joined*, - retired*, - status?, - roles?, - location? - } -attlist.user &= attribute username { xsd:ID } -realname = element realname { attlist.realname, firstname, familyname } -attlist.realname &= attribute fullname { text }? -firstname = element firstname { attlist.firstname, text } -attlist.firstname &= empty -familyname = element familyname { attlist.familyname, text } -attlist.familyname &= attribute sort { text }? -pgpkey = element pgpkey { attlist.pgpkey, text } -attlist.pgpkey &= empty -alias = element alias { attlist.alias, text } -attlist.alias &= empty -email = element email { attlist.email, text } -attlist.email &= empty -# all dates should be YYYY-MM-DD - eg '2006-11-22' -joined = element joined { attlist.joined, text } -attlist.joined &= empty -retired = element retired { attlist.retired, text } -attlist.retired &= empty -status = element status { attlist.status, text } -attlist.status &= empty -roles = element roles { attlist.roles, text } -attlist.roles &= empty -# Location is the string displayed on the webpage -location = element location { attlist.location, text } -# signed decimal numbers. degrees north/east. -attlist.location &= - attribute latitude { text }?, - attribute longitude { text }? -start = userlist