From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1A4C1382C5 for ; Wed, 3 Feb 2021 13:45:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED2D2E083B; Wed, 3 Feb 2021 13:45:35 +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 CF20BE083B for ; Wed, 3 Feb 2021 13:45:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32BCE341A6E for ; Wed, 3 Feb 2021 13:45:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A81548B for ; Wed, 3 Feb 2021 13:45:32 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1612351683.8b179602deb8179086c418108b4de43492d9acbb.ulm@gentoo> Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / X-VCS-Repository: proj/nxml-gentoo-schemas X-VCS-Files: devbook.rnc metadata.rnc X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8b179602deb8179086c418108b4de43492d9acbb X-VCS-Branch: master Date: Wed, 3 Feb 2021 13:45:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 10dd8611-e224-4756-9482-56bc30438a9b X-Archives-Hash: 8485edaaebb2240392b1ed9e3776b7b8 commit: 8b179602deb8179086c418108b4de43492d9acbb Author: Ulrich Müller gentoo org> AuthorDate: Wed Feb 3 11:28:03 2021 +0000 Commit: Ulrich Müller gentoo 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 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"