From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1689075-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9021A158042
for <garchives@archives.gentoo.org>; Tue, 12 Nov 2024 18:22:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DAB30E07EF;
Tue, 12 Nov 2024 18:22:25 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BF006E07EF
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Nov 2024 18:22:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CEB7C341256
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Nov 2024 18:22:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E3C3AED
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Nov 2024 18:22:23 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1731435733.b4947d893b0f092df2c9d67a3dcaa01d2ca92003.ulm@gentoo>
Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
X-VCS-Repository: proj/nxml-gentoo-schemas
X-VCS-Files: Makefile devbook.rnc devbook2.rnc devmanual schemas.xml
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: b4947d893b0f092df2c9d67a3dcaa01d2ca92003
X-VCS-Branch: master
Date: Tue, 12 Nov 2024 18:22:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4f059d89-f512-4f7e-a248-6176a15e31be
X-Archives-Hash: a028408a653b7f616363b931cb20215b
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"/>