From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1133774-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 B6DD4138334
	for <garchives@archives.gentoo.org>; Thu, 26 Dec 2019 21:36:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DD010E09B1;
	Thu, 26 Dec 2019 21:36:19 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BADB7E09B1
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2019 21:36:19 +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 7A34034DBD1
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2019 21:36:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A63B35
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2019 21:36:16 +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: <1577392827.91ee1bae83604a11bd5b8d7a04ab978c88040184.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: /
X-VCS-Repository: proj/devmanual
X-VCS-Files: devbook.dtd devbook.xsl devmanual.css
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 91ee1bae83604a11bd5b8d7a04ab978c88040184
X-VCS-Branch: master
Date: Thu, 26 Dec 2019 21:36:16 +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: 1cc6ec3d-5a98-4262-9168-11b327cced26
X-Archives-Hash: bdb3fbbc01b63b326f7fecf17f8069c0

commit:     91ee1bae83604a11bd5b8d7a04ab978c88040184
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 19:24:16 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 20:40:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=91ee1bae

More conventional syntax of definition lists.

Definition lists required only "p" elements as children of "dd".
Change to a more conventional syntax where each "dt" element can be
followed by one _or_more_ "dd" elements. This agrees with both
GuideXML and HTML.

Vertical spacing for "dd" should really be done in the CSS style
sheet, instead of complicated XSL processing.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.dtd   |  5 ++---
 devbook.xsl   | 11 +----------
 devmanual.css |  5 +----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index 946a7f1..455397b 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -80,10 +80,9 @@
 
 <!ELEMENT li            (#PCDATA|%all.class;)*>
 
-<!ELEMENT dl            (dt, dd)+>
+<!ELEMENT dl            (dt, dd+)+>
 <!ELEMENT dt            (#PCDATA|%inline.class;)*>
-<!-- The following is strange, but devbook.xsl expects only p elements -->
-<!ELEMENT dd            (p)+>
+<!ELEMENT dd            (#PCDATA|%inline.class;)*>
 
 <!ELEMENT b             (#PCDATA|%inline.class;)*>
 <!ELEMENT c             (#PCDATA|%inline.class;)*>

diff --git a/devbook.xsl b/devbook.xsl
index da60097..a8a11f1 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -231,16 +231,7 @@
   </xsl:template>
 
   <xsl:template match="dd">
-    <dd>
-      <xsl:for-each select="p">
-        <xsl:choose>
-        <xsl:when test="count(../p) = 1"><xsl:apply-templates/></xsl:when>
-        <xsl:when test="position() = 1"><p class="first"><xsl:apply-templates/></p></xsl:when>
-        <xsl:when test="position() = last()"><p class="last"><xsl:apply-templates/></p></xsl:when>
-        <xsl:otherwise><p><xsl:apply-templates/></p></xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </dd>
+    <dd><xsl:apply-templates/></dd>
   </xsl:template>
 
   <xsl:template match="important">

diff --git a/devmanual.css b/devmanual.css
index 1507558..414ad1e 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -139,11 +139,8 @@ dt {
     font-weight: bold;
 }
 
-dd p.first {
+dd {
     margin-top: 0.2em;
-}
-
-dd p.last {
     margin-bottom: 0.2em;
 }