* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 9:21 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 86251a7c37c55cf30fb598c96266093aa47790a7
Author: Diego Elio Pettenò <flameeyes <AT> gmail <DOT> com>
AuthorDate: Wed Mar 9 15:31:03 2011 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 15:31:03 2011 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=86251a7c
Update schemas.
book.rnc | 2 +-
guide.rnc | 8 ++++++--
metadata.rnc | 13 ++++++++++++-
userinfo.rnc | 6 +++---
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/book.rnc b/book.rnc
index ebec9f6..b7ebf7e 100644
--- a/book.rnc
+++ b/book.rnc
@@ -42,4 +42,4 @@ subsection.attlist &=
attribute id { text }?,
attribute test { text }?
body = element body { body.attlist, (\include | block.class+) }
-start = glepindex | book | included | sections | summary
+start = summary | glepindex | included | sections | book
diff --git a/guide.rnc b/guide.rnc
index 6b5a014..1ef1921 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -46,7 +46,9 @@ 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" }
+ attribute category {
+ "gentoo" | "main" | "linux" | "moo" | "plans" | "birthday"
+ }
subtitle = element subtitle { subtitle.attlist, text }
subtitle.attlist &= empty
poster = element poster { poster.attlist, text }
@@ -78,4 +80,6 @@ glsa-latest.attlist &= empty
mirrorlist = element mirrorlist { mirrorlist.attlist, empty }
mirrorlist.attlist &=
[ a:defaultValue = "full" ] attribute select { "full" | "partial" }?
-start = news | included | mainpage | guide
+mirrorlist.attlist &=
+ [ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }?
+start = guide | included | news | mainpage
diff --git a/metadata.rnc b/metadata.rnc
index 4fb8abd..e325a21 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -94,7 +94,18 @@ attlist.bugs-to &= empty
# specify a type of package identification tracker
remote-id = element remote-id { attlist.remote-id, text }
attlist.remote-id &=
- attribute type { "freshmeat" | "sourceforge" | "cpan" | "vim" }
+ attribute type {
+ "freshmeat"
+ | "sourceforge"
+ | "sourceforge-jp"
+ | "cpan"
+ | "vim"
+ | "google-code"
+ | "ctan"
+ | "pypi"
+ | "rubyforge"
+ | "cran"
+ }
# category/package information for cross-linking in descriptions
# and useflag descriptions
pkg = element pkg { attlist.pkg, text }
diff --git a/userinfo.rnc b/userinfo.rnc
index fa3492c..54a1305 100644
--- a/userinfo.rnc
+++ b/userinfo.rnc
@@ -4,11 +4,11 @@ user =
element user {
attlist.user,
realname,
- pgpkey,
+ pgpkey+,
alias*,
email+,
- joined,
- retired?,
+ joined*,
+ retired*,
status?,
roles?,
location?
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 9:21 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 79fafd6b89e9bf633403318e41ebf729198a4403
Author: Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Tue Nov 29 21:02:16 2011 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 21:02:16 2011 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=79fafd6b
Update schemas for new license tag version attribute.
common.rnc | 2 +-
metadoc.rnc | 12 ++++++------
project.rnc | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common.rnc b/common.rnc
index a5241d6..5373e73 100644
--- a/common.rnc
+++ b/common.rnc
@@ -29,7 +29,7 @@ abstract.attlist &= empty
summary = element summary { summary.attlist, text }
summary.attlist &= empty
license = element license { license.attlist, empty }
-license.attlist &= empty
+license.attlist &= attribute version { text }?
version = element version { version.attlist, text }
version.attlist &= empty
figure = element figure { figure.attlist, empty }
diff --git a/metadoc.rnc b/metadoc.rnc
index a735d75..a69bef0 100644
--- a/metadoc.rnc
+++ b/metadoc.rnc
@@ -69,12 +69,12 @@ section =
body = element body { body.attlist, (\include | block.class+) }
chapter |= notAllowed
start =
- glepindex
- | abstract
- | author
+ summary
+ | glepindex
| values
- | metadoc
- | license
| included
- | summary
| dynamic
+ | author
+ | license
+ | abstract
+ | metadoc
diff --git a/project.rnc b/project.rnc
index 05b5c2d..65c3ce7 100644
--- a/project.rnc
+++ b/project.rnc
@@ -118,4 +118,4 @@ milestone.attlist &=
depends = element depends { depends.attlist, text }
depends.attlist &= attribute ref { xsd:IDREF }
chapter |= notAllowed
-start = abstract | \include | values | license | included | project
+start = values | \include | project | included | license | abstract
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 9:28 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 9:28 UTC (permalink / raw
To: gentoo-commits
commit: b2741e4a0e1438aaffba2b4de9b171382d8c8fd1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 17:53:17 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 09:25:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b2741e4a
Import files from nxml-gentoo-schemas-20150428.
Makefile | 10 +++++++---
book.rnc | 1 +
guide.rnc | 1 -
metadata.rnc | 34 ++++++++++++++++++++++++++--------
project.rnc | 4 +++-
5 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 9302f27..5b20643 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ else
PN=nxml-gentoo-schemas-$(shell date '+%Y%m%d')
endif
-TARBALL=$(PN).tar.bz2
+TARBALL=$(PN).tar.xz
.SUFFIXES: .dtd .rnc .dep
.PHONY: depend all clean
@@ -30,7 +30,7 @@ clean:
$(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS)
mkdir -p $(PN)
cp $^ $(PN)
- tar jcf $@ $(PN)
+ tar cJf $@ $(PN)
.dtd.dep:
echo > $@
@@ -44,7 +44,11 @@ $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS)
.dtd.rnc:
trang -I dtd -O rnc $< $@
+metadata.rnc: metadata.dtd
+ trang -I dtd -O rnc -i no-generate-start $< $@
+ echo 'start = catmetadata | pkgmetadata' >> $@
+
%.dtd:
- wget -N --no-verbose http://www.gentoo.org/dtd/$@
+ wget -N --no-verbose https://www.gentoo.org/dtd/$@
-include .depend
diff --git a/book.rnc b/book.rnc
index b7ebf7e..51d57b1 100644
--- a/book.rnc
+++ b/book.rnc
@@ -16,6 +16,7 @@ book.attlist &=
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 }?
diff --git a/guide.rnc b/guide.rnc
index 1ef1921..aaef013 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -35,7 +35,6 @@ guide =
chapter+
}
guide.attlist &=
- attribute link { text }?,
attribute type { text }?,
attribute disclaimer {
"articles" | "oldbook" | "draft" | "obsolete"
diff --git a/metadata.rnc b/metadata.rnc
index e325a21..7a23cca 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -11,7 +11,12 @@ attlist.catmetadata &=
pkgmetadata =
element pkgmetadata {
attlist.pkgmetadata,
- (herd | maintainer | longdescription | use | upstream)*
+ (herd
+ | maintainer
+ | natural-name
+ | longdescription
+ | use
+ | upstream)*
}
attlist.pkgmetadata &=
[ a:defaultValue = "" ] attribute pkgname { text }?
@@ -22,6 +27,9 @@ maintainer =
element maintainer {
attlist.maintainer, email, (description | name)*
}
+# Natural name for package, example: LibreOffice (for app-office/libreoffice)
+natural-name = element natural-name { attlist.natural-name, text }
+attlist.natural-name &= empty
# A long description of the package in freetext
longdescription =
element longdescription {
@@ -95,16 +103,26 @@ attlist.bugs-to &= empty
remote-id = element remote-id { attlist.remote-id, text }
attlist.remote-id &=
attribute type {
- "freshmeat"
- | "sourceforge"
- | "sourceforge-jp"
+ "bitbucket"
| "cpan"
- | "vim"
- | "google-code"
+ | "cpan-module"
+ | "cpe"
+ | "cran"
| "ctan"
+ | "freecode"
+ | "freshmeat"
+ | "github"
+ | "gitorious"
+ | "google-code"
+ | "launchpad"
+ | "pear"
+ | "pecl"
| "pypi"
| "rubyforge"
- | "cran"
+ | "rubygems"
+ | "sourceforge"
+ | "sourceforge-jp"
+ | "vim"
}
# category/package information for cross-linking in descriptions
# and useflag descriptions
@@ -142,5 +160,5 @@ name = element name { attlist.name, text }
attlist.name &= empty
# the name of a person (maintainer, contributor)
description = element description { attlist.description, text }
-start = catmetadata | packages
# A description of a maintainer or change
+start = catmetadata | pkgmetadata
diff --git a/project.rnc b/project.rnc
index 65c3ce7..6984fa9 100644
--- a/project.rnc
+++ b/project.rnc
@@ -24,7 +24,9 @@ project =
| task
| author)*
}
-project.attlist &= empty
+project.attlist &=
+ attribute disclaimer { "draft" | "obsolete" }?,
+ attribute redirect { text }?
name = element name { name.attlist, text }
name.attlist &= empty
longname = element longname { longname.attlist, text }
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 21:23 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: ebe9d94f36bd257289286624cef971f0c7a3bdfa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 21:20:10 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 21:20:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=ebe9d94f
Update list of DTDs.
Makefile | 2 +-
schemas.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 56d1238..b55d3a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
DTDS = book.dtd gleps.dtd glsa.dtd guide.dtd metadata.dtd metadoc.dtd \
- project.dtd staffing-needs.dtd userinfo.dtd
+ project.dtd projects.dtd repositories.dtd userinfo.dtd
DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
diff --git a/schemas.xml b/schemas.xml
index 2e38d1f..6bd96a0 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -8,6 +8,7 @@
<documentElement localName="news" uri="guide.rnc" />
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
<documentElement localName="project" uri="project.rnc" />
- <documentElement localName="staffingNeeds" uri="staffing-needs.rnc" />
+ <documentElement localName="projects" uri="projects.rnc" />
+ <documentElement localName="repositories" uri="repositories.rnc" />
<documentElement localName="userlist" uri="userinfo.rnc" />
-</locatingRules>
\ No newline at end of file
+</locatingRules>
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 21:23 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: b3af262eb7886db4fcca502b147bcdb29518efeb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 21:23:02 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 21:23:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b3af262e
Update rnc schemas.
metadata.rnc | 24 +++++++++++++++----
projects.rnc | 40 +++++++++++++++++++++++++++++++
repositories.rnc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
staffing-needs.rnc | 22 -----------------
4 files changed, 128 insertions(+), 27 deletions(-)
diff --git a/metadata.rnc b/metadata.rnc
index 7a23cca..b7944d9 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -11,22 +11,26 @@ attlist.catmetadata &=
pkgmetadata =
element pkgmetadata {
attlist.pkgmetadata,
- (herd
- | maintainer
+ (maintainer
| natural-name
| longdescription
+ | slots
| use
| upstream)*
}
attlist.pkgmetadata &=
[ a:defaultValue = "" ] attribute pkgname { text }?
-# One tag for each herd this package is assigned to.
-herd = element herd { attlist.herd, text }
# One tag for each maintainer of a package, multiple allowed
maintainer =
element maintainer {
attlist.maintainer, email, (description | name)*
}
+# type attribute determines whether the maintainer is a person or a project.
+# Unknown is added to handle <maintainer/>s in <upstream/>s. Using it (or no
+# explicit type) for Gentoo maintainers is prohibited.
+attlist.maintainer &=
+ [ a:defaultValue = "unknown" ]
+ attribute type { "person" | "project" | "unknown" }?
# Natural name for package, example: LibreOffice (for app-office/libreoffice)
natural-name = element natural-name { attlist.natural-name, text }
attlist.natural-name &= empty
@@ -35,6 +39,15 @@ longdescription =
element longdescription {
attlist.longdescription, (text | pkg | cat)*
}
+# A description of the packages SLOTs
+slots = element slots { attlist.slots, slot*, subslots? }
+# A particular SLOT
+slot = element slot { attlist.slot, text* }
+# name attribute holds the name of the SLOT, for sub-SLOTS use the subslots element
+attlist.slot &= attribute name { text }
+# The meaning of sub-SLOTs for the whole package
+subslots = element subslots { attlist.subslots, text* }
+attlist.subslots &= empty
# The changelog of the package
# Please note that #PCDATA is mentioned only for the upstream changelog
@@ -112,6 +125,7 @@ attlist.remote-id &=
| "freecode"
| "freshmeat"
| "github"
+ | "gitlab"
| "gitorious"
| "google-code"
| "launchpad"
@@ -139,6 +153,7 @@ attlist.cat &= empty
attlist.description &= [ a:defaultValue = "C" ] attribute lang { text }?
attlist.longdescription &=
[ a:defaultValue = "C" ] attribute lang { text }?
+attlist.slots &= [ a:defaultValue = "C" ] attribute lang { text }?
attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }?
# The restrict attribute, this attribute specifies restrictions on
# the applicability of tags on versions. The format of this attribute is
@@ -148,7 +163,6 @@ attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }?
#
# For required tags, there must be either an unrestricted version, or a
# version that is default restricted.
-attlist.herd &= attribute restrict { text }?
attlist.maintainer &= attribute restrict { text }?
attlist.longdescription &= attribute restrict { text }?
attlist.flag &= attribute restrict { text }?
diff --git a/projects.rnc b/projects.rnc
new file mode 100644
index 0000000..b78b56f
--- /dev/null
+++ b/projects.rnc
@@ -0,0 +1,40 @@
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+projects = element projects { attlist.projects, project* }
+attlist.projects &= empty
+# A project (identified by email address)
+project =
+ element project {
+ attlist.project, email, name, url, description, subproject*, member*
+ }
+attlist.project &= empty
+# Contact e-mail address of a project or a project member
+email = element email { attlist.email, text }
+attlist.email &= empty
+# Name of a project or a project member
+name = element name { attlist.name, text }
+attlist.name &= empty
+# URL of the project homepage
+url = element url { attlist.url, text }
+attlist.url &= empty
+# Description of the project
+description = element description { attlist.description, text }
+attlist.description &= empty
+# Project member
+member = element member { attlist.member, email, name, role }
+# is-lead="1" indicates that the member is the project's lead
+attlist.member &=
+ [ a:defaultValue = "0" ] attribute is-lead { "0" | "1" }?
+# Project member role
+role = element role { attlist.role, text }
+attlist.role &= empty
+# Subproject of a project
+subproject = element subproject { attlist.subproject, text }
+# inherit-members="1" indicates that the project inherits members
+# from the subproject
+
+# ref="" references the subproject by the contact e-mail address
+attlist.subproject &=
+ [ a:defaultValue = "0" ] attribute inherit-members { "0" | "1" }?,
+ attribute ref { text }
+start = projects
diff --git a/repositories.rnc b/repositories.rnc
new file mode 100644
index 0000000..265a371
--- /dev/null
+++ b/repositories.rnc
@@ -0,0 +1,69 @@
+# $Header
+
+# Used by [gentoo]/xml/htdocs/proj/en/overlays/repositories.xml
+
+# The source copy and history of this file is available from
+# http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
+
+# Gentoo repositories.xml DTD 1.0
+#
+# Modelling by
+# Robert Buchholz <rbu@gentoo.org>
+# Sebastian Pipping <sebastian@pipping.org>
+# Mounir Lamouri <volkmar@gentoo.org>
+# Tiziano Müller <dev-zero@gentoo.org>
+#
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+default namespace = ""
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+repositories = element repositories { attlist.repositories, repo* }
+attlist.repositories &=
+ [ a:defaultValue = "1.0" ] attribute version { string "1.0" }?
+repo =
+ element repo {
+ attlist.repo,
+ name,
+ description+,
+ longdescription*,
+ homepage?,
+ owner+,
+ source+,
+ feed*
+ }
+attlist.repo &=
+ attribute priority { text }?,
+ attribute quality {
+ "core" | "stable" | "testing" | "experimental" | "graveyard"
+ },
+ attribute status { "official" | "unofficial" }
+name = element name { attlist.name, text }
+attlist.name &= empty
+description = element description { attlist.description, text }
+attlist.description &= attribute lang { text }?
+longdescription =
+ element longdescription { attlist.longdescription, text }
+attlist.longdescription &= attribute lang { text }?
+homepage = element homepage { attlist.homepage, text }
+attlist.homepage &= empty
+owner = element owner { attlist.owner, email, name? }
+attlist.owner &= attribute type { "project" | "person" }?
+source = element source { attlist.source, text }
+attlist.source &=
+ attribute type {
+ "bzr"
+ | "cvs"
+ | "darcs"
+ | "git"
+ | "mercurial"
+ | "rsync"
+ | "svn"
+ | "tar"
+ }
+feed = element feed { attlist.feed, text }
+attlist.feed &= empty
+email = element email { attlist.email, text }
+attlist.email &= empty
+start = repositories
diff --git a/staffing-needs.rnc b/staffing-needs.rnc
deleted file mode 100644
index bb62742..0000000
--- a/staffing-needs.rnc
+++ /dev/null
@@ -1,22 +0,0 @@
-staffingNeeds = element staffingNeeds { attlist.staffingNeeds, needed* }
-attlist.staffingNeeds &= empty
-needed =
- element needed { attlist.needed, summary, contact, description }
-attlist.needed &= empty
-summary = element summary { attlist.summary, text }
-# If unset, treated as '0'.
-attlist.summary &= attribute priority { text }?
-# Should be in RFC-2822.
-attlist.summary &= attribute dateRequested { text }
-contact = element contact { attlist.contact, text }
-# Makes a link called "Joe Bloggs", for example rather than jbloggs@...
-attlist.contact &= attribute name { text }?
-# If set to not "" then the string is formatted to "the ... herd"
-attlist.contact &= attribute herd { text }?
-# If set to not "" then the string is formatted to "the ... team"
-attlist.contact &= attribute team { text }?
-description = element description { attlist.description, (text | uri)* }
-attlist.description &= empty
-uri = element uri { attlist.uri, text }
-attlist.uri &= attribute link { text }?
-start = staffingNeeds
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 21:23 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: eaf67267b292e0bf058f1491469bcbd4d0aabeda
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 21:19:25 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 21:19:25 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=eaf67267
Makefile: Remove redundant files from clean target.
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ff5f000..56d1238 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ all: .depend $(TARBALL)
depend: .depend
clean:
- rm -f *.dtd *.dep *.dtd .depend
+ rm -f *.dtd *.dep .depend
.depend: $(DTDDEPS)
cat *.dep > $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-01-25 21:23 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-01-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 007651b01596f53f5d9a083d6d2ab71553ec4efc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 19:38:14 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 19:38:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=007651b0
Makefile: Add a comment.
Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
index 5b20643..ff5f000 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,8 @@ $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS)
.dtd.rnc:
trang -I dtd -O rnc $< $@
+# Trang will guess "packages" as start element, which causes Emacs
+# nXML validation to fail. So specify the start elements explicitly.
metadata.rnc: metadata.dtd
trang -I dtd -O rnc -i no-generate-start $< $@
echo 'start = catmetadata | pkgmetadata' >> $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-03-12 12:28 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-03-12 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 134ad07b81b30c833a53f299313a7659f95e2b01
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:27:57 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:27:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=134ad07b
Update rnc schemas.
metadata.rnc | 55 ++++++++++---------------------------------------------
1 file changed, 10 insertions(+), 45 deletions(-)
diff --git a/metadata.rnc b/metadata.rnc
index b7944d9..2ed65b0 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -1,8 +1,7 @@
+# Metadata for a category
+
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-packages = element packages { attlist.packages, pkgmetadata* }
-attlist.packages &= empty
-# Metadata for a category
catmetadata =
element catmetadata { attlist.catmetadata, longdescription* }
attlist.catmetadata &=
@@ -48,44 +47,6 @@ attlist.slot &= attribute name { text }
# The meaning of sub-SLOTs for the whole package
subslots = element subslots { attlist.subslots, text* }
attlist.subslots &= empty
-# The changelog of the package
-
-# Please note that #PCDATA is mentioned only for the upstream changelog
-# element, where the content is a URL. This is due to limitations of the DTD
-changelog = element changelog { attlist.changelog, (text | change)* }
-attlist.changelog &= empty
-# The changelog contains various "changes"
-change =
- element change {
- attlist.change,
- date,
- (developer | version | description | file | contributor | bug)*
- }
-attlist.change &= empty
-date = element date { attlist.date, text }
-attlist.date &= empty
-# The date of the change, in "YYYY-MM-DD" format
-developer = element developer { attlist.developer, name?, email }
-attlist.developer &= empty
-# The developer that made the change. The email is required, name
-# is optional
-version = element version { attlist.version, text }
-attlist.version &= empty
-# version of the packages involved (one tag per version)
-file = element file { attlist.file, text }
-attlist.file &= empty
-# one tag per file touched
-contributor = element contributor { attlist.contributor, name?, email? }
-attlist.contributor &= empty
-# A reference to a user that helped in causing this change.
-# There should at least be a name or email address included.
-# Email is preferred
-bug = element bug { attlist.bug, text }
-attlist.bug &= empty
-# bug-id of a bug fixed by this change, multiple allowed. The
-# format of this is a number or alias for a bug. NOT including a
-# # character
-
# description of what this USE flag does for this package
use = element use { attlist.use, flag* }
flag = element flag { attlist.flag, (text | pkg | cat)* }
@@ -105,6 +66,9 @@ attlist.upstream &= empty
attlist.maintainer &=
[ a:defaultValue = "unknown" ]
attribute status { "active" | "inactive" | "unknown" }?
+# URL where the upstream changelog can be found
+changelog = element changelog { attlist.changelog, text }
+attlist.changelog &= empty
# URL where the location of the upstream documentation can be found
doc = element doc { attlist.doc, text }
attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
@@ -167,12 +131,13 @@ attlist.maintainer &= attribute restrict { text }?
attlist.longdescription &= attribute restrict { text }?
attlist.flag &= attribute restrict { text }?
# standard parts
+
+# an email address
email = element email { attlist.email, text }
attlist.email &= empty
-# an email address
+# the name of a person (maintainer, contributor)
name = element name { attlist.name, text }
attlist.name &= empty
-# the name of a person (maintainer, contributor)
+# A description of a maintainer or change
description = element description { attlist.description, text }
-# A description of a maintainer or change
-start = catmetadata | pkgmetadata
+start = pkgmetadata | catmetadata
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-03-12 12:28 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-03-12 12:28 UTC (permalink / raw
To: gentoo-commits
commit: e387bffa608ce69809a32169b5a735e88735521c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:10:35 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:10:35 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=e387bffa
Makefile: Special rule for metadata.rnc is no longer needed.
Makefile | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Makefile b/Makefile
index b55d3a3..649478c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,12 +44,6 @@ $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS)
.dtd.rnc:
trang -I dtd -O rnc $< $@
-# Trang will guess "packages" as start element, which causes Emacs
-# nXML validation to fail. So specify the start elements explicitly.
-metadata.rnc: metadata.dtd
- trang -I dtd -O rnc -i no-generate-start $< $@
- echo 'start = catmetadata | pkgmetadata' >> $@
-
%.dtd:
wget -N --no-verbose https://www.gentoo.org/dtd/$@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2016-05-06 7:59 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2016-05-06 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 3bc35f466f90b36c76f72dde69f3f2809b618e11
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 07:58:41 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May 6 07:58:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3bc35f46
Update metadata.rnc from DTD.
metadata.rnc | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/metadata.rnc b/metadata.rnc
index 2ed65b0..3919793 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,12 +10,7 @@ attlist.catmetadata &=
pkgmetadata =
element pkgmetadata {
attlist.pkgmetadata,
- (maintainer
- | natural-name
- | longdescription
- | slots
- | use
- | upstream)*
+ (maintainer | longdescription | slots | use | upstream)*
}
attlist.pkgmetadata &=
[ a:defaultValue = "" ] attribute pkgname { text }?
@@ -30,9 +25,6 @@ maintainer =
attlist.maintainer &=
[ a:defaultValue = "unknown" ]
attribute type { "person" | "project" | "unknown" }?
-# Natural name for package, example: LibreOffice (for app-office/libreoffice)
-natural-name = element natural-name { attlist.natural-name, text }
-attlist.natural-name &= empty
# A long description of the package in freetext
longdescription =
element longdescription {
@@ -42,7 +34,10 @@ longdescription =
slots = element slots { attlist.slots, slot*, subslots? }
# A particular SLOT
slot = element slot { attlist.slot, text* }
-# name attribute holds the name of the SLOT, for sub-SLOTS use the subslots element
+# name attribute holds the name of the SLOT, for sub-SLOTS
+# use the subslots element. A slot name of '*' can be used to
+# indicate a single description applying to all the slots in which
+# case no other <slot/> elements may be present.
attlist.slot &= attribute name { text }
# The meaning of sub-SLOTs for the whole package
subslots = element subslots { attlist.subslots, text* }
@@ -71,7 +66,7 @@ changelog = element changelog { attlist.changelog, text }
attlist.changelog &= empty
# URL where the location of the upstream documentation can be found
doc = element doc { attlist.doc, text }
-attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
+attlist.doc &= [ a:defaultValue = "en" ] attribute lang { text }?
# location where to report bugs
# (may also be an email address prefixed with mailto:)
bugs-to = element bugs-to { attlist.bugs-to, text }
@@ -110,20 +105,22 @@ cat = element cat { attlist.cat, text }
attlist.cat &= empty
# Common attributes
-# the lang attribute, specifies the language of this tag. This is
-# only useful for descriptions of various kinds. If a tag with this
-# attribute is included there must be a description in the default
-# language "C" or "en", which is equivalent
-attlist.description &= [ a:defaultValue = "C" ] attribute lang { text }?
+# the lang attribute, specifies the language of this tag in the
+# form of a ISO 639-1 language code. This is only useful for
+# descriptions of various kinds. If a tag with this attribute is
+# included there must be a description in the default language "en"
+attlist.description &=
+ [ a:defaultValue = "en" ] attribute lang { text }?
attlist.longdescription &=
- [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.slots &= [ a:defaultValue = "C" ] attribute lang { text }?
-attlist.use &= [ a:defaultValue = "C" ] attribute lang { text }?
+ [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.slots &= [ a:defaultValue = "en" ] attribute lang { text }?
+attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }?
# The restrict attribute, this attribute specifies restrictions on
# the applicability of tags on versions. The format of this attribute is
-# equal to the format of DEPEND lines in ebuilds. There is one special
-# value though: restrict="*". A tag that specifies this only applies if
-# there are no other tags that apply.
+# equal to the format of DEPEND lines in ebuilds. Only package
+# dependency specifications conforming to EAPI=0 syntax are allowed.
+# The dependency specification may only contain references to the
+# package itself and no other package.
#
# For required tags, there must be either an unrestricted version, or a
# version that is default restricted.
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2018-06-11 22:42 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2018-06-11 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 88b814fa147ad085a74be4308b4de56de254b19d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 08:37:32 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 08:37:32 2017 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=88b814fa
Update rnc schemas from dtds.
book.rnc | 2 +-
glsa.rnc | 3 ++-
guide.rnc | 2 +-
metadata.rnc | 1 +
metadoc.rnc | 12 ++++++------
project.rnc | 2 +-
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/book.rnc b/book.rnc
index 51d57b1..bcffc69 100644
--- a/book.rnc
+++ b/book.rnc
@@ -43,4 +43,4 @@ subsection.attlist &=
attribute id { text }?,
attribute test { text }?
body = element body { body.attlist, (\include | block.class+) }
-start = summary | glepindex | included | sections | book
+start = sections | book | included | summary | glepindex
diff --git a/glsa.rnc b/glsa.rnc
index f5adaf7..a9f182a 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -49,6 +49,7 @@ attlist.synopsis &= empty
# infrastructure
#
# The text contains one keyword that defines the issue.
+# Note: All type values but 'ebuild' are considered deprecated.
#
# Example: <product type="ebuild">openssl</product>
# Example: <product type="infrastructure">rsync mirror</product>
@@ -87,7 +88,7 @@ attlist.access &= empty
# Element: affected
# Description: Describe what the affected subjects are.
#
-# If product@type = 'build', the child elements are 'package'
+# If product@type = 'ebuild', the child elements are 'package'
# If product@type = 'portage', the child elements are 'package'
# If product@type = 'infrastructure', the child elements are
# 'service'
diff --git a/guide.rnc b/guide.rnc
index aaef013..523af1c 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -81,4 +81,4 @@ mirrorlist.attlist &=
[ a:defaultValue = "full" ] attribute select { "full" | "partial" }?
mirrorlist.attlist &=
[ a:defaultValue = "/main/en/mirrors3.xml" ] attribute src { text }?
-start = guide | included | news | mainpage
+start = guide | mainpage | included | news
diff --git a/metadata.rnc b/metadata.rnc
index 3919793..2ac5f01 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -83,6 +83,7 @@ attlist.remote-id &=
| "ctan"
| "freecode"
| "freshmeat"
+ | "gentoo"
| "github"
| "gitlab"
| "gitorious"
diff --git a/metadoc.rnc b/metadoc.rnc
index a69bef0..481587c 100644
--- a/metadoc.rnc
+++ b/metadoc.rnc
@@ -69,12 +69,12 @@ section =
body = element body { body.attlist, (\include | block.class+) }
chapter |= notAllowed
start =
- summary
- | glepindex
- | values
- | included
- | dynamic
+ dynamic
| author
| license
- | abstract
+ | values
+ | included
+ | summary
| metadoc
+ | abstract
+ | glepindex
diff --git a/project.rnc b/project.rnc
index 6984fa9..6a885a5 100644
--- a/project.rnc
+++ b/project.rnc
@@ -120,4 +120,4 @@ milestone.attlist &=
depends = element depends { depends.attlist, text }
depends.attlist &= attribute ref { xsd:IDREF }
chapter |= notAllowed
-start = values | \include | project | included | license | abstract
+start = project | license | values | included | \include | abstract
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2018-06-11 22:42 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2018-06-11 22:42 UTC (permalink / raw
To: gentoo-commits
commit: ea7cd6e092def3df76f45f3ed30ecd1e4473e499
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 22:41:51 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 22:41:51 2018 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=ea7cd6e0
Update rnc schemas.
glsa.rnc | 4 +++-
metadata.rnc | 11 ++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/glsa.rnc b/glsa.rnc
index a9f182a..2711a6a 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -128,7 +128,8 @@ vulnerable = element vulnerable { attlist.vulnerable, text }
attlist.vulnerable &=
attribute range {
"le" | "lt" | "eq" | "gt" | "ge" | "rlt" | "rle" | "rgt" | "rge"
- }
+ },
+ [ a:defaultValue = "*" ] attribute slot { text }?
# Element: unaffected
# Description: Version of the fixed (or unaffected) package. In case the
# package is superseded by another package, you need to
@@ -144,6 +145,7 @@ attlist.unaffected &=
attribute range {
"le" | "lt" | "eq" | "gt" | "ge" | "rlt" | "rle" | "rgt" | "rge"
},
+ [ a:defaultValue = "*" ] attribute slot { text }?,
attribute name { text }?
# Element: service
# Description: Provide information about the Gentoo services that are
diff --git a/metadata.rnc b/metadata.rnc
index 2ac5f01..7f4c26e 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,7 +10,12 @@ attlist.catmetadata &=
pkgmetadata =
element pkgmetadata {
attlist.pkgmetadata,
- (maintainer | longdescription | slots | use | upstream)*
+ (maintainer
+ | longdescription
+ | slots
+ | stabilize-allarches
+ | use
+ | upstream)*
}
attlist.pkgmetadata &=
[ a:defaultValue = "" ] attribute pkgname { text }?
@@ -42,6 +47,9 @@ attlist.slot &= attribute name { text }
# The meaning of sub-SLOTs for the whole package
subslots = element subslots { attlist.subslots, text* }
attlist.subslots &= empty
+# whether it's possible to stabilize ALLARCHES
+stabilize-allarches =
+ element stabilize-allarches { attlist.stabilize-allarches, empty }
# description of what this USE flag does for this package
use = element use { attlist.use, flag* }
flag = element flag { attlist.flag, (text | pkg | cat)* }
@@ -128,6 +136,7 @@ attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }?
attlist.maintainer &= attribute restrict { text }?
attlist.longdescription &= attribute restrict { text }?
attlist.flag &= attribute restrict { text }?
+attlist.stabilize-allarches &= attribute restrict { text }?
# standard parts
# an email address
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2018-06-18 19:48 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2018-06-18 19:48 UTC (permalink / raw
To: gentoo-commits
commit: e7aefd1aeb43dfb6ebe23638fa7c0adcda80a8ed
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 19:48:22 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 19:48:22 2018 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=e7aefd1a
Makefile: Fix conditional.
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 649478c..68f9585 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DTDS = book.dtd gleps.dtd glsa.dtd guide.dtd metadata.dtd metadoc.dtd \
DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
-ifdef ($(PV),)
+ifneq ($(PV),)
PN=nxml-gentoo-schemas-$(PV)
else
PN=nxml-gentoo-schemas-$(shell date '+%Y%m%d')
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-03 14:57 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-03 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 9fa37b6dc3b368f742c7b7bc3c44feb4e1739d59
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 14:55:05 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 14:55:05 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=9fa37b6d
DONATING: Remove file.
Acked-by: Diego Elio Pettenò <flameeyes <AT> flameeyes.com>
"Feel free to drop it, lots of it is out of date."
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
DONATING | 42 ------------------------------------------
Makefile | 2 +-
2 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/DONATING b/DONATING
deleted file mode 100644
index ce23cd7..0000000
--- a/DONATING
+++ /dev/null
@@ -1,42 +0,0 @@
-This is message from the package's main author and maintainer,
-Diego Elio Pettenò, aka "Flameeyes".
-
-If you fell like donating to me for my work on this software, please
-consider an alternative first.
-
-During Summer 2007 I was hospitalised for an acute pancreatitis, and
-risked my life because of that, as of December 2008 my nightmare might
-not be ended just yet, after two more hospitalisations and a few
-visits to the ER. As the underlying causes of all this are still
-unknown, I would appreciate if any sum you'd have donated to me could
-be donated, instead, to one of the following organisation:
-
-- Fondazione Italiana per la ricerca sulle Malattie del Pancreas -
- ONLUS (http://www.fimpancreas.org/) [FIMP]
-
- Donations can be directed to these IBANs:
- IT 70 J 02008 11709 000040424060
- IT 03 N 05188 11701 000000164768
-
- In Italy you can donate 5‰ using this "Codice Fiscale" (in your
- "Dichiarazione dei Redditi"):
-
- 93175800239
-
-- National Pancreas Foundation (http://www.pancreasfoundation.org/)
- [NPF]
- If you wish to let me know of your support, then choose for a
- Donation in Honor, and use this address:
-
- Diego Elio Pettenò
- Via Scaramuzza, 125
- 30174 Mestre, VE
- Italy
-
-Thank you for reading this document, and thanks to all the people
-willing to donate.
-
-If you know other foundations, donations to which could be deduced
-from taxes in other countries, feel free to suggest more by mailing me
-at flameeyes@gmail.com . Hopefully wherever the research is based, the
-improvements will come equally.
diff --git a/Makefile b/Makefile
index 68f9585..04db712 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ clean:
.depend: $(DTDDEPS)
cat *.dep > $@
-$(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS)
+$(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
mkdir -p $(PN)
cp $^ $(PN)
tar cJf $@ $(PN)
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-11 6:55 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-11 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 522fcdedc74fe32ae8cc6c80bea41ccd647ac4fc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 22:20:23 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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
-# <lead>nickname</lead>
-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 @@
<?xml version="1.0" encoding="utf-8"?>
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<documentElement localName="catmetadata" uri="metadata.rnc" />
- <documentElement localName="gleps" uri="gleps.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
<documentElement localName="guide" uri="guide.rnc" />
- <documentElement localName="metadoc" uri="metadoc.rnc" />
<documentElement localName="news" uri="guide.rnc" />
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
- <documentElement localName="project" uri="project.rnc" />
<documentElement localName="projects" uri="projects.rnc" />
<documentElement localName="repositories" uri="repositories.rnc" />
- <documentElement localName="userlist" uri="userinfo.rnc" />
</locatingRules>
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
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-17 17:22 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-17 17:22 UTC (permalink / raw
To: gentoo-commits
commit: d8342fb563bd66da93b93d970e43baa05e6652cd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 14:40:09 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 14:40:09 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=d8342fb5
Add devbook.rnc for Gentoo devmanual.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 6 ++-
devbook.rnc | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
schemas.xml | 4 ++
3 files changed, 153 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 58802fe..9a40f59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-DTDS = book.dtd glsa.dtd guide.dtd metadata.dtd projects.dtd repositories.dtd
+DTDS = book.dtd devbook.dtd glsa.dtd guide.dtd metadata.dtd \
+ projects.dtd repositories.dtd
DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
@@ -46,4 +47,7 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
%.dtd:
wget -N --no-verbose https://www.gentoo.org/dtd/$@
+devbook.dtd:
+ wget -N --no-verbose https://devmanual.gentoo.org/$@
+
-include .depend
diff --git a/devbook.rnc b/devbook.rnc
new file mode 100644
index 0000000..1d24153
--- /dev/null
+++ b/devbook.rnc
@@ -0,0 +1,144 @@
+# Copyright 2019 Gentoo Authors
+
+# Distributed under the terms of the MIT/X11 license
+
+# Document Type Definition for the Gentoo Devmanual
+
+# Based on common.dtd from GuideXML
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+block.class =
+ p
+ | pre
+ | codesample
+ | note
+ | important
+ | warning
+ | todo
+ | figure
+ | table
+ | ul
+ | ol
+ | dl
+ | list-group-u
+ | list-group-d
+inline.class = sup | sub | b | c | d | e | path | uri
+all.class = block.class | inline.class
+guide = element guide { guide.attlist, (\include | chapter)+ }
+guide.attlist &=
+ attribute root { "true" }?,
+ attribute self { text }?
+\include = element include { include.attlist, empty }
+include.attlist &= attribute href { text }
+chapter =
+ element chapter { chapter.attlist, title, (body | section), section* }
+chapter.attlist &= empty
+section =
+ element section {
+ section.attlist, title, (body | subsection), subsection*
+ }
+section.attlist &= empty
+subsection =
+ element subsection {
+ subsection.attlist, title, (body | subsubsection), subsubsection*
+ }
+subsection.attlist &= empty
+subsubsection =
+ element subsubsection { subsubsection.attlist, title, body }
+subsubsection.attlist &= empty
+# Title texts are used as anchors, so we shouldn't allow any formatting,
+# but unfortunately it is used in the document.
+title = element title { title.attlist, (text | inline.class)* }
+title.attlist &= empty
+body =
+ element body { body.attlist, (authors | contentsTree | block.class)+ }
+body.attlist &= empty
+authors = element authors { authors.attlist, author+ }
+authors.attlist &= empty
+author = element author { author.attlist, (text | inline.class)* }
+author.attlist &=
+ attribute name { text },
+ attribute email { text }?
+contentsTree = element contentsTree { contentsTree.attlist, empty }
+contentsTree.attlist &=
+ attribute maxdepth { text }?,
+ attribute root { text }?,
+ attribute extraction { text }?
+p = element p { p.attlist, (text | inline.class)* }
+p.attlist &= empty
+pre = element pre { pre.attlist, text }
+pre.attlist &= empty
+codesample = element codesample { codesample.attlist, text }
+codesample.attlist &=
+ attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
+ attribute numbering { "lines" }?
+note = element note { note.attlist, (text | inline.class)* }
+note.attlist &= empty
+important =
+ element important { important.attlist, (text | inline.class)* }
+important.attlist &= empty
+warning = element warning { warning.attlist, (text | inline.class)* }
+warning.attlist &= empty
+todo = element todo { todo.attlist, (text | inline.class)* }
+todo.attlist &= empty
+figure = element figure { figure.attlist, empty }
+figure.attlist &=
+ attribute link { text },
+ attribute short { text }?,
+ attribute caption { text }?
+table = element table { table.attlist, tcolumn*, tr+ }
+table.attlist &= empty
+tcolumn = element tcolumn { tcolumn.attlist, empty }
+tcolumn.attlist &= attribute width { text }
+tr = element tr { tr.attlist, (th | ti)+ }
+tr.attlist &= empty
+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 | all.class)* }
+ti.attlist &=
+ attribute colspan { text }?,
+ attribute rowspan { text }?,
+ attribute nowrap { text }?,
+ [ a:defaultValue = "left" ]
+ attribute align { "left" | "center" | "right" }?
+ul = element ul { ul.attlist, li+ }
+ul.attlist &= empty
+ol = element ol { ol.attlist, li+ }
+ol.attlist &= empty
+li = element li { li.attlist, (text | all.class)* }
+li.attlist &= empty
+dl = element dl { dl.attlist, (dt, dd)+ }
+dl.attlist &= empty
+dt = element dt { dt.attlist, (text | inline.class)* }
+dt.attlist &= empty
+# The following is strange, but devbook.xsl expects only p elements
+dd = element dd { dd.attlist, p+ }
+dd.attlist &= empty
+list-group-u =
+ element list-group-u { list-group-u.attlist, (text | all.class)* }
+list-group-u.attlist &= empty
+list-group-d =
+ element list-group-d { list-group-d.attlist, (text | all.class)* }
+list-group-d.attlist &= empty
+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
+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
+d = element d { d.attlist, empty }
+d.attlist &= empty
+uri = element uri { uri.attlist, (text | inline.class)* }
+uri.attlist &= attribute link { text }?
+start = guide
diff --git a/schemas.xml b/schemas.xml
index 14927b1..7db46ae 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+ <!-- rng-loc.el cannot combine rules, so unfortunately we cannot
+ select a schema by both document element and filename pattern -->
+ <!-- First match, so make sure that "text.xml" is before "guide" -->
+ <uri pattern="text.xml" uri="devbook.rnc" />
<documentElement localName="catmetadata" uri="metadata.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
<documentElement localName="guide" uri="guide.rnc" />
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-17 19:07 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-17 19:07 UTC (permalink / raw
To: gentoo-commits
commit: f2d97490637ae0ae50dfe6165fd1ab53d5b993b4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 18:52:08 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 18:52:08 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=f2d97490
mirrors.rnc: New file.
mirrors.dtd was missing from the list of DTDs.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
mirrors.rnc | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
schemas.xml | 1 +
3 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 9a40f59..915719d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DTDS = book.dtd devbook.dtd glsa.dtd guide.dtd metadata.dtd \
+DTDS = book.dtd devbook.dtd glsa.dtd guide.dtd metadata.dtd mirrors.dtd \
projects.dtd repositories.dtd
DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
diff --git a/mirrors.rnc b/mirrors.rnc
new file mode 100644
index 0000000..e516d0c
--- /dev/null
+++ b/mirrors.rnc
@@ -0,0 +1,79 @@
+# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/mirrors.dtd,v 1.3 2009/12/03 09:43:39 robbat2 Exp $
+
+# This file is used for keeping the new mirrors.xml file
+
+# element: mirrors
+# description: A set of mirrorgroups followed by a list of countries with their code
+# example: <mirrors>
+# <mirrorgroup country="US" region="North America">
+# ...
+# </mirrorgroup>
+# ...
+# <countries>
+# <country code="CA">Canada</country>
+# ...
+# </countries>
+# </mirrors>
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+mirrors = element mirrors { attlist.mirrors, mirrorgroup*, countries }
+attlist.mirrors &= empty
+# element: mirrorgroup
+# description: Group mirrors by region and country.
+# The country code must exist in //countries/country
+# example: <mirrorgroup region="South America" country="BZ">
+# <mirror>
+# ...
+# </mirror>
+# ...
+# </mirrorgroup
+mirrorgroup = element mirrorgroup { attlist.mirrorgroup, mirror* }
+attlist.mirrorgroup &=
+ attribute region { text },
+ attribute country { xsd:IDREF }
+# element: mirror
+# description: One per mirror; name the mirror and provide one or more uris
+# optionally: provide GPS coordinates, a city and a bug id.
+# example: <mirror city="Corvallis"
+# coordinates="44.5646,-123.2620"
+# gentoo-bug="12345">
+# <name>OSU Open Source Lab</name>
+# <uri protocol="http">http://gentoo.osuosl.org/</uri>
+# <uri protocol="ftp">ftp://gentoo.osuosl.org/</uri>
+# </mirror>
+mirror = element mirror { attlist.mirror, name, uri+ }
+attlist.mirror &=
+ attribute city { text }?,
+ attribute coordinates { text }?,
+ attribute gentoo-bug { text }?
+# element: name
+# description: Name of the mirror
+# note: Do not include a country and protocol pair, "(USA/http)" as they will
+# be built by the XSL.
+# example: <name>OSU Open Source Lab</name>
+name = element name { attlist.name, text }
+attlist.name &= empty
+# element: uri
+# description: A Uniform Resource Locator for a given mirror
+# example: <uri protocol='http' ipv4='y' ipv6='y'>http://gentoo.osuosl.org/</uri>
+uri = element uri { attlist.uri, text }
+attlist.uri &=
+ [ a:defaultValue = "y" ] attribute ipv4 { "Y" | "y" | "N" | "n" }?,
+ [ a:defaultValue = "n" ] attribute ipv6 { "Y" | "y" | "N" | "n" }?,
+ [ a:defaultValue = "n" ] attribute partial { "Y" | "y" | "N" | "n" }?,
+ [ a:defaultValue = "http" ]
+ attribute protocol { "http" | "ftp" | "rsync" }?
+# element: countries
+# description: A list of countries with their code and name
+# example: <countries>
+# <country code="CA">Canada</country>
+# <countries>
+countries = element countries { attlist.countries, country* }
+attlist.countries &= empty
+# element: country
+# description: A country with its code
+# example: <country code="CA">Canada</country>
+country = element country { attlist.country, text }
+attlist.country &= attribute code { xsd:ID }
+start = mirrors
diff --git a/schemas.xml b/schemas.xml
index 7db46ae..590e4ce 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -7,6 +7,7 @@
<documentElement localName="catmetadata" uri="metadata.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
<documentElement localName="guide" uri="guide.rnc" />
+ <documentElement localName="mirrors" uri="mirrors.rnc" />
<documentElement localName="news" uri="guide.rnc" />
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
<documentElement localName="projects" uri="projects.rnc" />
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-17 19:07 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-17 19:07 UTC (permalink / raw
To: gentoo-commits
commit: d3e9d92465e27ff616178012151bf77aa3927a66
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 18:54:37 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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 @@
<uri pattern="text.xml" uri="devbook.rnc" />
<documentElement localName="catmetadata" uri="metadata.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
- <documentElement localName="guide" uri="guide.rnc" />
<documentElement localName="mirrors" uri="mirrors.rnc" />
- <documentElement localName="news" uri="guide.rnc" />
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
<documentElement localName="projects" uri="projects.rnc" />
<documentElement localName="repositories" uri="repositories.rnc" />
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-17 19:07 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-17 19:07 UTC (permalink / raw
To: gentoo-commits
commit: ad893ea8543ec69c45c712db58cfaa2a0b749063
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 18:57:30 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 18:57:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=ad893ea8
schemas.xml: Use document element to locate devbook.rnc.
The "guide" document element was previously used for GuideXML, and is
used for Devbook XML as well. This seems still more reliable than
using the rather generic "text.xml" filename for locating the schema.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
schemas.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/schemas.xml b/schemas.xml
index d9c7753..0a7f23c 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
- <!-- rng-loc.el cannot combine rules, so unfortunately we cannot
- select a schema by both document element and filename pattern -->
- <!-- First match, so make sure that "text.xml" is before "guide" -->
- <uri pattern="text.xml" uri="devbook.rnc" />
<documentElement localName="catmetadata" uri="metadata.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
+ <documentElement localName="guide" uri="devbook.rnc" />
+ <!-- rng-loc.el cannot combine rules, so unfortunately we cannot
+ select a schema by both document element and filename pattern -->
+ <!-- <uri pattern="text.xml" uri="devbook.rnc" /> -->
<documentElement localName="mirrors" uri="mirrors.rnc" />
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
<documentElement localName="projects" uri="projects.rnc" />
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-27 9:50 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-27 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 0af560f9e5ad607b40ef222f9b9b2c687a14fa3f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 09:41:10 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 09:41:10 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=0af560f9
devbook.rnc: Update.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 1d24153..758d836 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -21,11 +21,9 @@ block.class =
| ul
| ol
| dl
- | list-group-u
- | list-group-d
-inline.class = sup | sub | b | c | d | e | path | uri
+inline.class = b | c | e | d | uri
all.class = block.class | inline.class
-guide = element guide { guide.attlist, (\include | chapter)+ }
+guide = element guide { guide.attlist, chapter, \include* }
guide.attlist &=
attribute root { "true" }?,
attribute self { text }?
@@ -107,36 +105,23 @@ ti.attlist &=
[ a:defaultValue = "left" ]
attribute align { "left" | "center" | "right" }?
ul = element ul { ul.attlist, li+ }
-ul.attlist &= empty
+ul.attlist &= attribute class { text }?
ol = element ol { ol.attlist, li+ }
ol.attlist &= empty
li = element li { li.attlist, (text | all.class)* }
li.attlist &= empty
-dl = element dl { dl.attlist, (dt, dd)+ }
+dl = element dl { dl.attlist, (dt, dd+)+ }
dl.attlist &= empty
dt = element dt { dt.attlist, (text | inline.class)* }
dt.attlist &= empty
-# The following is strange, but devbook.xsl expects only p elements
-dd = element dd { dd.attlist, p+ }
+dd = element dd { dd.attlist, (text | inline.class)* }
dd.attlist &= empty
-list-group-u =
- element list-group-u { list-group-u.attlist, (text | all.class)* }
-list-group-u.attlist &= empty
-list-group-d =
- element list-group-d { list-group-d.attlist, (text | all.class)* }
-list-group-d.attlist &= empty
-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
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
d = element d { d.attlist, empty }
d.attlist &= empty
uri = element uri { uri.attlist, (text | inline.class)* }
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2019-12-27 9:50 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2019-12-27 9:50 UTC (permalink / raw
To: gentoo-commits
commit: e83a1319a36e159b7ab010c367ddc117d45eaf5f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 09:39:45 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 09:39:45 2019 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=e83a1319
Makefile: Suppress empty lines in .dep files.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5fe156f..04e04d9 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
tar cJf $@ $(PN)
.dtd.dep:
- echo > $@
+ echo -n > $@
sed -n -e '/ENTITY/s|<!ENTITY % \w\+ SYSTEM "\(.*\)\.dtd">|\1|p' $< | \
while read dep; do \
echo "$(patsubst %.dtd,%.rnc,$<): $$dep.rnc $$dep.dtd" >> $@ || exit 1; \
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-01-09 23:37 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-01-09 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 7ca83421a7fca5f8919f13f0f0681a3f13dc8bfe
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 9 23:30:22 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 23:30:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=7ca83421
metadata.rnc: Update from DTD.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
metadata.rnc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata.rnc b/metadata.rnc
index 7f4c26e..6225eaf 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -22,7 +22,7 @@ attlist.pkgmetadata &=
# One tag for each maintainer of a package, multiple allowed
maintainer =
element maintainer {
- attlist.maintainer, email, (description | name)*
+ attlist.maintainer, (email | name | description)+
}
# type attribute determines whether the maintainer is a person or a project.
# Unknown is added to handle <maintainer/>s in <upstream/>s. Using it (or no
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-01-09 23:37 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-01-09 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 05f57e06e8ac66d0bbfc805ef4d7edb88e4d3be3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 9 23:31:35 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 23:31:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=05f57e06
Makefile: Output date in UTC time zone.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 04e04d9..8d0c661 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
ifneq ($(PV),)
PN=nxml-gentoo-schemas-$(PV)
else
-PN=nxml-gentoo-schemas-$(shell date '+%Y%m%d')
+PN=nxml-gentoo-schemas-$(shell TZ=UTC date '+%Y%m%d')
endif
TARBALL=$(PN).tar.xz
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-01-22 19:54 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-01-22 19:54 UTC (permalink / raw
To: gentoo-commits
commit: d7285c11f633a9a5356226ed523048e223384c9e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 19:54:29 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 19:54:29 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=d7285c11
devbook.rnc: Update from DTD.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 758d836..96edb20 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the MIT/X11 license
@@ -85,10 +85,8 @@ figure.attlist &=
attribute link { text },
attribute short { text }?,
attribute caption { text }?
-table = element table { table.attlist, tcolumn*, tr+ }
+table = element table { table.attlist, tr+ }
table.attlist &= empty
-tcolumn = element tcolumn { tcolumn.attlist, empty }
-tcolumn.attlist &= attribute width { text }
tr = element tr { tr.attlist, (th | ti)+ }
tr.attlist &= empty
th = element th { th.attlist, (text | inline.class)* }
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-02-29 16:15 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-02-29 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 4a1383f3f12782fd1d4f229d8784e22339508fb7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 15:59:08 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 15:59:08 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=4a1383f3
Makefile: Update URL for devbook.dtd.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8d0c661..cc4406b 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
wget -N --no-verbose https://www.gentoo.org/dtd/$@
devbook.dtd:
- wget -N --no-verbose https://devmanual.gentoo.org/$@
+ wget -N --no-verbose \
+ https://gitweb.gentoo.org/proj/devmanual.git/plain/$@
-include .depend
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-02-29 16:15 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-02-29 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 8faabd289b20cb21c739a1915ea9ed22401c5332
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 15:59:56 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 15:59:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=8faabd28
Makefile: No more automatic dependencies.
The remaining DTDs don't have any interdependencies, which much
simplifies things.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitignore | 2 --
Makefile | 27 ++++-----------------------
2 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore
index 76c449f..7d15794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-*.dep
*.dtd
-.depend
diff --git a/Makefile b/Makefile
index cc4406b..304ae7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \
projects.dtd repositories.dtd
-DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
ifneq ($(PV),)
@@ -12,36 +11,20 @@ endif
TARBALL=$(PN).tar.xz
-.SUFFIXES: .dtd .rnc .dep
-.PHONY: depend all clean
+.PHONY: all clean
.PRECIOUS: $(RNCS) $(DTDS)
-.INTERMEDIATE: $(DTDDEPS)
-all: .depend $(TARBALL)
-
-depend: .depend
+all: $(TARBALL)
clean:
- rm -f *.dtd *.dep .depend
-
-.depend: $(DTDDEPS)
- cat *.dep > $@
+ rm -f *.dtd
$(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
mkdir -p $(PN)
cp $^ $(PN)
tar cJf $@ $(PN)
-.dtd.dep:
- echo -n > $@
- sed -n -e '/ENTITY/s|<!ENTITY % \w\+ SYSTEM "\(.*\)\.dtd">|\1|p' $< | \
- while read dep; do \
- echo "$(patsubst %.dtd,%.rnc,$<): $$dep.rnc $$dep.dtd" >> $@ || exit 1; \
- echo "$(TARBALL): $$dep.rnc" >> $@ || exit 1; \
- $(MAKE) "$$dep.dep" || exit 1; \
- done
-
-.dtd.rnc:
+%.rnc: %.dtd
trang -I dtd -O rnc $< $@
%.dtd:
@@ -50,5 +33,3 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
devbook.dtd:
wget -N --no-verbose \
https://gitweb.gentoo.org/proj/devmanual.git/plain/$@
-
--include .depend
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2020-03-03 8:33 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2020-03-03 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 3763928ca5ec45bd61cfc6eb5b7955a8ebf88068
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 08:32:59 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 08:32:59 2020 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3763928c
devbook.rnc: Update from DTD.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 96edb20..529471e 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -108,11 +108,11 @@ ol = element ol { ol.attlist, li+ }
ol.attlist &= empty
li = element li { li.attlist, (text | all.class)* }
li.attlist &= empty
-dl = element dl { dl.attlist, (dt, dd+)+ }
+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)* }
+dd = element dd { dd.attlist, (text | all.class)* }
dd.attlist &= empty
b = element b { b.attlist, (text | inline.class)* }
b.attlist &= empty
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2021-02-03 13:45 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2021-02-03 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 8b179602deb8179086c418108b4de43492d9acbb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 11:28:03 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 11:28:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=8b179602
devbook.rnc, metadata.rnc: Update from DTDs
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 8 ++++----
metadata.rnc | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 529471e..54659de 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -21,7 +21,8 @@ block.class =
| ul
| ol
| dl
-inline.class = b | c | e | d | uri
+attrib.class = b | c | e
+inline.class = attrib.class | d | uri
all.class = block.class | inline.class
guide = element guide { guide.attlist, chapter, \include* }
guide.attlist &=
@@ -45,9 +46,8 @@ subsection.attlist &= empty
subsubsection =
element subsubsection { subsubsection.attlist, title, body }
subsubsection.attlist &= empty
-# Title texts are used as anchors, so we shouldn't allow any formatting,
-# but unfortunately it is used in the document.
-title = element title { title.attlist, (text | inline.class)* }
+# Title texts are used as anchors, so allow only text attributes
+title = element title { title.attlist, (text | attrib.class)* }
title.attlist &= empty
body =
element body { body.attlist, (authors | contentsTree | block.class)+ }
diff --git a/metadata.rnc b/metadata.rnc
index 6225eaf..bc2a43d 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -96,6 +96,7 @@ attlist.remote-id &=
| "gitlab"
| "gitorious"
| "google-code"
+ | "heptapod"
| "launchpad"
| "pear"
| "pecl"
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2021-03-15 13:15 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2021-03-15 13:15 UTC (permalink / raw
To: gentoo-commits
commit: a0e92e8d81745983f277492e674e8606100a89c1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 20:44:47 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 20:44:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=a0e92e8d
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
metadata.rnc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/metadata.rnc b/metadata.rnc
index bc2a43d..3705f90 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -30,6 +30,12 @@ maintainer =
attlist.maintainer &=
[ a:defaultValue = "unknown" ]
attribute type { "person" | "project" | "unknown" }?
+# proxied attribute determines whether the maintainer is a proxied
+# maintainer (yes), regular dev (no) or a proxy for somebody (proxy). It is
+# valid only for Gentoo maintainers.
+attlist.maintainer &=
+ [ a:defaultValue = "no" ]
+ attribute proxied { "yes" | "no" | "proxy" }?
# A long description of the package in freetext
longdescription =
element longdescription {
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2021-09-06 18:11 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2021-09-06 18:11 UTC (permalink / raw
To: gentoo-commits
commit: b1bab6a516c5512e84ed70b38f0750654ab4a5f5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 07:52:37 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 19 07:52:37 2021 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b1bab6a5
userinfo.rnc: File restored
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
schemas.xml | 1 +
userinfo.rnc | 44 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 304ae7e..e9c6372 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \
- projects.dtd repositories.dtd
+ projects.dtd repositories.dtd userinfo.dtd
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
diff --git a/schemas.xml b/schemas.xml
index 0a7f23c..f93bcbb 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -10,4 +10,5 @@
<documentElement localName="pkgmetadata" uri="metadata.rnc" />
<documentElement localName="projects" uri="projects.rnc" />
<documentElement localName="repositories" uri="repositories.rnc" />
+ <documentElement localName="userlist" uri="userinfo.rnc" />
</locatingRules>
diff --git a/userinfo.rnc b/userinfo.rnc
new file mode 100644
index 0000000..54a1305
--- /dev/null
+++ b/userinfo.rnc
@@ -0,0 +1,44 @@
+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
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2021-09-08 17:55 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2021-09-08 17:55 UTC (permalink / raw
To: gentoo-commits
commit: f17c24093ad7b59d8abc21db51007a1a8e94e78c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 18:09:05 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 18:09:05 2021 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=f17c2409
devbook.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 54659de..2d21a4a 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,6 +1,7 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the MIT/X11 license
+# or the CC-BY-SA-4.0 license (dual-licensed)
# Document Type Definition for the Gentoo Devmanual
@@ -52,12 +53,16 @@ title.attlist &= empty
body =
element body { body.attlist, (authors | contentsTree | block.class)+ }
body.attlist &= empty
-authors = element authors { authors.attlist, author+ }
+authors = element authors { authors.attlist, (author+ | authorlist+) }
authors.attlist &= empty
author = element author { author.attlist, (text | inline.class)* }
author.attlist &=
attribute name { text },
attribute email { text }?
+authorlist = element authorlist { authorlist.attlist, empty }
+authorlist.attlist &=
+ attribute title { text },
+ attribute href { text }
contentsTree = element contentsTree { contentsTree.attlist, empty }
contentsTree.attlist &=
attribute maxdepth { text }?,
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-01-21 22:08 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-01-21 22:08 UTC (permalink / raw
To: gentoo-commits
commit: b86ec5d5a0f7503d1cbb3d994f7b65f8b73a3592
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 22:04:33 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 22:04:33 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b86ec5d5
Makefile: New dist target replaces $(TARBALL)
Use tar --transform, so we don't need a temporary directory.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitignore | 1 +
Makefile | 20 ++++++++------------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7d15794..fb79b6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.dtd
+*.tar.xz
diff --git a/Makefile b/Makefile
index e9c6372..acba372 100644
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,21 @@ DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \
RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
ifneq ($(PV),)
-PN=nxml-gentoo-schemas-$(PV)
+P=nxml-gentoo-schemas-$(PV)
else
-PN=nxml-gentoo-schemas-$(shell TZ=UTC date '+%Y%m%d')
+P=nxml-gentoo-schemas-$(shell TZ=UTC date '+%Y%m%d')
endif
-TARBALL=$(PN).tar.xz
-
-.PHONY: all clean
+.PHONY: all dist clean
.PRECIOUS: $(RNCS) $(DTDS)
-all: $(TARBALL)
+all: $(RNCS)
-clean:
- rm -f *.dtd
+dist: Makefile LICENCE schemas.xml $(RNCS)
+ tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
-$(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
- mkdir -p $(PN)
- cp $^ $(PN)
- tar cJf $@ $(PN)
+clean:
+ rm -f *.dtd *.tar.xz
%.rnc: %.dtd
trang -I dtd -O rnc $< $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-01-25 8:11 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-01-25 8:11 UTC (permalink / raw
To: gentoo-commits
commit: c238a3e8fd3240b27f39bb25f3368e36912b71fc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 00:31:52 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:31:52 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=c238a3e8
mirrors.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
mirrors.rnc | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/mirrors.rnc b/mirrors.rnc
index e516d0c..23a8d7d 100644
--- a/mirrors.rnc
+++ b/mirrors.rnc
@@ -1,27 +1,20 @@
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/mirrors.dtd,v 1.3 2009/12/03 09:43:39 robbat2 Exp $
-
# This file is used for keeping the new mirrors.xml file
# element: mirrors
-# description: A set of mirrorgroups followed by a list of countries with their code
+# description: A set of mirrorgroups
# example: <mirrors>
# <mirrorgroup country="US" region="North America">
# ...
# </mirrorgroup>
# ...
-# <countries>
-# <country code="CA">Canada</country>
-# ...
-# </countries>
# </mirrors>
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-mirrors = element mirrors { attlist.mirrors, mirrorgroup*, countries }
+mirrors = element mirrors { attlist.mirrors, mirrorgroup* }
attlist.mirrors &= empty
# element: mirrorgroup
# description: Group mirrors by region and country.
-# The country code must exist in //countries/country
# example: <mirrorgroup region="South America" country="BZ">
# <mirror>
# ...
@@ -31,7 +24,8 @@ attlist.mirrors &= empty
mirrorgroup = element mirrorgroup { attlist.mirrorgroup, mirror* }
attlist.mirrorgroup &=
attribute region { text },
- attribute country { xsd:IDREF }
+ attribute country { text },
+ attribute countryname { text }?
# element: mirror
# description: One per mirror; name the mirror and provide one or more uris
# optionally: provide GPS coordinates, a city and a bug id.
@@ -64,16 +58,4 @@ attlist.uri &=
[ a:defaultValue = "n" ] attribute partial { "Y" | "y" | "N" | "n" }?,
[ a:defaultValue = "http" ]
attribute protocol { "http" | "ftp" | "rsync" }?
-# element: countries
-# description: A list of countries with their code and name
-# example: <countries>
-# <country code="CA">Canada</country>
-# <countries>
-countries = element countries { attlist.countries, country* }
-attlist.countries &= empty
-# element: country
-# description: A country with its code
-# example: <country code="CA">Canada</country>
-country = element country { attlist.country, text }
-attlist.country &= attribute code { xsd:ID }
start = mirrors
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-01-25 8:11 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-01-25 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 140f12f64dd4da0ff21495bbf4444a350b2d6b51
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 00:29:57 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:29:57 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=140f12f6
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 213 +++++++++++++++++++++++++++---------------------------------
1 file changed, 97 insertions(+), 116 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 2d21a4a..4ca931d 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,132 +1,113 @@
-# Copyright 2019-2021 Gentoo Authors
-
-# Distributed under the terms of the MIT/X11 license
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the MIT license
# or the CC-BY-SA-4.0 license (dual-licensed)
-# Document Type Definition for the Gentoo Devmanual
-
+# RELAX NG schema for the Gentoo Devmanual
# Based on common.dtd from GuideXML
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-block.class =
- p
- | pre
- | codesample
- | note
- | important
- | warning
- | todo
- | figure
- | table
- | ul
- | ol
- | dl
-attrib.class = b | c | e
+block.class = p | pre | codesample | note | important | warning | todo
+| figure | table | ul | ol | dl
+attrib.class = text | b | c | e
inline.class = attrib.class | d | uri
-all.class = block.class | inline.class
-guide = element guide { guide.attlist, chapter, \include* }
-guide.attlist &=
- attribute root { "true" }?,
- attribute self { text }?
-\include = element include { include.attlist, empty }
-include.attlist &= attribute href { text }
-chapter =
- element chapter { chapter.attlist, title, (body | section), section* }
-chapter.attlist &= empty
-section =
- element section {
- section.attlist, title, (body | subsection), subsection*
- }
-section.attlist &= empty
+
+attrib = attrib.class*
+inline = inline.class*
+all = (block.class | inline.class)*
+
+start = guide
+
+guide = element guide {
+ (attribute root { "true" } | attribute self { text }),
+ chapter,
+ \include*
+}
+
+\include = element include { attribute href { text } }
+
+chapter = element chapter { title, (body | section), section* }
+section = element section { title, (body | subsection), subsection* }
subsection =
- element subsection {
- subsection.attlist, title, (body | subsubsection), subsubsection*
- }
-subsection.attlist &= empty
-subsubsection =
- element subsubsection { subsubsection.attlist, title, body }
-subsubsection.attlist &= empty
+ element subsection { title, (body | subsubsection), subsubsection* }
+subsubsection = element subsubsection { title, body }
+
# Title texts are used as anchors, so allow only text attributes
-title = element title { title.attlist, (text | attrib.class)* }
-title.attlist &= empty
-body =
- element body { body.attlist, (authors | contentsTree | block.class)+ }
-body.attlist &= empty
-authors = element authors { authors.attlist, (author+ | authorlist+) }
-authors.attlist &= empty
-author = element author { author.attlist, (text | inline.class)* }
-author.attlist &=
+title = element title { attrib }
+
+body = element body { (authors | contentsTree | block.class)+ }
+
+authors = element authors { author+ | authorlist+ }
+
+author = element author {
attribute name { text },
- attribute email { text }?
-authorlist = element authorlist { authorlist.attlist, empty }
-authorlist.attlist &=
+ attribute email { text }?,
+ inline
+}
+
+authorlist = element authorlist {
attribute title { text },
attribute href { text }
-contentsTree = element contentsTree { contentsTree.attlist, empty }
-contentsTree.attlist &=
- attribute maxdepth { text }?,
+}
+
+contentsTree = element contentsTree {
+ attribute maxdepth { xsd:unsignedInt }?,
attribute root { text }?,
attribute extraction { text }?
-p = element p { p.attlist, (text | inline.class)* }
-p.attlist &= empty
-pre = element pre { pre.attlist, text }
-pre.attlist &= empty
-codesample = element codesample { codesample.attlist, text }
-codesample.attlist &=
+}
+
+p = element p { inline }
+
+pre = element pre { text }
+
+codesample = element codesample {
attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
- attribute numbering { "lines" }?
-note = element note { note.attlist, (text | inline.class)* }
-note.attlist &= empty
-important =
- element important { important.attlist, (text | inline.class)* }
-important.attlist &= empty
-warning = element warning { warning.attlist, (text | inline.class)* }
-warning.attlist &= empty
-todo = element todo { todo.attlist, (text | inline.class)* }
-todo.attlist &= empty
-figure = element figure { figure.attlist, empty }
-figure.attlist &=
+ attribute numbering { "lines" }?,
+ text
+}
+
+note = element note { inline }
+important = element important { inline }
+warning = element warning { inline }
+todo = element todo { inline }
+
+figure = element figure {
attribute link { text },
attribute short { text }?,
attribute caption { text }?
-table = element table { table.attlist, tr+ }
-table.attlist &= empty
-tr = element tr { tr.attlist, (th | ti)+ }
-tr.attlist &= empty
-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 | all.class)* }
-ti.attlist &=
- attribute colspan { text }?,
- attribute rowspan { text }?,
- attribute nowrap { text }?,
- [ a:defaultValue = "left" ]
- attribute align { "left" | "center" | "right" }?
-ul = element ul { ul.attlist, li+ }
-ul.attlist &= attribute class { text }?
-ol = element ol { ol.attlist, li+ }
-ol.attlist &= empty
-li = element li { li.attlist, (text | all.class)* }
-li.attlist &= empty
-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 | all.class)* }
-dd.attlist &= empty
-b = element b { b.attlist, (text | inline.class)* }
-b.attlist &= empty
-c = element c { c.attlist, (text | inline.class)* }
-c.attlist &= empty
-e = element e { e.attlist, (text | inline.class)* }
-e.attlist &= empty
-d = element d { d.attlist, empty }
-d.attlist &= empty
-uri = element uri { uri.attlist, (text | inline.class)* }
-uri.attlist &= attribute link { text }?
-start = guide
+}
+
+table = element table { tr+ }
+tr = element tr { (th | ti)+ }
+
+th = element th {
+ attribute colspan { xsd:unsignedInt }?,
+ attribute rowspan { xsd:unsignedInt }?,
+ attribute align { "left" | "center" | "right" }?,
+ inline
+}
+
+ti = element ti {
+ attribute colspan { xsd:unsignedInt }?,
+ attribute rowspan { xsd:unsignedInt }?,
+ attribute nowrap { "nowrap" }?,
+ attribute align { "left" | "center" | "right" }?,
+ all
+}
+
+ul = element ul { attribute class { "list-group" }?, li+ }
+ol = element ol { li+ }
+li = element li { all }
+
+dl = element dl { (dt | dd)+ }
+dt = element dt { inline }
+dd = element dd { all }
+
+b = element b { inline }
+c = element c { inline }
+e = element e { inline }
+d = element d { empty }
+
+uri = element uri {
+ # uri can have either an URI in the body text or a link attribute
+ xsd:anyURI
+ | (attribute link { text }, inline)
+}
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-01-25 8:11 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-01-25 8:11 UTC (permalink / raw
To: gentoo-commits
commit: bd1f8977651b3ea9a7a20fdd439e2f66f236a3bd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 00:18:59 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:18:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=bd1f8977
Makefile: The devmanual now uses RELAX NG instead of DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitignore | 1 +
Makefile | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index fb79b6a..cf60873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.dtd
+*.stamp
*.tar.xz
diff --git a/Makefile b/Makefile
index acba372..57ca512 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \
- projects.dtd repositories.dtd userinfo.dtd
+DTDS = glsa.dtd metadata.dtd mirrors.dtd projects.dtd \
+ repositories.dtd userinfo.dtd
-RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
+RNCS = $(patsubst %.dtd,%.rnc,$(DTDS)) devbook.rnc
ifneq ($(PV),)
P=nxml-gentoo-schemas-$(PV)
@@ -10,7 +10,7 @@ P=nxml-gentoo-schemas-$(shell TZ=UTC date '+%Y%m%d')
endif
.PHONY: all dist clean
-.PRECIOUS: $(RNCS) $(DTDS)
+.PRECIOUS: $(RNCS)
all: $(RNCS)
@@ -18,14 +18,17 @@ dist: Makefile LICENCE schemas.xml $(RNCS)
tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
clean:
- rm -f *.dtd *.tar.xz
+ rm -f *.dtd *.stamp *.tar.xz
%.rnc: %.dtd
trang -I dtd -O rnc $< $@
-%.dtd:
+$(DTDS):
wget -N --no-verbose https://www.gentoo.org/dtd/$@
-devbook.dtd:
+devbook.rnc: devbook.stamp
+
+devbook.stamp:
wget -N --no-verbose \
- https://gitweb.gentoo.org/proj/devmanual.git/plain/$@
+ https://gitweb.gentoo.org/proj/devmanual.git/plain/devbook.rnc
+ touch -r devbook.rnc $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-04-28 22:35 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-04-28 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 313d6eec66edc2d6e93acb08f0ff6ee239eebd30
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 22:33:31 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 22:33:31 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=313d6eec
LICENSE: Change to MIT
Acknowledged by Diego per e-mail on Thu, 28 Apr 2022 10:11:32 +0100,
Message-Id <9fb51532-c237-43e5-a5c8-732567c8f56a <AT> www.fastmail.com>:
"I'm happy to have any of my "historical permission notice" code in
nxml-gentoo-schemas relicensed under MIT or 0BSD as you find more
convenient."
Acked-by: Diego Elio Pettenò <flameeyes <AT> flameeyes.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
LICENCE | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/LICENCE b/LICENCE
index ae0a02c..1bf9852 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,9 +1,18 @@
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appears in all copies and
-that both the copyright notice and this permission notice appear in
-supporting documentation, and that the same name not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission. We make no representations
-about the suitability this software for any purpose. It is provided
-"as is" without express or implied warranty.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-04-28 22:38 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-04-28 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 1551fec5527f92188382578129d8341fd0e48342
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 22:33:31 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 22:33:31 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=1551fec5
LICENCE: Change to MIT
Acknowledged by Diego per e-mail on Thu, 28 Apr 2022 10:11:32 +0100,
Message-Id <9fb51532-c237-43e5-a5c8-732567c8f56a <AT> www.fastmail.com>:
"I'm happy to have any of my "historical permission notice" code in
nxml-gentoo-schemas relicensed under MIT or 0BSD as you find more
convenient."
Acked-by: Diego Elio Pettenò <flameeyes <AT> flameeyes.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
LICENCE | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/LICENCE b/LICENCE
index ae0a02c..1bf9852 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,9 +1,18 @@
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appears in all copies and
-that both the copyright notice and this permission notice appear in
-supporting documentation, and that the same name not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission. We make no representations
-about the suitability this software for any purpose. It is provided
-"as is" without express or implied warranty.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-05-24 17:59 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-05-24 17:59 UTC (permalink / raw
To: gentoo-commits
commit: a3f459e2cd8ff001145f7084d664691d51a92fe8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 17:50:30 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 24 17:50:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=a3f459e2
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
metadata.rnc | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/metadata.rnc b/metadata.rnc
index 3705f90..8deae47 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -95,8 +95,6 @@ attlist.remote-id &=
| "cpe"
| "cran"
| "ctan"
- | "freecode"
- | "freshmeat"
| "gentoo"
| "github"
| "gitlab"
@@ -104,13 +102,12 @@ attlist.remote-id &=
| "google-code"
| "heptapod"
| "launchpad"
+ | "osdn"
| "pear"
| "pecl"
| "pypi"
- | "rubyforge"
| "rubygems"
| "sourceforge"
- | "sourceforge-jp"
| "vim"
}
# category/package information for cross-linking in descriptions
@@ -122,7 +119,7 @@ attlist.cat &= empty
# Common attributes
# the lang attribute, specifies the language of this tag in the
-# form of a ISO 639-1 language code. This is only useful for
+# form of an IETF (BCP 47) language tag. This is only useful for
# descriptions of various kinds. If a tag with this attribute is
# included there must be a description in the default language "en"
attlist.description &=
@@ -131,14 +128,14 @@ attlist.longdescription &=
[ a:defaultValue = "en" ] attribute lang { text }?
attlist.slots &= [ a:defaultValue = "en" ] attribute lang { text }?
attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }?
-# The restrict attribute, this attribute specifies restrictions on
-# the applicability of tags on versions. The format of this attribute is
+# The restrict attribute, this attribute specifies restrictions on
+# the applicability of tags on versions. The format of this attribute is
# equal to the format of DEPEND lines in ebuilds. Only package
# dependency specifications conforming to EAPI=0 syntax are allowed.
# The dependency specification may only contain references to the
# package itself and no other package.
#
-# For required tags, there must be either an unrestricted version, or a
+# For required tags, there must be either an unrestricted version, or a
# version that is default restricted.
attlist.maintainer &= attribute restrict { text }?
attlist.longdescription &= attribute restrict { text }?
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-05-26 6:10 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-05-26 6:10 UTC (permalink / raw
To: gentoo-commits
commit: f84e89097180151ab71875c1ccdc7904d4ff3e6e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 18:41:13 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 25 18:41:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=f84e8909
glsa.rnc, metadata.rnc, repositories.rnc: Update from DTDs
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
glsa.rnc | 44 +++++++++++++++++++++-----------------------
metadata.rnc | 1 -
repositories.rnc | 4 +---
3 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/glsa.rnc b/glsa.rnc
index 2711a6a..b2fbdf4 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -1,5 +1,3 @@
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/glsa.dtd,v 1.17 2008/04/04 17:04:39 neysx Exp $
-
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
glsa =
@@ -24,8 +22,8 @@ glsa =
}
attlist.glsa &= attribute id { text }
# Element: title
-# Description: Provides a 4-5 word description about the advisory
-# Example: <title>Buffer overflow vulnerability found in openssl-0.9.5</title>
+# Description: Provides a 4-5 word description about the advisory
+# Example: <title>Buffer overflow vulnerability found in openssl-0.9.5</title>
title = element title { attlist.title, text }
attlist.title &= empty
# Element: synopsis
@@ -41,11 +39,11 @@ attlist.synopsis &= empty
# Description: Defines what type of security announcement this is.
#
# Valid types are:
-# - ebuild A Portage-provided ebuild has a security
+# - ebuild A Portage-provided ebuild has a security
# issue
# - informational This GLSA is purely informational, no Gentoo
# system is affected
-# - infrastructure The security issue involves the Gentoo
+# - infrastructure The security issue involves the Gentoo
# infrastructure
#
# The text contains one keyword that defines the issue.
@@ -90,25 +88,25 @@ attlist.access &= empty
#
# If product@type = 'ebuild', the child elements are 'package'
# If product@type = 'portage', the child elements are 'package'
-# If product@type = 'infrastructure', the child elements are
+# If product@type = 'infrastructure', the child elements are
# 'service'
#
affected = element affected { attlist.affected, (package* | service*) }
attlist.affected &= empty
# Element: package
-# Description: Provide all necessary information regarded the affected
-# packages. It also contains information about the affected
+# Description: Provide all necessary information regarded the affected
+# packages. It also contains information about the affected
# architectures, if automatic updates can be done and the update
#
# The "update" attribute contains the path to the non-vulnerable
# version of the package
#
-# The "auto" attribute contains either "yes" or "no" and tells
-# Portage that the package can be updated automatically (to be
+# The "auto" attribute contains either "yes" or "no" and tells
+# Portage that the package can be updated automatically (to be
# implemented) without further user interaction
#
# The "arch" attribute contains either the architecture (as used
-# by ACCEPT_KEYWORDS) or the "*" value (in case all
+# by ACCEPT_KEYWORDS) or the "*" value (in case all
# architectures are affected)
#
# Occurrence: The package element can occur 0, 1 or more times
@@ -131,11 +129,11 @@ attlist.vulnerable &=
},
[ a:defaultValue = "*" ] attribute slot { text }?
# Element: unaffected
-# Description: Version of the fixed (or unaffected) package. In case the
+# Description: Version of the fixed (or unaffected) package. In case the
# package is superseded by another package, you need to
# define that package using the "name" attribute.
#
-# The r* range information is revision-specific. For instance,
+# The r* range information is revision-specific. For instance,
# rge foo-1.2.3-r4 == >=foo-1.2.3-r4 && <foo-1.2.4
#
# Example:
@@ -150,7 +148,7 @@ attlist.unaffected &=
# Element: service
# Description: Provide information about the Gentoo services that are
# affected by the security advisory. Portage must be able
-# to parse this information to make decisions (for instance,
+# to parse this information to make decisions (for instance,
# ignore an rsync server or a certain distfiles mirror).
#
# The type attribute can be one of "rsync", "web", "mirror".
@@ -196,7 +194,7 @@ code = element code { attlist.code, text }
attlist.code &= empty
# Element: background
# Description: Provides a background of the affected package(s)/service(s)
-# The background element contains only "<p>"s in which the text
+# The background element contains only "<p>"s in which the text
# is placed
#
background = element background { attlist.background, (p | ul | ol)* }
@@ -208,18 +206,18 @@ description =
element description { attlist.description, (p | ul | ol | code)* }
attlist.description &= empty
# Element: impact
-# Description: Provides information about the impact that the security issue
+# Description: Provides information about the impact that the security issue
# can have
#
# The "impact" element contains only "<p>"s.
#
-# The type element gives a short term, such as
+# The type element gives a short term, such as
# "Denial of Service", "Buffer Overflow", ...
#
impact = element impact { attlist.impact, (p | ul | ol)* }
attlist.impact &= attribute type { text }
# Element: workaround
-# Description: Provides information about how the security issue can be
+# Description: Provides information about how the security issue can be
# (temporarily) resolved through a work-around
#
# The "workaround" element contains only "<p>"s and "<code>"s.
@@ -227,7 +225,7 @@ workaround =
element workaround { attlist.workaround, (p | code | ul | ol)* }
attlist.workaround &= empty
# Element: resolution
-# Description: Provides information about how the security issue can be
+# Description: Provides information about how the security issue can be
# resolved.
#
# The "resolution" element contains only "<p>"s and "<code>"s.
@@ -249,7 +247,7 @@ attlist.ul &= empty
ol = element ol { attlist.ol, li* }
attlist.ol &= empty
# Element: li
-# Description: Element of a listing
+# Description: Element of a listing
#
# Example: <ul>
# <li>This is element one</li>
@@ -272,7 +270,7 @@ attlist.i &= empty
# Element: br
# Description: hard line break
#
-# Example: And then: <br/>
+# Example: And then: <br/>
# KABLAM!
br = element br { attlist.br, text }
attlist.br &= empty
@@ -287,7 +285,7 @@ attlist.license &= empty
#
# Example: <metadata tag="approved">Level 1</metadata>
#
-# On request of plasmaroo, metadata can contain all elements again.
+# On request of plasmaroo, metadata can contain all elements again.
metadata = element metadata { attlist.metadata, (text | metadata)* }
attlist.metadata &=
attribute tag { text },
diff --git a/metadata.rnc b/metadata.rnc
index 8deae47..f815278 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -98,7 +98,6 @@ attlist.remote-id &=
| "gentoo"
| "github"
| "gitlab"
- | "gitorious"
| "google-code"
| "heptapod"
| "launchpad"
diff --git a/repositories.rnc b/repositories.rnc
index 265a371..8c2d469 100644
--- a/repositories.rnc
+++ b/repositories.rnc
@@ -1,9 +1,7 @@
-# $Header
-
# Used by [gentoo]/xml/htdocs/proj/en/overlays/repositories.xml
# The source copy and history of this file is available from
-# http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
+# https://gitweb.gentoo.org/proj/repositories-xml-format.git/
# Gentoo repositories.xml DTD 1.0
#
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-05-26 6:10 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-05-26 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 4233c4e2b68262aa5adb56809bc5119b1ba8a8c6
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 18:42:20 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 25 18:42:20 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=4233c4e2
schemas.xml: Add copyright and license notice
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
schemas.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/schemas.xml b/schemas.xml
index f93bcbb..592459e 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2007-2021 Gentoo Authors
+ Distributed under the terms of the MIT license
+-->
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<documentElement localName="catmetadata" uri="metadata.rnc" />
<documentElement localName="glsa" uri="glsa.rnc" />
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-06-19 15:46 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-06-19 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 2c9cfc21ab438d5854dc20392f895ef788c94ea5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 15:45:43 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 15:45:43 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=2c9cfc21
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devbook.rnc b/devbook.rnc
index 4ca931d..9fe44b8 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -107,7 +107,7 @@ e = element e { inline }
d = element d { empty }
uri = element uri {
- # uri can have either an URI in the body text or a link attribute
+ # uri can have either a URI in the body text or a link attribute
xsd:anyURI
| (attribute link { text }, inline)
}
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-07-30 5:31 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-07-30 5:31 UTC (permalink / raw
To: gentoo-commits
commit: c683fef315b2a153c2d9da9f111f5bcf42d8bb39
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 05:30:59 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 05:30:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=c683fef3
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
metadata.rnc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/metadata.rnc b/metadata.rnc
index f815278..a8a0810 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -99,6 +99,7 @@ attlist.remote-id &=
| "github"
| "gitlab"
| "google-code"
+ | "hackage"
| "heptapod"
| "launchpad"
| "osdn"
@@ -107,6 +108,7 @@ attlist.remote-id &=
| "pypi"
| "rubygems"
| "sourceforge"
+ | "sourcehut"
| "vim"
}
# category/package information for cross-linking in descriptions
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-09-16 7:15 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-09-16 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 59ba7ce1c7c5fda00453a95d599dee3b346094a6
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 07:14:26 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 07:14:26 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=59ba7ce1
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
metadata.rnc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/metadata.rnc b/metadata.rnc
index a8a0810..7ab3e42 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -95,9 +95,11 @@ attlist.remote-id &=
| "cpe"
| "cran"
| "ctan"
+ | "freedesktop-gitlab"
| "gentoo"
| "github"
| "gitlab"
+ | "gnome-gitlab"
| "google-code"
| "hackage"
| "heptapod"
@@ -107,6 +109,8 @@ attlist.remote-id &=
| "pecl"
| "pypi"
| "rubygems"
+ | "savannah"
+ | "savannah-nongnu"
| "sourceforge"
| "sourcehut"
| "vim"
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-10-01 9:40 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-10-01 9:40 UTC (permalink / raw
To: gentoo-commits
commit: eb8e27333c076a55d0a5633a53efcde4e79d9984
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 09:36:26 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 09:36:26 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=eb8e2733
Add dtd and devmanual repos as submodules
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitmodules | 6 ++++++
devmanual | 1 +
dtd | 1 +
3 files changed, 8 insertions(+)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a82473d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "dtd"]
+ path = dtd
+ url = https://anongit.gentoo.org/git/data/dtd.git
+[submodule "devmanual"]
+ path = devmanual
+ url = https://anongit.gentoo.org/git/proj/devmanual.git
diff --git a/devmanual b/devmanual
new file mode 160000
index 0000000..f73fcfb
--- /dev/null
+++ b/devmanual
@@ -0,0 +1 @@
+Subproject commit f73fcfb9352f815d44a0198516ac759caa6e09ec
diff --git a/dtd b/dtd
new file mode 160000
index 0000000..87222b4
--- /dev/null
+++ b/dtd
@@ -0,0 +1 @@
+Subproject commit 87222b4de8d12028cb8a72b1f80a318a749c239d
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-10-01 9:40 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-10-01 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 7f33c3f2ea82600ad53498340f804520871876f0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 09:38:18 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 09:38:18 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=7f33c3f2
Makefile: Build from sources in submodules
Instead of fetching files over the network.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitignore | 2 --
Makefile | 15 ++++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index cf60873..b5624b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-*.dtd
-*.stamp
*.tar.xz
diff --git a/Makefile b/Makefile
index 57ca512..2a37157 100644
--- a/Makefile
+++ b/Makefile
@@ -18,17 +18,10 @@ dist: Makefile LICENCE schemas.xml $(RNCS)
tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
clean:
- rm -f *.dtd *.stamp *.tar.xz
+ rm -f *.tar.xz
-%.rnc: %.dtd
+%.rnc: dtd/%.dtd
trang -I dtd -O rnc $< $@
-$(DTDS):
- wget -N --no-verbose https://www.gentoo.org/dtd/$@
-
-devbook.rnc: devbook.stamp
-
-devbook.stamp:
- wget -N --no-verbose \
- https://gitweb.gentoo.org/proj/devmanual.git/plain/devbook.rnc
- touch -r devbook.rnc $@
+devbook.rnc: devmanual/devbook.rnc
+ cp $< $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-10-01 9:42 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-10-01 9:42 UTC (permalink / raw
To: gentoo-commits
commit: d9c60811809c9fb8d3d714f16191ace208f9cc9a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 09:38:18 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 09:38:18 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=d9c60811
Makefile: Build from sources in submodules
Instead of fetching files over the network.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.gitignore | 2 --
Makefile | 21 ++++++---------------
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index cf60873..b5624b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-*.dtd
-*.stamp
*.tar.xz
diff --git a/Makefile b/Makefile
index 57ca512..a3a384a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-DTDS = glsa.dtd metadata.dtd mirrors.dtd projects.dtd \
- repositories.dtd userinfo.dtd
-
-RNCS = $(patsubst %.dtd,%.rnc,$(DTDS)) devbook.rnc
+RNCS = devbook.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
+ repositories.rnc userinfo.rnc
ifneq ($(PV),)
P=nxml-gentoo-schemas-$(PV)
@@ -18,17 +16,10 @@ dist: Makefile LICENCE schemas.xml $(RNCS)
tar -cJf $(P).tar.xz --transform='s%^%$(P)/%' $^
clean:
- rm -f *.dtd *.stamp *.tar.xz
+ rm -f *.tar.xz
-%.rnc: %.dtd
+%.rnc: dtd/%.dtd
trang -I dtd -O rnc $< $@
-$(DTDS):
- wget -N --no-verbose https://www.gentoo.org/dtd/$@
-
-devbook.rnc: devbook.stamp
-
-devbook.stamp:
- wget -N --no-verbose \
- https://gitweb.gentoo.org/proj/devmanual.git/plain/devbook.rnc
- touch -r devbook.rnc $@
+devbook.rnc: devmanual/devbook.rnc
+ cp $< $@
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2022-11-03 17:48 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2022-11-03 17:48 UTC (permalink / raw
To: gentoo-commits
commit: c70ff788a6c0b7acf1025310e2c25a1c7e3ce3f5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 17:47:58 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 17:47:58 2022 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=c70ff788
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dtd | 2 +-
metadata.rnc | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dtd b/dtd
index 87222b4..021212e 160000
--- a/dtd
+++ b/dtd
@@ -1 +1 @@
-Subproject commit 87222b4de8d12028cb8a72b1f80a318a749c239d
+Subproject commit 021212eca36f8e22d110a8d77bbb96bdd908f499
diff --git a/metadata.rnc b/metadata.rnc
index 7ab3e42..92058dc 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -4,8 +4,7 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
catmetadata =
element catmetadata { attlist.catmetadata, longdescription* }
-attlist.catmetadata &=
- [ a:defaultValue = "" ] attribute pkgname { text }?
+attlist.catmetadata &= empty
# Metadata for a package
pkgmetadata =
element pkgmetadata {
@@ -17,8 +16,7 @@ pkgmetadata =
| use
| upstream)*
}
-attlist.pkgmetadata &=
- [ a:defaultValue = "" ] attribute pkgname { text }?
+attlist.pkgmetadata &= empty
# One tag for each maintainer of a package, multiple allowed
maintainer =
element maintainer {
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2023-02-27 18:20 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2023-02-27 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 33a7da00469564566b2388f67381f6d1a93c45be
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 18:00:26 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 18:00:26 2023 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=33a7da00
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dtd | 2 +-
metadata.rnc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dtd b/dtd
index 021212e..bb286db 160000
--- a/dtd
+++ b/dtd
@@ -1 +1 @@
-Subproject commit 021212eca36f8e22d110a8d77bbb96bdd908f499
+Subproject commit bb286dbef6af03bd7d063cf693f9860419796c3d
diff --git a/metadata.rnc b/metadata.rnc
index 92058dc..69952e1 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -101,6 +101,7 @@ attlist.remote-id &=
| "google-code"
| "hackage"
| "heptapod"
+ | "kde-invent"
| "launchpad"
| "osdn"
| "pear"
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2023-09-14 16:01 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2023-09-14 16:01 UTC (permalink / raw
To: gentoo-commits
commit: e0a552eee69b3f7038b5362b843b3b2a476a5022
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 15:54:47 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 15:54:47 2023 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=e0a552ee
metadata.rnc: Update from DTD
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dtd | 2 +-
metadata.rnc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dtd b/dtd
index bb286db..73759fb 160000
--- a/dtd
+++ b/dtd
@@ -1 +1 @@
-Subproject commit bb286dbef6af03bd7d063cf693f9860419796c3d
+Subproject commit 73759fb943467e059035e1e271c50893a43f70e9
diff --git a/metadata.rnc b/metadata.rnc
index 69952e1..28a00eb 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -88,6 +88,7 @@ remote-id = element remote-id { attlist.remote-id, text }
attlist.remote-id &=
attribute type {
"bitbucket"
+ | "codeberg"
| "cpan"
| "cpan-module"
| "cpe"
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2023-10-07 14:17 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2023-10-07 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 6f47949f1b7d28044c384bbeedb499fd2d5837af
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 7 14:09:50 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 14:09:50 2023 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=6f47949f
LICENCE: Add a copyright notice
The text mentions "the above copyright notice", therefore add one.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
LICENCE | 3 +++
1 file changed, 3 insertions(+)
diff --git a/LICENCE b/LICENCE
index 1bf9852..0a21fdc 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,3 +1,6 @@
+Copyright 2007-2011 Diego Elio Pettenò
+Copyright 2015-2023 Ulrich Müller
+
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2023-10-22 21:05 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2023-10-22 21:05 UTC (permalink / raw
To: gentoo-commits
commit: cc63c4cc8533f92cdd6bf55ddb38f751777b0b2f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 21:02:03 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 21:02:03 2023 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=cc63c4cc
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 14 +++++++++++---
devmanual | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 9fe44b8..158f372 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the MIT license
# or the CC-BY-SA-4.0 license (dual-licensed)
@@ -93,8 +93,16 @@ ti = element ti {
all
}
-ul = element ul { attribute class { "list-group" }?, li+ }
-ol = element ol { li+ }
+ul = element ul {
+ attribute class { "list-group" }?,
+ li+
+}
+
+ol = element ol {
+ attribute type { "1" | "A" | "a" | "I" | "i" }?,
+ li+
+}
+
li = element li { all }
dl = element dl { (dt | dd)+ }
diff --git a/devmanual b/devmanual
index f73fcfb..4ad0fdf 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit f73fcfb9352f815d44a0198516ac759caa6e09ec
+Subproject commit 4ad0fdff94a8e51fa2be94eff28357d962c8063a
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-02-08 10:56 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-02-08 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 56b0eacf4052e7514965690e96ead29f30c8e21a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 10:49:37 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 10:49:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=56b0eacf
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 6 ++++--
devmanual | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 158f372..22f7c09 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the MIT license
# or the CC-BY-SA-4.0 license (dual-licensed)
@@ -7,7 +7,7 @@
block.class = p | pre | codesample | note | important | warning | todo
| figure | table | ul | ol | dl
-attrib.class = text | b | c | e
+attrib.class = text | b | c | e | sub | sup
inline.class = attrib.class | d | uri
attrib = attrib.class*
@@ -112,6 +112,8 @@ dd = element dd { all }
b = element b { inline }
c = element c { inline }
e = element e { inline }
+sub = element sub { inline }
+sup = element sup { inline }
d = element d { empty }
uri = element uri {
diff --git a/devmanual b/devmanual
index 4ad0fdf..bd47497 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit 4ad0fdff94a8e51fa2be94eff28357d962c8063a
+Subproject commit bd474970728035c6286f1071162efefd6f8d63e9
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-10-31 19:27 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-10-31 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 1860033427189cc97ef3d8e4dede8d7677779e92
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 08:35:45 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 08:35:45 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=18600334
schemas.xml: Explicitly require an empty prefix
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
LICENCE | 2 +-
schemas.xml | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/LICENCE b/LICENCE
index 0a21fdc..bc3c646 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,5 +1,5 @@
Copyright 2007-2011 Diego Elio Pettenò
-Copyright 2015-2023 Ulrich Müller
+Copyright 2015-2024 Ulrich Müller
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/schemas.xml b/schemas.xml
index 592459e..129b6bf 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2007-2021 Gentoo Authors
+ Copyright 2007-2024 Gentoo Authors
Distributed under the terms of the MIT license
-->
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
- <documentElement localName="catmetadata" uri="metadata.rnc" />
- <documentElement localName="glsa" uri="glsa.rnc" />
- <documentElement localName="guide" uri="devbook.rnc" />
+ <documentElement prefix="" localName="catmetadata" uri="metadata.rnc"/>
+ <documentElement prefix="" localName="glsa" uri="glsa.rnc"/>
+ <documentElement prefix="" localName="guide" uri="devbook.rnc"/>
<!-- rng-loc.el cannot combine rules, so unfortunately we cannot
select a schema by both document element and filename pattern -->
<!-- <uri pattern="text.xml" uri="devbook.rnc" /> -->
- <documentElement localName="mirrors" uri="mirrors.rnc" />
- <documentElement localName="pkgmetadata" uri="metadata.rnc" />
- <documentElement localName="projects" uri="projects.rnc" />
- <documentElement localName="repositories" uri="repositories.rnc" />
- <documentElement localName="userlist" uri="userinfo.rnc" />
+ <documentElement prefix="" localName="mirrors" uri="mirrors.rnc"/>
+ <documentElement prefix="" localName="pkgmetadata" uri="metadata.rnc"/>
+ <documentElement prefix="" localName="projects" uri="projects.rnc"/>
+ <documentElement prefix="" localName="repositories" uri="repositories.rnc"/>
+ <documentElement prefix="" localName="userlist" uri="userinfo.rnc"/>
</locatingRules>
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-10-31 19:27 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-10-31 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 3d543ce1b29808478ad09cf70cac8a0b7f7a9f83
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:10:36 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:10:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=3d543ce1
devbook.rnc: Update from devmanual
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.rnc | 12 ++++++++++--
devmanual | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/devbook.rnc b/devbook.rnc
index 22f7c09..06b5f5b 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -56,11 +56,15 @@ contentsTree = element contentsTree {
p = element p { inline }
-pre = element pre { text }
+pre = element pre {
+ attribute caption { text }?,
+ text
+}
codesample = element codesample {
attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
attribute numbering { "lines" }?,
+ attribute caption { text }?,
text
}
@@ -75,7 +79,11 @@ figure = element figure {
attribute caption { text }?
}
-table = element table { tr+ }
+table = element table {
+ attribute caption { text }?,
+ tr+
+}
+
tr = element tr { (th | ti)+ }
th = element th {
diff --git a/devmanual b/devmanual
index bd47497..a104fe1 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit bd474970728035c6286f1071162efefd6f8d63e9
+Subproject commit a104fe1378cebfb50494565fb0d2cb589a682831
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-10-31 19:27 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-10-31 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 516a45ecf94530fc37b8b61ba297ab8595d38766
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:13:14 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:13:14 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=516a45ec
devbook2.rnc: New file
Preparing to rename the document element from "guide" to "devbook".
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
devbook2.rnc | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
schemas.xml | 1 +
3 files changed, 133 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a3a384a..5f30260 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RNCS = devbook.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
+RNCS = devbook.rnc devbook2.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
repositories.rnc userinfo.rnc
ifneq ($(PV),)
diff --git a/devbook2.rnc b/devbook2.rnc
new file mode 100644
index 0000000..0097a97
--- /dev/null
+++ b/devbook2.rnc
@@ -0,0 +1,131 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the MIT license
+# or the CC-BY-SA-4.0 license (dual-licensed)
+
+# RELAX NG schema for the Gentoo Devmanual
+# Based on common.dtd from GuideXML
+
+block.class = p | pre | codesample | note | important | warning | todo
+| figure | table | ul | ol | dl
+attrib.class = text | b | c | e | sub | sup
+inline.class = attrib.class | d | uri
+
+attrib = attrib.class*
+inline = inline.class*
+all = (block.class | inline.class)*
+
+start = devbook
+
+devbook = element devbook {
+ (attribute root { "true" } | attribute self { text }),
+ chapter,
+ \include*
+}
+
+\include = element include { attribute href { text } }
+
+chapter = element chapter { title, (body | section), section* }
+section = element section { title, (body | subsection), subsection* }
+subsection =
+ element subsection { title, (body | subsubsection), subsubsection* }
+subsubsection = element subsubsection { title, body }
+
+# Title texts are used as anchors, so allow only text attributes
+title = element title { attrib }
+
+body = element body { (authors | contents | block.class)+ }
+
+authors = element authors { author+ | authorlist+ }
+
+author = element author {
+ attribute name { text },
+ attribute email { text }?,
+ inline
+}
+
+authorlist = element authorlist {
+ attribute title { text },
+ attribute href { text }
+}
+
+contents = element contents {
+ attribute maxdepth { xsd:unsignedInt }?,
+ attribute root { text }?,
+ attribute extraction { text }?
+}
+
+p = element p { inline }
+
+pre = element pre {
+ attribute caption { text }?,
+ text
+}
+
+codesample = element codesample {
+ attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
+ attribute numbering { "lines" }?,
+ attribute caption { text }?,
+ text
+}
+
+note = element note { inline }
+important = element important { inline }
+warning = element warning { inline }
+todo = element todo { inline }
+
+figure = element figure {
+ attribute link { text },
+ attribute short { text }?,
+ attribute caption { text }?
+}
+
+table = element table {
+ attribute caption { text }?,
+ tr+
+}
+
+tr = element tr { (th | ti)+ }
+
+th = element th {
+ attribute colspan { xsd:unsignedInt }?,
+ attribute rowspan { xsd:unsignedInt }?,
+ attribute align { "left" | "center" | "right" }?,
+ inline
+}
+
+ti = element ti {
+ attribute colspan { xsd:unsignedInt }?,
+ attribute rowspan { xsd:unsignedInt }?,
+ attribute nowrap { "nowrap" }?,
+ attribute align { "left" | "center" | "right" }?,
+ all
+}
+
+ul = element ul {
+ attribute class { "list-group" }?,
+ li+
+}
+
+ol = element ol {
+ attribute type { "1" | "A" | "a" | "I" | "i" }?,
+ li+
+}
+
+li = element li { all }
+
+dl = element dl { (dt | dd)+ }
+dt = element dt { inline }
+dd = element dd { all }
+
+b = element b { inline }
+c = element c { inline }
+e = element e { inline }
+sub = element sub { inline }
+sup = element sup { inline }
+d = element d { empty }
+
+uri = element uri {
+ # uri can have either a URI in the body text or a link attribute
+ xsd:anyURI
+ | (attribute link { text }, inline)
+}
diff --git a/schemas.xml b/schemas.xml
index 129b6bf..ce5c0d3 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -5,6 +5,7 @@
-->
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<documentElement prefix="" localName="catmetadata" uri="metadata.rnc"/>
+ <documentElement prefix="" localName="devbook" uri="devbook2.rnc"/>
<documentElement prefix="" localName="glsa" uri="glsa.rnc"/>
<documentElement prefix="" localName="guide" uri="devbook.rnc"/>
<!-- rng-loc.el cannot combine rules, so unfortunately we cannot
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-11-12 18:22 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-11-12 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 100931651111f4d70c2b5c5d1695e09762e8c588
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 14:49:08 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 17:37:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=10093165
devbook.rnc: Update from devmanual
This renames the document element from "guide" to "devbook", as well
as "contentsTree" to "contents". Drop transitional devbook2.rnc.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
devbook.rnc | 8 ++--
devbook2.rnc | 131 -----------------------------------------------------------
devmanual | 2 +-
schemas.xml | 4 --
5 files changed, 6 insertions(+), 141 deletions(-)
diff --git a/Makefile b/Makefile
index 5f30260..a3a384a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RNCS = devbook.rnc devbook2.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
+RNCS = devbook.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
repositories.rnc userinfo.rnc
ifneq ($(PV),)
diff --git a/devbook.rnc b/devbook.rnc
index 06b5f5b..0097a97 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -14,9 +14,9 @@ attrib = attrib.class*
inline = inline.class*
all = (block.class | inline.class)*
-start = guide
+start = devbook
-guide = element guide {
+devbook = element devbook {
(attribute root { "true" } | attribute self { text }),
chapter,
\include*
@@ -33,7 +33,7 @@ subsubsection = element subsubsection { title, body }
# Title texts are used as anchors, so allow only text attributes
title = element title { attrib }
-body = element body { (authors | contentsTree | block.class)+ }
+body = element body { (authors | contents | block.class)+ }
authors = element authors { author+ | authorlist+ }
@@ -48,7 +48,7 @@ authorlist = element authorlist {
attribute href { text }
}
-contentsTree = element contentsTree {
+contents = element contents {
attribute maxdepth { xsd:unsignedInt }?,
attribute root { text }?,
attribute extraction { text }?
diff --git a/devbook2.rnc b/devbook2.rnc
deleted file mode 100644
index 0097a97..0000000
--- a/devbook2.rnc
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the MIT license
-# or the CC-BY-SA-4.0 license (dual-licensed)
-
-# RELAX NG schema for the Gentoo Devmanual
-# Based on common.dtd from GuideXML
-
-block.class = p | pre | codesample | note | important | warning | todo
-| figure | table | ul | ol | dl
-attrib.class = text | b | c | e | sub | sup
-inline.class = attrib.class | d | uri
-
-attrib = attrib.class*
-inline = inline.class*
-all = (block.class | inline.class)*
-
-start = devbook
-
-devbook = element devbook {
- (attribute root { "true" } | attribute self { text }),
- chapter,
- \include*
-}
-
-\include = element include { attribute href { text } }
-
-chapter = element chapter { title, (body | section), section* }
-section = element section { title, (body | subsection), subsection* }
-subsection =
- element subsection { title, (body | subsubsection), subsubsection* }
-subsubsection = element subsubsection { title, body }
-
-# Title texts are used as anchors, so allow only text attributes
-title = element title { attrib }
-
-body = element body { (authors | contents | block.class)+ }
-
-authors = element authors { author+ | authorlist+ }
-
-author = element author {
- attribute name { text },
- attribute email { text }?,
- inline
-}
-
-authorlist = element authorlist {
- attribute title { text },
- attribute href { text }
-}
-
-contents = element contents {
- attribute maxdepth { xsd:unsignedInt }?,
- attribute root { text }?,
- attribute extraction { text }?
-}
-
-p = element p { inline }
-
-pre = element pre {
- attribute caption { text }?,
- text
-}
-
-codesample = element codesample {
- attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
- attribute numbering { "lines" }?,
- attribute caption { text }?,
- text
-}
-
-note = element note { inline }
-important = element important { inline }
-warning = element warning { inline }
-todo = element todo { inline }
-
-figure = element figure {
- attribute link { text },
- attribute short { text }?,
- attribute caption { text }?
-}
-
-table = element table {
- attribute caption { text }?,
- tr+
-}
-
-tr = element tr { (th | ti)+ }
-
-th = element th {
- attribute colspan { xsd:unsignedInt }?,
- attribute rowspan { xsd:unsignedInt }?,
- attribute align { "left" | "center" | "right" }?,
- inline
-}
-
-ti = element ti {
- attribute colspan { xsd:unsignedInt }?,
- attribute rowspan { xsd:unsignedInt }?,
- attribute nowrap { "nowrap" }?,
- attribute align { "left" | "center" | "right" }?,
- all
-}
-
-ul = element ul {
- attribute class { "list-group" }?,
- li+
-}
-
-ol = element ol {
- attribute type { "1" | "A" | "a" | "I" | "i" }?,
- li+
-}
-
-li = element li { all }
-
-dl = element dl { (dt | dd)+ }
-dt = element dt { inline }
-dd = element dd { all }
-
-b = element b { inline }
-c = element c { inline }
-e = element e { inline }
-sub = element sub { inline }
-sup = element sup { inline }
-d = element d { empty }
-
-uri = element uri {
- # uri can have either a URI in the body text or a link attribute
- xsd:anyURI
- | (attribute link { text }, inline)
-}
diff --git a/devmanual b/devmanual
index a104fe1..754d52d 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit a104fe1378cebfb50494565fb0d2cb589a682831
+Subproject commit 754d52d8106c20ca8034ee22dbb4865e7f91d776
diff --git a/schemas.xml b/schemas.xml
index ce5c0d3..52f6933 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -7,10 +7,6 @@
<documentElement prefix="" localName="catmetadata" uri="metadata.rnc"/>
<documentElement prefix="" localName="devbook" uri="devbook2.rnc"/>
<documentElement prefix="" localName="glsa" uri="glsa.rnc"/>
- <documentElement prefix="" localName="guide" uri="devbook.rnc"/>
- <!-- rng-loc.el cannot combine rules, so unfortunately we cannot
- select a schema by both document element and filename pattern -->
- <!-- <uri pattern="text.xml" uri="devbook.rnc" /> -->
<documentElement prefix="" localName="mirrors" uri="mirrors.rnc"/>
<documentElement prefix="" localName="pkgmetadata" uri="metadata.rnc"/>
<documentElement prefix="" localName="projects" uri="projects.rnc"/>
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-11-12 18:22 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-11-12 18:22 UTC (permalink / raw
To: gentoo-commits
commit: b4947d893b0f092df2c9d67a3dcaa01d2ca92003
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 18:22:13 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 18:22:13 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b4947d89
devbook.rnc: Update from devmanual
This renames the document element from "guide" to "devbook", as well
as "contentsTree" to "contents". Drop transitional devbook2.rnc.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 2 +-
devbook.rnc | 8 ++--
devbook2.rnc | 131 -----------------------------------------------------------
devmanual | 2 +-
schemas.xml | 4 --
5 files changed, 6 insertions(+), 141 deletions(-)
diff --git a/Makefile b/Makefile
index 5f30260..a3a384a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RNCS = devbook.rnc devbook2.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
+RNCS = devbook.rnc glsa.rnc metadata.rnc mirrors.rnc projects.rnc \
repositories.rnc userinfo.rnc
ifneq ($(PV),)
diff --git a/devbook.rnc b/devbook.rnc
index 06b5f5b..0097a97 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -14,9 +14,9 @@ attrib = attrib.class*
inline = inline.class*
all = (block.class | inline.class)*
-start = guide
+start = devbook
-guide = element guide {
+devbook = element devbook {
(attribute root { "true" } | attribute self { text }),
chapter,
\include*
@@ -33,7 +33,7 @@ subsubsection = element subsubsection { title, body }
# Title texts are used as anchors, so allow only text attributes
title = element title { attrib }
-body = element body { (authors | contentsTree | block.class)+ }
+body = element body { (authors | contents | block.class)+ }
authors = element authors { author+ | authorlist+ }
@@ -48,7 +48,7 @@ authorlist = element authorlist {
attribute href { text }
}
-contentsTree = element contentsTree {
+contents = element contents {
attribute maxdepth { xsd:unsignedInt }?,
attribute root { text }?,
attribute extraction { text }?
diff --git a/devbook2.rnc b/devbook2.rnc
deleted file mode 100644
index 0097a97..0000000
--- a/devbook2.rnc
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the MIT license
-# or the CC-BY-SA-4.0 license (dual-licensed)
-
-# RELAX NG schema for the Gentoo Devmanual
-# Based on common.dtd from GuideXML
-
-block.class = p | pre | codesample | note | important | warning | todo
-| figure | table | ul | ol | dl
-attrib.class = text | b | c | e | sub | sup
-inline.class = attrib.class | d | uri
-
-attrib = attrib.class*
-inline = inline.class*
-all = (block.class | inline.class)*
-
-start = devbook
-
-devbook = element devbook {
- (attribute root { "true" } | attribute self { text }),
- chapter,
- \include*
-}
-
-\include = element include { attribute href { text } }
-
-chapter = element chapter { title, (body | section), section* }
-section = element section { title, (body | subsection), subsection* }
-subsection =
- element subsection { title, (body | subsubsection), subsubsection* }
-subsubsection = element subsubsection { title, body }
-
-# Title texts are used as anchors, so allow only text attributes
-title = element title { attrib }
-
-body = element body { (authors | contents | block.class)+ }
-
-authors = element authors { author+ | authorlist+ }
-
-author = element author {
- attribute name { text },
- attribute email { text }?,
- inline
-}
-
-authorlist = element authorlist {
- attribute title { text },
- attribute href { text }
-}
-
-contents = element contents {
- attribute maxdepth { xsd:unsignedInt }?,
- attribute root { text }?,
- attribute extraction { text }?
-}
-
-p = element p { inline }
-
-pre = element pre {
- attribute caption { text }?,
- text
-}
-
-codesample = element codesample {
- attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
- attribute numbering { "lines" }?,
- attribute caption { text }?,
- text
-}
-
-note = element note { inline }
-important = element important { inline }
-warning = element warning { inline }
-todo = element todo { inline }
-
-figure = element figure {
- attribute link { text },
- attribute short { text }?,
- attribute caption { text }?
-}
-
-table = element table {
- attribute caption { text }?,
- tr+
-}
-
-tr = element tr { (th | ti)+ }
-
-th = element th {
- attribute colspan { xsd:unsignedInt }?,
- attribute rowspan { xsd:unsignedInt }?,
- attribute align { "left" | "center" | "right" }?,
- inline
-}
-
-ti = element ti {
- attribute colspan { xsd:unsignedInt }?,
- attribute rowspan { xsd:unsignedInt }?,
- attribute nowrap { "nowrap" }?,
- attribute align { "left" | "center" | "right" }?,
- all
-}
-
-ul = element ul {
- attribute class { "list-group" }?,
- li+
-}
-
-ol = element ol {
- attribute type { "1" | "A" | "a" | "I" | "i" }?,
- li+
-}
-
-li = element li { all }
-
-dl = element dl { (dt | dd)+ }
-dt = element dt { inline }
-dd = element dd { all }
-
-b = element b { inline }
-c = element c { inline }
-e = element e { inline }
-sub = element sub { inline }
-sup = element sup { inline }
-d = element d { empty }
-
-uri = element uri {
- # uri can have either a URI in the body text or a link attribute
- xsd:anyURI
- | (attribute link { text }, inline)
-}
diff --git a/devmanual b/devmanual
index a104fe1..754d52d 160000
--- a/devmanual
+++ b/devmanual
@@ -1 +1 @@
-Subproject commit a104fe1378cebfb50494565fb0d2cb589a682831
+Subproject commit 754d52d8106c20ca8034ee22dbb4865e7f91d776
diff --git a/schemas.xml b/schemas.xml
index ce5c0d3..52f6933 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -7,10 +7,6 @@
<documentElement prefix="" localName="catmetadata" uri="metadata.rnc"/>
<documentElement prefix="" localName="devbook" uri="devbook2.rnc"/>
<documentElement prefix="" localName="glsa" uri="glsa.rnc"/>
- <documentElement prefix="" localName="guide" uri="devbook.rnc"/>
- <!-- rng-loc.el cannot combine rules, so unfortunately we cannot
- select a schema by both document element and filename pattern -->
- <!-- <uri pattern="text.xml" uri="devbook.rnc" /> -->
<documentElement prefix="" localName="mirrors" uri="mirrors.rnc"/>
<documentElement prefix="" localName="pkgmetadata" uri="metadata.rnc"/>
<documentElement prefix="" localName="projects" uri="projects.rnc"/>
^ permalink raw reply related [flat|nested] 58+ messages in thread
* [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
@ 2024-11-16 12:51 Ulrich Müller
0 siblings, 0 replies; 58+ messages in thread
From: Ulrich Müller @ 2024-11-16 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 1d24c981825782ba583d021ffabea0060ef691ce
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 12:48:00 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 12:48:00 2024 +0000
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=1d24c981
schemas.xml: Fix uri
Fixes: b4947d893b0f092df2c9d67a3dcaa01d2ca92003
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
schemas.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/schemas.xml b/schemas.xml
index 52f6933..4d60c70 100644
--- a/schemas.xml
+++ b/schemas.xml
@@ -5,7 +5,7 @@
-->
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<documentElement prefix="" localName="catmetadata" uri="metadata.rnc"/>
- <documentElement prefix="" localName="devbook" uri="devbook2.rnc"/>
+ <documentElement prefix="" localName="devbook" uri="devbook.rnc"/>
<documentElement prefix="" localName="glsa" uri="glsa.rnc"/>
<documentElement prefix="" localName="mirrors" uri="mirrors.rnc"/>
<documentElement prefix="" localName="pkgmetadata" uri="metadata.rnc"/>
^ permalink raw reply related [flat|nested] 58+ messages in thread
end of thread, other threads:[~2024-11-16 12:51 UTC | newest]
Thread overview: 58+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-27 9:50 [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2024-11-16 12:51 Ulrich Müller
2024-11-12 18:22 Ulrich Müller
2024-11-12 18:22 Ulrich Müller
2024-10-31 19:27 Ulrich Müller
2024-10-31 19:27 Ulrich Müller
2024-10-31 19:27 Ulrich Müller
2024-02-08 10:56 Ulrich Müller
2023-10-22 21:05 Ulrich Müller
2023-10-07 14:17 Ulrich Müller
2023-09-14 16:01 Ulrich Müller
2023-02-27 18:20 Ulrich Müller
2022-11-03 17:48 Ulrich Müller
2022-10-01 9:42 Ulrich Müller
2022-10-01 9:40 Ulrich Müller
2022-10-01 9:40 Ulrich Müller
2022-09-16 7:15 Ulrich Müller
2022-07-30 5:31 Ulrich Müller
2022-06-19 15:46 Ulrich Müller
2022-05-26 6:10 Ulrich Müller
2022-05-26 6:10 Ulrich Müller
2022-05-24 17:59 Ulrich Müller
2022-04-28 22:38 Ulrich Müller
2022-04-28 22:35 Ulrich Müller
2022-01-25 8:11 Ulrich Müller
2022-01-25 8:11 Ulrich Müller
2022-01-25 8:11 Ulrich Müller
2022-01-21 22:08 Ulrich Müller
2021-09-08 17:55 Ulrich Müller
2021-09-06 18:11 Ulrich Müller
2021-03-15 13:15 Ulrich Müller
2021-02-03 13:45 Ulrich Müller
2020-03-03 8:33 Ulrich Müller
2020-02-29 16:15 Ulrich Müller
2020-02-29 16:15 Ulrich Müller
2020-01-22 19:54 Ulrich Müller
2020-01-09 23:37 Ulrich Müller
2020-01-09 23:37 Ulrich Müller
2019-12-27 9:50 Ulrich Müller
2019-12-17 19:07 Ulrich Müller
2019-12-17 19:07 Ulrich Müller
2019-12-17 19:07 Ulrich Müller
2019-12-17 17:22 Ulrich Müller
2019-12-11 6:55 Ulrich Müller
2019-12-03 14:57 Ulrich Müller
2018-06-18 19:48 Ulrich Müller
2018-06-11 22:42 Ulrich Müller
2018-06-11 22:42 Ulrich Müller
2016-05-06 7:59 Ulrich Müller
2016-03-12 12:28 Ulrich Müller
2016-03-12 12:28 Ulrich Müller
2016-01-25 21:23 Ulrich Müller
2016-01-25 21:23 Ulrich Müller
2016-01-25 21:23 Ulrich Müller
2016-01-25 21:23 Ulrich Müller
2016-01-25 9:28 Ulrich Müller
2016-01-25 9:21 Ulrich Müller
2016-01-25 9:21 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox