commit: 19719233d088e05f43ee783ec989c4db24218b3f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 07:21:58 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 08:46:36 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=19719233
devbook.xsl: Change figure caption into an attribute.
As discussed in #gentoo-qa. This also follows the description in the
devbook guide.
Change all uses in the document.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
devbook.xsl | 4 +++-
general-concepts/autotools/text.xml | 6 +++---
general-concepts/emerge-and-ebuild/text.xml | 3 +--
general-concepts/git-to-rsync/text.xml | 5 ++---
general-concepts/mirrors/text.xml | 5 ++---
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/devbook.xsl b/devbook.xsl
index b3a14cc..cadd975 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -188,7 +188,9 @@
<xsl:template match="figure">
<div class="figure">
<div class="image"><img alt="{@short}" src="{@link}"/></div>
- <p class="caption"><xsl:value-of select="."/></p>
+ <xsl:if test="@caption">
+ <p class="caption"><xsl:value-of select="@caption"/></p>
+ </xsl:if>
</div>
</xsl:template>
diff --git a/general-concepts/autotools/text.xml
b/general-concepts/autotools/text.xml
index 8be8d34..fc21a7c 100644
--- a/general-concepts/autotools/text.xml
+++ b/general-concepts/autotools/text.xml
@@ -42,9 +42,9 @@ together with a few relatively simple upstream-supplied input
files, are used to
create the build system for a package.
</p>
-<figure short="How autotools fits together" link="diagram.png">
-A basic overview of how the main autotools components fit together.
-</figure>
+<figure short="How autotools fits together" link="diagram.png"
+ caption="A basic overview of how the main autotools components fit together."
+ />
<p>
In a simple setup:
diff --git a/general-concepts/emerge-and-ebuild/text.xml
b/general-concepts/emerge-and-ebuild/text.xml
index 73c97e9..d96d5b0 100644
--- a/general-concepts/emerge-and-ebuild/text.xml
+++ b/general-concepts/emerge-and-ebuild/text.xml
@@ -5,8 +5,7 @@
<body>
-<figure short="How emerge, ebuild and foo.ebuild interact" link="diagram.png">
-</figure>
+<figure short="How emerge, ebuild and foo.ebuild interact" link="diagram.png"
/>
<p>
The <c>emerge</c> program is a high level wrapper for <c>ebuild.sh</c> that
handles
diff --git a/general-concepts/git-to-rsync/text.xml
b/general-concepts/git-to-rsync/text.xml
index b7a2c8e..354c555 100644
--- a/general-concepts/git-to-rsync/text.xml
+++ b/general-concepts/git-to-rsync/text.xml
@@ -29,9 +29,8 @@
</li>
</ul>
-<figure short="Git to RSYNC Propagation" link="diagram.png">
- Diagram showing Git to RSYNC Propagation
-</figure>
+<figure short="Git to RSYNC Propagation" link="diagram.png"
+ caption="Diagram showing Git to RSYNC Propagation" />
<p>
The <c>emerge-websync</c> snapshot is made daily from the staging box.
diff --git a/general-concepts/mirrors/text.xml
b/general-concepts/mirrors/text.xml
index 37e05e3..c6570b0 100644
--- a/general-concepts/mirrors/text.xml
+++ b/general-concepts/mirrors/text.xml
@@ -142,9 +142,8 @@ doing so can cause all kinds of problems with strict
firewalls.
<title>Mirroring Process</title>
<body>
-<figure short="Mirroring Process" link="diagram.png">
-Diagram showing the mirroring process.
-</figure>
+<figure short="Mirroring Process" link="diagram.png"
+ caption="Diagram showing the mirroring process." />
</body>
</section>
