From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1133842-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D706F138335
for <garchives@archives.gentoo.org>; Fri, 27 Dec 2019 09:50:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 51BF8E0AF2;
Fri, 27 Dec 2019 09:50:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 31A81E0AD0
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2019 09:50:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9A6BA34DBE3
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2019 09:50:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AC5D340
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2019 09:50:03 +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: <1577439670.0af560f9e5ad607b40ef222f9b9b2c687a14fa3f.ulm@gentoo>
Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
X-VCS-Repository: proj/nxml-gentoo-schemas
X-VCS-Files: devbook.rnc
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 0af560f9e5ad607b40ef222f9b9b2c687a14fa3f
X-VCS-Branch: master
Date: Fri, 27 Dec 2019 09:50:03 +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: f921a0ac-0775-409f-a9c1-04d3c1fbc547
X-Archives-Hash: 4ae3d78c0b7ffa99b701c2d7de87219c
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)* }