[gentoo-commits] proj/devmanual:master commit in: /

[gentoo-commits] proj/devmanual:master commit in: /

[Torsten Veller]

commit:     db484ff2d10116ff24e43b80435c4a1401f5fdea
Author:     Torsten Veller <tove <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 12:22:59 2011 +0000
Commit:     Torsten Veller <tove <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 12:37:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=db484ff2

Change Bugzilla link to the proper "Product" and "Component" (#395355)

---
 text.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/text.xml b/text.xml
index ed53f8c..566de42 100644
--- a/text.xml
+++ b/text.xml
@@ -25,8 +25,9 @@ detailed, up to date technical content.
 <p>
 Contributions are encouraged. See the <uri link="::appendices/contributing"/>
 section for how to get started. If you have any corrections, suggestions or
-improvements please file a bug at <uri link="http://bugs.gentoo.org">bugs.gentoo.org</uri>
-and assign it to <c>qa@gentoo.org</c>. The <uri link="::appendices/contributors"/>
+improvements please look at the <uri link="https://bugs.gentoo.org/buglist.cgi?product=Doc%20Other;component=Devmanual;resolution=---">bug list</uri>
+and file a <uri link="https://bugs.gentoo.org/enter_bug.cgi?product=Doc%20Other;component=Devmanual;format=guided">new bug</uri>.
+The <uri link="::appendices/contributors"/>
 section lists specific contributions to this manual.
 </p>
 </body>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     55630b1fd8cf10ea29a1eeae9ce64f8d98618c76
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 00:13:40 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 00:13:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=55630b1f

Add Mike Pagano to contributors because of bug #365189

---
 text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/text.xml b/text.xml
index 566de42..4d9e883 100644
--- a/text.xml
+++ b/text.xml
@@ -18,7 +18,7 @@ detailed, up to date technical content.
             Tom Martin, Paul Varner, Ilya Volynets-Evenbakh,
             Diego Pettenò, Fernando J. Pereda, Simon Stelling, Alin Dobre,
             Joseph Jezak, Tim Yamin, Mark Loeser, Petteri Räty, Markos
-	    Chandras
+		    Chandras, Mike Pagano
         </p>
     </dd>
 </dl>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     a1c30a57410c527b6054ff68520be95b63ebbd6a
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 19:23:08 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 19:23:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=a1c30a57

text.xml/contributors: Add Julian Ospald (hasufell)

---
 text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/text.xml b/text.xml
index 4d9e883..4c497cb 100644
--- a/text.xml
+++ b/text.xml
@@ -18,7 +18,7 @@ detailed, up to date technical content.
             Tom Martin, Paul Varner, Ilya Volynets-Evenbakh,
             Diego Pettenò, Fernando J. Pereda, Simon Stelling, Alin Dobre,
             Joseph Jezak, Tim Yamin, Mark Loeser, Petteri Räty, Markos
-		    Chandras, Mike Pagano
+		    Chandras, Mike Pagano, Julian Ospald
         </p>
     </dd>
 </dl>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Mueller]

commit:     c6e599778a87b6009a10a90c426cd294869d49e9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 16:44:26 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 16:44:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=c6e59977

Add myself to contributors.

---
 text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/text.xml b/text.xml
index 4c497cb..88016b0 100644
--- a/text.xml
+++ b/text.xml
@@ -18,7 +18,7 @@ detailed, up to date technical content.
             Tom Martin, Paul Varner, Ilya Volynets-Evenbakh,
             Diego Pettenò, Fernando J. Pereda, Simon Stelling, Alin Dobre,
             Joseph Jezak, Tim Yamin, Mark Loeser, Petteri Räty, Markos
-		    Chandras, Mike Pagano, Julian Ospald
+            Chandras, Mike Pagano, Julian Ospald, Ulrich Müller
         </p>
     </dd>
 </dl>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     c7dcd3c11fa968696775084d7f3029ee479fda61
Author:     Theo Chatzimichos <tampakrap <AT> gmail <DOT> com>
AuthorDate: Sat May 11 08:39:47 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:39:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=c7dcd3c1

Merge pull request #1 from nikai3d/patch-1

fix typo


 general-concepts/filesystem/text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     47891d55e1e5f73bbb4b4a5cd32ae3b5e5c57b8d
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 15:05:50 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun May 12 15:05:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=47891d55

Merge pull request #2 from gentoo/metastructure_hyperlink_fix

Fix for incorrect hyperlink to metastructure project


 ebuild-writing/misc-files/metadata/text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     904e1ded67689b3f39d4a1f393120c9d0765962b
Author:     Tomáš Chvátal <tomas.chvatal <AT> gmail <DOT> com>
AuthorDate: Sun May 12 19:18:00 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun May 12 19:18:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=904e1ded

Merge pull request #3 from nikai3d/duplications

fix duplications and typos


 archs/amd64/text.xml          |    4 ++--
 tools-reference/find/text.xml |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Dirkjan Ochtman]

commit:     d75f9b8fa1ee28df69eb2e9e3f64c36e16709c4f
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 12:57:17 2013 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Wed May 15 12:57:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=d75f9b8f

Clarify dependencies for building the manual.

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index dfdf968..dd2d1c4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ image_files := $(shell find -name "*.svg" | sed -e "s/svg$$/png/")
 all: prereq $(text_files) $(image_files)
 
 prereq:
-	@type -p convert &>/dev/null || { echo "media-gfx/imagemagick with truetype and corefonts is required" >&2; exit 1; }; \
+	@type -p convert &>/dev/null || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
 		type -p xsltproc &>/dev/null || { echo "dev-libs/libxslt is required" >&2; exit 1; }
 
 %index.html : %text.xml

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     fe00595bafdc9672c006aa1661f1462c5fa4030d
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 08:37:56 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun May 19 08:37:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=fe00595b

Merge pull request #4 from mrueg/patch-1

Fix path for use.mask


 profiles/use.mask/text.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     2ecaf9db0a3f2c418ec8c63e94d19dc237082ab1
Author:     Justin <jlec <AT> j-schmitz <DOT> net>
AuthorDate: Thu Jul 25 08:13:22 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 08:13:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=2ecaf9db

Merge pull request #6 from Whissi/master

pkg_pretend sample used deprecated error message format


 ebuild-writing/functions/pkg_pretend/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     9dfe391e3f3d2c8b3f4aa205dca3516af23ca2b8
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 12:22:38 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 12:22:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=9dfe391e

Merge pull request #9 from TomWij/patch-1

Add a reference to the Gentoo Developer Handbook.


 text.xml | 1 +
 1 file changed, 1 insertion(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     ced738e2cf213f7001a4f39cd561983f71631582
Author:     Tom Wijsman <TomWij <AT> live <DOT> com>
AuthorDate: Wed Sep 18 19:17:28 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 19:17:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=ced738e2

Add a reference to the Gentoo Developer Handbook.

---
 text.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/text.xml b/text.xml
index 88016b0..8cacc3e 100644
--- a/text.xml
+++ b/text.xml
@@ -30,6 +30,7 @@ and file a <uri link="https://bugs.gentoo.org/enter_bug.cgi?product=Doc%20Other;
 The <uri link="::appendices/contributors"/>
 section lists specific contributions to this manual.
 </p>
+<p>Users that are interested in becoming a Gentoo Developer are encouraged to also read the <uri link="http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml">Gentoo Developer Handbook</uri>.</p>
 </body>
 
 <section>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     840d0cabafc715ae61db43992836d46ea4d7e464
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 07:39:38 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 07:39:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=840d0cab

Merge pull request #10 from mrueg/master

Add changes for architectures w/o a stable tree due to the latest council decision


 ebuild-writing/ebuild-maintenance/text.xml | 6 ++++--
 general-concepts/virtuals/text.xml         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     03e10633fb2ae08334fe6f0c0da5d2847f950b56
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 18:31:34 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 18:31:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=03e10633

Merge pull request #12 from iXit/master

metadata: fix important sequence of email and name in maintainer section


 ebuild-writing/misc-files/metadata/text.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     9d97f188d97e7a90577653883daa9d8541fae7fd
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 11:23:28 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 11:23:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=9d97f188

Merge pull request #14 from creffett/masklive

Change references to masking live packages to setting KEYWORDS=""


 ebuild-writing/functions/src_unpack/cvs-sources/text.xml | 2 +-
 ebuild-writing/functions/src_unpack/svn-sources/text.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     68990c4329bc68b340627415e0c75e19035ad244
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 12:33:19 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 12:33:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=68990c43

Drop duplicate info about contributions

Contributors are listed in
http://devmanual.gentoo.org/appendices/contributors/index.html

There is no need to duplicate this information on the homepage.

---
 text.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/text.xml b/text.xml
index 8cacc3e..c2c89b0 100644
--- a/text.xml
+++ b/text.xml
@@ -10,18 +10,6 @@ inaccuracies, omissions, typos and the occasional outright lie. The
 intent is to make a handbook giving developers and users correct,
 detailed, up to date technical content.
 </p>
-<dl>
-    <dt>Contributors</dt>
-    <dd>
-        <p>
-            Ciaran McCreesh, Grant Goodyear, Aaron Walker, Robert Coie,
-            Tom Martin, Paul Varner, Ilya Volynets-Evenbakh,
-            Diego Pettenò, Fernando J. Pereda, Simon Stelling, Alin Dobre,
-            Joseph Jezak, Tim Yamin, Mark Loeser, Petteri Räty, Markos
-            Chandras, Mike Pagano, Julian Ospald, Ulrich Müller
-        </p>
-    </dd>
-</dl>
 <p>
 Contributions are encouraged. See the <uri link="::appendices/contributing"/>
 section for how to get started. If you have any corrections, suggestions or

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     f412bbeafc40d829257d95934f48220c1b7c7362
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 14:52:08 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 14:52:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=f412bbea

Merge pull request #15 from xhochy/link-to-toolchain-funcs

Link to toolchain-funcs.eclass in src_compile/building


 ebuild-writing/functions/src_compile/building/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     c66cb75ab51e8e901f4c9a1d322ea5a12fc75456
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 21:51:13 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 02:55:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=c66cb75a

Add README.md

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0a211a4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+devmanual.gentoo.org
+====================
+
+Gentoo devmanual source
+
+You can find the compiled version here: http://devmanual.gentoo.org
+
+This document is licensed under [CC-BY-SA-2.0](License)
+
+See also http://devmanual.gentoo.org/appendices/contributing/index.html

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     4e0acbce9786cf0ebdb1830c66944caa0a916182
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 21:44:53 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 21:44:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=4e0acbce

Add LICENSE File

---
 LICENSE | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 252 insertions(+)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..70da0ad
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,252 @@
+Creative Commons Legal Code
+
+Attribution-ShareAlike 2.0
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
+RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
+AND CONDITIONS.
+
+1. Definitions
+
+ a. "Collective Work" means a work, such as a periodical issue, anthology
+    or encyclopedia, in which the Work in its entirety in unmodified form,
+    along with a number of other contributions, constituting separate and
+    independent works in themselves, are assembled into a collective
+    whole. A work that constitutes a Collective Work will not be
+    considered a Derivative Work (as defined below) for the purposes of
+    this License.
+ b. "Derivative Work" means a work based upon the Work or upon the Work
+    and other pre-existing works, such as a translation, musical
+    arrangement, dramatization, fictionalization, motion picture version,
+    sound recording, art reproduction, abridgment, condensation, or any
+    other form in which the Work may be recast, transformed, or adapted,
+    except that a work that constitutes a Collective Work will not be
+    considered a Derivative Work for the purpose of this License. For the
+    avoidance of doubt, where the Work is a musical composition or sound
+    recording, the synchronization of the Work in timed-relation with a
+    moving image ("synching") will be considered a Derivative Work for the
+    purpose of this License.
+ c. "Licensor" means the individual or entity that offers the Work under
+    the terms of this License.
+ d. "Original Author" means the individual or entity who created the Work.
+ e. "Work" means the copyrightable work of authorship offered under the
+    terms of this License.
+ f. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ g. "License Elements" means the following high-level license attributes
+    as selected by Licensor and indicated in the title of this License:
+    Attribution, ShareAlike.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit,
+or restrict any rights arising from fair use, first sale or other
+limitations on the exclusive rights of the copyright owner under copyright
+law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to reproduce the Work, to incorporate the Work into one or more
+    Collective Works, and to reproduce the Work as incorporated in the
+    Collective Works;
+ b. to create and reproduce Derivative Works;
+ c. to distribute copies or phonorecords of, display publicly, perform
+    publicly, and perform publicly by means of a digital audio
+    transmission the Work including as incorporated in Collective Works;
+ d. to distribute copies or phonorecords of, display publicly, perform
+    publicly, and perform publicly by means of a digital audio
+    transmission Derivative Works.
+ e. For the avoidance of doubt, where the work is a musical composition:
+
+     i. Performance Royalties Under Blanket Licenses. Licensor waives
+        the exclusive right to collect, whether individually or via a
+        performance rights society (e.g. ASCAP, BMI, SESAC), royalties
+        for the public performance or public digital performance (e.g.
+        webcast) of the Work.
+    ii. Mechanical Rights and Statutory Royalties. Licensor waives the
+        exclusive right to collect, whether individually or via a music
+        rights society or designated agent (e.g. Harry Fox Agency),
+        royalties for any phonorecord You create from the Work ("cover
+        version") and distribute, subject to the compulsory license
+        created by 17 USC Section 115 of the US Copyright Act (or the
+        equivalent in other jurisdictions).
+
+ f. Webcasting Rights and Statutory Royalties. For the avoidance of doubt,
+    where the Work is a sound recording, Licensor waives the exclusive
+    right to collect, whether individually or via a performance-rights
+    society (e.g. SoundExchange), royalties for the public digital
+    performance (e.g. webcast) of the Work, subject to the compulsory
+    license created by 17 USC Section 114 of the US Copyright Act (or the
+    equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. All rights not expressly granted by Licensor are
+hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may distribute, publicly display, publicly perform, or publicly
+    digitally perform the Work only under the terms of this License, and
+    You must include a copy of, or the Uniform Resource Identifier for,
+    this License with every copy or phonorecord of the Work You
+    distribute, publicly display, publicly perform, or publicly digitally
+    perform. You may not offer or impose any terms on the Work that alter
+    or restrict the terms of this License or the recipients' exercise of
+    the rights granted hereunder. You may not sublicense the Work. You
+    must keep intact all notices that refer to this License and to the
+    disclaimer of warranties. You may not distribute, publicly display,
+    publicly perform, or publicly digitally perform the Work with any
+    technological measures that control access or use of the Work in a
+    manner inconsistent with the terms of this License Agreement. The
+    above applies to the Work as incorporated in a Collective Work, but
+    this does not require the Collective Work apart from the Work itself
+    to be made subject to the terms of this License. If You create a
+    Collective Work, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Collective Work any reference to such
+    Licensor or the Original Author, as requested. If You create a
+    Derivative Work, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Derivative Work any reference to such
+    Licensor or the Original Author, as requested.
+ b. You may distribute, publicly display, publicly perform, or publicly
+    digitally perform a Derivative Work only under the terms of this
+    License, a later version of this License with the same License
+    Elements as this License, or a Creative Commons iCommons license that
+    contains the same License Elements as this License (e.g. Attribution-
+    ShareAlike 2.0 Japan). You must include a copy of, or the Uniform
+    Resource Identifier for, this License or other license specified in
+    the previous sentence with every copy or phonorecord of each
+    Derivative Work You distribute, publicly display, publicly perform, or
+    publicly digitally perform. You may not offer or impose any terms on
+    the Derivative Works that alter or restrict the terms of this License
+    or the recipients' exercise of the rights granted hereunder, and You
+    must keep intact all notices that refer to this License and to the
+    disclaimer of warranties. You may not distribute, publicly display,
+    publicly perform, or publicly digitally perform the Derivative Work
+    with any technological measures that control access or use of the Work
+    in a manner inconsistent with the terms of this License Agreement. The
+    above applies to the Derivative Work as incorporated in a Collective
+    Work, but this does not require the Collective Work apart from the
+    Derivative Work itself to be made subject to the terms of this
+    License.
+ c. If you distribute, publicly display, publicly perform, or publicly
+    digitally perform the Work or any Derivative Works or Collective
+    Works, You must keep intact all copyright notices for the Work and
+    give the Original Author credit reasonable to the medium or means You
+    are utilizing by conveying the name (or pseudonym if applicable) of
+    the Original Author if supplied; the title of the Work if supplied; to
+    the extent reasonably practicable, the Uniform Resource Identifier, if
+    any, that Licensor specifies to be associated with the Work, unless
+    such URI does not refer to the copyright notice or licensing
+    information for the Work; and in the case of a Derivative Work, a
+    credit identifying the use of the Work in the Derivative Work (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). Such credit may be
+    implemented in any reasonable manner; provided, however, that in the
+    case of a Derivative Work or Collective Work, at a minimum such credit
+    will appear where any other comparable authorship credit appears and
+    in a manner at least as prominent as such other comparable authorship
+    credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE
+WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Derivative Works or
+    Collective Works from You under this License, however, will not have
+    their licenses terminated provided such individuals or entities remain
+    in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8
+    will survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You distribute or publicly digitally perform the Work or a
+    Collective Work, the Licensor offers to the recipient a license to the
+    Work on the same terms and conditions as the license granted to You
+    under this License.
+ b. Each time You distribute or publicly digitally perform a Derivative
+    Work, Licensor offers to the recipient a license to the original Work
+    on the same terms and conditions as the license granted to You under
+    this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, neither party will use the trademark
+    "Creative Commons" or any related trademark or logo of Creative
+    Commons without the prior written consent of Creative Commons. Any
+    permitted use will be in compliance with Creative Commons'
+    then-current trademark usage guidelines, as may be published on its
+    website or otherwise made available upon request from time to time.
+
+    Creative Commons may be contacted at http://creativecommons.org/.

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     8ac0d601c7afff70b89d409294d67f47af6be56c
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 10:24:31 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 10:24:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=8ac0d601

Merge pull request #11 from mrueg/master

Add README and License file


 LICENSE   | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |  10 +++
 2 files changed, 262 insertions(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     1201354b180850eed37d0a5038cb04bd86c3f474
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 18:03:56 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 18:03:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=1201354b

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/devmanual


 ebuild-writing/common-mistakes/text.xml | 17 -----------------
 ebuild-writing/eapi/text.xml            |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     fa9c4e76d418fa774e8fd05368c218bdb063e791
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:25:28 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:25:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=fa9c4e76

Merge pull request #13 from creffett/master

Clarify difference between _p and -r in ebuild names


 ebuild-writing/file-format/text.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     1288fb0040e581058459fb4dca77491479a3ac57
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:24:01 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:24:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=1288fb00

Merge pull request #18 from mudler/master

fixing a small typo in ebuild-writing/misc-files/patches


 ebuild-writing/misc-files/patches/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     0c5590319775a92ffe83c95ed4212e618f846844
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:24:21 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:24:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=0c559031

Merge pull request #16 from mrueg/master

Add a verification step


 general-concepts/news/text.xml | 1 +
 1 file changed, 1 insertion(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     fa9c4e76d418fa774e8fd05368c218bdb063e791
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:25:28 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:25:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=fa9c4e76

Merge pull request #13 from creffett/master

Clarify difference between _p and -r in ebuild names


 ebuild-writing/file-format/text.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     1288fb0040e581058459fb4dca77491479a3ac57
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:24:01 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:24:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=1288fb00

Merge pull request #18 from mudler/master

fixing a small typo in ebuild-writing/misc-files/patches


 ebuild-writing/misc-files/patches/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     0c5590319775a92ffe83c95ed4212e618f846844
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 16:24:21 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 16:24:21 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=0c559031

Merge pull request #16 from mrueg/master

Add a verification step


 general-concepts/news/text.xml | 1 +
 1 file changed, 1 insertion(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     1201354b180850eed37d0a5038cb04bd86c3f474
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 18:03:56 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 18:03:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=1201354b

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/devmanual


 ebuild-writing/common-mistakes/text.xml | 17 -----------------
 ebuild-writing/eapi/text.xml            |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     833a83d6d2b3d100d00a951b1f50a744856954d0
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 18 17:34:40 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 17:34:40 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=833a83d6

Merge pull request #21 from wking/no-network-access

ebuild-writing/functions: Don't allow network access


 ebuild-writing/functions/text.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     f7aa9aa4f5c0cda7b8169876e2d0c10fe5f81c53
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 18 17:33:43 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 17:33:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=f7aa9aa4

Merge pull request #23 from wking/doc-use

ebuild-writing/common-mistakes: Mention the 'doc' USE flag


 ebuild-writing/common-mistakes/text.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     98013988f18cfb5e90b7f4593c1eb4f14c46e72b
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 18 17:31:01 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 17:31:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=98013988

Merge pull request #17 from mrueg/master

 Add paragraph regarding packages without existing HOMEPAGE


 ebuild-writing/ebuild-maintenance/text.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     c67c07a3f3431658ce64aa870485e8b8b0ebc0cb
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 22 19:22:54 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 19:22:54 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=c67c07a3

Improve navigation a bit

- Add dropdown with available child pages
- Use glyphs from bootstrap instead of pure html arrows
- Drop parent page menu entry since it's available via breadcrumb

---
 devbook.xsl | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1d72520..c9fb066 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -335,6 +335,7 @@
   <!-- TOC Tree -->
   <xsl:template match="contentsTree" name="contentsTree">
     <xsl:param name="depth" select="0"/>
+    <xsl:param name="ulclass"/>
     <xsl:param name="maxdepth">
       <xsl:choose>
 	<xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
@@ -376,7 +377,7 @@
 	</xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-	<ul>
+	<ul class="{$ulclass}">
 	  <xsl:for-each select="document($doc_self)/guide/include">
 	    <xsl:variable name="extraction_counter_node">
 	      <xsl:call-template name="contentsTree">
@@ -484,8 +485,14 @@
               </div>
               <div class="collapse navbar-collapse navbar-main-collapse">
                 <ul class="nav navbar-nav">
+                  <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
+                    <xsl:call-template name="contentsTree">
+                      <xsl:with-param name="maxdepth" select="1"/>
+                      <xsl:with-param name="ulclass">dropdown-menu</xsl:with-param>
+                    </xsl:call-template>
+                  </li>
                   <li><xsl:call-template name="findPrevious"/></li>
-                  <li><xsl:call-template name="findParent"/></li>
                   <li><xsl:call-template name="findNext"/></li>
                 </ul>
               </div>
@@ -559,7 +566,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
 	<xsl:variable name="doc" select="/guide/include[1]/@href"/>
-	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#x2192;</a>
+	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> <span class="glyphicon glyphicon-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -592,7 +599,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:variable>
-	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#x2192;</a>
+	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> <span class="glyphicon glyphicon-arrow-right"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -639,7 +646,7 @@
 	       * Fully recurse up the node to get the last extremity
 	     * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-	<a href="#">&#x2190; <xsl:value-of select="/guide/chapter[1]/title"/></a>
+	<a href="#"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="/guide/chapter[1]/title"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -662,10 +669,10 @@
 	    </xsl:call-template>
 	    </xsl:variable>
 	    <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">&#x2190; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <a href="../index.html">&#x2190; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+	    <a href="../index.html"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
 	  </xsl:otherwise>
 	</xsl:choose>
       </xsl:otherwise>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     87d36fe685e3155268765ed0346a691570fe4a83
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 19:46:19 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 19:46:19 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=87d36fe6

Add jquery and bootstrap .js files

---
 devbook.xsl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index 175aa45..98206e8 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -510,6 +510,8 @@
           </div>
         </div>
       </footer>
+      <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/jquery.min.js"></script>
+      <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
     </body>
     </html>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     a429f4c8d7f2b662d4a5eeb8f014ef769cfdbbec
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 20:13:48 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 20:13:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=a429f4c8

Use bootstrap tables

- Use css table class for <table>s
- Drop custom <th> magic and use bootstrap native one

---
 devbook.xsl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 81d9ad1..1f6bfed 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -85,7 +85,7 @@
   <!-- Tables -->
   <!-- From the Gentoo GuideXML Stylesheet -->
   <xsl:template match="table">
-  <table><xsl:apply-templates/></table>
+  <table class="table"><xsl:apply-templates/></table>
   </xsl:template>
 
   <xsl:template match="tr">
@@ -111,7 +111,7 @@
 
   <!-- Table Heading -->
   <xsl:template match="th">
-    <td class="devbook">
+    <th>
       <xsl:if test="@colspan">
 	<xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
 	<!-- Center only when item spans several columns as
@@ -124,10 +124,8 @@
       <xsl:if test="@rowspan">
 	<xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
       </xsl:if>
-      <b>
 	<xsl:apply-templates/>
-      </b>
-    </td>
+    </th>
   </xsl:template>
   <!-- End Table Jojo -->
 

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     da6d9033572e33673be0eb14bbb39687d6fb50ca
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 22 18:58:16 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 18:58:16 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=da6d9033

Show current page location under the menu

- Use the breadcrump component of bootstrap
- Add printParentDocs template to generate the entries recursively

---
 devbook.xsl | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index 98206e8..1d72520 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -494,6 +494,18 @@
         </nav>
       </header>
       <div class="container">
+        <div class="row">
+          <div class="col-md010">
+            <ol class="breadcrumb">
+              <xsl:call-template name="printParentDocs">
+                <xsl:with-param name="path" select="/guide/@self"/>
+                <xsl:with-param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+              </xsl:call-template>
+            </ol>
+          </div>
+        </div>
+      </div>
+      <div class="container">
         <xsl:apply-templates/>
       </div>
       <footer>
@@ -660,6 +672,26 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="printParentDocs">
+    <xsl:param name="depth"/>
+    <xsl:choose>
+      <xsl:when test="$depth &gt; 0">
+        <xsl:variable name="relative_path_depth_recursion">
+          <xsl:call-template name="str:repeatString">
+            <xsl:with-param name="count" select="$depth"/>
+            <xsl:with-param name="append">../</xsl:with-param>
+          </xsl:call-template>
+        </xsl:variable>
+
+        <li><a href="{$relative_path_depth_recursion}index.html"><xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/></a></li>
+
+        <xsl:call-template name="printParentDocs">
+          <xsl:with-param name="depth" select="$depth - 1"/>
+        </xsl:call-template>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template name="findParent">
     <xsl:choose>
     <xsl:when test="not(/guide/@root)">

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     6115f4707e2c7b07d418ae2dd3e2673f326c25e5
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 19:26:13 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 19:26:13 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=6115f470

use bootstrap layout from infra-status.g.o

---
 devbook.xsl | 159 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 95 insertions(+), 64 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 0548c22..175aa45 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -419,66 +419,97 @@
   <xsl:template match="/">
     <html lang="en-GB" xml:lang="en-GB" xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title>Gentoo Development Guide: <xsl:value-of select="/guide/chapter[1]/title"/></title>
-        <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-        <xsl:variable name="relative_path_depth_recursion">
-          <xsl:call-template name="str:repeatString">
-            <xsl:with-param name="count" select="$relative_path_depth"/>
-            <xsl:with-param name="append">../</xsl:with-param>
-          </xsl:call-template>
-        </xsl:variable>	
-        <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
+      <title>Gentoo Development Guide: <xsl:value-of select="/guide/chapter[1]/title"/></title>
+      <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+      <xsl:variable name="relative_path_depth_recursion">
+        <xsl:call-template name="str:repeatString">
+          <xsl:with-param name="count" select="$relative_path_depth"/>
+          <xsl:with-param name="append">../</xsl:with-param>
+        </xsl:call-template>
+      </xsl:variable>
+      <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <meta name="description" content="Gentoo Infrastructure Status provides information on the status of the services the Gentoo Linux distribution offers to its developers and users." />
+      <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />
+      <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen" />
+      <link rel="icon" href="http://www.gentoo.org/favicon.ico" type="image/x-icon" />
     </head>
     <body>
-      <div class="main">
-	<h1>Gentoo Development Guide</h1>
-	<div class="navtop" style="text-align: center;">
-	  <table style="border-top: 1px dashed #330066; margin-left: auto; margin-right: auto;
-			width: 100%;">
-
-	    <col width="33%" />
-	    <col width="34%" />
-	    <col width="33%" />
-	    <tr>
-	      <td style="text-align: center; border-right: 1px dashed #330066;">&#x2190; <xsl:call-template name="findPrevious"/></td>
-	      <td style="text-align: center;">&#x2191; <xsl:call-template name="findParent"/> &#x2191;</td>
-	      <td style="text-align: center; border-left: 1px dashed #330066;"><xsl:call-template name="findNext"/> &#x2192;</td>
-	    </tr>
-	  </table>
-	</div>
-
-	<div class="document">
-	  <xsl:apply-templates/>
-	</div>
-
-	<div class="navbottom" style="text-align: center;">
-	  <table style="border-top: 1px dashed #330066; margin-left: auto; margin-right: auto;
-			width: 100%;">
-
-	    <col width="33%" />
-	    <col width="34%" />
-	    <col width="33%" />
-	    <tr>
-	      <td style="text-align: center; border-right: 1px dashed #330066;">&#x2190; <xsl:call-template name="findPrevious"/></td>
-	      <td style="text-align: center;">&#x2191; <xsl:call-template name="findParent"/> &#x2191;</td>
-	      <td style="text-align: center; border-left: 1px dashed #330066;"><xsl:call-template name="findNext"/> &#x2192;</td>
-	    </tr>
-	  </table>
-	</div>
-      </div>
-
-      <div class="footer">
-	<p>
-	    <a href="http://validator.w3.org/check/referer"><img src="/icons/icon_mini-xhtml.png" alt="Valid XHTML 1.0" /></a>
-	    <a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="/icons/icon_mini-css.png" alt="Valid CSS" /></a>
-	    <a href="http://www.gentoo.org/"><img src="/icons/icon_mini-gentoo.png" alt="Powered by Gentoo" /></a>
-	    <a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/icons/icon_mini-creativecommons.png" alt="Creative Commons License" /></a>
-	    <img src="/icons/icon_mini-xml.png" alt="XML Powered!"/>
-	  <br />
-	  <br />
-	  The text of this document is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 License</a>.
-	</p>
+      <header>
+        <div class="site-title">
+          <div class="container">
+            <div class="row">
+              <div class="site-title-buttons">
+                <div class="btn-group btn-group-sm">
+                  <a href="http://get.gentoo.org/" type="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
+                  <div class="btn-group btn-group-sm">
+                    <button type="button" class="gentoo-org-sites btn" data-toggle="dropdown">
+                      <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                      <li><a href="http://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
+                      <li><a href="http://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text fa-fw"></span> Wiki</a></li>
+                      <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
+                      <li><a href="http://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
+                      <li><a href="http://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
+                      <li class="divider"></li>
+                      <li><a href="http://overlays.gentoo.org/" title="Collaborate on maintaining packages"><span class="fa fa-code-fork fa-fw"></span> Overlays</a></li>
+                      <li><a href="http://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
+                      <li><a href="http://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
+                      <li><a href="http://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
+                      <li class="divider"></li>
+                      <li><a href="http://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-tasks fa-fw"></span> Infra Status</a></li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+              <div class="logo">
+                <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" alt="Gentoo Linux Logo"/>
+                <span class="site-label">Gentoo Development Guide</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <nav class="tyrian-navbar" role="navigation">
+          <div class="container">
+            <div class="row">
+              <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
+                  <span class="sr-only">Toggle navigation</span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                </button>
+              </div>
+              <div class="collapse navbar-collapse navbar-main-collapse">
+                <ul class="nav navbar-nav">
+                  <li><xsl:call-template name="findPrevious"/></li>
+                  <li><xsl:call-template name="findParent"/></li>
+                  <li><xsl:call-template name="findNext"/></li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </nav>
+      </header>
+      <div class="container">
+        <xsl:apply-templates/>
       </div>
+      <footer>
+        <div class="container">
+          <div class="row">
+            <div class="col-md-12">
+              <strong>Copyright 2001-2014 Gentoo Foundation, Inc.</strong><br />
+              <small>
+                Gentoo is a trademark of the Gentoo Foundation, Inc.
+                The text of this document is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 License</a>.
+                The <a href="#">Gentoo Name and Logo Usage Guidelines</a> apply.
+              </small>
+            </div>
+          </div>
+        </div>
+      </footer>
     </body>
     </html>
   </xsl:template>
@@ -514,7 +545,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
 	<xsl:variable name="doc" select="/guide/include[1]/@href"/>
-	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/></a>
+	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#x2192;</a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -547,7 +578,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:variable>
-	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/></a>
+	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#x2192;</a>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -594,7 +625,7 @@
 	       * Fully recurse up the node to get the last extremity
 	     * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-	<a href="#"><xsl:value-of select="/guide/chapter[1]/title"/></a>
+	<a href="#">&#x2190; <xsl:value-of select="/guide/chapter[1]/title"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -617,10 +648,10 @@
 	    </xsl:call-template>
 	    </xsl:variable>
 	    <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">&#x2190; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <a href="../index.html"><xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+	    <a href="../index.html">&#x2190; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
 	  </xsl:otherwise>
 	</xsl:choose>
       </xsl:otherwise>
@@ -630,10 +661,10 @@
   <xsl:template name="findParent">
     <xsl:choose>
     <xsl:when test="not(/guide/@root)">
-      <a href="../index.html"><xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+      <a href="../index.html">&#x2191; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/> &#x2191;</a>
     </xsl:when>
     <xsl:otherwise>
-      <a href="#"><xsl:value-of select="/guide/chapter[1]/title"/></a>
+      <a href="#">&#x2191; <xsl:value-of select="/guide/chapter[1]/title"/> &#x2191;</a>
     </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     6b6d52e73a9fb756aa1577f4b59a529369562409
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 19:58:47 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 19:58:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=6b6d52e7

use bootstrap alerts for important, note, todo and warning tags

- drop replaced css parts

---
 devbook.xsl   | 24 ++++++++++++------------
 devmanual.css | 52 ----------------------------------------------------
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index c9fb066..81d9ad1 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -227,30 +227,30 @@
   </xsl:template>
 
   <xsl:template match="important">
-    <div class="important">
-    <p class="first admonition-title">Important</p>
-    <p class="last"><xsl:apply-templates/></p>
+    <div class="alert alert-info" role="alert">
+    <strong>Important:</strong>
+    <xsl:apply-templates/>
     </div>
   </xsl:template>
 
   <xsl:template match="note">
-    <div class="note">
-    <p class="first admonition-title">Note</p>
-    <p class="last"><xsl:apply-templates/></p>
+    <div class="alert alert-success" role="alert">
+    <strong>Note:</strong>
+    <xsl:apply-templates/>
     </div>
   </xsl:template>
 
   <xsl:template match="todo">
-    <div class="todo">
-    <p class="first admonition-title">Todo</p>
-    <p class="last"><xsl:apply-templates/></p>
+    <div class="alert alert-success" role="alert">
+    <strong>Todo:</strong>
+    <xsl:apply-templates/>
     </div>
   </xsl:template>
 
   <xsl:template match="warning">
-    <div class="warning">
-    <p class="first admonition-title">Warning</p>
-    <p class="last"><xsl:apply-templates/></p>
+    <div class="alert alert-warning" role="alert">
+    <strong>Warning:</strong>
+    <xsl:apply-templates/>
     </div>
   </xsl:template>
 

diff --git a/devmanual.css b/devmanual.css
index 9f7e18a..3a49c84 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -156,58 +156,6 @@ code, pre, tt {
     font-family: monospace;
 }
 
-div.warning    p.admonition-title,
-div.note       p.admonition-title,
-div.todo       p.admonition-title,
-div.admonition p.admonition-title,
-div.important  p.admonition-title {
-    font-weight: bold;
-    display: inline;
-}
-
-div.warning    p,
-div.note       p,
-div.todo       p,
-div.admonition p,
-div.important  p {
-    display: inline;
-}
-
-div.warning    p.admonition-title:after,
-div.note       p.admonition-title:after,
-div.todo       p.admonition-title:after,
-div.admonition p.admonition-title:after,
-div.important  p.admonition-title:after {
-    content: ":";
-}
-
-div.note, div.warning,
-div.important, div.todo,
-div.admonition {
-    padding: 4px;
-    text-align: justify;
-}
-
-div.note {
-    background-color: #c9c4ff;
-}
-
-div.warning {
-    background-color: #ee9999;
-}
-
-div.important {
-    background-color: #99ee99;
-}
-
-div.todo {
-    background-color: #cccccc;
-}
-
-div.admonition {
-    background-color: #ffffff;
-}
-
 blockquote.epigraph p {
     font-size: 80%;
     font-style: italic;

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     164d7c3c0ab2d2af1f203cfde053bc2acca76687
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 15:46:57 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 15:46:57 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=164d7c3c

fix logo usage link

---
 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 567f7d2..a94b217 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -535,7 +535,7 @@
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 License</a>.
-                The <a href="#">Gentoo Name and Logo Usage Guidelines</a> apply.
+                The <a href="http://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo Usage Guidelines</a> apply.
               </small>
             </div>
           </div>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     203508a5b608f89272cbd11a0d3e291147c7b875
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 15:30:54 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 15:30:54 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=203508a5

use first-header class for <h1> headings

---
 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 699d14e..f55e302 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -21,7 +21,7 @@
 </xsl:variable>
 
   <xsl:template match="chapter">
-    <h1><xsl:apply-templates select="title"/></h1>
+    <h1 class="first-header"><xsl:apply-templates select="title"/></h1>
     <xsl:apply-templates select="(body|section)"/>
   </xsl:template>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     7ddb7efc61c82c02ea02b623b0e210fa2f5026b1
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 20:18:59 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 20:18:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=7ddb7efc

Add explicit space between arrow and text in navigation bar

---
 devbook.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1f6bfed..f46c252 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -564,7 +564,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
 	<xsl:variable name="doc" select="/guide/include[1]/@href"/>
-	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> <span class="glyphicon glyphicon-arrow-right"/></a>
+	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="glyphicon glyphicon-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -597,7 +597,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:variable>
-	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> <span class="glyphicon glyphicon-arrow-right"/></a>
+	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="glyphicon glyphicon-arrow-right"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -644,7 +644,7 @@
 	       * Fully recurse up the node to get the last extremity
 	     * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-	<a href="#"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="/guide/chapter[1]/title"/></a>
+	<a href="#"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -667,10 +667,10 @@
 	    </xsl:call-template>
 	    </xsl:variable>
 	    <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <a href="../index.html"><span class="glyphicon glyphicon-arrow-left"/> <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+	    <a href="../index.html"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
 	  </xsl:otherwise>
 	</xsl:choose>
       </xsl:otherwise>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     d208b82298622e343a6f7a28f344e9071a804477
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  8 12:27:18 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Nov  8 12:27:18 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=d208b822

Merge pull request #22 from maekke/bootstrap

Use Tyrian layout


 devbook.xsl   | 256 +++++++++++++++++++++++++++++++++++++++-------------------
 devmanual.css |  54 +------------
 2 files changed, 172 insertions(+), 138 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     90f8524217db849f8c3998ce202423e71e35ea68
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 12:06:24 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 12:06:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=90f85242

drop <a> in headings

---
 devbook.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 0b6f154..699d14e 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -33,7 +33,7 @@
         </xsl:call-template>
       </xsl:variable>
 
-      <h2><a name="{$anchor}"><xsl:apply-templates select="title"/></a></h2>
+      <h2 id="{$anchor}"><xsl:apply-templates select="title"/></h2>
       <xsl:apply-templates select="(body|subsection)"/>
     </div>
   </xsl:template>
@@ -46,7 +46,7 @@
         </xsl:call-template>
       </xsl:variable>
 
-      <h3><a name="{$anchor}"><xsl:apply-templates select="title"/></a></h3>
+      <h3 id="{$anchor}"><xsl:apply-templates select="title"/></h3>
       <xsl:apply-templates select="(body|subsubsection)"/>
 
       <!-- If you need, change here to add more nesting levels -->
@@ -61,7 +61,7 @@
         </xsl:call-template>
       </xsl:variable>
 
-      <h4><a name="{$anchor}"><xsl:apply-templates select="title"/></a></h4>
+      <h4 id="{$anchor}"><xsl:apply-templates select="title"/></h4>
       <xsl:apply-templates select="(body)"/>
 
       <!-- If you need, change here to add more nesting levels -->

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     d8165eaf1bbe5472fc258df9412606d1075226bb
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 18:22:34 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 18:22:34 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=d8165eaf

fix Questions/comments columns

As pointed out by Alex Legler switch the columns

---
 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ef0a5c2..064498d 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -524,12 +524,12 @@
       <footer>
         <div class="container">
           <div class="row">
+            <div class="col-md-8">
+            </div>
             <div class="col-md-4">
               <strong>Questions or comments?</strong><br />
               Please feel free to <a href="http://www.gentoo.org/main/en/contact.xml">contact us</a>.
             </div>
-            <div class="col-md-8">
-            </div>
           </div>
           <div class="row">
             <div class="col-md-12">

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     10f9133b2d0638c276a244c4a6602ba080a4fbcc
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 11:52:08 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 11:52:08 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=10f9133b

make pre's span.Constant darker to be more readable

---
 devmanual.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devmanual.css b/devmanual.css
index 3a49c84..f90d52a 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -176,7 +176,7 @@ pre span.Identifier { color: #ff8bff; }
 pre span.Type { color: #ff8bff; }
 pre span.PreProc { color: #409090; }
 pre span.String { color: #ffcd8b; background-color: #404040; }
-pre span.Constant { color: #ffcd8b; }
+pre span.Constant { color: #675338; }
 pre span.lnr { color: #8b8bcd; background-color: #2e2e2e; }
 pre span.Comment { color: #cd8b00; }
 pre span.Statement { color: #808bed; }

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     6b8b1f87f4d2f2701c0f6e32d0e9ad0532cfe91d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 11:14:39 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 11:14:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=6b8b1f87

add Home button to navigation bar

---
 devbook.xsl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index f46c252..0b6f154 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -483,6 +483,14 @@
               </div>
               <div class="collapse navbar-collapse navbar-main-collapse">
                 <ul class="nav navbar-nav">
+                  <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+                  <xsl:variable name="relative_path_depth_recursion">
+                    <xsl:call-template name="str:repeatString">
+                      <xsl:with-param name="count" select="$relative_path_depth"/>
+                      <xsl:with-param name="append">../</xsl:with-param>
+                    </xsl:call-template>
+                  </xsl:variable>
+                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), '/index.html', substring-after(@link, '##'))}"><span class="glyphicon glyphicon-home"/>&#160; Home</a></li>
                   <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
                     <xsl:call-template name="contentsTree">

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     bf9953a15f8c918551a4b935c41969328c8184e7
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 13:14:06 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 13:14:06 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=bf9953a1

add missing columns in footer for change in 990f1bc87b4bfe02d9ee908d56d27c0b088e2013

---
 devbook.xsl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index a94b217..ef0a5c2 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -528,6 +528,8 @@
               <strong>Questions or comments?</strong><br />
               Please feel free to <a href="http://www.gentoo.org/main/en/contact.xml">contact us</a>.
             </div>
+            <div class="col-md-8">
+            </div>
           </div>
           <div class="row">
             <div class="col-md-12">

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     990f1bc87b4bfe02d9ee908d56d27c0b088e2013
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 24 15:45:02 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Aug 24 15:45:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=990f1bc8

Add 'Questions or comments?' to the footer

This will increase the height of the footer and fix the distance of the images

---
 devbook.xsl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index f55e302..567f7d2 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -524,6 +524,12 @@
       <footer>
         <div class="container">
           <div class="row">
+            <div class="col-md-4">
+              <strong>Questions or comments?</strong><br />
+              Please feel free to <a href="http://www.gentoo.org/main/en/contact.xml">contact us</a>.
+            </div>
+          </div>
+          <div class="row">
             <div class="col-md-12">
               <strong>Copyright 2001-2014 Gentoo Foundation, Inc.</strong><br />
               <small>

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     45693ae2304c197d5a41f246f09bda3602f71736
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 21:27:36 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 21:27:36 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=45693ae2

update color scheme for syntax highlighting

* better contrast
* colors based on zellner.vim
* drop unused style definition

---
 devmanual.css | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/devmanual.css b/devmanual.css
index 1211f61..6f24642 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -169,19 +169,12 @@ td.devbook {
     vertical-align: top;
 }
 
-pre span.Normal { color: #cfbfad; background-color: #1e1e27; }
-pre span.Number { color: #506dbd; }
-pre span.Special { color: #c080d0; }
-pre span.Identifier { color: #ff8bff; }
-pre span.Type { color: #ff8bff; }
-pre span.PreProc { color: #409090; }
-pre span.String { color: #ffcd8b; background-color: #404040; }
-pre span.Constant { color: #333; }
-pre span.lnr { color: #8b8bcd; background-color: #2e2e2e; }
-pre span.Comment { color: #cd8b00; }
-pre span.Statement { color: #808bed; }
-pre span.DiffAdd { color: #40c060; }
-pre span.Title { color: #40c060; font-weight: bold; }
-pre span.Underlined { font-weight: bold; color: #fff0c0; }
+pre span.Special { color: magenta; }
+pre span.Identifier { color: blue; }
+pre span.Type { color: blue; }
+pre span.PreProc { color: magenta; }
+pre span.Constant { color: black; }
+pre span.Comment { color: red; }
+pre span.Statement { color: darkred; }
 
 /* vim: set ts=4 tw=80 et : */

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     93000dc91591e581adc959eca8e57184695efc9a
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 11 20:31:51 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Nov 11 20:31:51 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=93000dc9

use darker color for span.Constant in code examples for bug #515696

---
 devmanual.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devmanual.css b/devmanual.css
index f90d52a..1211f61 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -176,7 +176,7 @@ pre span.Identifier { color: #ff8bff; }
 pre span.Type { color: #ff8bff; }
 pre span.PreProc { color: #409090; }
 pre span.String { color: #ffcd8b; background-color: #404040; }
-pre span.Constant { color: #675338; }
+pre span.Constant { color: #333; }
 pre span.lnr { color: #8b8bcd; background-color: #2e2e2e; }
 pre span.Comment { color: #cd8b00; }
 pre span.Statement { color: #808bed; }

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     c6b9f59c6acf70832e5e783c484ec31c799751a0
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 14 18:07:24 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Nov 14 18:07:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=c6b9f59c

Merge pull request #24 from maekke/css

use darker color for span.Constant in code examples for bug #515696


 devmanual.css | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     6fe6538a649b75cf1ace08b6ad57ef4e8f9b308d
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 09:02:35 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 09:02:35 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=6fe6538a

Merge pull request #25 from Tranquility/update-handbook-links

Fix handbook links that broke after moving to the wiki


 tasks-reference/environment/text.xml  | 2 +-
 tasks-reference/init-scripts/text.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     30e12386b9343941e47d35b56617c4b7c0b43dda
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 15 09:51:49 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Feb 15 09:51:49 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=30e12386

Merge pull request #26 from yaccz/fix-best_version-weasel-word

Replace weasel word with proper description


 function-reference/query-functions/text.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     953dabed3938c2a8756d393a2653c70938225266
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 18:22:13 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 18:26:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=953dabed

devbook.xsl: Update copyright year

Happy new year!

X-Gentoo-Bug: 542304
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542304

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 064498d..c23a6fc 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -533,7 +533,7 @@
           </div>
           <div class="row">
             <div class="col-md-12">
-              <strong>Copyright 2001-2014 Gentoo Foundation, Inc.</strong><br />
+              <strong>Copyright 2001-2015 Gentoo Foundation, Inc.</strong><br />
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 License</a>.

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     27924700b3ec2c7f88b0680e818baad84ad5002d
Author:     Zero_Chaos <sidhayn <AT> gmail <DOT> com>
AuthorDate: Wed Mar 25 21:40:58 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 21:40:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=27924700

Merge pull request #27 from Whissi/correct-pkg_pretend-calltime

pkg_pretend: Binary packages also call this function

 ebuild-writing/functions/pkg_pretend/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markus Meier]

commit:     bf60a8772d3ece409e2fbe0b4dd8b5a5dd7df167
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 09:40:50 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun May 31 09:40:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bf60a877

use html output to avoid invalid self closing elements

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 407e910..5f34962 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -11,7 +11,7 @@
 <xsl:import href="xsl/lang.highlight.m4.xsl"/>
 <xsl:import href="xsl/lang.highlight.sgml.xsl"/>
 
-<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
+<xsl:output method="html" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:variable name="newline">
 <xsl:text>

[gentoo-commits] proj/devmanual:master commit in: /

[Markus Meier]

commit:     e918c7dc8268c4a4723ab4b3a35479f4d191a765
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 09:29:41 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun May 31 09:29:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e918c7dc

use HTML5 doctype instead of xhtml one

 devbook.xsl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index c23a6fc..407e910 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -2,8 +2,7 @@
   xmlns:str="http://exslt.org/strings"
   xmlns:exslt="http://exslt.org/common"
   extension-element-prefixes="str exslt xsl"
-  exclude-result-prefixes="str exslt xsl"
-  xmlns="http://www.w3.org/1999/xhtml">
+  exclude-result-prefixes="str exslt xsl">
 
 <xsl:import href="xsl/str.tokenize.function.xsl"/>
 <xsl:import href="xsl/lang.highlight.c.xsl"/>
@@ -12,8 +11,7 @@
 <xsl:import href="xsl/lang.highlight.m4.xsl"/>
 <xsl:import href="xsl/lang.highlight.sgml.xsl"/>
 
-<xsl:output method="xml" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" 
-	    doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" indent="yes"/>
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:variable name="newline">
 <xsl:text>
@@ -416,7 +414,8 @@
   </xsl:template>
 
   <xsl:template match="/">
-    <html lang="en-GB" xml:lang="en-GB" xmlns="http://www.w3.org/1999/xhtml">
+    <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
+    <html>
     <head>
       <title>Gentoo Development Guide: <xsl:value-of select="/guide/chapter[1]/title"/></title>
       <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     d69dfccc03f157cf397ad66ec0db665e1df35473
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 15:36:35 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 15:36:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d69dfccc

Makefile: Add missing dependency on XSL stylesheet.

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dd2d1c4..f22f304 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@ prereq:
 	@type -p convert &>/dev/null || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
 		type -p xsltproc &>/dev/null || { echo "dev-libs/libxslt is required" >&2; exit 1; }
 
-%index.html : %text.xml
+%index.html : %text.xml devbook.xsl
 	xsltproc devbook.xsl $< > $@ 
 
 # Someone should figure out a way to put this to the pattern
-index.html : text.xml
+index.html : text.xml devbook.xsl
 	xsltproc devbook.xsl $< > $@ 
 
 %.png : %.svg

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     3770c96d9ec2e2277dbf0108f9b00e64cc217e24
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 18:36:44 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 18:36:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=3770c96d

Fix issue with HTML validation.

See Bug 550640 comment 7.

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 5f34962..6134e98 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -440,7 +440,7 @@
             <div class="row">
               <div class="site-title-buttons">
                 <div class="btn-group btn-group-sm">
-                  <a href="http://get.gentoo.org/" type="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
+                  <a href="http://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
                   <div class="btn-group btn-group-sm">
                     <button type="button" class="gentoo-org-sites btn" data-toggle="dropdown">
                       <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5e21123c21c086132a52cc261bcd138e7614aae4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 16:58:28 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 16:58:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5e21123c

devbook.xsl: Fix description meta tag.

Bug 550942.

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 6134e98..bc97a2d 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -428,7 +428,7 @@
       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
       <meta charset="utf-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <meta name="description" content="Gentoo Infrastructure Status provides information on the status of the services the Gentoo Linux distribution offers to its developers and users." />
+      <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen" />
       <link rel="icon" href="http://www.gentoo.org/favicon.ico" type="image/x-icon" />

[gentoo-commits] proj/devmanual:master commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     154c63417a9c65d2617ab6ee260df9f764f64fc0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 01:11:02 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 01:11:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=154c6341

Update favicon.ico url from http to https.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index bc97a2d..3fd2c1b 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -431,7 +431,7 @@
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen" />
-      <link rel="icon" href="http://www.gentoo.org/favicon.ico" type="image/x-icon" />
+      <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
     </head>
     <body>
       <header>

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     733c2791e252ded039866f11262c6fcda0fd0ade
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 09:30:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 09:30:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=733c2791

Merge remote-tracking branch 'github/master'

* github/master:
  Update bash command

 ebuild-writing/file-format/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     b8380ddca7c233c247b02eec46cfc99489302dce
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 09:04:04 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 09:04:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b8380ddc

Merge pull request #29 from gentoid/patch-1

Update bash command

 ebuild-writing/file-format/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     1f0e43c433a062cc8f45f2ff72893f8ef452d88a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 12:39:20 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 12:39:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1f0e43c4

Merge remote-tracking branch 'github/master'

* github/master:
  Quickstart guide update

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     d35c84570a941cabb934c59a9f03a8891046d2be
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 12:38:03 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 12:38:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d35c8457

Merge pull request #30 from johu/quick-start-ebuild-guide

Quickstart guide update

 quickstart/text.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     5960264b9bea3985d50a8c7e63fc5e0fa1d4a4a8
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 11:45:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 11:45:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5960264b

Merge pull request #32 from johu/eapi-declaration

Consistent EAPI declaration

 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 ebuild-writing/functions/src_prepare/text.xml        | 2 +-
 ebuild-writing/using-eclasses/text.xml               | 2 +-
 general-concepts/autotools/text.xml                  | 2 +-
 general-concepts/dependencies/text.xml               | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     cf304a48244efe55f90eef5e72ca95d123264bd4
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 07:03:09 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 07:03:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=cf304a48

Merge pull request #31 from johu/git-to-rsync

Replace cvs to rsync with git to rsync

 general-concepts/{cvs-to-rsync => git-to-rsync}/diagram.svg |  4 ++--
 general-concepts/{cvs-to-rsync => git-to-rsync}/text.xml    | 12 ++++++------
 general-concepts/mirrors/text.xml                           |  2 +-
 general-concepts/text.xml                                   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     aaa5e8b8d307d1892cd5735d3a29cef66dd6c557
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 07:06:25 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 07:06:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=aaa5e8b8

Merge pull request #33 from johu/header-update

Update header lines

 ebuild-writing/common-mistakes/text.xml                  | 14 ++++++--------
 ebuild-writing/eapi/text.xml                             | 12 ++++++------
 ebuild-writing/file-format/text.xml                      |  8 ++++----
 ebuild-writing/functions/src_prepare/epatch/text.xml     | 12 ++++++------
 ebuild-writing/functions/src_unpack/rpm-sources/text.xml |  4 ++--
 ebuild-writing/using-eclasses/text.xml                   |  4 ++--
 eclass-writing/text.xml                                  | 12 ++++++------
 7 files changed, 32 insertions(+), 34 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     1264625476748021aa092351a0b915a0336399a2
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 06:36:10 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 06:36:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=12646254

Merge pull request #34 from johu/patches-update

Update patches

 ebuild-writing/misc-files/patches/text.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     f3e8b1046d9fd3ea569aca9f4148c034f81ca2fc
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 06:35:53 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 06:35:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f3e8b104

Merge pull request #35 from johu/diff-and-patch-update

Diff and patch update

 tools-reference/diff-and-patch/text.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Justin Lecher]

commit:     901a0c49e15780801284d20c10c16796f7585f55
Author:     Justin <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 06:48:49 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 06:48:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=901a0c49

Merge pull request #36 from mrueg/news-repository

Update git repository URI

 general-concepts/news/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Markos Chandras]

commit:     486f38da55c16ff44f5242aaabc97a3031c16158
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Tue Sep  1 09:17:07 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 15:47:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=486f38da

Update Tyrian implementation

The header and footer were reworked a bit since the initial
implementation. Also, use the SVG logo.

 devbook.xsl | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 3cfac4c..67f15b1 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -440,31 +440,34 @@
             <div class="row">
               <div class="site-title-buttons">
                 <div class="btn-group btn-group-sm">
-                  <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
+                  <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong> Get Gentoo!</strong></a>
                   <div class="btn-group btn-group-sm">
-                    <button type="button" class="gentoo-org-sites btn" data-toggle="dropdown">
-                      <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu">
+                    <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
+                      <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs"> gentoo.org sites </span> <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu dropdown-menu-right">
                       <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
-                      <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text fa-fw"></span> Wiki</a></li>
+                      <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
                       <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
                       <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
                       <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
                       <li class="divider"></li>
-                      <li><a href="https://overlays.gentoo.org/" title="Collaborate on maintaining packages"><span class="fa fa-code-fork fa-fw"></span> Overlays</a></li>
                       <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
                       <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
                       <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
                       <li class="divider"></li>
-                      <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-tasks fa-fw"></span> Infra Status</a></li>
+                      <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
                     </ul>
                   </div>
                 </div>
               </div>
               <div class="logo">
-                <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" alt="Gentoo Linux Logo"/>
-                <span class="site-label">Gentoo Development Guide</span>
+                <a href="/" title="Back to the homepage" class="site-logo">
+                  <object data="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.svg" type="image/svg+xml">
+                    <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" alt="Gentoo Linux Logo" />
+                  </object>
+                </a>
+                <span class="site-label">Development Guide</span>
               </div>
             </div>
           </div>
@@ -523,20 +526,27 @@
       <footer>
         <div class="container">
           <div class="row">
-            <div class="col-md-8">
+            <div class="col-xs-12 col-md-offset-2 col-md-7">
             </div>
-            <div class="col-md-4">
-              <strong>Questions or comments?</strong><br />
-              Please feel free to <a href="https://www.gentoo.org/main/en/contact.xml">contact us</a>.
+            <div class="col-xs-12 col-md-3">
+              <h3 class="footerhead">Questions or comments?</h3>
+              Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>.
             </div>
           </div>
           <div class="row">
-            <div class="col-md-12">
-              <strong>Copyright 2001-2015 Gentoo Foundation, Inc.</strong><br />
+            <div class="col-xs-2 col-sm-3 col-md-2">
+              <ul class="footerlinks three-icons">
+                <li><a href="http://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
+                <li><a href="https://plus.google.com/+Gentoo" title="+Gentoo on Google+"><span class="fa fa-google-plus fa-fw"></span></a></li>
+                <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
+              </ul>
+            </div>
+            <div class="col-xs-10 col-sm-9 col-md-10">
+              <strong>Copyright (C) 2001-2015 Gentoo Foundation, Inc.</strong><br />
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 License</a>.
-                The <a href="https://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo Usage Guidelines</a> apply.
+                The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
               </small>
             </div>
           </div>

[gentoo-commits] proj/devmanual:master commit in: /

[NP Hardass]

commit:     429888b04c0489da9dc2e5a441c30af4a0fd6059
Author:     Gokturk Yuksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Fri Jan  1 21:55:28 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 21:58:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=429888b0

Remove the reference to the Gentoo Developer Handbook #546542

devmanual is not accessible anymore. Do not instruct users to
read it. Remove the link on the main page.

Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546542
Signed-off-by: NP-Hardass <NP-Hardass <AT> gentoo.org>

 text.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/text.xml b/text.xml
index 7c56cae..607271d 100644
--- a/text.xml
+++ b/text.xml
@@ -18,7 +18,6 @@ and file a <uri link="https://bugs.gentoo.org/enter_bug.cgi?product=Doc%20Other;
 The <uri link="::appendices/contributors"/>
 section lists specific contributions to this manual.
 </p>
-<p>Users that are interested in becoming a Gentoo Developer are encouraged to also read the <uri link="https://www.gentoo.org/proj/en/devrel/handbook/handbook.xml">Gentoo Developer Handbook</uri>.</p>
 </body>
 
 <section>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     cae0db465c2d79ca4c9071469016d58127675f3e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 08:41:29 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 08:41:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=cae0db46

devbook.xsl: Update copyright year.

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index aeb66e2..d399a7b 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -542,7 +542,7 @@
               </ul>
             </div>
             <div class="col-xs-10 col-sm-9 col-md-10">
-              <strong>Copyright (C) 2001-2015 Gentoo Foundation, Inc.</strong><br />
+              <strong>Copyright (C) 2001-2016 Gentoo Foundation, Inc.</strong><br />
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     7977d86d8cfa8ef8b4368c338cb6933024361186
Author:     Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Tue Mar 29 09:48:40 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 08:07:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7977d86d

Makefile: construct the full dependency tree instead of pattern matching

Currently, the Makefile assumes that each document can be
independently transformed and thus exposes a flat dependency
hierarchy. This is incorrect because of the way table of contents
(TOC) is generated. When a page is added or removed, its immediate
parent and all of the parent's parents, all the way up to the root
node, need to be recompiled in a bottom-up fashion to regenerate the
TOC in each page.

Use black magic to automatically generate build rules with proper
prerequisites during runtime. The idea is to mirror the hierarchy in the
document: every section has a dependency to its subsections. The rules
are generated by iterating through each directory in the entire file
system tree.

Signed-off-by: Göktürk Yüksek <gokturk <AT> binghamton.edu>

 Makefile | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f22f304..d4182a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-text_files := $(shell find -name "text.xml" | sed -e "s/text.xml$$/index.html/")
+ALL_DIRS := $(shell find -name "text.xml" -exec dirname {} +)
+text_files := $(addsuffix /index.html,$(ALL_DIRS))
 image_files := $(shell find -name "*.svg" | sed -e "s/svg$$/png/")
 
 all: prereq $(text_files) $(image_files)
@@ -7,13 +8,6 @@ prereq:
 	@type -p convert &>/dev/null || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
 		type -p xsltproc &>/dev/null || { echo "dev-libs/libxslt is required" >&2; exit 1; }
 
-%index.html : %text.xml devbook.xsl
-	xsltproc devbook.xsl $< > $@ 
-
-# Someone should figure out a way to put this to the pattern
-index.html : text.xml devbook.xsl
-	xsltproc devbook.xsl $< > $@ 
-
 %.png : %.svg
 	convert $< $@
 
@@ -21,3 +15,26 @@ clean:
 	@find . -name "*.png" -a \! -path "./icons/*" -exec rm -v {} +
 	@find . -name "index.html" -exec rm -v {} +
 
+# Given a directory with text.xml in it, return its immediate children as prerequisites
+# Hypothetical example:
+# INPUT:  "./archs" "./archs/amd64 ./archs/x86 ./ebuild-writing ./appendices"
+# OUTPUT: ./archs/amd64/index.html ./archs/amd64/index.html
+define get_prerequisites =
+$(addsuffix /index.html,$(foreach subdir,$(2),$(if $(subst $(1)/,,$(dir $(subdir))),,$(subdir))))
+endef
+
+# Given a directory with text.xml in it, genereate a complete build rule with prerequisites
+# Hypothetical example:
+# INPUT:  "./archs" "./archs/amd64 ./archs/x86 ./ebuild-writing ./appendices"
+# OUTPUT  ./archs/index.html: ./archs/text.xml devbook.xsl ./archs/amd64/index.html ./archs/x86/index.html
+#                 xsltproc devbook.xsl ./archs/text.xml > ./archs/index.html
+define generate_rule =
+$(1)/index.html: $(1)/text.xml devbook.xsl $(call get_prerequisites,$(1),$(2))
+	xsltproc devbook.xsl $$< > $$@
+endef
+
+# This generates individual build rules for all the text files by
+# iterating over all the directories in the file system tree
+$(foreach dir,$(ALL_DIRS),$(eval $(call generate_rule,$(dir),$(filter-out $(dir),$(ALL_DIRS)))))
+
+.PHONY: all prereq clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     460a315b2952e8b9753969e84a19647531ec45b4
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Thu May 12 15:42:51 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 15 11:46:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=460a315b

devbook.xsl: Change HTML title format

Bug: https://bugs.gentoo.org/582750

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index d399a7b..ced6901 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -417,7 +417,7 @@
     <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
     <html>
     <head>
-      <title>Gentoo Development Guide: <xsl:value-of select="/guide/chapter[1]/title"/></title>
+      <title><xsl:value-of select="/guide/chapter[1]/title"/> – Gentoo Development Guide</title>
       <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
       <xsl:variable name="relative_path_depth_recursion">
         <xsl:call-template name="str:repeatString">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     9d1c9c91bfaf6ac29eb1fc797417755ab47f9b06
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Thu May 12 15:45:46 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 15 11:47:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9d1c9c91

devbook.xsl: Make UTF-8 usage and output more explicit

Since commit 460a315b2952e8b9753969e84a19647531ec45b4 we are using
a UTF-8 character in devbook.xsl. By adding an explicit XML encoding
header we hopefully make sure that nothing will mess it up.

Also we were duplicating the charset header in the HTML output because
docbook already sets the META tag before we set our own in the template.
Fixed by removing our declaration.

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ced6901..dce6595 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
   xmlns:str="http://exslt.org/strings"
   xmlns:exslt="http://exslt.org/common"
@@ -11,7 +12,7 @@
 <xsl:import href="xsl/lang.highlight.m4.xsl"/>
 <xsl:import href="xsl/lang.highlight.sgml.xsl"/>
 
-<xsl:output method="html" indent="yes" omit-xml-declaration="yes"/>
+<xsl:output method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:variable name="newline">
 <xsl:text>
@@ -426,7 +427,6 @@
         </xsl:call-template>
       </xsl:variable>
       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
-      <meta charset="utf-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a52b896c0577076a6aa9d8dd049d5d866afc57a7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 18:46:03 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 18:46:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a52b896c

Fix Bugzilla URLs.

 text.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/text.xml b/text.xml
index 607271d..e88ed52 100644
--- a/text.xml
+++ b/text.xml
@@ -13,8 +13,10 @@ detailed, up to date technical content.
 <p>
 Contributions are encouraged. See the <uri link="::appendices/contributing"/>
 section for how to get started. If you have any corrections, suggestions or
-improvements please look at the <uri link="https://bugs.gentoo.org/buglist.cgi?product=Doc%20Other;component=Devmanual;resolution=---">bug list</uri>
-and file a <uri link="https://bugs.gentoo.org/enter_bug.cgi?product=Doc%20Other;component=Devmanual;format=guided">new bug</uri>.
+improvements please look at the
+<uri link="https://bugs.gentoo.org/buglist.cgi?product=Documentation;component=Devmanual;resolution=---">bug list</uri>
+and file a
+<uri link="https://bugs.gentoo.org/enter_bug.cgi?product=Documentation;component=Devmanual;format=guided">new bug</uri>.
 The <uri link="::appendices/contributors"/>
 section lists specific contributions to this manual.
 </p>

[gentoo-commits] proj/devmanual:master commit in: /

[Mike Gilbert]

commit:     627ca55670862b7bcab101b9f2d30cd6f467e081
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 22:08:44 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 22:08:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=627ca556

devbook.xsl: Eliminate duplicate slash in 'Home' link

Bug: https://bugs.gentoo.org/596372

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index dce6595..8f740e2 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -492,7 +492,7 @@
                       <xsl:with-param name="append">../</xsl:with-param>
                     </xsl:call-template>
                   </xsl:variable>
-                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), '/index.html', substring-after(@link, '##'))}"><span class="glyphicon glyphicon-home"/>&#160; Home</a></li>
+                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="glyphicon glyphicon-home"/>&#160; Home</a></li>
                   <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
                     <xsl:call-template name="contentsTree">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     da6949293f15f9b2a811a7c17a58c61a4682477e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:15:13 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 17:15:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=da694929

devbook.xsl: Update URLs to assets.gentoo.org.

 devbook.xsl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 8f740e2..654a7af 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -429,8 +429,8 @@
       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
-      <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />
-      <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen" />
+      <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
+      <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
       <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
     </head>
     <body>
@@ -463,8 +463,8 @@
               </div>
               <div class="logo">
                 <a href="/" title="Back to the homepage" class="site-logo">
-                  <object data="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.svg" type="image/svg+xml">
-                    <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" alt="Gentoo Linux Logo" />
+                  <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
+                    <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />
                   </object>
                 </a>
                 <span class="site-label">Development Guide</span>
@@ -553,8 +553,8 @@
           </div>
         </div>
       </footer>
-      <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/jquery.min.js"></script>
-      <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
+      <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
+      <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
     </body>
     </html>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     4954fe81ac60278b04eadc15eef3d8fff677cb3b
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 00:29:31 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 01:09:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4954fe81

devbook.xsl: add support for disabling word-wrapping for table items

 devbook.xsl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index 654a7af..3d40d7c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -104,6 +104,10 @@
       <xsl:if test="@rowspan">
 	<xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
       </xsl:if>
+      <xsl:if test="@nowrap">
+	<!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
+	<xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
+      </xsl:if>
       <xsl:apply-templates/>
     </td>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     8659e62c8d402dd6c6d3b7caaccaa0baccbac0b8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 11:26:15 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 11:26:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8659e62c

Update copyright years.

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 3d40d7c..807b11c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -546,7 +546,7 @@
               </ul>
             </div>
             <div class="col-xs-10 col-sm-9 col-md-10">
-              <strong>Copyright (C) 2001-2016 Gentoo Foundation, Inc.</strong><br />
+              <strong>Copyright (C) 2001-2017 Gentoo Foundation, Inc.</strong><br />
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     c7e61fd606da3951e427c3c4931d2fb96e391738
Author:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 18:11:26 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 05:17:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c7e61fd6

CSS: let tabs in code blocks render as 4 positions

Per devmanual, in ebuild files only tabs must be used for indentation,
and each tab represents four spaces. However, many snippets of ebuild
code in devmanual use spaces for indentation, making these snippets not
immediately usable for pasting. Snippets indented with tabs, while
technically conformant, look the wrong way.

This change makes tabs-indented snippets look right, making it more
attractive for contributors to use tabs for indentation, and paving the
road for potential conversion of spaces-indented snippets to tabs.

Acked-by: Gokturk Yuksek <gokturk <AT> gentoo.org>

 devmanual.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devmanual.css b/devmanual.css
index 6f24642..1507558 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -154,6 +154,9 @@ div.figure, div.figure p {
 
 code, pre, tt {
     font-family: monospace;
+    tab-size: 4;
+    -o-tab-size: 4;
+    -moz-tab-size: 4;
 }
 
 blockquote.epigraph p {

[gentoo-commits] proj/devmanual:master commit in: /

[Brian Evans]

commit:     ad73851922df05d91b9be52f41529014c3482113
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 16:01:18 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 16:57:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ad738519

Makefile: remove BASH-specific "type -p" and "&>" idioms.

The Makefile uses two "type -p" commands to determine if the "convert"
and "xsltproc" commands are present. The "type" command itself is
defined in POSIX,

  http://pubs.opengroup.org/onlinepubs/9699919799/utilities/type.html

but the additional "-p" flag is BASH-specific. This can lead to
unexpected behavior when the /bin/sh symlink that the Makefile uses by
default points to a non-BASH shell:

  $ dash
  $ type -p convert
  -p: not found
  convert is /usr/bin/convert

By chance, this is ultimately not fatal, but does cause the default
target to output some confusing messages. And in fact the output from
the "type -p" command is never used, which means that "type" itself
should suffice, in any shell. Thus this commit drops the two "-p"
arguments to "type".

The same two "type" commands attempt to redirect both stdout and
stderr to /dev/null using the BASH "&>" shortcut. This commit replaces
it with the standard, but more verbose incantation ">/dev/null 2>&1"
that is portable to other shells.

Closes: https://bugs.gentoo.org/680932
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d4182a8..a61128b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ image_files := $(shell find -name "*.svg" | sed -e "s/svg$$/png/")
 all: prereq $(text_files) $(image_files)
 
 prereq:
-	@type -p convert &>/dev/null || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
-		type -p xsltproc &>/dev/null || { echo "dev-libs/libxslt is required" >&2; exit 1; }
+	@type convert >/dev/null 2>&1 || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
+		type xsltproc >/dev/null 2>&1 || { echo "dev-libs/libxslt is required" >&2; exit 1; }
 
 %.png : %.svg
 	convert $< $@

[gentoo-commits] proj/devmanual:master commit in: /

[Brian Evans]

commit:     cc3ebea213506f963081464bad913d8470da6038
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 19:01:11 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 19:01:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=cc3ebea2

Merge branch 'devbook-guide'

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 appendices/contributing/devbook-guide/text.xml | 617 +++++++++++++++++++++++++
 appendices/contributing/text.xml               |   3 +-
 appendices/contributors/text.xml               |   9 +
 3 files changed, 628 insertions(+), 1 deletion(-)

[gentoo-commits] proj/devmanual:master commit in: /

[Brian Evans]

commit:     361033ad06388df33c2c30e9d14fa6b077839e85
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 16:04:31 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 16:04:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=361033ad

Include the eclass-reference directory

Now generated by the script in bin/

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text.xml b/text.xml
index e88ed52..4bc295c 100644
--- a/text.xml
+++ b/text.xml
@@ -46,7 +46,7 @@ section lists specific contributions to this manual.
 <include href="keywording/"/>
 <include href="tasks-reference/"/>
 <include href="function-reference/"/>
-<!-- <include href="eclass-reference/"/> -->
+<include href="eclass-reference/"/>
 <include href="tools-reference/"/>
 <include href="hosted-projects/"/>
 <include href="archs/"/>

[gentoo-commits] proj/devmanual:master commit in: /

[Brian Evans]

commit:     bf154c632dc1059eef9aca2970db9c85f515a97c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 16:02:02 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 16:02:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bf154c63

Change docbook template to remove glyphicon

glyphicons are deprecated and we have fontawesome already

Use Font awesome instead

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 devbook.xsl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 853f4bd..2c8e506 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -496,7 +496,7 @@
                       <xsl:with-param name="append">../</xsl:with-param>
                     </xsl:call-template>
                   </xsl:variable>
-                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="glyphicon glyphicon-home"/>&#160; Home</a></li>
+                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
                   <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
                     <xsl:call-template name="contentsTree">
@@ -594,7 +594,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
 	<xsl:variable name="doc" select="/guide/include[1]/@href"/>
-	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="glyphicon glyphicon-arrow-right"/></a>
+	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -627,7 +627,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:variable>
-	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="glyphicon glyphicon-arrow-right"/></a>
+	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -674,7 +674,7 @@
 	       * Fully recurse up the node to get the last extremity
 	     * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-	<a href="#"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
+	<a href="#"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
       </xsl:when>
       <xsl:otherwise>
 	<!-- This document's path -->
@@ -697,10 +697,10 @@
 	    </xsl:call-template>
 	    </xsl:variable>
 	    <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
 	  </xsl:when>
 	  <xsl:otherwise>
-	    <a href="../index.html"><span class="glyphicon glyphicon-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+	    <a href="../index.html"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
 	  </xsl:otherwise>
 	</xsl:choose>
       </xsl:otherwise>

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     3c2491a9e3018d1fc98feaf5d3b91c4ad2e7013a
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 01:10:28 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 02:17:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=3c2491a9

Makefile: simplify generated rules.

Our Makefile is GNU-specific, thanks to heavy use of call/eval to
automatically generate rules. In this commit, those generated rules
have been replaced by slightly less (in terms of code volume)
GNU-specific magic. The new magic uses a secondary expansion rule that
allows us to access the target name inside its own prerequisites. The
single resulting SECONDEXPANSION rule seems to be able to replace all
of the generated rules.

The variables and "clean" targets were also simplified using the full
power of the GNU extensions, which we are assuming anyway. Finally,
two other minor improvements were made:

  1. The "clean" target was moved to the end of the file.

  2. The "prereq" rule was split into two separate commands, and
     wrapped to a reasonable line length.

Closes: https://bugs.gentoo.org/684688
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 Makefile | 60 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 8742a68..3da7c99 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,40 @@
-ALL_DIRS := $(shell find -name "text.xml" -exec dirname {} +)
-text_files := $(addsuffix /index.html,$(ALL_DIRS))
-image_files := $(shell find -name "*.svg" | sed -e "s/svg$$/png/")
+# These "find" commands match text.xml and *.svg files, respectively,
+# but only after excluding the .git directory from the search for
+# performance and overall sanity reasons.
+HTMLS := $(subst text.xml,index.html,\
+  $(shell find ./ -name .git -prune -o \( -type f -name 'text.xml' -print \)))
+IMAGES := $(patsubst %.svg,%.png,\
+  $(shell find ./ -name .git -prune -o \( -type f -name '*.svg' -print \)))
 
-all: prereq $(text_files) $(image_files)
+all: prereq $(HTMLS) $(IMAGES)
 
 prereq:
-	@type convert >/dev/null 2>&1 || { echo "media-gfx/imagemagick with corefonts, svg and truetype required" >&2; exit 1; }; \
-		type xsltproc >/dev/null 2>&1 || { echo "dev-libs/libxslt is required" >&2; exit 1; }
+	@type convert >/dev/null 2>&1 || \
+	{ echo "media-gfx/imagemagick[corefonts,svg,truetype] required" >&2;\
+          exit 1; }
+	@type xsltproc >/dev/null 2>&1 || \
+	{ echo "dev-libs/libxslt is required" >&2;\
+	  exit 1; }
 
 %.png : %.svg
 	convert $< $@
 
-clean:
-	@find . -name "*.png" -exec rm -v {} +
-	@find . -name "index.html" -exec rm -v {} +
-
-# Given a directory with text.xml in it, return its immediate children as prerequisites
-# Hypothetical example:
-# INPUT:  "./archs" "./archs/amd64 ./archs/x86 ./ebuild-writing ./appendices"
-# OUTPUT: ./archs/amd64/index.html ./archs/amd64/index.html
-define get_prerequisites =
-$(addsuffix /index.html,$(foreach subdir,$(2),$(if $(subst $(1)/,,$(dir $(subdir))),,$(subdir))))
-endef
+# Secondary expansion allows us to use the automatic variable $@ in
+# the prerequisites. When it is used (and we have no idea when that
+# is, so we assume always) our <include href="foo"> tag induces a
+# dependency on the output of all subdirectories of the current
+# directories. This wacky rule finds all of those subdirectories by
+# looking for text.xml in them, and then replaces "text.xml" in the
+# path with "index.html".
+#
+# We use the pattern %.html rather than the more-sensible %index.html
+# because the latter doesn't match our top-level index.html target.
+#
+.SECONDEXPANSION:
+%.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
+	xsltproc devbook.xsl $< > $@
 
-# Given a directory with text.xml in it, genereate a complete build rule with prerequisites
-# Hypothetical example:
-# INPUT:  "./archs" "./archs/amd64 ./archs/x86 ./ebuild-writing ./appendices"
-# OUTPUT  ./archs/index.html: ./archs/text.xml devbook.xsl ./archs/amd64/index.html ./archs/x86/index.html
-#                 xsltproc devbook.xsl ./archs/text.xml > ./archs/index.html
-define generate_rule =
-$(1)/index.html: $(1)/text.xml devbook.xsl $(call get_prerequisites,$(1),$(2))
-	xsltproc devbook.xsl $$< > $$@
-endef
-
-# This generates individual build rules for all the text files by
-# iterating over all the directories in the file system tree
-$(foreach dir,$(ALL_DIRS),$(eval $(call generate_rule,$(dir),$(filter-out $(dir),$(ALL_DIRS)))))
+clean:
+	rm -f $(HTMLS) $(IMAGES)
 
 .PHONY: all prereq clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     0ecdaa0e247d13ac57a40731fb70e77eae07d418
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 18:02:59 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 18:04:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0ecdaa0e

devbook.xsl: Fix handling of <uri> without link attribute.

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

 devbook.xsl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 39d49f8..b3a14cc 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -336,8 +336,15 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:otherwise>
+      <xsl:when test="@link">
         <a class="{$class}" href="{@link}"><xsl:value-of select="."/></a>
+      </xsl:when>
+      <xsl:when test="contains(., '://')">
+        <a class="{$class}" href="{.}"><xsl:value-of select="."/></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:message>Error: No link target (<xsl:value-of select="."/>)</xsl:message>
+        <a class="{$class}"><xsl:value-of select="."/></a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     7695336663da5dd52d919b66a1f13e3913294fb6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 11:15:40 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=76953366

devbook.dtd: Add DTD.

This is based on what is supported by devbook.xsl, and on actual usage
throughout the document.

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

 devbook.dtd | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/devbook.dtd b/devbook.dtd
new file mode 100644
index 0000000..96d1c9d
--- /dev/null
+++ b/devbook.dtd
@@ -0,0 +1,98 @@
+<!-- Copyright 2019 Gentoo Authors -->
+<!-- Distributed under the terms of the MIT/X11 license -->
+
+<!-- Document Type Definition for the Gentoo Devmanual -->
+<!-- Based on common.dtd from GuideXML -->
+
+<!ENTITY  % block.class     "p|pre|codesample|note|important|warning|todo
+                                |figure|table|ul|ol|dl
+                                |list-group-u|list-group-d">
+<!ENTITY  % inline.class    "sup|sub|b|c|d|e|path|uri">
+<!ENTITY  % all.class       "%block.class;|%inline.class;">
+
+<!ELEMENT guide         (include|chapter)+>
+<!ATTLIST guide         root (true) #IMPLIED
+                        self CDATA #IMPLIED>
+
+<!ELEMENT include       EMPTY>
+<!ATTLIST include       href CDATA #REQUIRED>
+
+<!ELEMENT chapter       (title, (body|section), section*)>
+<!ELEMENT section       (title, (body|subsection), subsection*)>
+<!ELEMENT subsection    (title, (body|subsubsection), subsubsection*)>
+<!ELEMENT subsubsection (title, body)>
+
+<!-- Title texts are used as anchors, so we shouldn't allow any formatting,
+     but unfortunately it is used in the document. -->
+<!ELEMENT title         (#PCDATA|%inline.class;)*>
+
+<!ELEMENT body          (authors|contentsTree|%block.class;)+>
+
+<!ELEMENT authors       (author)+>
+<!ELEMENT author        (#PCDATA|%inline.class;)*>
+<!ATTLIST author        name  CDATA #REQUIRED
+                        email CDATA #IMPLIED>
+
+<!ELEMENT contentsTree  EMPTY>
+<!ATTLIST contentsTree  maxdepth   CDATA #IMPLIED
+                        root       CDATA #IMPLIED
+                        extraction CDATA #IMPLIED>
+
+<!ELEMENT p             (#PCDATA|%inline.class;)*>
+
+<!ELEMENT pre           (#PCDATA)>
+
+<!ELEMENT codesample    (#PCDATA)>
+<!ATTLIST codesample    lang (c|ebuild|make|m4|sgml) #REQUIRED
+                        numbering (lines) #IMPLIED>
+
+<!ELEMENT note          (#PCDATA|%inline.class;)*>
+<!ELEMENT important     (#PCDATA|%inline.class;)*>
+<!ELEMENT warning       (#PCDATA|%inline.class;)*>
+<!ELEMENT todo          (#PCDATA|%inline.class;)*>
+
+<!ELEMENT figure        EMPTY>
+<!ATTLIST figure        link CDATA #REQUIRED
+                        short CDATA #IMPLIED
+                        caption CDATA #IMPLIED>
+
+<!ELEMENT table         (tcolumn*, tr+)>
+
+<!ELEMENT tcolumn       EMPTY>
+<!ATTLIST tcolumn       width CDATA #REQUIRED>
+
+<!ELEMENT tr            (th|ti)+>
+
+<!ELEMENT th            (#PCDATA|%inline.class;)*>
+<!ATTLIST th            colspan CDATA #IMPLIED
+                        rowspan CDATA #IMPLIED
+                        align (left|center|right) "left">
+
+<!ELEMENT ti            (#PCDATA|%all.class;)*>
+<!ATTLIST ti            colspan CDATA #IMPLIED
+                        rowspan CDATA #IMPLIED
+                        nowrap  CDATA #IMPLIED
+                        align (left|center|right) "left">
+
+<!ELEMENT ul            (li)+>
+<!ELEMENT ol            (li)+>
+<!ELEMENT li            (#PCDATA|%all.class;)*>
+
+<!ELEMENT dl            (dt, dd)+>
+<!ELEMENT dt            (#PCDATA|%inline.class;)*>
+<!-- The following is strange, but devbook.xsl expects only p elements -->
+<!ELEMENT dd            (p)+>
+
+<!ELEMENT list-group-u  (#PCDATA|%all.class;)*>
+<!ELEMENT list-group-d  (#PCDATA|%all.class;)*>
+
+<!ELEMENT sup           (#PCDATA|%inline.class;)*>
+<!ELEMENT sub           (#PCDATA|%inline.class;)*>
+<!ELEMENT b             (#PCDATA|%inline.class;)*>
+<!ELEMENT c             (#PCDATA|%inline.class;)*>
+<!ELEMENT e             (#PCDATA|%inline.class;)*>
+<!ELEMENT path          (#PCDATA|%inline.class;)*>
+<!ELEMENT d             EMPTY>
+
+<!ELEMENT uri           (#PCDATA|%inline.class;)*>
+<!ATTLIST uri           link CDATA #IMPLIED>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     01be8b7fbd93d4497d4dd7942d321f30c444ab0f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 11:27:27 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 08:46:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=01be8b7f

Makefile: Add "validate" rule.

Make XMLS list available separately from HTMLS. Same for SVGS and
IMAGES, for consistency.

Require xmllint as prerequisite. (This doesn't add any new dependencies,
because dev-libs/libxml2 is already pulled in by libxslt.)

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

 Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3da7c99..61daef4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # These "find" commands match text.xml and *.svg files, respectively,
 # but only after excluding the .git directory from the search for
 # performance and overall sanity reasons.
-HTMLS := $(subst text.xml,index.html,\
-  $(shell find ./ -name .git -prune -o \( -type f -name 'text.xml' -print \)))
-IMAGES := $(patsubst %.svg,%.png,\
-  $(shell find ./ -name .git -prune -o \( -type f -name '*.svg' -print \)))
+XMLS := $(shell find . -name .git -prune -o -type f -name 'text.xml' -print)
+SVGS := $(shell find . -name .git -prune -o -type f -name '*.svg' -print)
+HTMLS := $(subst text.xml,index.html,$(XMLS))
+IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
-all: prereq $(HTMLS) $(IMAGES)
+all: prereq validate $(HTMLS) $(IMAGES)
 
 prereq:
 	@type convert >/dev/null 2>&1 || \
@@ -15,6 +15,9 @@ prereq:
 	@type xsltproc >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxslt is required" >&2;\
 	  exit 1; }
+	@type xmllint >/dev/null 2>&1 || \
+	{ echo "dev-libs/libxml2 is required" >&2;\
+	  exit 1; }
 
 %.png : %.svg
 	convert $< $@
@@ -34,7 +37,11 @@ prereq:
 %.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
 	xsltproc devbook.xsl $< > $@
 
+validate: prereq
+	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
+	  && echo "xmllint validation successful"
+
 clean:
 	rm -f $(HTMLS) $(IMAGES)
 
-.PHONY: all prereq clean
+.PHONY: all prereq validate clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e9cfcb2d945a8379624467ef6f85fb7968db47fe
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 11:15:01 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 11:15:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e9cfcb2d

devbook.xsl: Indent with spaces only.

There were 265 lines with 8 initial spaces, and 136 lines with an
initial tab. Unify it to use spaces only. (This also agrees with
"tabs are not allowed" in the devbook guide.)

Add an Emacs local variables block for indent-tabs-mode.

Remove trailing whitespace in lines.

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

 devbook.xsl | 286 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 145 insertions(+), 141 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 94cbf96..63ff219 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -99,14 +99,14 @@
   <xsl:template match="ti">
     <td class="devbook">
       <xsl:if test="@colspan">
-	<xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
+        <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
       </xsl:if>
       <xsl:if test="@rowspan">
-	<xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
+        <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
       </xsl:if>
       <xsl:if test="@nowrap">
-	<!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
-	<xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
+        <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
+        <xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
       </xsl:if>
       <xsl:apply-templates/>
     </td>
@@ -116,18 +116,18 @@
   <xsl:template match="th">
     <th>
       <xsl:if test="@colspan">
-	<xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
-	<!-- Center only when item spans several columns as
+        <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
+        <!-- Center only when item spans several columns as
              centering all <th> might disrupt some pages.
              We might want to use a plain html <th> tag later.
              Tip: to center a single-cell title, use <th colspan="1">
-	  -->
-	<xsl:attribute name="style">text-align:center</xsl:attribute>
+          -->
+        <xsl:attribute name="style">text-align:center</xsl:attribute>
       </xsl:if>
       <xsl:if test="@rowspan">
-	<xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
+        <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
       </xsl:if>
-	<xsl:apply-templates/>
+        <xsl:apply-templates/>
     </th>
   </xsl:template>
   <!-- End Table Jojo -->
@@ -152,27 +152,27 @@
               <xsl:when test="$lang = 'ebuild'">
                 <xsl:call-template name="lang.highlight.ebuild.tokenate">
                   <xsl:with-param name="data" select="."/>
-                </xsl:call-template>               
+                </xsl:call-template>
               </xsl:when>
               <xsl:when test="$lang = 'make'">
                 <xsl:call-template name="lang.highlight.make.tokenate">
                   <xsl:with-param name="data" select="."/>
-                </xsl:call-template>               
+                </xsl:call-template>
               </xsl:when>
               <xsl:when test="$lang = 'm4'">
                 <xsl:call-template name="lang.highlight.m4.tokenate">
                   <xsl:with-param name="data" select="."/>
-                </xsl:call-template>               
+                </xsl:call-template>
               </xsl:when>
               <xsl:when test="$lang = 'sgml'">
                 <xsl:call-template name="lang.highlight.sgml.tokenate">
                   <xsl:with-param name="data" select="."/>
-                </xsl:call-template>               
+                </xsl:call-template>
               </xsl:when>
               <xsl:when test="$lang = 'c'">
                 <xsl:call-template name="lang.highlight.c.tokenate">
                   <xsl:with-param name="data" select="."/>
-                </xsl:call-template>               
+                </xsl:call-template>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:message>Error: Unknown language type (<xsl:value-of select="$lang"/>)</xsl:message>
@@ -305,8 +305,8 @@
           <xsl:call-template name="str:repeatString">
             <xsl:with-param name="count" select="$relative_path_depth"/>
             <xsl:with-param name="append">../</xsl:with-param>
-	  </xsl:call-template>
-	</xsl:variable>
+          </xsl:call-template>
+        </xsl:variable>
         <xsl:choose>
           <xsl:when test="contains(@link, '##')">
             <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), '/index.html#', substring-after(@link, '##'))}"><xsl:value-of select="."/></a>
@@ -363,8 +363,8 @@
     <xsl:param name="ulclass"/>
     <xsl:param name="maxdepth">
       <xsl:choose>
-	<xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
-	<xsl:otherwise>0</xsl:otherwise>
+        <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
+        <xsl:otherwise>0</xsl:otherwise>
       </xsl:choose>
     </xsl:param>
     <xsl:param name="path">
@@ -378,7 +378,7 @@
         <xsl:call-template name="str:repeatString">
           <xsl:with-param name="count" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
           <xsl:with-param name="append">../</xsl:with-param>
-	</xsl:call-template>
+        </xsl:call-template>
       </xsl:if>
     </xsl:param>
     <xsl:param name="extraction" select="@extraction"/>
@@ -388,37 +388,37 @@
     <xsl:if test="count(document($doc_self)/guide/include) &gt; 0 and ($depth &lt; $maxdepth or $maxdepth = '0')">
     <xsl:choose>
       <xsl:when test="$extraction_counting = 1">
-	<xsl:for-each select="document($doc_self)/guide/include">
-	  <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}" path="{concat($path, @href)}">
-	    <xsl:call-template name="contentsTree">
-	      <xsl:with-param name="depth" select="$depth + 1"/>
-	      <xsl:with-param name="maxdepth" select="$maxdepth"/>
-	      <xsl:with-param name="path" select="concat($path, @href)"/>
-	      <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-	      <xsl:with-param name="extraction" select="$extraction"/>
-	      <xsl:with-param name="extraction_counting" select="1"/>
-	    </xsl:call-template>
-	  </count>
-	</xsl:for-each>
+        <xsl:for-each select="document($doc_self)/guide/include">
+          <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}" path="{concat($path, @href)}">
+            <xsl:call-template name="contentsTree">
+              <xsl:with-param name="depth" select="$depth + 1"/>
+              <xsl:with-param name="maxdepth" select="$maxdepth"/>
+              <xsl:with-param name="path" select="concat($path, @href)"/>
+              <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+              <xsl:with-param name="extraction" select="$extraction"/>
+              <xsl:with-param name="extraction_counting" select="1"/>
+            </xsl:call-template>
+          </count>
+        </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-	<ul class="{$ulclass}">
-	  <xsl:for-each select="document($doc_self)/guide/include">
-	    <xsl:variable name="extraction_counter_node">
-	      <xsl:call-template name="contentsTree">
-		<xsl:with-param name="depth" select="$depth + 1"/>
-		<xsl:with-param name="maxdepth" select="$maxdepth"/>
-		<xsl:with-param name="path" select="concat($path, @href)"/>
-		<xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-		<xsl:with-param name="extraction" select="$extraction"/>
-		<xsl:with-param name="extraction_counting" select="1"/>
-	      </xsl:call-template>
-	    </xsl:variable>
-	    <xsl:variable name="extraction_counter" select="count(exslt:node-set($extraction_counter_node)//*[@value != 0]) + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
-	    <xsl:if test="string($extraction) = '' or $extraction_counter > 0">
-	    <li>
-	      <a class="reference" href="{concat($path_rel, @href, 'index.html')}"><xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/></a>
-	      <xsl:if test="$extraction != ''">
+        <ul class="{$ulclass}">
+          <xsl:for-each select="document($doc_self)/guide/include">
+            <xsl:variable name="extraction_counter_node">
+              <xsl:call-template name="contentsTree">
+                <xsl:with-param name="depth" select="$depth + 1"/>
+                <xsl:with-param name="maxdepth" select="$maxdepth"/>
+                <xsl:with-param name="path" select="concat($path, @href)"/>
+                <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+                <xsl:with-param name="extraction" select="$extraction"/>
+                <xsl:with-param name="extraction_counting" select="1"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:variable name="extraction_counter" select="count(exslt:node-set($extraction_counter_node)//*[@value != 0]) + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
+            <xsl:if test="string($extraction) = '' or $extraction_counter > 0">
+            <li>
+              <a class="reference" href="{concat($path_rel, @href, 'index.html')}"><xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/></a>
+              <xsl:if test="$extraction != ''">
                 <ul>
                 <xsl:for-each select="document(concat($path, @href, 'text.xml'))//*[name()=$extraction]">
                   <xsl:variable name="extraction_id" select="position()"/>
@@ -426,17 +426,17 @@
                 </xsl:for-each>
                 </ul>
               </xsl:if>
-	      <xsl:call-template name="contentsTree">
-		<xsl:with-param name="depth" select="$depth + 1"/>
-		<xsl:with-param name="maxdepth" select="$maxdepth"/>
-		<xsl:with-param name="path" select="concat($path, @href)"/>
-		<xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-		<xsl:with-param name="extraction" select="$extraction"/>
-	      </xsl:call-template>
-	    </li>
-	    </xsl:if>
-	  </xsl:for-each>
-	</ul>
+              <xsl:call-template name="contentsTree">
+                <xsl:with-param name="depth" select="$depth + 1"/>
+                <xsl:with-param name="maxdepth" select="$maxdepth"/>
+                <xsl:with-param name="path" select="concat($path, @href)"/>
+                <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+                <xsl:with-param name="extraction" select="$extraction"/>
+              </xsl:call-template>
+            </li>
+            </xsl:if>
+          </xsl:for-each>
+        </ul>
       </xsl:otherwise>
     </xsl:choose>
     </xsl:if>
@@ -609,64 +609,64 @@
     <xsl:param name="self" select="/guide/@self"/>
     <xsl:choose>
       <!-- To find the "next" node:
-	   * See if this node includes any subnodes... if it does, that is
-	     our next node
-	   * Look at our parent and see if it includes any nodes after us, if
-	     it does use it.
-	   * Repeat recursively, going down parents if needed.
+           * See if this node includes any subnodes... if it does, that is
+             our next node
+           * Look at our parent and see if it includes any nodes after us, if
+             it does use it.
+           * Repeat recursively, going down parents if needed.
            * End at the root item if needed.
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
-	<xsl:variable name="doc" select="/guide/include[1]/@href"/>
-	<a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+        <xsl:variable name="doc" select="/guide/include[1]/@href"/>
+        <a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
-	<!-- This document's path -->
-	<xsl:variable name="doc_self" select="concat($self, 'text.xml')"/>
-	<!-- Turn the absolute path into a relative path so we can find ourselves in
-	     the parent -->
+        <!-- This document's path -->
+        <xsl:variable name="doc_self" select="concat($self, 'text.xml')"/>
+        <!-- Turn the absolute path into a relative path so we can find ourselves in
+             the parent -->
         <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
-	<xsl:variable name="index_self" select="count(document(concat($self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)+1"/>
-	<!-- Go down a parent, lookup the item after us... -->
+        <xsl:variable name="index_self" select="count(document(concat($self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)+1"/>
+        <!-- Go down a parent, lookup the item after us... -->
         <xsl:variable name="parentItem_lookup" select="document(concat($self, '../text.xml'))/guide/include[$index_self]/@href"/>
-	<xsl:variable name="parentItem_next" select="concat(document(concat($self, '../text.xml'))/guide/@self, $parentItem_lookup)"/>
+        <xsl:variable name="parentItem_next" select="concat(document(concat($self, '../text.xml'))/guide/@self, $parentItem_lookup)"/>
         <xsl:choose>
-	  <!-- If we have an item after us, or we are at the root node (termination condition) we need to
-	       not recurse any further... -->
-	  <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
-	    <xsl:variable name="parentItem_actual">
-	      <xsl:choose>
-		<xsl:when test="$parentItem_next = ''"></xsl:when>
-		<xsl:otherwise><xsl:value-of select="$parentItem_next"/></xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:variable>
-	    <!-- This is where we do a little trickery. To count how many levels we need to go down, 
+          <!-- If we have an item after us, or we are at the root node (termination condition) we need to
+               not recurse any further... -->
+          <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
+            <xsl:variable name="parentItem_actual">
+              <xsl:choose>
+                <xsl:when test="$parentItem_next = ''"></xsl:when>
+                <xsl:otherwise><xsl:value-of select="$parentItem_next"/></xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <!-- This is where we do a little trickery. To count how many levels we need to go down,
                  we count how far up we currently are (remember that the absolute link we get is relative to /...) and
-	         hence we can build a relative link... -->
-	    <xsl:variable name="relative_path" select="$parentItem_actual"/>
-	    <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-	    <xsl:variable name="relative_path_depth_recursion">
-	      <xsl:call-template name="str:repeatString">
+                 hence we can build a relative link... -->
+            <xsl:variable name="relative_path" select="$parentItem_actual"/>
+            <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+            <xsl:variable name="relative_path_depth_recursion">
+              <xsl:call-template name="str:repeatString">
                 <xsl:with-param name="count" select="$relative_path_depth"/>
                 <xsl:with-param name="append">../</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:variable>
-	    <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
-	         into the next iteration... -->
-	    <xsl:variable name="relative_path_depth" select="string-length($self)-string-length(translate($self, '/' , ''))"/>
-	    <xsl:variable name="relative_path_fixed">
-	      <xsl:for-each select="str:tokenize_plasmaroo($self, '/')[position() &lt; (($relative_path_depth - 1)*2 + 1)]">
-		<xsl:value-of select="."/>
-	      </xsl:for-each>
-	    </xsl:variable>
-	    <xsl:call-template name="findNext">
-	      <xsl:with-param name="self" select="$relative_path_fixed"/>
-	    </xsl:call-template>
-	  </xsl:otherwise>
-	</xsl:choose>
+              </xsl:call-template>
+            </xsl:variable>
+            <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
+                 into the next iteration... -->
+            <xsl:variable name="relative_path_depth" select="string-length($self)-string-length(translate($self, '/' , ''))"/>
+            <xsl:variable name="relative_path_fixed">
+              <xsl:for-each select="str:tokenize_plasmaroo($self, '/')[position() &lt; (($relative_path_depth - 1)*2 + 1)]">
+                <xsl:value-of select="."/>
+              </xsl:for-each>
+            </xsl:variable>
+            <xsl:call-template name="findNext">
+              <xsl:with-param name="self" select="$relative_path_fixed"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -678,13 +678,13 @@
     <xsl:variable name="include" select="document(concat($root, $path))/guide/include[last()]/@href"/>
     <xsl:choose>
       <xsl:when test="$include">
-	<xsl:call-template name="getLastNode">
+        <xsl:call-template name="getLastNode">
           <xsl:with-param name="root" select="$root"/>
-	  <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
-	</xsl:call-template>
+          <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:value-of select="$path"/>
+        <xsl:value-of select="$path"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -692,41 +692,41 @@
   <xsl:template name="findPrevious">
     <xsl:choose>
       <!-- To find the "previous" node:
-	   * Go down to our parent
-	     * See if there are any nodes before us
-	       * If we have a valid node that is before us
-	       * Fully recurse up the node to get the last extremity
-	     * Otherwise list the parent -->
+           * Go down to our parent
+             * See if there are any nodes before us
+               * If we have a valid node that is before us
+               * Fully recurse up the node to get the last extremity
+             * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-	<a href="#"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
+        <a href="#"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
       </xsl:when>
       <xsl:otherwise>
-	<!-- This document's path -->
-	<xsl:variable name="doc_self" select="concat(/guide/@self, 'text.xml')"/>
-	<!-- Turn the absolute path we have into a relative path so we can find ourselves in the
-	     parent -->
-	<!-- FIXME: Bombproof the doc_self so it still works if it's missing a '/' on the end -->
+        <!-- This document's path -->
+        <xsl:variable name="doc_self" select="concat(/guide/@self, 'text.xml')"/>
+        <!-- Turn the absolute path we have into a relative path so we can find ourselves in the
+             parent -->
+        <!-- FIXME: Bombproof the doc_self so it still works if it's missing a '/' on the end -->
         <xsl:variable name="path_self" select="concat(str:tokenize(/guide/@self, '/')[last()], '/')"/>
-	<xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
-	<xsl:choose>
-	  <xsl:when test="$index_self &gt; 0">
-	    <!-- Relative path of the parent -->
-	    <xsl:variable name="parentItem_path" select="document(concat(/guide/@self, '../text.xml'))/guide/@self"/>
-	    <!-- Previous item in the parent -->
-	    <xsl:variable name="parentItem_next" select="document(concat(/guide/@self, '../text.xml'))/guide/include[$index_self]/@href"/>
-	    <xsl:variable name="myItem_path">
-	    <xsl:call-template name="getLastNode">
+        <xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
+        <xsl:choose>
+          <xsl:when test="$index_self &gt; 0">
+            <!-- Relative path of the parent -->
+            <xsl:variable name="parentItem_path" select="document(concat(/guide/@self, '../text.xml'))/guide/@self"/>
+            <!-- Previous item in the parent -->
+            <xsl:variable name="parentItem_next" select="document(concat(/guide/@self, '../text.xml'))/guide/include[$index_self]/@href"/>
+            <xsl:variable name="myItem_path">
+            <xsl:call-template name="getLastNode">
               <xsl:with-param name="root" select="$parentItem_path"/>
-	      <xsl:with-param name="path" select="concat($parentItem_next, 'text.xml')"/>
-	    </xsl:call-template>
-	    </xsl:variable>
-	    <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-	    <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <a href="../index.html"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
-	  </xsl:otherwise>
-	</xsl:choose>
+              <xsl:with-param name="path" select="concat($parentItem_next, 'text.xml')"/>
+            </xsl:call-template>
+            </xsl:variable>
+            <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
+            <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+          </xsl:when>
+          <xsl:otherwise>
+            <a href="../index.html"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -773,3 +773,7 @@
     </dl>
   </xsl:template>
 </xsl:stylesheet>
+
+<!-- Local Variables: -->
+<!-- indent-tabs-mode: nil -->
+<!-- End: -->

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     7183f91296cf25741bb31b77f88eb57698782878
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 00:56:19 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:53:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7183f912

Make text.xml files a dependency for documents.js, update search_index.py

Updates to any text.xml should trigger a rebuild of documents.js. The
Makefile is updated to reflect that. And the updated search_index.py
that takes a list of files as arguments.

(This commit message is written by the committer, not the author.)

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 Makefile        |  7 +++++--
 search_index.py | 30 +++++++++++++-----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index ac024b6..90990a8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,11 @@ prereq:
 	{ echo "dev-libs/libxml2 is required" >&2;\
 	  exit 1; }
 
-index:
-	@./search_index.py text.xml > documents.js
+# Since search_index.py rebuilds the index from scratch instead of
+# updating it, we pass it the names of ALL prerequisites ($^) and not
+# just the names of the ones that are new ($?).
+documents.js: $(XMLS)
+	./search_index.py $^ > documents.js
 
 %.png : %.svg
 	convert $< $@

diff --git a/search_index.py b/search_index.py
index 3226775..9af2753 100755
--- a/search_index.py
+++ b/search_index.py
@@ -2,27 +2,23 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 import json
-import os
+import os.path
 import sys
 import xml.etree.ElementTree as ET
 
-xmlFile = sys.argv[1]
+files = sys.argv[1:]
 documents = []
 url_root = 'https://devmanual.gentoo.org/'
 
-print('var documents = ', end = '')
-for path, dirs, files in os.walk('.'):
-    if xmlFile in files:
-        tree = ET.parse(path + '/' + xmlFile)
-        root = tree.getroot()
-        for chapter in root.findall('chapter'):
-            try:
-                documents.append({"name": chapter.find('title').text,
-                    "text": chapter.find('body').find('p').text,
-                                  "url": url_root + path[+2:] })
-            except:
-                pass
-    if '.git' in dirs:
-        dirs.remove('.git')  # don't visit git directories
+for f in files:
+    tree = ET.parse(f)
+    root = tree.getroot()
+    for chapter in root.findall('chapter'):
+        try:
+            documents.append({"name": chapter.find('title').text,
+                "text": chapter.find('body').find('p').text,
+                 "url": url_root + os.path.dirname(f) + '/'})
+        except AttributeError:
+            pass
 
-print(json.dumps(documents))
+print('var documents = ' + json.dumps(documents) + ';')

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     173273b10e50d649924f70223cd5817585fc59af
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 02:11:15 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:58:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=173273b1

search.js: highlight the search terms in results

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 search.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/search.js b/search.js
index ab28f87..9cbf05a 100644
--- a/search.js
+++ b/search.js
@@ -42,9 +42,32 @@ function search() {
       $.each(results, function(index, result) {
         var uid = result.ref;
         var contents = getContents(documents, uid);
+        var stems = Object.keys(result.matchData.metadata);
+        var positions = [];
+        var text = "";
+        var pos = 0;
+
+        stems.forEach(function (stem) {
+            positions = positions.concat(result.matchData.metadata[stem].text.position);
+        });
+        positions.sort(function(x, y) {
+            if (x[0] < y[0]) { return -1; }
+            else if (x[0] > y[0]) { return 1; }
+            else { return 0; }
+        });
+
+        for (var i = 0; i < positions.length; i++) {
+          text += contents.text.substring(pos, positions[i][0]);
+          pos = positions[i][0];
+          text += "<span style='background-color: yellow;'>";
+          text += contents.text.substring(pos, pos + positions[i][1]);
+          pos += positions[i][1];
+          text += "</span>";
+        }
+        text += contents.text.substring(pos);
 
         $("#searchResults .modal-body").append(`<article><h5><a href="${contents.url}">
-                                                ${title}</a></h5><p>${contents.text}</p></article>`);
+                                                ${contents.name}</a></h5><p>${text}</p></article>`);
       });
     } else {
       $("#searchResults .modal-body").empty();

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     74bc977dfc56f07b065e85abdde70c075775d829
Author:     Lucas Ramage <oxr463 <AT> gmx <DOT> us>
AuthorDate: Mon Nov 18 13:56:37 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:53:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=74bc977d

Ensure Python is enabled for dev-libs/libxslt

Required to build the Lunr search index

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 343234b..ac024b6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ prereq:
 	{ echo "media-gfx/imagemagick[corefonts,svg,truetype] required" >&2;\
           exit 1; }
 	@type xsltproc >/dev/null 2>&1 || \
-	{ echo "dev-libs/libxslt is required" >&2;\
+	{ echo "dev-libs/libxslt is with python required" >&2;\
 	  exit 1; }
 	@type xmllint >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxml2 is required" >&2;\

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     7f13e9b5f59ee496db5b8af7ab093a17c8f76066
Author:     Lucas Ramage <ramage.lucas <AT> protonmail <DOT> com>
AuthorDate: Thu Apr 11 19:21:27 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:52:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7f13e9b5

Implement search functionality via lunr.js

Bug: https://bugs.gentoo.org/674378
Signed-off-by: Lucas Ramage <ramage.lucas <AT> protonmail.com>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 .gitignore      |  1 +
 Makefile        |  6 +++++-
 devbook.xsl     | 48 +++++++++++++++++++++++++++++++++++++++++++++
 search.js       | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 search_index.py | 26 +++++++++++++++++++++++++
 5 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 720d4d6..ce644c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.html
 *.png
+documents.js
 eclass-reference/

diff --git a/Makefile b/Makefile
index 61daef4..4a52cc0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,10 @@ prereq:
 	{ echo "dev-libs/libxml2 is required" >&2;\
 	  exit 1; }
 
+index:
+	@echo -n "var documents = " > documents.js
+	@./search_index.py text.xml >> documents.js
+
 %.png : %.svg
 	convert $< $@
 
@@ -42,6 +46,6 @@ validate: prereq
 	  && echo "xmllint validation successful"
 
 clean:
-	rm -f $(HTMLS) $(IMAGES)
+	rm -f $(HTMLS) $(IMAGES) documents.js
 
 .PHONY: all prereq validate clean

diff --git a/devbook.xsl b/devbook.xsl
index 96a0508..71dde54 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -536,7 +536,45 @@
             </div>
           </div>
         </nav>
+        <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
+          <div class="container">
+            <div class="row">
+              <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
+                  <span class="sr-only">Toggle navigation</span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                </button>
+              </div>
+              <div class="collapse navbar-collapse" id="gw-toolbar">
+              <div class="input-group">
+                <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control"/>
+                <div class="input-group-btn">
+                  <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </nav>
       </header>
+      <div id="searchResults" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal">x</button>
+              <h4 class="modal-title">Search Results</h4>
+            </div>
+            <div class="modal-body">
+              <p>No results found.</p>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
+          </div>
+        </div>
+      </div>
       <div class="container">
         <div class="row">
           <div class="col-md010">
@@ -583,6 +621,16 @@
       </footer>
       <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
       <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
+      <script src="https://unpkg.com/lunr/lunr.js"></script>
+      <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+      <xsl:variable name="relative_path_depth_recursion">
+          <xsl:call-template name="str:repeatString">
+            <xsl:with-param name="count" select="$relative_path_depth"/>
+            <xsl:with-param name="append">../</xsl:with-param>
+          </xsl:call-template>
+      </xsl:variable>
+      <script src="{$relative_path_depth_recursion}documents.js"></script>
+      <script src="{$relative_path_depth_recursion}search.js"></script>
     </body>
     </html>
   </xsl:template>

diff --git a/search.js b/search.js
new file mode 100644
index 0000000..0b9292f
--- /dev/null
+++ b/search.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019 Gentoo Authors
+ * Distributed under the terms of the GNU GPL version 2 or later
+ */
+"use strict";
+
+var search_index = lunr(function () {
+  this.ref('name');
+  this.field('text');
+  this.field('url');
+
+  documents.forEach(function (doc) {
+    this.add(doc);
+  }, this);
+});
+
+var search_input = document.getElementById("searchInput");
+
+search_input.addEventListener("keyup", function(event) {
+  if(event.keyCode === 13) {
+    event.preventDefault();
+    document.getElementById("mw-searchButton").click();
+  }
+});
+
+function getContents(docs, article) {
+  var contents = { text: "", url: "" };
+
+  for (var i = 0; i< docs.length; i++) {
+    if (docs[i].name == article) {
+      contents.text = docs[i].text;
+      contents.url = docs[i].url;
+    }
+  }
+  return contents;
+}
+
+function search() {
+  var term = document.getElementById("searchInput").value;
+  if (term !== "") {
+    var results = search_index.search(term);
+    if (results.length > 0) {
+      $("#searchResults .modal-body").empty();
+      $.each(results, function(index, result) {
+        var title = result.ref;
+        var contents = getContents(documents, title);
+
+        $("#searchResults .modal-body").append(`<article><h5><a href="${contents.url}">
+                                                ${title}</a></h5><p>${contents.text}</p></article>`);
+      });
+    } else {
+      $("#searchResults .modal-body").empty();
+      $("#searchResults .modal-body").append("<p>No results found.</p>");
+    }
+  } else {
+      $("#searchResults .modal-body").empty();
+      $("#searchResults .modal-body").append("<p>No search term defined.</p>");
+  }
+  $("#searchResults").modal();
+}

diff --git a/search_index.py b/search_index.py
new file mode 100755
index 0000000..2ab79f1
--- /dev/null
+++ b/search_index.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU GPL version 2 or later
+import json
+import os
+import sys
+import xml.etree.ElementTree as ET
+
+xmlFile = sys.argv[1]
+documents = []
+
+for path, dirs, files in os.walk('.'):
+    if xmlFile in files:
+        tree = ET.parse(path + '/' + xmlFile)
+        root = tree.getroot()
+        for chapter in root.findall('chapter'):
+            try:
+                documents.append({"name": chapter.find('title').text,
+                    "text": chapter.find('body').find('p').text,
+                    "url": path })
+            except:
+                pass
+    if '.git' in dirs:
+        dirs.remove('.git')  # don't visit git directories
+
+print(json.dumps(documents))

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     50dadd6df06a8e50889ddb9460d098c62a5112ee
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 07:05:30 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:58:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=50dadd6d

Makefile: add 'documents.js' to 'all'

Closes: https://github.com/gentoo/devmanual/pull/120
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aa29c26..56f2e68 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SVGS := $(shell find . -name .git -prune -o -type f -name '*.svg' -print)
 HTMLS := $(subst text.xml,index.html,$(XMLS))
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
-all: prereq validate $(HTMLS) $(IMAGES)
+all: prereq validate $(HTMLS) $(IMAGES) documents.js
 
 prereq:
 	@type convert >/dev/null 2>&1 || \

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     690ef9d882b7cb66e7cc93409cf91175f4cc45e1
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 01:23:07 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:58:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=690ef9d8

search.js: escape HTML/XML tags returned in search results

build_search_documents.py unescapes the escaped tags when creating an
index. This is desired as lunr doesn't index them otherwise. For
example it indexes '<warning>' properly but not
'&lt;warning&gt;'. When we display them on the browser though, we need
to escape them again so that they are not interpreted as real tags.

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 search.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/search.js b/search.js
index 9cbf05a..aae7bcf 100644
--- a/search.js
+++ b/search.js
@@ -33,6 +33,21 @@ function getContents(docs, uid) {
   return contents;
 }
 
+function escapeHTML(str) {
+  return str.replace(/[&<"']/g, function(m) {
+    switch (m) {
+    case '&':
+      return '&amp;';
+    case '<':
+      return '&lt;';
+    case '"':
+      return '&quot;';
+    default:
+      return '&#039;';
+    }
+  });
+};
+
 function search() {
   var term = document.getElementById("searchInput").value;
   if (term !== "") {
@@ -57,14 +72,14 @@ function search() {
         });
 
         for (var i = 0; i < positions.length; i++) {
-          text += contents.text.substring(pos, positions[i][0]);
+          text += escapeHTML(contents.text.substring(pos, positions[i][0]));
           pos = positions[i][0];
           text += "<span style='background-color: yellow;'>";
-          text += contents.text.substring(pos, pos + positions[i][1]);
+          text += escapeHTML(contents.text.substring(pos, pos + positions[i][1]));
           pos += positions[i][1];
           text += "</span>";
         }
-        text += contents.text.substring(pos);
+        text += escapeHTML(contents.text.substring(pos));
 
         $("#searchResults .modal-body").append(`<article><h5><a href="${contents.url}">
                                                 ${contents.name}</a></h5><p>${text}</p></article>`);

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     b70366b239ca21dda65c928df8963bd115ebdd98
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 00:00:53 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:57:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b70366b2

Makefile: do not blindly overwrite documents.js

In case search_index.py fails, it will truncate documents.js. Create
documents in a separate file and atomically move it upon completion.

Suggested-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 .gitignore | 1 +
 Makefile   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce644c7..5413cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.html
 *.png
+_documents.js
 documents.js
 eclass-reference/

diff --git a/Makefile b/Makefile
index 90990a8..4e591ac 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ prereq:
 # updating it, we pass it the names of ALL prerequisites ($^) and not
 # just the names of the ones that are new ($?).
 documents.js: $(XMLS)
-	./search_index.py $^ > documents.js
+	./search_index.py $^ > _documents.js
+	mv _documents.js documents.js
 
 %.png : %.svg
 	convert $< $@
@@ -48,6 +49,6 @@ validate: prereq
 	  && echo "xmllint validation successful"
 
 clean:
-	rm -f $(HTMLS) $(IMAGES) documents.js
+	rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
 
 .PHONY: all prereq validate clean

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     8a7bc280c2c77a379fa8c1ac481cf00728801162
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 04:49:01 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:58:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8a7bc280

Fetch documents.js on demand when the user clicks the search text box

Instead of shipping a relatively large ~400K documents.js file on
every page load, do it when the user clicks the search text box for
the first time. Local performance measurements show that it takes
about 350ms to build the index from documents.js after fetching it.

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 devbook.xsl |  4 ++--
 search.js   | 36 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 44ca659..da60097 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -549,7 +549,7 @@
               </div>
               <div class="collapse navbar-collapse" id="gw-toolbar">
               <div class="input-group">
-                <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control"/>
+                <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
                 <div class="input-group-btn">
                   <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
                 </div>
@@ -629,7 +629,7 @@
             <xsl:with-param name="append">../</xsl:with-param>
           </xsl:call-template>
       </xsl:variable>
-      <script src="{$relative_path_depth_recursion}documents.js"></script>
+      <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
       <script src="{$relative_path_depth_recursion}search.js"></script>
     </body>
     </html>

diff --git a/search.js b/search.js
index aae7bcf..c56a31a 100644
--- a/search.js
+++ b/search.js
@@ -4,16 +4,7 @@
  */
 "use strict";
 
-var search_index = lunr(function () {
-  this.ref('id');
-  this.field('text');
-  this.metadataWhitelist = ['position']
-
-  documents.forEach(function (doc) {
-    this.add(doc);
-  }, this);
-});
-
+var search_index = null;
 var search_input = document.getElementById("searchInput");
 
 search_input.addEventListener("keyup", function(event) {
@@ -23,6 +14,31 @@ search_input.addEventListener("keyup", function(event) {
   }
 });
 
+function buildIndex() {
+  search_index = lunr(function () {
+    this.ref('id');
+    this.field('text');
+    this.metadataWhitelist = ['position']
+
+    documents.forEach(function (doc) {
+      this.add(doc);
+    }, this);
+  });
+}
+
+function fetchDocuments() {
+  document.getElementsByName("search")[0].onclick = null;
+  if (search_index == null) {
+    const script = document.createElement('script')
+    script.src = documentsSrc;
+    script.async = false;
+    script.onload = function() {
+      buildIndex();
+    }
+    document.body.appendChild(script);
+  }
+}
+
 function getContents(docs, uid) {
   var contents = { name: "", text: "", url: "" };
 

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     fd979d4030008efb529a4fda3ea0539166d3c49d
Author:     Lucas Ramage <ramage.lucas <AT> protonmail <DOT> com>
AuthorDate: Tue Nov 26 20:07:47 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:53:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fd979d40

Use Gentoo-hosted minified version

Co-Authored-By: Gokturk Yuksek <gokturk <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 71dde54..44ca659 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -621,7 +621,7 @@
       </footer>
       <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
       <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
-      <script src="https://unpkg.com/lunr/lunr.js"></script>
+      <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
       <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
       <xsl:variable name="relative_path_depth_recursion">
           <xsl:call-template name="str:repeatString">

[gentoo-commits] proj/devmanual:master commit in: /

[Göktürk Yüksek]

commit:     e01e6ccbdecf369c6f6c0d9da800ebea2e264f96
Author:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 12:29:29 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 20:53:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e01e6ccb

Fix make all URL relative to root directory

Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 Makefile        | 3 +--
 search_index.py | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4a52cc0..343234b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,7 @@ prereq:
 	  exit 1; }
 
 index:
-	@echo -n "var documents = " > documents.js
-	@./search_index.py text.xml >> documents.js
+	@./search_index.py text.xml > documents.js
 
 %.png : %.svg
 	convert $< $@

diff --git a/search_index.py b/search_index.py
index 2ab79f1..3226775 100755
--- a/search_index.py
+++ b/search_index.py
@@ -8,7 +8,9 @@ import xml.etree.ElementTree as ET
 
 xmlFile = sys.argv[1]
 documents = []
+url_root = 'https://devmanual.gentoo.org/'
 
+print('var documents = ', end = '')
 for path, dirs, files in os.walk('.'):
     if xmlFile in files:
         tree = ET.parse(path + '/' + xmlFile)
@@ -17,7 +19,7 @@ for path, dirs, files in os.walk('.'):
             try:
                 documents.append({"name": chapter.find('title').text,
                     "text": chapter.find('body').find('p').text,
-                    "url": path })
+                                  "url": url_root + path[+2:] })
             except:
                 pass
     if '.git' in dirs:

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     167e9b50644484f047b60fd1f55950821810dc18
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 04:31:52 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 05:18:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=167e9b50

Makefile: make build_search_documents.py a prerequisite for documents.js

Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 56f2e68..17be902 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,12 @@ prereq:
 	{ echo "dev-libs/libxml2 is required" >&2;\
 	  exit 1; }
 
-# Since search_index.py rebuilds the index from scratch instead of
-# updating it, we pass it the names of ALL prerequisites ($^) and not
-# just the names of the ones that are new ($?).
-documents.js: $(XMLS)
-	./bin/build_search_documents.py $^ > _documents.js
+# We need to parse all the XMLs every time, not just the ones
+# that are newer than the target. This is because each search
+# document in devmanual gets a unique ID, which is used to
+# quickly tie search matches to the corresponding documents.
+documents.js: bin/build_search_documents.py $(XMLS)
+	./bin/build_search_documents.py $(XMLS) > _documents.js
 	mv _documents.js documents.js
 
 %.png : %.svg

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     aa26b473992dd1df1417153b0b03cae6cfe28f8a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 16:47:01 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 16:47:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=aa26b473

devbook.dtd: Fix guide element.

There must be exactly one chapter in each file.

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

 devbook.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.dtd b/devbook.dtd
index dac1815..d60930e 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -9,7 +9,7 @@
 <!ENTITY  % inline.class    "sup|sub|b|c|d|e|path|uri">
 <!ENTITY  % all.class       "%block.class;|%inline.class;">
 
-<!ELEMENT guide         (include|chapter)+>
+<!ELEMENT guide         (chapter,include*)>
 <!ATTLIST guide         root (true) #IMPLIED
                         self CDATA #IMPLIED>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     0396a29b8420ba0cdf56eaa652191bcc376b180f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 17:06:22 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 17:06:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0396a29b

devbook.dtd: Whitespace.

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

 devbook.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.dtd b/devbook.dtd
index d60930e..beca012 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -9,7 +9,7 @@
 <!ENTITY  % inline.class    "sup|sub|b|c|d|e|path|uri">
 <!ENTITY  % all.class       "%block.class;|%inline.class;">
 
-<!ELEMENT guide         (chapter,include*)>
+<!ELEMENT guide         (chapter, include*)>
 <!ATTLIST guide         root (true) #IMPLIED
                         self CDATA #IMPLIED>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a21e370404778ff7ad301e7fc5ca04a6f4f3b772
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 08:58:13 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 17:58:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a21e3704

devbook.dtd: Remove sup, sub, and path elements.

These are not supported by devbook.xsl.

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

 devbook.dtd | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index beca012..946a7f1 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -6,7 +6,7 @@
 
 <!ENTITY  % block.class     "p|pre|codesample|note|important|warning|todo
                                 |figure|table|ul|ol|dl">
-<!ENTITY  % inline.class    "sup|sub|b|c|d|e|path|uri">
+<!ENTITY  % inline.class    "b|c|e|d|uri">
 <!ENTITY  % all.class       "%block.class;|%inline.class;">
 
 <!ELEMENT guide         (chapter, include*)>
@@ -85,12 +85,9 @@
 <!-- The following is strange, but devbook.xsl expects only p elements -->
 <!ELEMENT dd            (p)+>
 
-<!ELEMENT sup           (#PCDATA|%inline.class;)*>
-<!ELEMENT sub           (#PCDATA|%inline.class;)*>
 <!ELEMENT b             (#PCDATA|%inline.class;)*>
 <!ELEMENT c             (#PCDATA|%inline.class;)*>
 <!ELEMENT e             (#PCDATA|%inline.class;)*>
-<!ELEMENT path          (#PCDATA|%inline.class;)*>
 <!ELEMENT d             EMPTY>
 
 <!ELEMENT uri           (#PCDATA|%inline.class;)*>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

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;
 }
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     ff9d9f476e9f2d57795eb38f018a628588b02e70
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 12:51:28 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 12:51:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ff9d9f47

devbook.xsl: Remove duplicate comment.

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

 devbook.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ae0313c..4b16010 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -47,8 +47,6 @@
 
       <h3 id="{$anchor}"><xsl:apply-templates select="title"/></h3>
       <xsl:apply-templates select="(body|subsubsection)"/>
-
-      <!-- If you need, change here to add more nesting levels -->
     </div>
   </xsl:template>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     b5bfc69fab686a49e6fbf54aceae2bb12885dc5a
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 16:51:57 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 12:41:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b5bfc69f

devbook.xsl: strip leading/trailing whitespace from header identifiers.

We were already replacing spaces *within* these identifiers, so we
don't have to worry about that.

Bug: https://bugs.gentoo.org/626032
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index a8a11f1..ae0313c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -282,7 +282,7 @@
     <xsl:param name="data"/>
     <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz--</xsl:variable>
     <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text>,</xsl:variable>
-    <xsl:value-of select="translate($data,$ucletters,$lcletters)"/>
+    <xsl:value-of select="translate(normalize-space($data),$ucletters,$lcletters)"/>
   </xsl:template>
 
   <xsl:template match="uri">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     2330779776b8ed53ec91629db2d2d56b65e64eb7
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 16:24:51 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 12:43:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=23307797

Makefile: add new app-text/tidy-html5 sanity check.

This new PHONY "make tidy" target runs the tidy-html5 program, using a
new .tidyrc file, to ensure that the HTML we have generated is free
from certain problems. In particular, it should complain if bug 626032
ever resurfaces and there are duplicate identifiers in some document.

Closes: https://bugs.gentoo.org/626032
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
[Command line options instead of .tidyrc file. Don't fail on first error.]
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 17be902..407decf 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,17 @@ validate: prereq
 	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
 	  && echo "xmllint validation successful"
 
+# Run app-text/tidy-html5 on the output to detect mistakes.
+# We have to loop through them because otherwise tidy won't
+# tell you which file contains a mistake.
+tidy: $(HTMLS)
+	@for f in $(HTMLS); do \
+	  output=$$(tidy -q -errors --drop-empty-elements no $${f} 2>&1) \
+	  || { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
+	done; \
+	exit $${status}
+
 clean:
 	rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
 
-.PHONY: all prereq validate clean
+.PHONY: all prereq validate tidy clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     832b6ab7ea3e5239ec1ad850ca08a85dc1cb3bb1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 13:35:35 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 13:35:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=832b6ab7

Makefile: Output a message if tidy succeeded.

Explicitly initialise status, in order to be independent of the
environment.

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

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 407decf..398d976 100644
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,12 @@ validate: prereq
 # We have to loop through them because otherwise tidy won't
 # tell you which file contains a mistake.
 tidy: $(HTMLS)
-	@for f in $(HTMLS); do \
+	@status=0; \
+	for f in $(HTMLS); do \
 	  output=$$(tidy -q -errors --drop-empty-elements no $${f} 2>&1) \
 	  || { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
 	done; \
+	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
 
 clean:

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     200818b99d2f874ad9e885861704a53d29f4e619
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 19:11:04 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 08:53:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=200818b9

devbook.xsl: ID attributes should contain only valid characters.

Keep only characters that HTML 4 allows in ID attributes (but exclude
the colon as well). Note that HTML 5 is more sloppy and would permit
characters outside of the ASCII range, but these won't be valid in URI
fragment identifiers (RFC 3986).

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

 devbook.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 2a5dea2..9d3d5f0 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -280,7 +280,10 @@
     <xsl:param name="data"/>
     <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz--</xsl:variable>
     <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text>,</xsl:variable>
-    <xsl:value-of select="translate(normalize-space($data),$ucletters,$lcletters)"/>
+    <xsl:variable name="lcdata" select="translate(normalize-space($data), $ucletters, $lcletters)"/>
+    <!-- Delete anything but letters, digits, hyphen, dot, underscore -->
+    <xsl:variable name="allowed">abcdefghijklmnopqrstuvwxyz0123456789-._</xsl:variable>
+    <xsl:value-of select="translate($lcdata, translate($lcdata, $allowed, ''), '')"/>
   </xsl:template>
 
   <xsl:template match="uri">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     1f0a3ae7ca5d7f0321a8bd852d3eaba60ab2a06e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 19:14:23 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 08:53:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1f0a3ae7

devbook.xsl: Don't treat commas in ID attributes as special.

Now that invalid characters are filtered, special treatment of commas
is no longer necessary. See also bug #141686.

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

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 9d3d5f0..cae10ae 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -278,8 +278,8 @@
 
   <xsl:template name="convert-to-anchor">
     <xsl:param name="data"/>
-    <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz--</xsl:variable>
-    <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text>,</xsl:variable>
+    <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz-</xsl:variable>
+    <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text></xsl:variable>
     <xsl:variable name="lcdata" select="translate(normalize-space($data), $ucletters, $lcletters)"/>
     <!-- Delete anything but letters, digits, hyphen, dot, underscore -->
     <xsl:variable name="allowed">abcdefghijklmnopqrstuvwxyz0123456789-._</xsl:variable>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5a59efa3a33383bf41466296c765d6ba096ebc25
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 00:32:39 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 09:21:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5a59efa3

Makefile: Run tidy also on html files generated from eclass manpages.

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

 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 398d976..a6df3be 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
 XMLS := $(shell find . -name .git -prune -o -type f -name 'text.xml' -print)
 SVGS := $(shell find . -name .git -prune -o -type f -name '*.svg' -print)
 HTMLS := $(subst text.xml,index.html,$(XMLS))
+ECLASS_HTMLS := $(wildcard eclass-reference/*/index.html)
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
 all: prereq validate $(HTMLS) $(IMAGES) documents.js
@@ -52,9 +53,9 @@ validate: prereq
 # Run app-text/tidy-html5 on the output to detect mistakes.
 # We have to loop through them because otherwise tidy won't
 # tell you which file contains a mistake.
-tidy: $(HTMLS)
+tidy: $(HTMLS) $(ECLASS_HTMLS)
 	@status=0; \
-	for f in $(HTMLS); do \
+	for f in $^; do \
 	  output=$$(tidy -q -errors --drop-empty-elements no $${f} 2>&1) \
 	  || { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
 	done; \

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     29d74e3951ad9acd000c6671a437e2fee5c440d0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 17:30:19 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 08:13:26 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=29d74e39

devmanual.css: Drop unused elements.

Most elements of the stylesheet are either not used at all, or they
are superseded by the Bootstrap or Tyrian stylesheets which are loaded
later.

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

 devmanual.css | 143 +---------------------------------------------------------
 1 file changed, 1 insertion(+), 142 deletions(-)

diff --git a/devmanual.css b/devmanual.css
index 414ad1e..bb89812 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -1,138 +1,6 @@
-div.header {
-    border-bottom: 3px solid #333333;
-    background-color: #666666;
-    color: #eeeeee;
-    margin: 0em 0em 0em 0em;
-    padding: 0.2em;
-    font-size: 70%;
-}
-
-div.navtop {
-    border-bottom: 1px dashed #333333;
-    text-align: center;
-}
-
-div.navbottom {
-    border-top: 1px dashed #333333;
-    text-align: center;
-    margin-top: 1em;
-}
-
-@media print {
-    div.header {
-        display: none;
-    }
-}
-
-div.header a:link, div.header a:visited,
-div.footer a:link, div.footer a:visited {
-    color: #eeeeee;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-div.header a:hover, div.footer a:hover {
-    color: #eeeeee;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
-div.footer {
-    text-align: center;
-    border-top: 3px solid #333333;
-    background-color: #666666;
-    color: #eeeeee;
-    margin: 0em 0em 0em 0em;
-    padding: 0em 0.2em;
-    font-size: 70%;
-}
-
-@media print {
-    div.footer {
-        display: none;
-    }
-}
-
-div.main {
-    padding: 1em 40px;
-    margin: 0em;
-    background-color: #eeeeee;
-    color: #333333;
-}
-
-body {
-    background-color: #666666;
-    color: #eeeeee;
-    padding: 0em;
-    margin: 0em;
-    font-family: "Verdana", "Arial", "Helvetica", sans-serif;
-}
-
-div.footer * img {
-    border-width: 0px;
-}
-
 th {
     font-weight: bold;
     text-align: left;
-    padding: 0.3em;
-}
-
-th, td {
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-}
-
-div.main a:link, div.main a:visited {
-    color: #000099;
-    text-decoration: none;
-}
-
-div.main a[href]:hover {
-    color: #000099;
-    text-decoration: underline;
-}
-
-div.main pre a:link, div.main pre a:visited {
-    color: #fff0e0;
-    text-decoration: none;
-}
-
-div.main pre a[href]:hover {
-    color: #fff0e0;
-    text-decoration: underline;
-}
-
-code, tt {
-    color: #993333;
-}
-
-div.main p, div.main dd {
-    text-align: justify;
-}
-
-pre {
-    background-color: #1e1e27;
-    color: #cfbfad;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-div.main h1 {
-    text-align: center;
-}
-
-div.main h2 {
-    text-align: left;
-    border-bottom: 1px dashed #333333;
-    margin-left: -30px;
-}
-
-div.main h3 {
-    text-align: left;
-    margin-left: -30px;
 }
 
 dt {
@@ -149,22 +17,13 @@ div.figure, div.figure p {
     font-weight: bold;
 }
 
-code, pre, tt {
+code, pre {
     font-family: monospace;
     tab-size: 4;
     -o-tab-size: 4;
     -moz-tab-size: 4;
 }
 
-blockquote.epigraph p {
-    font-size: 80%;
-    font-style: italic;
-}
-
-blockquote.epigraph p.attribution {
-    font-style: normal;
-}
-
 td.devbook {
     vertical-align: top;
 }

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     d1e4dbd4a0d4be63bb5928b5328357e41483fdda
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 22:41:17 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 23:03:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d1e4dbd4

devmanual.css, devbook.xsl: Drop td.devbook.

Use the bootstrap default instead. Custom handling for <th> has
already been removed in commit a429f4c, drop it for <ti> as well.

About the history of this:
The vertical alignment was originally added to resolve bug 53500,
see the variables table (e.g. the KEYWORDS line) in the archived page:
https://web.archive.org/web/20040604000628/http://www.gentoo.org/doc/en/gentoo-howto.xml
The class was later (commit cff18db) renamed from tableinfo to devbook.
None of this seems to be necessary any more; vertical alignment is
just fine with the bootstrap layout.

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

 devbook.xsl   | 2 +-
 devmanual.css | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 04987df..a85d81c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -95,7 +95,7 @@
 
   <!-- Table Item -->
   <xsl:template match="ti">
-    <td class="devbook">
+    <td>
       <xsl:if test="@colspan">
         <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
       </xsl:if>

diff --git a/devmanual.css b/devmanual.css
index bb89812..81e78de 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -24,10 +24,6 @@ code, pre {
     -moz-tab-size: 4;
 }
 
-td.devbook {
-    vertical-align: top;
-}
-
 pre span.Special { color: magenta; }
 pre span.Identifier { color: blue; }
 pre span.Type { color: blue; }

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     3d9337265a479f4025207348138877d844a9d943
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 20:04:15 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 18:49:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=3d933726

devbook.xsl: Fix links to eclass references.

Closes: https://bugs.gentoo.org/442194
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/devbook.xsl b/devbook.xsl
index a85d81c..19012ff 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -329,6 +329,12 @@
               <xsl:when test=". != ''">
                 <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="."/></a>
               </xsl:when>
+              <xsl:when test="starts-with(@link, '::eclass-reference/') and substring-after(@link, '::eclass-reference/') != ''">
+                <!-- Eclass reference pages are generated with man2html,
+                     so there isn't any text.xml that could be loaded.
+                     Use the name of the eclass as link text. #442194 -->
+                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="substring-before(concat(substring-after(@link, '::eclass-reference/'), $slash), '/')"/></a>
+              </xsl:when>
               <xsl:otherwise>
                 <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $relative_path_depth_recursion, substring-after(@link, '::'), '/text.xml'))/guide/chapter[1]/title"/></a>
               </xsl:otherwise>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     264672ddb6857313b7ba9426853d58e3b61b6590
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 21:35:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 21:35:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=264672dd

devbook.xsl: Remove tcolumn element.

Not clear what the original intention of this was, but:
- <tcolumn> was never used in the devmanual.
- The generated HTML would have been invalid, because it contained
  <col> without an enclosing <colgroup>.
- The width attribute is deprecated in HTML 4 and obsolete in HTML 5.

Remove for now from devbook.xsl; update devbook.dtd accordingly.

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

 devbook.dtd | 7 ++-----
 devbook.xsl | 4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index 455397b..d213d0c 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -1,4 +1,4 @@
-<!-- Copyright 2019 Gentoo Authors -->
+<!-- Copyright 2019-2020 Gentoo Authors -->
 <!-- Distributed under the terms of the MIT/X11 license -->
 
 <!-- Document Type Definition for the Gentoo Devmanual -->
@@ -55,10 +55,7 @@
                         short CDATA #IMPLIED
                         caption CDATA #IMPLIED>
 
-<!ELEMENT table         (tcolumn*, tr+)>
-
-<!ELEMENT tcolumn       EMPTY>
-<!ATTLIST tcolumn       width CDATA #REQUIRED>
+<!ELEMENT table         (tr)+>
 
 <!ELEMENT tr            (th|ti)+>
 

diff --git a/devbook.xsl b/devbook.xsl
index 8c367d4..8d8d082 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -89,10 +89,6 @@
   <tr><xsl:apply-templates/></tr>
   </xsl:template>
 
-  <xsl:template match="tcolumn">
-  <col width="{@width}"/>
-  </xsl:template>
-
   <!-- Table Item -->
   <xsl:template match="ti">
     <td>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     dc3fdda90a01bde7de5bfb409c4a46a4486e9e7a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 18:07:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 18:07:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dc3fdda9

devmanual.css: Indent <dd> in definition lists.

The Bootstrap layout indents <li> but leaves <dd> flush-left (why?).
Add a 2em left margin for <dd> so it will be indented.

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

 devmanual.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devmanual.css b/devmanual.css
index 81e78de..41c6beb 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -10,6 +10,7 @@ dt {
 dd {
     margin-top: 0.2em;
     margin-bottom: 0.2em;
+    margin-left: 2em;
 }
 
 div.figure, div.figure p {

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6bff1eb8b62b9d07e1cc1098eb617f9302487907
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 03:10:18 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 19:57:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6bff1eb8

Makefile: use rsvg-convert to generate PNGs from SVGs.

Our Makefile currently uses inkscape (via imagemagick's "convert"
wrapper) to turn SVGs into PNGs. This has a few downsides:

  * media-gfx/inkscape is a huge dependency,
  * inkscape is slow to perform the conversion,
  * installing imagemagick[svg] doesn't ensure that "convert" can
    convert an SVG to a PNG if inkscape is missing (bug 684686).

The good news is that there is another SVG -> PNG conversion tool
called rsvg-convert that is installed by gnome-base/librsvg. Compared
to inkscape, librsvg is a light dependency and rsvg-convert is
lightning-fast. Moreover, installing gnome-base/librsvg guarantees
that the latter will exist and can actually perform the conversion.

Inkscape is supposedly more powerful, but so far in the devmanual
we're only using SVG to put words in boxes. The simpler tool is
sufficient for that, and therefore preferable.

This commit updates the Makefile to use rsvg-convert.

Bug: https://bugs.gentoo.org/684686
Closes: https://bugs.gentoo.org/700904
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9cccb38..e7131ed 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 all: prereq validate $(HTMLS) $(IMAGES) documents.js
 
 prereq:
-	@type convert >/dev/null 2>&1 || \
-	{ echo "media-gfx/imagemagick[corefonts,svg,truetype] required" >&2;\
+	@type rsvg-convert >/dev/null 2>&1 || \
+	{ echo "gnome-base/librsvg required" >&2;\
           exit 1; }
 	@type xsltproc >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxslt is with python required" >&2;\
@@ -32,7 +32,7 @@ documents.js: bin/build_search_documents.py $(XMLS)
 	mv _documents.js documents.js
 
 %.png : %.svg
-	convert $< $@
+	rsvg-convert --output=$@ $<
 
 # Secondary expansion allows us to use the automatic variable $@ in
 # the prerequisites. When it is used (and we have no idea when that

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a3d4f013e640988d6097d29623aec40bfc89521b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 01:30:28 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 19:57:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a3d4f013

Makefile: add prereq check for the Open Sans font.

The fc-list command from media-libs/fontconfig can tell us what fonts
are available to rsvg-convert, so this commit asks it if any font
matching the pattern "Open Sans" is installed. You could make this
check a bit more bullet-proof by checking the exact string (to avoid
matching e.g. Not Open Sans), but only at the expense of making a
simple command more complicated.

Bug: https://bugs.gentoo.org/700904
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index a6df3be..9cccb38 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,9 @@ prereq:
 	@type xmllint >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxml2 is required" >&2;\
 	  exit 1; }
+	@fc-list -q "Open Sans" || \
+	{ echo "media-fonts/open-sans is required" >&2;\
+	  exit 1; }
 
 # We need to parse all the XMLs every time, not just the ones
 # that are newer than the target. This is because each search

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     aa6e1e365fff48b6e1e5470791f499a0589d39c3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 20:37:00 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 20:37:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=aa6e1e36

Makefile: Add separate "build" target.

This is for the app-doc/devmanual[fallback] offline package, where we
don't have lunr.js and don't want to build documents.js.

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

 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e7131ed..3fb4c52 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ HTMLS := $(subst text.xml,index.html,$(XMLS))
 ECLASS_HTMLS := $(wildcard eclass-reference/*/index.html)
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
-all: prereq validate $(HTMLS) $(IMAGES) documents.js
+all: prereq validate build documents.js
 
 prereq:
 	@type rsvg-convert >/dev/null 2>&1 || \
@@ -23,6 +23,8 @@ prereq:
 	{ echo "media-fonts/open-sans is required" >&2;\
 	  exit 1; }
 
+build: $(HTMLS) $(IMAGES)
+
 # We need to parse all the XMLs every time, not just the ones
 # that are newer than the target. This is because each search
 # document in devmanual gets a unique ID, which is used to
@@ -68,4 +70,4 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 clean:
 	rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
 
-.PHONY: all prereq validate tidy clean
+.PHONY: all prereq validate build tidy clean

[gentoo-commits] proj/devmanual:master commit in: /

[Brian Evans]

commit:     34b6770fe9d190018197202861b82cf00c64eb20
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 13:43:53 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 13:43:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=34b6770f

Make logo visible on mobile

Currently, it is pushed down into the navbar on small screens because
of the logo class making it inline-block.

Removing the class should make it appear normally

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 2bd73d8..50315d1 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -484,7 +484,7 @@
                   </div>
                 </div>
               </div>
-              <div class="logo">
+              <div>
                 <a href="/" title="Back to the homepage" class="site-logo">
                   <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
                     <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     0bbfa28025b1a89eb8cac3f96b7072c1de01b6ba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 11:15:38 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 00:01:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0bbfa280

devbook.xsl: Add simple navigation in offline mode.

This consists of "previous" and "next" links.

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

 devbook.xsl | 198 +++++++++++++++++++++++++++++++-----------------------------
 offline.css |  26 ++++++++
 2 files changed, 130 insertions(+), 94 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index faf9796..a61cae0 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -469,111 +469,121 @@
     </head>
     <body>
       <header>
-        <xsl:if test="not($offline)">
-        <div class="site-title">
-          <div class="container">
-            <div class="row">
-              <div class="site-title-buttons">
-                <div class="btn-group btn-group-sm">
-                  <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong> Get Gentoo!</strong></a>
-                  <div class="btn-group btn-group-sm">
-                    <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
-                      <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs"> gentoo.org sites </span> <span class="caret"></span>
+        <xsl:choose>
+          <xsl:when test="$offline">
+            <nav class="offline">
+              <ul>
+                <li><xsl:call-template name="findPrevious"/></li>
+                <li><xsl:call-template name="findNext"/></li>
+              </ul>
+            </nav>
+          </xsl:when>
+          <xsl:otherwise>
+            <div class="site-title">
+              <div class="container">
+                <div class="row">
+                  <div class="site-title-buttons">
+                    <div class="btn-group btn-group-sm">
+                      <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong> Get Gentoo!</strong></a>
+                      <div class="btn-group btn-group-sm">
+                        <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
+                          <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs"> gentoo.org sites </span> <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-right">
+                          <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
+                          <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
+                          <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
+                          <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
+                          <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
+                          <li class="divider"></li>
+                          <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
+                          <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
+                          <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
+                          <li class="divider"></li>
+                          <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
+                        </ul>
+                      </div>
+                    </div>
+                  </div>
+                  <div>
+                    <a href="/" title="Back to the homepage" class="site-logo">
+                      <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
+                        <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />
+                      </object>
                     </a>
-                    <ul class="dropdown-menu dropdown-menu-right">
-                      <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
-                      <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
-                      <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
-                      <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
-                      <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
-                      <li class="divider"></li>
-                      <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
-                      <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
-                      <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
-                      <li class="divider"></li>
-                      <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
-                    </ul>
+                    <span class="site-label">Development Guide</span>
                   </div>
                 </div>
               </div>
-              <div>
-                <a href="/" title="Back to the homepage" class="site-logo">
-                  <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
-                    <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />
-                  </object>
-                </a>
-                <span class="site-label">Development Guide</span>
-              </div>
             </div>
-          </div>
-        </div>
-        <nav class="tyrian-navbar" role="navigation">
-          <div class="container">
-            <div class="row">
-              <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                  <span class="sr-only">Toggle navigation</span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                </button>
-              </div>
-              <div class="collapse navbar-collapse navbar-main-collapse">
-                <ul class="nav navbar-nav">
-                  <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
-                    <xsl:call-template name="contentsTree">
-                      <xsl:with-param name="maxdepth" select="1"/>
-                      <xsl:with-param name="ulclass">dropdown-menu</xsl:with-param>
-                    </xsl:call-template>
-                  </li>
-                  <li><xsl:call-template name="findPrevious"/></li>
-                  <li><xsl:call-template name="findNext"/></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
-          <div class="container">
-            <div class="row">
-              <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
-                  <span class="sr-only">Toggle navigation</span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                </button>
-              </div>
-              <div class="collapse navbar-collapse" id="gw-toolbar">
-                <div class="input-group">
-                  <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
-                  <div class="input-group-btn">
-                    <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
+            <nav class="tyrian-navbar" role="navigation">
+              <div class="container">
+                <div class="row">
+                  <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
+                      <span class="sr-only">Toggle navigation</span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                    </button>
+                  </div>
+                  <div class="collapse navbar-collapse navbar-main-collapse">
+                    <ul class="nav navbar-nav">
+                      <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
+                      <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
+                        <xsl:call-template name="contentsTree">
+                          <xsl:with-param name="maxdepth" select="1"/>
+                          <xsl:with-param name="ulclass">dropdown-menu</xsl:with-param>
+                        </xsl:call-template>
+                      </li>
+                      <li><xsl:call-template name="findPrevious"/></li>
+                      <li><xsl:call-template name="findNext"/></li>
+                    </ul>
                   </div>
                 </div>
               </div>
-            </div>
-          </div>
-        </nav>
-        <div id="searchResults" class="modal fade" role="dialog">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal">x</button>
-              <h4 class="modal-title">Search Results</h4>
-              </div>
-              <div class="modal-body">
-                <p>No results found.</p>
+            </nav>
+            <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
+              <div class="container">
+                <div class="row">
+                  <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
+                      <span class="sr-only">Toggle navigation</span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                    </button>
+                  </div>
+                  <div class="collapse navbar-collapse" id="gw-toolbar">
+                    <div class="input-group">
+                      <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
+                      <div class="input-group-btn">
+                        <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
+                      </div>
+                    </div>
+                  </div>
+                </div>
               </div>
-              <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </nav>
+            <div id="searchResults" class="modal fade" role="dialog">
+              <div class="modal-dialog">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">x</button>
+                    <h4 class="modal-title">Search Results</h4>
+                  </div>
+                  <div class="modal-body">
+                    <p>No results found.</p>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                  </div>
+                </div>
               </div>
             </div>
-          </div>
-        </div>
-        </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
         <div class="container">
           <div class="row">
             <div class="col-md010">

diff --git a/offline.css b/offline.css
index 42f94e9..85dfa56 100644
--- a/offline.css
+++ b/offline.css
@@ -17,3 +17,29 @@ header, footer {
 h1, h2, h3, h4, h5, h6 {
     line-height: 1.2;
 }
+
+nav.offline ul, .breadcrumb {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+nav.offline li, .breadcrumb li {
+    display: inline;
+}
+
+nav.offline li+li {
+    margin-left: 1em;
+}
+
+.breadcrumb li+li:before {
+    content: " / ";
+}
+
+.fa-arrow-left:after {
+    content: "\25c4"; /* BLACK LEFT-POINTING POINTER */
+}
+
+.fa-arrow-right:after {
+    content: "\25ba"; /* BLACK RIGHT-POINTING POINTER */
+}

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a17eeb5d6403f6e020b1ae7fbe92f6606bb28ed0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 11:21:52 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 00:01:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a17eeb5d

devbook.xsl: Define relative_path_depth_recursion only once.

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

 devbook.xsl | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index be30022..3ff6502 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -437,18 +437,18 @@
   </xsl:template>
 
   <xsl:template match="/">
+    <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+    <xsl:variable name="relative_path_depth_recursion">
+      <xsl:call-template name="str:repeatString">
+        <xsl:with-param name="count" select="$relative_path_depth"/>
+        <xsl:with-param name="append">../</xsl:with-param>
+      </xsl:call-template>
+    </xsl:variable>
     <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
     <xsl:value-of select='$newline'/>
     <html lang="en">
     <head>
       <title><xsl:value-of select="/guide/chapter[1]/title"/> – Gentoo Development Guide</title>
-      <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-      <xsl:variable name="relative_path_depth_recursion">
-        <xsl:call-template name="str:repeatString">
-          <xsl:with-param name="count" select="$relative_path_depth"/>
-          <xsl:with-param name="append">../</xsl:with-param>
-        </xsl:call-template>
-      </xsl:variable>
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
       <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
@@ -508,13 +508,6 @@
               </div>
               <div class="collapse navbar-collapse navbar-main-collapse">
                 <ul class="nav navbar-nav">
-                  <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-                  <xsl:variable name="relative_path_depth_recursion">
-                    <xsl:call-template name="str:repeatString">
-                      <xsl:with-param name="count" select="$relative_path_depth"/>
-                      <xsl:with-param name="append">../</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:variable>
                   <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
                   <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
@@ -618,13 +611,6 @@
       <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
       <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
       <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
-      <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-      <xsl:variable name="relative_path_depth_recursion">
-          <xsl:call-template name="str:repeatString">
-            <xsl:with-param name="count" select="$relative_path_depth"/>
-            <xsl:with-param name="append">../</xsl:with-param>
-          </xsl:call-template>
-      </xsl:variable>
       <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
       <script src="{$relative_path_depth_recursion}search.js"></script>
     </body>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     563f4c60d694a0ce2e053a88fdf11f1f88e63dcd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 19:40:51 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 00:01:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=563f4c60

Support offline browsing.

Pass an "offline" flag to devbook.xsl, which disables loading of
external assets and loads a simple CSS instead. This will replace
the fragile patching in the app-doc/devmanual ebuild.

offline.css was originally contributed (as fallback.css)
by Lucas Ramage in bug 617724.

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

 Makefile    |  5 ++++-
 devbook.xsl | 55 +++++++++++++++++++++++++++++++++++++------------------
 offline.css | 19 +++++++++++++++++++
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 3fb4c52..ef2c735 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ HTMLS := $(subst text.xml,index.html,$(XMLS))
 ECLASS_HTMLS := $(wildcard eclass-reference/*/index.html)
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
+# Nonzero value disables external assets for offline browsing.
+OFFLINE = 0
+
 all: prereq validate build documents.js
 
 prereq:
@@ -49,7 +52,7 @@ documents.js: bin/build_search_documents.py $(XMLS)
 #
 .SECONDEXPANSION:
 %.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
-	xsltproc devbook.xsl $< > $@
+	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
 validate: prereq
 	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \

diff --git a/devbook.xsl b/devbook.xsl
index 3ff6502..faf9796 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -14,6 +14,10 @@
 
 <xsl:output method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
+<!-- When true, disable external assets for offline browsing.
+     The parameter can be passed with "xsltproc -\-param offline 1". -->
+<xsl:param name="offline" select="0"/>
+
 <xsl:variable name="newline">
 <xsl:text>
 </xsl:text>
@@ -451,13 +455,21 @@
       <title><xsl:value-of select="/guide/chapter[1]/title"/> – Gentoo Development Guide</title>
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
-      <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
-      <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
+      <xsl:choose>
+        <xsl:when test="$offline">
+          <link rel="stylesheet" href="{$relative_path_depth_recursion}offline.css" type="text/css" />
+        </xsl:when>
+        <xsl:otherwise>
+          <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
+          <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
+        </xsl:otherwise>
+      </xsl:choose>
       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
       <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
     </head>
     <body>
       <header>
+        <xsl:if test="not($offline)">
         <div class="site-title">
           <div class="container">
             <div class="row">
@@ -561,6 +573,7 @@
             </div>
           </div>
         </div>
+        </xsl:if>
         <div class="container">
           <div class="row">
             <div class="col-md010">
@@ -581,20 +594,24 @@
       </main>
       <footer>
         <div class="container">
-          <div class="row">
-            <div class="col-xs-12 col-md-offset-2 col-md-7">
-            </div>
-            <div class="col-xs-12 col-md-3">
-              <h3 class="footerhead">Questions or comments?</h3>
-              Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>.
+          <xsl:if test="not($offline)">
+            <div class="row">
+              <div class="col-xs-12 col-md-offset-2 col-md-7">
+              </div>
+              <div class="col-xs-12 col-md-3">
+                <h3 class="footerhead">Questions or comments?</h3>
+                Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>.
+              </div>
             </div>
-          </div>
+          </xsl:if>
           <div class="row">
             <div class="col-xs-2 col-sm-3 col-md-2">
-              <ul class="footerlinks three-icons">
-                <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
-                <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
-              </ul>
+              <xsl:if test="not($offline)">
+                <ul class="footerlinks three-icons">
+                  <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
+                  <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
+                </ul>
+              </xsl:if>
             </div>
             <div class="col-xs-10 col-sm-9 col-md-10">
               <strong>Copyright (C) 2001-2020 Gentoo Authors</strong><br />
@@ -608,11 +625,13 @@
           </div>
         </div>
       </footer>
-      <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
-      <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
-      <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
-      <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
-      <script src="{$relative_path_depth_recursion}search.js"></script>
+      <xsl:if test="not($offline)">
+        <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
+        <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
+        <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
+        <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
+        <script src="{$relative_path_depth_recursion}search.js"></script>
+      </xsl:if>
     </body>
     </html>
   </xsl:template>

diff --git a/offline.css b/offline.css
new file mode 100644
index 0000000..42f94e9
--- /dev/null
+++ b/offline.css
@@ -0,0 +1,19 @@
+body {
+    margin: 40px auto;
+    max-width: 650px;
+    line-height: 1.6;
+    font-size: 18px;
+    color: #454545;
+    background-color: #fafafa;
+    padding: 0 10px;
+}
+
+header, footer {
+    padding: 0.75em 1em;
+    margin: 0;
+    background-color: #e1e1e1;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    line-height: 1.2;
+}

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6bc98f8c14ae3097c19cb3b1ce861e8d18e50b58
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 10:05:16 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 10:05:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6bc98f8c

offline.css: Add vertical margin to header and footer.

This should make a visible difference only for the top margin of
the footer.

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

 offline.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline.css b/offline.css
index 85dfa56..463eebc 100644
--- a/offline.css
+++ b/offline.css
@@ -10,7 +10,7 @@ body {
 
 header, footer {
     padding: 0.75em 1em;
-    margin: 0;
+    margin: 1em 0;
     background-color: #e1e1e1;
 }
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a08319d85e0e3054aaa8048b4d51fc534533e23e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 13:04:23 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 13:04:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a08319d8

Makefile: New target "delete-old".

This will delete any orphaned html and image files that could be
left over after the corresponding source file was moved or removed.
Such files are also not covered by "clean", so add the new target as
prerequisite.

Run a single "find" pass to get a list of all files in ALL_FILES and
subsequently extract the necessary subsets from it. The list of all
files is needed anyway for deletion of orphans, which are not included
in HTMLS or IMAGES.

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

 Makefile | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ef2c735..d379bd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-# These "find" commands match text.xml and *.svg files, respectively,
-# but only after excluding the .git directory from the search for
-# performance and overall sanity reasons.
-XMLS := $(shell find . -name .git -prune -o -type f -name 'text.xml' -print)
-SVGS := $(shell find . -name .git -prune -o -type f -name '*.svg' -print)
+# Run a single "find" pass to get a list of all files (with the .git
+# directory excluded), then filter out what we need.
+ALL_FILES := $(shell find . -name .git -prune -o -type f -print)
+XMLS := $(filter %/text.xml,$(ALL_FILES))
+SVGS := $(filter %.svg,$(ALL_FILES))
 HTMLS := $(subst text.xml,index.html,$(XMLS))
-ECLASS_HTMLS := $(wildcard eclass-reference/*/index.html)
+ECLASS_HTMLS := $(filter ./eclass-reference/%/index.html,$(ALL_FILES))
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
 # Nonzero value disables external assets for offline browsing.
 OFFLINE = 0
 
-all: prereq validate build documents.js
+all: prereq validate delete-old build documents.js
 
 prereq:
 	@type rsvg-convert >/dev/null 2>&1 || \
@@ -70,7 +70,14 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
 
-clean:
-	rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
+# Delete any orphaned html and image files that could be left over
+# after the corresponding source file was moved or removed.
+delete-old:
+	@-rm -f $(filter-out $(HTMLS) $(ECLASS_HTMLS) $(IMAGES), \
+	  $(filter %/index.html %.png,$(ALL_FILES)))
+	@find . ! -path './.git*' -type d -empty -delete
 
-.PHONY: all prereq validate build tidy clean
+clean: delete-old
+	@rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
+
+.PHONY: all prereq validate build tidy delete-old clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6f5b13920552d6882bcb5103e84d3a3146bd632c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 05:33:15 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 05:33:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6f5b1392

Makefile: Drop "delete-old" from all prerequisites.

By popular demand.

Also drop "prereq" as prerequisite of "validate", because it is
already listed with "all".

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

 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d379bd3..d1515fb 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 # Nonzero value disables external assets for offline browsing.
 OFFLINE = 0
 
-all: prereq validate delete-old build documents.js
+all: prereq validate build documents.js
 
 prereq:
 	@type rsvg-convert >/dev/null 2>&1 || \
@@ -54,7 +54,7 @@ documents.js: bin/build_search_documents.py $(XMLS)
 %.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
-validate: prereq
+validate:
 	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
 	  && echo "xmllint validation successful"
 
@@ -77,7 +77,7 @@ delete-old:
 	  $(filter %/index.html %.png,$(ALL_FILES)))
 	@find . ! -path './.git*' -type d -empty -delete
 
-clean: delete-old
+clean:
 	@rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
 
 .PHONY: all prereq validate build tidy delete-old clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e187278a7762c8e2a925f75b9d4544fedbe2600d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 13:57:52 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 13:57:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e187278a

Makefile: Recipe lines must begin with a TAB.

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

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d1515fb..7b5569f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ all: prereq validate build documents.js
 prereq:
 	@type rsvg-convert >/dev/null 2>&1 || \
 	{ echo "gnome-base/librsvg required" >&2;\
-          exit 1; }
+	  exit 1; }
 	@type xsltproc >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxslt is with python required" >&2;\
 	  exit 1; }

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     c90f1ae71883907bf2c94949a6e69e066888985b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 13:39:20 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 17:59:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c90f1ae7

Makefile: Add install target.

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

 Makefile | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7b5569f..d8e3547 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,14 @@ HTMLS := $(subst text.xml,index.html,$(XMLS))
 ECLASS_HTMLS := $(filter ./eclass-reference/%/index.html,$(ALL_FILES))
 IMAGES := $(patsubst %.svg,%.png,$(SVGS))
 
+CSS_FILES = devmanual.css offline.css
+JS_FILES = search.js documents.js
+
+prefix = /usr/local/share
+docdir = $(prefix)/doc/devmanual
+htmldir = $(docdir)
+DESTDIR =
+
 # Nonzero value disables external assets for offline browsing.
 OFFLINE = 0
 
@@ -54,6 +62,17 @@ documents.js: bin/build_search_documents.py $(XMLS)
 %.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
+install: all
+	set -e; \
+	for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \
+	  install -d "$(DESTDIR)$(htmldir)"/$${file%/*}; \
+	  install -m 644 $${file} "$(DESTDIR)$(htmldir)"/$${file}; \
+	done
+	install -m 644 $(CSS_FILES) "$(DESTDIR)$(htmldir)"/
+	if test $(OFFLINE) -eq 0; then \
+	  install -m 644 $(JS_FILES) "$(DESTDIR)$(htmldir)"/; \
+	fi
+
 validate:
 	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
 	  && echo "xmllint validation successful"
@@ -80,4 +99,4 @@ delete-old:
 clean:
 	@rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
 
-.PHONY: all prereq validate build tidy delete-old clean
+.PHONY: all prereq build install validate tidy delete-old clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     37415c314cd0bbbc07f7f43b3364abed2cb641d3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:26:52 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:26:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=37415c31

Makefile: Remove quirks necessary for installing in-place.

Now that infra installs into a separate target directory, we no longer
need atomicity during the build. Remove the delete-old rule as well,
which was intended for the same purpose.

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

 Makefile | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index d8e3547..b93a85e 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,7 @@ build: $(HTMLS) $(IMAGES)
 # document in devmanual gets a unique ID, which is used to
 # quickly tie search matches to the corresponding documents.
 documents.js: bin/build_search_documents.py $(XMLS)
-	./bin/build_search_documents.py $(XMLS) > _documents.js
-	mv _documents.js documents.js
+	./bin/build_search_documents.py $(XMLS) > $@
 
 %.png : %.svg
 	rsvg-convert --output=$@ $<
@@ -89,14 +88,7 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
 
-# Delete any orphaned html and image files that could be left over
-# after the corresponding source file was moved or removed.
-delete-old:
-	@-rm -f $(filter-out $(HTMLS) $(ECLASS_HTMLS) $(IMAGES), \
-	  $(filter %/index.html %.png,$(ALL_FILES)))
-	@find . ! -path './.git*' -type d -empty -delete
-
 clean:
-	@rm -f $(HTMLS) $(IMAGES) _documents.js documents.js
+	@rm -f $(HTMLS) $(IMAGES) documents.js
 
-.PHONY: all prereq build install validate tidy delete-old clean
+.PHONY: all prereq build install validate tidy clean

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     59e2965fe2ed050efa8df115533ebec287b88d12
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:14:23 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:14:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=59e2965f

devbook.xsl: Remove spurious line break in list.

This affects contentsTree with the extraction attribute, which is only
used for the TODO list in the appendix.

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

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index a61cae0..7a8af1b 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -420,7 +420,7 @@
                 <ul>
                 <xsl:for-each select="document(concat($path, @href, 'text.xml'))//*[name()=$extraction]">
                   <xsl:variable name="extraction_id" select="position()"/>
-                  <li><xsl:apply-templates select="(//*[name()=$extraction])[position()=$extraction_id]"/><br/></li>
+                  <li><xsl:apply-templates select="(//*[name()=$extraction])[position()=$extraction_id]"/></li>
                 </xsl:for-each>
                 </ul>
               </xsl:if>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     364d49a31a87b53fa2d556c706204d7bf09d49d5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 18:52:36 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 18:52:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=364d49a3

.gitignore: Remove _documents.js.

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

 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5413cdc..ce644c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.html
 *.png
-_documents.js
 documents.js
 eclass-reference/

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     2e289d44e5d3d0cb925166190b6f3ed71ebc6330
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 20:10:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 21:27:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=2e289d44

devbook.xsl: Remove collapse from search bar.

In order not to hide it on small devices.
Patch from Brian Evans <grknight <AT> gentoo.org> in bug 615938.

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

 devbook.xsl | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 8dc9976..025cb70 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -547,20 +547,10 @@
             <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
               <div class="container">
                 <div class="row">
-                  <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
-                      <span class="sr-only">Toggle navigation</span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                    </button>
-                  </div>
-                  <div class="collapse navbar-collapse" id="gw-toolbar">
-                    <div class="input-group">
-                      <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
-                      <div class="input-group-btn">
-                        <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
-                      </div>
+                  <div class="input-group">
+                    <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
+                    <div class="input-group-btn">
+                      <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
                     </div>
                   </div>
                 </div>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5de88d38b2fb5f2b0b07ed4e46d027fd7f0f4cd4
Author:     Max Magorsch <arzano <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 19:01:53 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 21:27:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5de88d38

Revise the navbar items

The navbar links have been shortened using css resulting in a
fixed navbar size. In addition the searchbar in the lower navbar
has been centered vertically.

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

 devbook.xsl   | 10 +++++-----
 devmanual.css | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 0fd8766..8dc9976 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -677,7 +677,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
         <xsl:variable name="doc" select="/guide/include[1]/@href"/>
-        <a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+        <a class="w-250 text-center" href="{concat($doc, 'index.html')}"><span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -710,7 +710,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
               </xsl:call-template>
             </xsl:variable>
-            <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+            <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"> <span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
           </xsl:when>
           <xsl:otherwise>
             <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -757,7 +757,7 @@
                * Fully recurse up the node to get the last extremity
              * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-        <a href="#"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
+        <a class="w-250 text-center" href="#"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="/guide/chapter[1]/title"/></span></a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -780,10 +780,10 @@
             </xsl:call-template>
             </xsl:variable>
             <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-            <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+            <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></span></a>
           </xsl:when>
           <xsl:otherwise>
-            <a href="../index.html"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+            <a class="w-250 text-center" href="../index.html"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></span></a>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:otherwise>

diff --git a/devmanual.css b/devmanual.css
index 41c6beb..24b3551 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -33,4 +33,44 @@ pre span.Constant { color: black; }
 pre span.Comment { color: red; }
 pre span.Statement { color: darkred; }
 
+.truncated-text {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+}
+
+.w-250 {
+    width: 250px;
+}
+
+.max-w-200 {
+    max-width: 200px;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.d-inline-block {
+    display: inline-block;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.text-center {
+    text-align: center;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.mr-2 {
+    margin-right: 8px;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.ml-2 {
+    margin-left: 8px;
+}
+
+/* vertically center the search bar */
+.navbar-grey .input-group {
+    margin-top: 3px;
+}
+
 /* vim: set ts=4 tw=80 et : */

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     f8ba2eb6afe1febc4337bde1b39ef55def0a85f3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 18:57:08 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 18:57:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f8ba2eb6

Makefile: Quieten the documents.js recipe.

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

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b93a85e..4879792 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build: $(HTMLS) $(IMAGES)
 # document in devmanual gets a unique ID, which is used to
 # quickly tie search matches to the corresponding documents.
 documents.js: bin/build_search_documents.py $(XMLS)
-	./bin/build_search_documents.py $(XMLS) > $@
+	@./bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
 
 %.png : %.svg
 	rsvg-convert --output=$@ $<

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     d451eb5010b2e446c1f87ec968e651f052e09ea2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 18:52:36 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 20:39:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d451eb50

.gitignore: Remove _documents.js.

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

 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5413cdc..ce644c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.html
 *.png
-_documents.js
 documents.js
 eclass-reference/

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a5d9290cc058972d81deb8c325d570a4757e3c40
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 18:57:08 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 20:39:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a5d9290c

Makefile: Quieten the documents.js recipe.

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

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b93a85e..4879792 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build: $(HTMLS) $(IMAGES)
 # document in devmanual gets a unique ID, which is used to
 # quickly tie search matches to the corresponding documents.
 documents.js: bin/build_search_documents.py $(XMLS)
-	./bin/build_search_documents.py $(XMLS) > $@
+	@./bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
 
 %.png : %.svg
 	rsvg-convert --output=$@ $<

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     55104cea1b44b11984723dd3f61c06e823cbd7f5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 20:36:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 06:59:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=55104cea

devbook.xsl: List sections in navigation dropdown.

This aims at improving navigation by also listing the sections of the
current chapter in the dropdown list.

As before, list any first-level sub-documents (below a divider line).

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

 devbook.xsl | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 69a3b9a..ae25acb 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -358,7 +358,6 @@
   <!-- TOC Tree -->
   <xsl:template match="contentsTree" name="contentsTree">
     <xsl:param name="depth" select="0"/>
-    <xsl:param name="ulclass"/>
     <xsl:param name="maxdepth">
       <xsl:choose>
         <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
@@ -400,7 +399,7 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-        <ul class="{$ulclass}">
+        <ul>
           <xsl:for-each select="document($doc_self)/guide/include">
             <xsl:variable name="extraction_counter_node">
               <xsl:call-template name="contentsTree">
@@ -531,11 +530,35 @@
                     <ul class="nav navbar-nav">
                       <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
                       <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
-                        <xsl:call-template name="contentsTree">
-                          <xsl:with-param name="maxdepth" select="1"/>
-                          <xsl:with-param name="ulclass">dropdown-menu</xsl:with-param>
-                        </xsl:call-template>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                          <xsl:value-of select="/guide/chapter[1]/title"/>&#160;<span class="caret"></span>
+                        </a>
+                        <xsl:if test="/guide/chapter[1]/section or //contentsTree">
+                          <ul class="dropdown-menu">
+                            <!-- List sections of this chapter first. -->
+                            <xsl:for-each select="/guide/chapter[1]/section">
+                              <xsl:variable name="anchor">
+                                <xsl:call-template name="convert-to-anchor">
+                                  <xsl:with-param name="data" select="title"/>
+                                </xsl:call-template>
+                              </xsl:variable>
+                              <li><a class="reference" href="#{$anchor}"><xsl:value-of select="title"/></a></li>
+                            </xsl:for-each>
+                            <xsl:if test="//contentsTree">
+                              <li class="divider"></li>
+                              <!-- List any sub-documents included at first level.
+                                   We cannot call "contentsTree" directly, because it would
+                                   insert another "ul" element. So, assign it to a variable,
+                                   then copy only the "li" nodes. -->
+                              <xsl:variable name="contents">
+                                <xsl:call-template name="contentsTree">
+                                  <xsl:with-param name="maxdepth" select="1"/>
+                                </xsl:call-template>
+                              </xsl:variable>
+                              <xsl:copy-of select="exslt:node-set($contents)/ul/li"/>
+                            </xsl:if>
+                          </ul>
+                        </xsl:if>
                       </li>
                       <li><xsl:call-template name="findPrevious"/></li>
                       <li><xsl:call-template name="findNext"/></li>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     8d1c75cf5e880da716ce9b8c1dc7f961d3ad8301
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 16:17:15 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 06:59:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8d1c75cf

devbook.xsl: Use a fixed label for the dropdown.

This will help to prevent the navbar from becoming too wide.
The chapter title didn't add much information, because it also appears
just below.

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

 devbook.xsl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ae25acb..1fa4233 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -530,9 +530,7 @@
                     <ul class="nav navbar-nav">
                       <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
                       <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                          <xsl:value-of select="/guide/chapter[1]/title"/>&#160;<span class="caret"></span>
-                        </a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#160;<span class="caret"></span></a>
                         <xsl:if test="/guide/chapter[1]/section or //contentsTree">
                           <ul class="dropdown-menu">
                             <!-- List sections of this chapter first. -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     71be847bf34a79fb0ac220300edb02b318025ad1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 16:22:44 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 06:59:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=71be847b

devbook.xsl: Don't use @link to construct the home path.

The root template doesn't even have attributes, so why was this
originally added?

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

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1fa4233..31c73d4 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -528,7 +528,7 @@
                   </div>
                   <div class="collapse navbar-collapse navbar-main-collapse">
                     <ul class="nav navbar-nav">
-                      <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
+                      <li><a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#160;Home</a></li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#160;<span class="caret"></span></a>
                         <xsl:if test="/guide/chapter[1]/section or //contentsTree">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     da089b016625ed6f9df3b122c1d972748f5cdb85
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 16:23:46 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 07:16:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=da089b01

devbook.xsl: Suppress // in URIs with literal ## fragments.

Handle the slash in the same way as for other types of URIs.

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

 devbook.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 31c73d4..e3bb38d 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -301,7 +301,10 @@
         </xsl:variable>
         <xsl:choose>
           <xsl:when test="contains(@link, '##')">
-            <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), '/index.html#', substring-after(@link, '##'))}"><xsl:value-of select="."/></a>
+            <xsl:variable name="slash">
+              <xsl:if test="substring(substring-before(@link, '##'), string-length(substring-before(@link, '##'))) != '/'">/</xsl:if>
+            </xsl:variable>
+            <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), $slash, 'index.html#', substring-after(@link, '##'))}"><xsl:value-of select="."/></a>
           </xsl:when>
           <xsl:when test="contains(@link, '#')">
             <xsl:variable name="anchor">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     66271602df53b2072fb6b9e896e9fd9b292678c8
Author:     Max Magorsch <arzano <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 19:01:53 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 07:18:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=66271602

Revise the navbar items

The navbar links have been shortened using css resulting in a
fixed navbar size. In addition the searchbar in the lower navbar
has been centered vertically.

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

 devbook.xsl   | 10 +++++-----
 devmanual.css | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index e3bb38d..11b4fd5 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -701,7 +701,7 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
         <xsl:variable name="doc" select="/guide/include[1]/@href"/>
-        <a href="{concat($doc, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+        <a class="w-250 text-center" href="{concat($doc, 'index.html')}"><span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -734,7 +734,7 @@
                 <xsl:with-param name="append">../</xsl:with-param>
               </xsl:call-template>
             </xsl:variable>
-            <a href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/> &#160;<span class="fa fa-arrow-right"/></a>
+            <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"> <span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
           </xsl:when>
           <xsl:otherwise>
             <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -781,7 +781,7 @@
                * Fully recurse up the node to get the last extremity
              * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-        <a href="#"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="/guide/chapter[1]/title"/></a>
+        <a class="w-250 text-center" href="#"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="/guide/chapter[1]/title"/></span></a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -804,10 +804,10 @@
             </xsl:call-template>
             </xsl:variable>
             <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-            <a href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></a>
+            <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></span></a>
           </xsl:when>
           <xsl:otherwise>
-            <a href="../index.html"><span class="fa fa-arrow-left"/>&#160; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></a>
+            <a class="w-250 text-center" href="../index.html"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></span></a>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:otherwise>

diff --git a/devmanual.css b/devmanual.css
index 41c6beb..24b3551 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -33,4 +33,44 @@ pre span.Constant { color: black; }
 pre span.Comment { color: red; }
 pre span.Statement { color: darkred; }
 
+.truncated-text {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+}
+
+.w-250 {
+    width: 250px;
+}
+
+.max-w-200 {
+    max-width: 200px;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.d-inline-block {
+    display: inline-block;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.text-center {
+    text-align: center;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.mr-2 {
+    margin-right: 8px;
+}
+
+/* compatible to Bootstrap 4 for future migration */
+.ml-2 {
+    margin-left: 8px;
+}
+
+/* vertically center the search bar */
+.navbar-grey .input-group {
+    margin-top: 3px;
+}
+
 /* vim: set ts=4 tw=80 et : */

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     62bfb0e50692e56b5a6d6559e85a587a62e67789
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 20:10:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 07:19:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=62bfb0e5

devbook.xsl: Remove collapse from search bar.

In order not to hide it on small devices.
Patch from Brian Evans <grknight <AT> gentoo.org> in bug 615938.

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

 devbook.xsl | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 11b4fd5..a22366c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -571,20 +571,10 @@
             <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
               <div class="container">
                 <div class="row">
-                  <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
-                      <span class="sr-only">Toggle navigation</span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                    </button>
-                  </div>
-                  <div class="collapse navbar-collapse" id="gw-toolbar">
-                    <div class="input-group">
-                      <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
-                      <div class="input-group-btn">
-                        <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
-                      </div>
+                  <div class="input-group">
+                    <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
+                    <div class="input-group-btn">
+                      <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
                     </div>
                   </div>
                 </div>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     1efc3cf32e61f00629e576088517094b7a7e5c29
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 20:17:04 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 21:40:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1efc3cf3

devbook.xsl: Assign a default "depth" value for printParentDocs.

The depth of the current document from the document root looks like
a reasonable default.

There is no "path" parameter, so remove it from the caller.

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

 devbook.xsl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index a22366c..8024e7f 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -602,10 +602,7 @@
           <div class="row">
             <div class="col-md010">
               <ol class="breadcrumb">
-                <xsl:call-template name="printParentDocs">
-                  <xsl:with-param name="path" select="/guide/@self"/>
-                  <xsl:with-param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-                </xsl:call-template>
+                <xsl:call-template name="printParentDocs"/>
               </ol>
             </div>
           </div>
@@ -805,7 +802,7 @@
   </xsl:template>
 
   <xsl:template name="printParentDocs">
-    <xsl:param name="depth"/>
+    <xsl:param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/', ''))"/>
     <xsl:choose>
       <xsl:when test="$depth &gt; 0">
         <xsl:variable name="relative_path_depth_recursion">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     9b663cce9ed88ec5b86cfde8d050017d23894798
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 20:21:54 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 21:40:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9b663cce

Makefile, depend.xsl: Use XSLT to generate the list of dependencies.

Each HTML file must depend on its XML file with all its descendants
(for the contents tree), all its ancestors (for breadcrumbs), and the
previous and next documents (for backward and forward links).

Trying to generate the list of dependencies with make seems hopeless
(especially, how would one determine the previous and next documents?).
OTOH, the necessary templates already exist in devbook.xsl. Therefore,
add a simple depend.xsl on top of it, which outputs a dependency list
as plain text.

Closes: https://bugs.gentoo.org/710918
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .gitignore |  1 +
 Makefile   | 21 +++++++++++++--------
 depend.xsl | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce644c7..7c45b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.html
 *.png
+.depend
 documents.js
 eclass-reference/

diff --git a/Makefile b/Makefile
index 4879792..be1224f 100644
--- a/Makefile
+++ b/Makefile
@@ -47,20 +47,23 @@ documents.js: bin/build_search_documents.py $(XMLS)
 	rsvg-convert --output=$@ $<
 
 # Secondary expansion allows us to use the automatic variable $@ in
-# the prerequisites. When it is used (and we have no idea when that
-# is, so we assume always) our <include href="foo"> tag induces a
-# dependency on the output of all subdirectories of the current
-# directories. This wacky rule finds all of those subdirectories by
-# looking for text.xml in them, and then replaces "text.xml" in the
-# path with "index.html".
+# the prerequisites.
 #
 # We use the pattern %.html rather than the more-sensible %index.html
 # because the latter doesn't match our top-level index.html target.
 #
 .SECONDEXPANSION:
-%.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl $$(subst text.xml,index.html,$$(wildcard $$(dir $$@)*/text.xml))
+%.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
+# Each HTML file must depend on its XML file with all its descendants
+# (for the contents tree), all its ancestors (for breadcrumbs), and
+# the previous and next documents (for backward and forward links).
+# Generate the list of dependencies with XSLT, which appears to be a
+# better tool for this than make.
+.depend: $(XMLS) depend.xsl devbook.xsl
+	@xsltproc depend.xsl $(XMLS) | sed ':x;s%[^ /]*/\.\./%%;tx' > $@
+
 install: all
 	set -e; \
 	for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \
@@ -89,6 +92,8 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	exit $${status}
 
 clean:
-	@rm -f $(HTMLS) $(IMAGES) documents.js
+	@rm -f $(HTMLS) $(IMAGES) documents.js .depend
 
 .PHONY: all prereq build install validate tidy clean
+
+-include .depend

diff --git a/depend.xsl b/depend.xsl
new file mode 100644
index 0000000..e0ee66c
--- /dev/null
+++ b/depend.xsl
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+  xmlns:exslt="http://exslt.org/common"
+  extension-element-prefixes="exslt xsl"
+  exclude-result-prefixes="exslt xsl">
+
+<xsl:import href="devbook.xsl"/>
+<xsl:output method="text"/>
+
+<xsl:template match="/">
+  <xsl:variable name="refs">
+    <!-- all descendants -->
+    <xsl:call-template name="contentsTree"/>
+    <!-- all ancestors -->
+    <xsl:call-template name="printParentDocs"/>
+    <!-- previous and next documents -->
+    <xsl:call-template name="findPrevious"/>
+    <xsl:call-template name="findNext"/>
+  </xsl:variable>
+  <xsl:variable name="self" select="/guide/@self"/>
+  <xsl:value-of select="concat($self, 'index.html:')"/>
+  <xsl:for-each select="exslt:node-set($refs)//a/@href[. != '#']">
+    <!-- At this point, the path can contain ".." components and
+         should be canonicalised, but string processing in XPath 1.0
+         sucks (no pattern matching!). It is easier to pipe the output
+         through sed instead. -->
+    <xsl:value-of select="concat(' ', $self,
+        substring-before(., 'index.html'), 'text.xml')"/>
+  </xsl:for-each>
+  <xsl:value-of select="$newline"/>
+</xsl:template>
+
+</xsl:stylesheet>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     9939c2d38ec93f36c9047e1a0a2d6301280b1741
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 23:45:05 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  2 23:45:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9939c2d3

devbook.dtd: Allow block level elements in <dd>.

Definition lists are simply passed through to the output, so there is
no good reason to be stricter than HTML.

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

 devbook.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index d213d0c..16037de 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -77,9 +77,9 @@
 
 <!ELEMENT li            (#PCDATA|%all.class;)*>
 
-<!ELEMENT dl            (dt, dd+)+>
+<!ELEMENT dl            (dt|dd)+>
 <!ELEMENT dt            (#PCDATA|%inline.class;)*>
-<!ELEMENT dd            (#PCDATA|%inline.class;)*>
+<!ELEMENT dd            (#PCDATA|%all.class;)*>
 
 <!ELEMENT b             (#PCDATA|%inline.class;)*>
 <!ELEMENT c             (#PCDATA|%inline.class;)*>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     322da3e34dc68d83b8d5cfd4431c8d9ebb092add
Author:     Max Magorsch <arzano <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 15:43:22 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:27:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=322da3e3

Fix list-groups in text browsers

Closes: https://bugs.gentoo.org/711286
Signed-off-by: Max Magorsch <arzano <AT> gentoo.org>
[Removed extra newline before </li>.]
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl   | 13 +++++++------
 devmanual.css | 13 +++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 8024e7f..ea15885 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -204,14 +204,15 @@
   <xsl:template match="ul">
     <xsl:choose>
       <xsl:when test="@class='list-group'">
-        <div class="list-group">
+        <ul class="list-group fix-links">
           <xsl:for-each select="li">
-            <xsl:apply-templates>
-              <xsl:with-param name="class">list-group-item</xsl:with-param>
-            </xsl:apply-templates>
-            <xsl:value-of select='$newline'/>
+            <li class="list-group-item">
+              <xsl:apply-templates>
+                <xsl:with-param name="class">list-group-item</xsl:with-param>
+              </xsl:apply-templates>
+            </li>
           </xsl:for-each>
-        </div>
+        </ul>
       </xsl:when>
       <xsl:otherwise>
         <ul><xsl:apply-templates/></ul>

diff --git a/devmanual.css b/devmanual.css
index 24b3551..288f81d 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -73,4 +73,17 @@ pre span.Statement { color: darkred; }
     margin-top: 3px;
 }
 
+/*
+ * .fix-links can be used to fix listgroups in text browsers
+ * see https://bugs.gentoo.org/show_bug.cgi?id=711286
+ */
+
+.fix-links > li {
+    padding: 0px;
+}
+
+.fix-links > li > a {
+    border: none;
+}
+
 /* vim: set ts=4 tw=80 et : */

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6fb169cf04e84a0b91708630e832ac0c5c1ecd8d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 22:56:58 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 16:27:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6fb169cf

devbook.xsl: Bring admonitions in line with the wiki.

Use alert-info, alert-warning, and alert-danger for note, important,
and warning, respectively. This is also the scheme used in the wiki:
https://wiki.gentoo.org/wiki/Gentoo_Wiki:Guidelines#Block-level_layout_elements

Yellow background for important and red for warning also agrees with
the colours formerly used with GuideXML:
https://web.archive.org/web/20150314192204/http://www.gentoo.org/doc/en/xml-guide.xml#doc_chap2_sect3

Closes: https://bugs.gentoo.org/711164
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ea15885..1605663 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -233,30 +233,30 @@
     <dd><xsl:apply-templates/></dd>
   </xsl:template>
 
-  <xsl:template match="important">
+  <xsl:template match="note">
     <div class="alert alert-info" role="alert">
-    <strong>Important:</strong>
+    <strong>Note:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="note">
-    <div class="alert alert-success" role="alert">
-    <strong>Note:</strong>
+  <xsl:template match="important">
+    <div class="alert alert-warning" role="alert">
+    <strong>Important:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="todo">
-    <div class="alert alert-success" role="alert">
-    <strong>Todo:</strong>
+  <xsl:template match="warning">
+    <div class="alert alert-danger" role="alert">
+    <strong>Warning:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="warning">
-    <div class="alert alert-warning" role="alert">
-    <strong>Warning:</strong>
+  <xsl:template match="todo">
+    <div class="alert alert-info" role="alert">
+    <strong>Todo:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     186800b1a74a7e01805632c5ed23737681b5be10
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 17:46:10 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 17:46:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=186800b1

devbook.dtd: Tighten definition of <title>.

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

 devbook.dtd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index 16037de..17fb59b 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -6,7 +6,8 @@
 
 <!ENTITY  % block.class     "p|pre|codesample|note|important|warning|todo
                                 |figure|table|ul|ol|dl">
-<!ENTITY  % inline.class    "b|c|e|d|uri">
+<!ENTITY  % attrib.class    "b|c|e">
+<!ENTITY  % inline.class    "%attrib.class;|d|uri">
 <!ENTITY  % all.class       "%block.class;|%inline.class;">
 
 <!ELEMENT guide         (chapter, include*)>
@@ -21,9 +22,8 @@
 <!ELEMENT subsection    (title, (body|subsubsection), subsubsection*)>
 <!ELEMENT subsubsection (title, body)>
 
-<!-- Title texts are used as anchors, so we shouldn't allow any formatting,
-     but unfortunately it is used in the document. -->
-<!ELEMENT title         (#PCDATA|%inline.class;)*>
+<!-- Title texts are used as anchors, so allow only text attributes -->
+<!ELEMENT title         (#PCDATA|%attrib.class;)*>
 
 <!ELEMENT body          (authors|contentsTree|%block.class;)+>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     c92ff87eb8afef815d6f39c78579392f893967d0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 22:09:37 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 22:09:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c92ff87e

Makefile: Call build_search_documents.py with python3 explicitly

Bug: https://bugs.gentoo.org/765826
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index be1224f..13f2bb9 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build: $(HTMLS) $(IMAGES)
 # document in devmanual gets a unique ID, which is used to
 # quickly tie search matches to the corresponding documents.
 documents.js: bin/build_search_documents.py $(XMLS)
-	@./bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
+	@python3 bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
 
 %.png : %.svg
 	rsvg-convert --output=$@ $<

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e58b9a9894bb6fd551a43e9d71c838fa8bbf6c0e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 12:14:33 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:14:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e58b9a98

Makefile: Add dist target

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

 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 13f2bb9..e516e15 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,16 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
 
+dist:
+	COMMITDATE=$$(TZ=UTC git log -1 --pretty="format:%cd" \
+	  --date="format-local:%Y%m%d"); \
+	TARBALL="devmanual-0_pre$${COMMITDATE}.tar.xz"; \
+	echo "Creating tarball: $${TARBALL}"; \
+	git archive --format=tar --prefix=devmanual/ HEAD | xz > $${TARBALL}
+
 clean:
 	@rm -f $(HTMLS) $(IMAGES) documents.js .depend
 
-.PHONY: all prereq build install validate tidy clean
+.PHONY: all prereq build install validate tidy dist clean
 
 -include .depend

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e6f7e84f131a236fdcf272044432daf79fe34f34
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 10:33:52 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 10:33:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e6f7e84f

Makefile: Add eclass-reference/text.xml target

For the time being, this is only intended as a fallback. It doesn't
have any prerequisites on purpose, so it will be a no-op if the target
file exists.

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

 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index e516e15..8eb405c 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,9 @@ documents.js: bin/build_search_documents.py $(XMLS)
 %.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
+eclass-reference/text.xml:
+	bin/gen-eclass-html.sh
+
 # Each HTML file must depend on its XML file with all its descendants
 # (for the contents tree), all its ancestors (for breadcrumbs), and
 # the previous and next documents (for backward and forward links).

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     97e657e31519d09f0517f89599233cc9bda79ac8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 10:38:28 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 10:38:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=97e657e3

Makefile: Output a warning if eclass documentation is not found

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

 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8eb405c..618b190 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,11 @@ documents.js: bin/build_search_documents.py $(XMLS)
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
 eclass-reference/text.xml:
-	bin/gen-eclass-html.sh
+	@echo "*** Warning: No eclass documentation found." >&2
+	@echo "Install app-doc/eclass-manpages and" >&2
+	@echo "run bin/gen-eclass-html.sh before calling make." >&2
+	@echo "Creating a placeholder index as fallback." >&2
+	bin/gen-eclass-html.sh -n
 
 # Each HTML file must depend on its XML file with all its descendants
 # (for the contents tree), all its ancestors (for breadcrumbs), and

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     8c8aa2eb9275ebd2d1ca944f982646147665c0ee
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 19:35:09 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 19:35:09 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8c8aa2eb

devbook.xsl: Drop unused findParent template

This has been superseded by printParentDocs some time ago.

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

 devbook.xsl | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 5c81497..003f7ed 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -822,17 +822,6 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="findParent">
-    <xsl:choose>
-    <xsl:when test="not(/guide/@root)">
-      <a href="../index.html">&#x2191; <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/> &#x2191;</a>
-    </xsl:when>
-    <xsl:otherwise>
-      <a href="#">&#x2191; <xsl:value-of select="/guide/chapter[1]/title"/> &#x2191;</a>
-    </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
   <xsl:template match="author">
     <dt><xsl:value-of select="@name"/><xsl:if test="@email != ''"> &lt;<a href="mailto:{@email}"><xsl:value-of select="@email"/></a>&gt;</xsl:if></dt>
     <dd><xsl:apply-templates/></dd>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     ca88a7b371840409a3f3788da5365d968a55118e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 22:02:43 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 19:06:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ca88a7b3

devbook.xsl, devmanual.css: Add permalinks to section headers

While we use empty fragments ("#") elsewhere for navigation within the
document (because they don't cause reloading of the page), we use an
empty href ("") for the chapter because it is meant to be copied as an
external link.

Closes: https://bugs.gentoo.org/772005
Suggested-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl   |  6 +++++-
 devmanual.css | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index ec02aa4..49dc0c3 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -24,7 +24,10 @@
 </xsl:variable>
 
   <xsl:template match="chapter">
-    <h1 class="first-header"><xsl:apply-templates select="title"/></h1>
+    <h1 class="first-header">
+      <xsl:apply-templates select="title"/>
+      <a class="permalink" href=""><span class="fa fa-link"/></a>
+    </h1>
     <xsl:apply-templates select="*[not(self::title)]"/>
   </xsl:template>
 
@@ -42,6 +45,7 @@
       <xsl:element name="h{$level}">
         <xsl:attribute name="id"><xsl:value-of select="$anchor"/></xsl:attribute>
         <xsl:apply-templates select="title"/>
+        <a class="permalink" href="#{$anchor}"><span class="fa fa-link"/></a>
       </xsl:element>
       <xsl:apply-templates select="*[not(self::title)]"/>
     </div>

diff --git a/devmanual.css b/devmanual.css
index 288f81d..bba2a31 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -33,6 +33,20 @@ pre span.Constant { color: black; }
 pre span.Comment { color: red; }
 pre span.Statement { color: darkred; }
 
+a.permalink {
+    padding: 0 0.3em;
+    font-size: 90%;
+    text-decoration: none;
+    visibility: hidden;
+}
+
+h1:hover > a.permalink,
+h2:hover > a.permalink,
+h3:hover > a.permalink,
+h4:hover > a.permalink {
+    visibility: visible;
+}
+
 .truncated-text {
     white-space: nowrap;
     overflow: hidden;

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a3f7286741bd7511d25e174037ee7d23e4d38fa8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 22:02:18 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 19:06:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a3f72867

devbook.xsl: Remove code duplication in section templates

HTML output is identical.

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

 devbook.xsl | 54 ++++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 003f7ed..ec02aa4 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -25,47 +25,25 @@
 
   <xsl:template match="chapter">
     <h1 class="first-header"><xsl:apply-templates select="title"/></h1>
-    <xsl:apply-templates select="(body|section)"/>
+    <xsl:apply-templates select="*[not(self::title)]"/>
   </xsl:template>
 
-  <xsl:template match="section">
-    <div class="section">
-      <xsl:variable name="anchor">
-        <xsl:call-template name="convert-to-anchor">
-          <xsl:with-param name="data" select="title"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <h2 id="{$anchor}"><xsl:apply-templates select="title"/></h2>
-      <xsl:apply-templates select="(body|subsection)"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="subsection">
-    <div class="section">
-      <xsl:variable name="anchor">
-        <xsl:call-template name="convert-to-anchor">
-          <xsl:with-param name="data" select="title"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <h3 id="{$anchor}"><xsl:apply-templates select="title"/></h3>
-      <xsl:apply-templates select="(body|subsubsection)"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="subsubsection">
+  <xsl:template match="section|subsection|subsubsection">
+    <xsl:variable name="level">
+      <xsl:value-of select="number(starts-with(local-name(), 'sub'))
+        + number(starts-with(local-name(), 'subsub')) + 2"/>
+    </xsl:variable>
+    <xsl:variable name="anchor">
+      <xsl:call-template name="convert-to-anchor">
+        <xsl:with-param name="data" select="title"/>
+      </xsl:call-template>
+    </xsl:variable>
     <div class="section">
-      <xsl:variable name="anchor">
-        <xsl:call-template name="convert-to-anchor">
-          <xsl:with-param name="data" select="title"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <h4 id="{$anchor}"><xsl:apply-templates select="title"/></h4>
-      <xsl:apply-templates select="(body)"/>
-
-      <!-- If you need, change here to add more nesting levels -->
+      <xsl:element name="h{$level}">
+        <xsl:attribute name="id"><xsl:value-of select="$anchor"/></xsl:attribute>
+        <xsl:apply-templates select="title"/>
+      </xsl:element>
+      <xsl:apply-templates select="*[not(self::title)]"/>
     </div>
   </xsl:template>
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     7270decd622d47c494116a9c7ccbbae7fabc70fd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 23:49:07 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 23:49:07 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7270decd

devmanual.css: Use margin instead of padding for permalink

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

 devmanual.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devmanual.css b/devmanual.css
index bba2a31..83f6b14 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -34,7 +34,7 @@ pre span.Comment { color: red; }
 pre span.Statement { color: darkred; }
 
 a.permalink {
-    padding: 0 0.3em;
+    margin: 0em 0.3em;
     font-size: 90%;
     text-decoration: none;
     visibility: hidden;

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     f8f963463000ea36cd0c36e7505e678b14395315
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 15:41:28 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 15:41:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f8f96346

Makefile: Suppress spurious tidy warnings

tidy-html5 complains about empty URI references in href which are
perfectly valid HTML: https://tools.ietf.org/html/std66#section-4.4

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

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 618b190..5d74d88 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,8 @@ validate:
 tidy: $(HTMLS) $(ECLASS_HTMLS)
 	@status=0; \
 	for f in $^; do \
-	  output=$$(tidy -q -errors --drop-empty-elements no $${f} 2>&1) \
+	  output=$$(sed 's/href=""/href="index.html"/' $${f} \
+	    | tidy -q -errors --drop-empty-elements no 2>&1) \
 	  || { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
 	done; \
 	test $${status} -eq 0 && echo "tidy validation successful"; \

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     f24bc4e057a0553d388699431bf7f3f21c8179d1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  3 19:07:20 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar  3 19:07:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f24bc4e0

devbook.xsl: Split some very long lines for better readability

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

 devbook.xsl | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 49dc0c3..75aa8f0 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -671,7 +671,12 @@
       -->
       <xsl:when test="count(/guide/include) &gt; 0">
         <xsl:variable name="doc" select="/guide/include[1]/@href"/>
-        <a class="w-250 text-center" href="{concat($doc, 'index.html')}"><span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
+        <a class="w-250 text-center" href="{concat($doc, 'index.html')}">
+          <span class="truncated-text d-inline-block max-w-200 mr-2">
+            <xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/>
+          </span>
+          <span class="fa fa-arrow-right"/>
+        </a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -704,7 +709,12 @@
                 <xsl:with-param name="append">../</xsl:with-param>
               </xsl:call-template>
             </xsl:variable>
-            <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}"> <span class="truncated-text d-inline-block max-w-200 mr-2"><xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/></span><span class="fa fa-arrow-right"/></a>
+            <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}">
+              <span class="truncated-text d-inline-block max-w-200 mr-2">
+                <xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/>
+              </span>
+              <span class="fa fa-arrow-right"/>
+            </a>
           </xsl:when>
           <xsl:otherwise>
             <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
@@ -751,7 +761,12 @@
                * Fully recurse up the node to get the last extremity
              * Otherwise list the parent -->
       <xsl:when test="/guide/@root">
-        <a class="w-250 text-center" href="#"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="/guide/chapter[1]/title"/></span></a>
+        <a class="w-250 text-center" href="#">
+          <span class="fa fa-arrow-left"/>
+          <span class="truncated-text d-inline-block max-w-200 ml-2">
+            <xsl:value-of select="/guide/chapter[1]/title"/>
+          </span>
+        </a>
       </xsl:when>
       <xsl:otherwise>
         <!-- This document's path -->
@@ -774,10 +789,20 @@
             </xsl:call-template>
             </xsl:variable>
             <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-            <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/></span></a>
+            <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">
+              <span class="fa fa-arrow-left"/>
+              <span class="truncated-text d-inline-block max-w-200 ml-2">
+                <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/>
+              </span>
+            </a>
           </xsl:when>
           <xsl:otherwise>
-            <a class="w-250 text-center" href="../index.html"><span class="fa fa-arrow-left"/><span class="truncated-text d-inline-block max-w-200 ml-2"><xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/></span></a>
+            <a class="w-250 text-center" href="../index.html">
+              <span class="fa fa-arrow-left"/>
+              <span class="truncated-text d-inline-block max-w-200 ml-2">
+                <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/>
+              </span>
+            </a>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:otherwise>
@@ -794,9 +819,11 @@
             <xsl:with-param name="append">../</xsl:with-param>
           </xsl:call-template>
         </xsl:variable>
-
-        <li><a href="{$relative_path_depth_recursion}index.html"><xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/></a></li>
-
+        <li>
+          <a href="{$relative_path_depth_recursion}index.html">
+            <xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/>
+          </a>
+        </li>
         <xsl:call-template name="printParentDocs">
           <xsl:with-param name="depth" select="$depth - 1"/>
         </xsl:call-template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     d3f5864c3f304fe43e0943f3c459f06f5a66700b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 17:34:23 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 17:34:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d3f5864c

devbook.xsl: Specify line length for Emacs

The Emacs default of 70 is definitely to small for this file, but 200
won't fit on my laptop screen. :) So, make it moderately larger.

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

 devbook.xsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devbook.xsl b/devbook.xsl
index 75aa8f0..a3f7edb 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -845,4 +845,5 @@
 
 <!-- Local Variables: -->
 <!-- indent-tabs-mode: nil -->
+<!-- fill-column: 120 -->
 <!-- End: -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     7e83587c5a6d9b5b00b6882f828235bfa5e791d7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 23:08:23 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 23:08:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7e83587c

devbook.xsl: Simplify section template

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

 devbook.xsl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index a3f7edb..fe93020 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -32,10 +32,8 @@
   </xsl:template>
 
   <xsl:template match="section|subsection|subsubsection">
-    <xsl:variable name="level">
-      <xsl:value-of select="number(starts-with(local-name(), 'sub'))
-        + number(starts-with(local-name(), 'subsub')) + 2"/>
-    </xsl:variable>
+    <xsl:variable name="level" select="2 + number(starts-with(local-name(), 'sub'))
+                                         + number(starts-with(local-name(), 'subsub'))"/>
     <xsl:variable name="anchor">
       <xsl:call-template name="convert-to-anchor">
         <xsl:with-param name="data" select="title"/>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     873ecd6b31468c5d91b0cfa0a1ce6a525508ff83
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 18:14:26 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 18:14:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=873ecd6b

devbook.xsl: concat can take more than two arguments

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

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index abc3853..f79bee3 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -867,7 +867,7 @@
       </xsl:variable>
       <li>
         <a href="{$relative_path_depth_recursion}index.html">
-          <xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/>
+          <xsl:value-of select="document(concat(/guide/@self, $relative_path_depth_recursion, 'text.xml'))/guide/chapter[1]/title"/>
         </a>
       </li>
       <xsl:call-template name="printParentDocs">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     c96ec785f5a3d51179eec941648eee67a3410836
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 18:18:40 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 18:18:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c96ec785

devbook.xsl: Drop unnecessary xsl:text elements

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

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index f79bee3..7e34e94 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -670,7 +670,7 @@
         <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
         <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
         <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
-        <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
+        <script>var documentsSrc = "<xsl:value-of select="$relative_path_depth_recursion"/>documents.js"</script>
         <script src="{$relative_path_depth_recursion}search.js"></script>
       </xsl:if>
     </body>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5f5e4cf980ef59f30a7c78477fd13298a53f3bd0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 18:11:41 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 18:11:41 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5f5e4cf9

devbook.xsl: Indent consistently and other whitespace fixes

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

 devbook.xsl | 1128 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 590 insertions(+), 538 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index fe93020..abc3853 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -23,354 +23,383 @@
 </xsl:text>
 </xsl:variable>
 
-  <xsl:template match="chapter">
-    <h1 class="first-header">
+<xsl:template match="chapter">
+  <h1 class="first-header">
+    <xsl:apply-templates select="title"/>
+    <a class="permalink" href=""><span class="fa fa-link"/></a>
+  </h1>
+  <xsl:apply-templates select="*[not(self::title)]"/>
+</xsl:template>
+
+<xsl:template match="section|subsection|subsubsection">
+  <xsl:variable name="level" select="2 + number(starts-with(local-name(), 'sub'))
+                                       + number(starts-with(local-name(), 'subsub'))"/>
+  <xsl:variable name="anchor">
+    <xsl:call-template name="convert-to-anchor">
+      <xsl:with-param name="data" select="title"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <div class="section">
+    <xsl:element name="h{$level}">
+      <xsl:attribute name="id"><xsl:value-of select="$anchor"/></xsl:attribute>
       <xsl:apply-templates select="title"/>
-      <a class="permalink" href=""><span class="fa fa-link"/></a>
-    </h1>
+      <a class="permalink" href="#{$anchor}"><span class="fa fa-link"/></a>
+    </xsl:element>
     <xsl:apply-templates select="*[not(self::title)]"/>
-  </xsl:template>
-
-  <xsl:template match="section|subsection|subsubsection">
-    <xsl:variable name="level" select="2 + number(starts-with(local-name(), 'sub'))
-                                         + number(starts-with(local-name(), 'subsub'))"/>
-    <xsl:variable name="anchor">
-      <xsl:call-template name="convert-to-anchor">
-        <xsl:with-param name="data" select="title"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <div class="section">
-      <xsl:element name="h{$level}">
-        <xsl:attribute name="id"><xsl:value-of select="$anchor"/></xsl:attribute>
-        <xsl:apply-templates select="title"/>
-        <a class="permalink" href="#{$anchor}"><span class="fa fa-link"/></a>
-      </xsl:element>
-      <xsl:apply-templates select="*[not(self::title)]"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="body">
-    <xsl:apply-templates/>
-  </xsl:template>
+  </div>
+</xsl:template>
 
-  <xsl:template match="p">
-    <p>
+<xsl:template match="body">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="p">
+  <p>
     <xsl:apply-templates/>
-    </p>
-  </xsl:template>
+  </p>
+</xsl:template>
 
-  <xsl:template match="pre">
+<xsl:template match="pre">
   <pre><xsl:apply-templates/></pre>
-  </xsl:template>
+</xsl:template>
 
-  <!-- Tables -->
-  <!-- From the Gentoo GuideXML Stylesheet -->
-  <xsl:template match="table">
+<!-- Tables -->
+<!-- From the Gentoo GuideXML Stylesheet -->
+<xsl:template match="table">
   <table class="table"><xsl:apply-templates/></table>
-  </xsl:template>
+</xsl:template>
 
-  <xsl:template match="tr">
+<xsl:template match="tr">
   <tr><xsl:apply-templates/></tr>
-  </xsl:template>
-
-  <!-- Table Item -->
-  <xsl:template match="ti">
-    <td>
-      <xsl:if test="@colspan">
-        <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@rowspan">
-        <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@nowrap">
-        <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
-        <xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </td>
-  </xsl:template>
-
-  <!-- Table Heading -->
-  <xsl:template match="th">
-    <th>
-      <xsl:if test="@colspan">
-        <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
-        <!-- Center only when item spans several columns as
-             centering all <th> might disrupt some pages.
-             We might want to use a plain html <th> tag later.
-             Tip: to center a single-cell title, use <th colspan="1">
-          -->
-        <xsl:attribute name="style">text-align:center</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@rowspan">
-        <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
-      </xsl:if>
-        <xsl:apply-templates/>
-    </th>
-  </xsl:template>
-  <!-- End Table Jojo -->
-
-  <!-- FIXME: Handle lang=... -->
-  <xsl:template match="codesample">
-      <xsl:variable name="ctype"><xsl:if test="@lang = 'ebuild'">Constant</xsl:if></xsl:variable>
-      <xsl:variable name="numbering" select="@numbering"/>
-      <xsl:variable name="lang" select="@lang"/>
-      <pre><span class="{$ctype}">
-
-      <xsl:for-each select="str:tokenize_plasmaroo(., $newline)">
-        <xsl:choose>
-          <xsl:when test=". = $newline">
-            <xsl:if test="position() != 1"><xsl:value-of select='$newline'/></xsl:if>
-            <xsl:if test="$numbering = 'lines' and position() != last()-1">
-              <span style="float: left;"><xsl:number format="01"/>:<xsl:text> </xsl:text></span>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="$lang = 'ebuild'">
-                <xsl:call-template name="lang.highlight.ebuild.tokenate">
-                  <xsl:with-param name="data" select="."/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$lang = 'make'">
-                <xsl:call-template name="lang.highlight.make.tokenate">
-                  <xsl:with-param name="data" select="."/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$lang = 'm4'">
-                <xsl:call-template name="lang.highlight.m4.tokenate">
-                  <xsl:with-param name="data" select="."/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$lang = 'sgml'">
-                <xsl:call-template name="lang.highlight.sgml.tokenate">
-                  <xsl:with-param name="data" select="."/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$lang = 'c'">
-                <xsl:call-template name="lang.highlight.c.tokenate">
-                  <xsl:with-param name="data" select="."/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:message>Error: Unknown language type (<xsl:value-of select="$lang"/>)</xsl:message>
-                <xsl:value-of select="."/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      </span></pre>
-  </xsl:template>
-
-  <xsl:template match="figure">
-    <div class="figure">
-      <div class="image"><img alt="{@short}" src="{@link}"/></div>
-      <xsl:if test="@caption">
-        <p class="caption"><xsl:value-of select="@caption"/></p>
-      </xsl:if>
-    </div>
-  </xsl:template>
-
-  <!-- Lists -->
-  <xsl:template match="li">
-    <li><xsl:apply-templates/></li>
-  </xsl:template>
-
-  <xsl:template match="ol">
-    <ol><xsl:apply-templates/></ol>
-  </xsl:template>
+</xsl:template>
 
-  <xsl:template match="ul">
-    <xsl:choose>
-      <xsl:when test="@class='list-group'">
-        <ul class="list-group fix-links">
-          <xsl:for-each select="li">
-            <li class="list-group-item">
-              <xsl:apply-templates>
-                <xsl:with-param name="class">list-group-item</xsl:with-param>
-              </xsl:apply-templates>
-            </li>
-          </xsl:for-each>
-        </ul>
-      </xsl:when>
-      <xsl:otherwise>
-        <ul><xsl:apply-templates/></ul>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+<!-- Table Item -->
+<xsl:template match="ti">
+  <td>
+    <xsl:if test="@colspan">
+      <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@rowspan">
+      <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@nowrap">
+      <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
+      <xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </td>
+</xsl:template>
+
+<!-- Table Heading -->
+<xsl:template match="th">
+  <th>
+    <xsl:if test="@colspan">
+      <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
+      <!-- Center only when item spans several columns as
+           centering all <th> might disrupt some pages.
+           We might want to use a plain html <th> tag later.
+           Tip: to center a single-cell title, use <th colspan="1">
+      -->
+      <xsl:attribute name="style">text-align:center</xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@rowspan">
+      <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </th>
+</xsl:template>
+<!-- End Table Jojo -->
+
+<!-- FIXME: Handle lang=... -->
+<xsl:template match="codesample">
+  <xsl:variable name="ctype"><xsl:if test="@lang = 'ebuild'">Constant</xsl:if></xsl:variable>
+  <xsl:variable name="numbering" select="@numbering"/>
+  <xsl:variable name="lang" select="@lang"/>
+  <pre><span class="{$ctype}">
+
+    <xsl:for-each select="str:tokenize_plasmaroo(., $newline)">
+      <xsl:choose>
+        <xsl:when test=". = $newline">
+          <xsl:if test="position() != 1"><xsl:value-of select='$newline'/></xsl:if>
+          <xsl:if test="$numbering = 'lines' and position() != last()-1">
+            <span style="float: left;"><xsl:number format="01"/>:<xsl:text> </xsl:text></span>
+          </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:choose>
+            <xsl:when test="$lang = 'ebuild'">
+              <xsl:call-template name="lang.highlight.ebuild.tokenate">
+                <xsl:with-param name="data" select="."/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$lang = 'make'">
+              <xsl:call-template name="lang.highlight.make.tokenate">
+                <xsl:with-param name="data" select="."/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$lang = 'm4'">
+              <xsl:call-template name="lang.highlight.m4.tokenate">
+                <xsl:with-param name="data" select="."/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$lang = 'sgml'">
+              <xsl:call-template name="lang.highlight.sgml.tokenate">
+                <xsl:with-param name="data" select="."/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="$lang = 'c'">
+              <xsl:call-template name="lang.highlight.c.tokenate">
+                <xsl:with-param name="data" select="."/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:message>Error: Unknown language type (<xsl:value-of select="$lang"/>)</xsl:message>
+              <xsl:value-of select="."/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+  </span></pre>
+</xsl:template>
+
+<xsl:template match="figure">
+  <div class="figure">
+    <div class="image"><img alt="{@short}" src="{@link}"/></div>
+    <xsl:if test="@caption">
+      <p class="caption"><xsl:value-of select="@caption"/></p>
+    </xsl:if>
+  </div>
+</xsl:template>
+
+<!-- Lists -->
+<xsl:template match="li">
+  <li><xsl:apply-templates/></li>
+</xsl:template>
+
+<xsl:template match="ol">
+  <ol><xsl:apply-templates/></ol>
+</xsl:template>
+
+<xsl:template match="ul">
+  <xsl:choose>
+    <xsl:when test="@class='list-group'">
+      <ul class="list-group fix-links">
+        <xsl:for-each select="li">
+          <li class="list-group-item">
+            <xsl:apply-templates>
+              <xsl:with-param name="class">list-group-item</xsl:with-param>
+            </xsl:apply-templates>
+          </li>
+        </xsl:for-each>
+      </ul>
+    </xsl:when>
+    <xsl:otherwise>
+      <ul><xsl:apply-templates/></ul>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
 
-  <!-- Definition Lists -->
-  <xsl:template match="dl">
-    <dl><xsl:apply-templates/></dl>
-  </xsl:template>
+<!-- Definition Lists -->
+<xsl:template match="dl">
+  <dl><xsl:apply-templates/></dl>
+</xsl:template>
 
-  <xsl:template match="dt">
-    <dt><xsl:apply-templates/></dt>
-  </xsl:template>
+<xsl:template match="dt">
+  <dt><xsl:apply-templates/></dt>
+</xsl:template>
 
-  <xsl:template match="dd">
-    <dd><xsl:apply-templates/></dd>
-  </xsl:template>
+<xsl:template match="dd">
+  <dd><xsl:apply-templates/></dd>
+</xsl:template>
 
-  <xsl:template match="note">
-    <div class="alert alert-info" role="alert">
+<xsl:template match="note">
+  <div class="alert alert-info" role="alert">
     <strong>Note:</strong>
     <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+  </div>
+</xsl:template>
 
-  <xsl:template match="important">
-    <div class="alert alert-warning" role="alert">
+<xsl:template match="important">
+  <div class="alert alert-warning" role="alert">
     <strong>Important:</strong>
     <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+  </div>
+</xsl:template>
 
-  <xsl:template match="warning">
-    <div class="alert alert-danger" role="alert">
+<xsl:template match="warning">
+  <div class="alert alert-danger" role="alert">
     <strong>Warning:</strong>
     <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+  </div>
+</xsl:template>
 
-  <xsl:template match="todo">
-    <div class="alert alert-info" role="alert">
+<xsl:template match="todo">
+  <div class="alert alert-info" role="alert">
     <strong>Todo:</strong>
     <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="b">
-    <b><xsl:apply-templates/></b>
-  </xsl:template>
-
-  <xsl:template match="d">
-    <xsl:text>&#8212;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="e">
-    <i><xsl:apply-templates/></i>
-  </xsl:template>
-
-  <xsl:template match="c">
-    <code class="docutils literal"><span class="pre"><xsl:apply-templates/></span></code>
-  </xsl:template>
-
-  <xsl:template name="convert-to-anchor">
-    <xsl:param name="data"/>
-    <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz-</xsl:variable>
-    <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text></xsl:variable>
-    <xsl:variable name="lcdata" select="translate(normalize-space($data), $ucletters, $lcletters)"/>
-    <!-- Delete anything but letters, digits, hyphen, dot, underscore -->
-    <xsl:variable name="allowed">abcdefghijklmnopqrstuvwxyz0123456789-._</xsl:variable>
-    <xsl:value-of select="translate($lcdata, translate($lcdata, $allowed, ''), '')"/>
-  </xsl:template>
-
-  <xsl:template match="uri">
-    <xsl:param name="class" />
-    <xsl:choose>
-      <xsl:when test="starts-with(@link, '::')">
-      <!-- Ideally we would work out how many levels to nest down to save a few bytes but
-           going down to root level works just as well (and is faster). -->
-        <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-        <xsl:variable name="relative_path_depth_recursion">
-          <xsl:call-template name="str:repeatString">
-            <xsl:with-param name="count" select="$relative_path_depth"/>
-            <xsl:with-param name="append">../</xsl:with-param>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="contains(@link, '##')">
-            <xsl:variable name="slash">
-              <xsl:if test="substring(substring-before(@link, '##'), string-length(substring-before(@link, '##'))) != '/'">/</xsl:if>
-            </xsl:variable>
-            <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), $slash, 'index.html#', substring-after(@link, '##'))}"><xsl:value-of select="."/></a>
-          </xsl:when>
-          <xsl:when test="contains(@link, '#')">
-            <xsl:variable name="anchor">
-              <xsl:call-template name="convert-to-anchor">
-                <xsl:with-param name="data" select="substring-after(@link, '#')"/>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:variable name="slash">
-              <xsl:if test="substring(substring-before(@link, '#'), string-length(substring-before(@link, '#'))) != '/'">/</xsl:if>
-            </xsl:variable>
-            <xsl:choose>
-              <xsl:when test=". != ''">
-                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'), $slash, 'index.html#', $anchor)}"><xsl:value-of select="."/></a>
-              </xsl:when>
-              <xsl:otherwise>
-                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'), $slash, 'index.html#', $anchor)}"><xsl:value-of select="substring-after(@link, '#')"/></a>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:variable name="slash">
-              <xsl:if test="substring(@link, string-length(@link)) != '/'">/</xsl:if>
-            </xsl:variable>
-            <xsl:choose>
-              <xsl:when test=". != ''">
-                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="."/></a>
-              </xsl:when>
-              <xsl:when test="starts-with(@link, '::eclass-reference/') and substring-after(@link, '::eclass-reference/') != ''">
-                <!-- Eclass reference pages are generated with man2html,
-                     so there isn't any text.xml that could be loaded.
-                     Use the name of the eclass as link text. #442194 -->
-                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="substring-before(concat(substring-after(@link, '::eclass-reference/'), $slash), '/')"/></a>
-              </xsl:when>
-              <xsl:otherwise>
-                <a class="{$class}" href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}"><xsl:value-of select="document(concat(/guide/@self, $relative_path_depth_recursion, substring-after(@link, '::'), '/text.xml'))/guide/chapter[1]/title"/></a>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="@link">
-        <a class="{$class}" href="{@link}"><xsl:value-of select="."/></a>
-      </xsl:when>
-      <xsl:when test="contains(., '://')">
-        <a class="{$class}" href="{.}"><xsl:value-of select="."/></a>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>Error: No link target (<xsl:value-of select="."/>)</xsl:message>
-        <a class="{$class}"><xsl:value-of select="."/></a>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- TOC Tree -->
-  <xsl:template match="contentsTree" name="contentsTree">
-    <xsl:param name="depth" select="0"/>
-    <xsl:param name="maxdepth">
-      <xsl:choose>
-        <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-    <xsl:param name="path">
-      <xsl:choose>
-        <xsl:when test="@root"><xsl:value-of select="@root"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="/guide/@self"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-    <xsl:param name="path_rel">
-      <xsl:if test="$depth = 0 and $path = '' and /guide/@self != ''">
+  </div>
+</xsl:template>
+
+<xsl:template match="b">
+  <b><xsl:apply-templates/></b>
+</xsl:template>
+
+<xsl:template match="d">
+  <xsl:text>&#8212;</xsl:text>
+</xsl:template>
+
+<xsl:template match="e">
+  <i><xsl:apply-templates/></i>
+</xsl:template>
+
+<xsl:template match="c">
+  <code class="docutils literal"><span class="pre"><xsl:apply-templates/></span></code>
+</xsl:template>
+
+<xsl:template name="convert-to-anchor">
+  <xsl:param name="data"/>
+  <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz-</xsl:variable>
+  <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text></xsl:variable>
+  <xsl:variable name="lcdata" select="translate(normalize-space($data), $ucletters, $lcletters)"/>
+  <!-- Delete anything but letters, digits, hyphen, dot, underscore -->
+  <xsl:variable name="allowed">abcdefghijklmnopqrstuvwxyz0123456789-._</xsl:variable>
+  <xsl:value-of select="translate($lcdata, translate($lcdata, $allowed, ''), '')"/>
+</xsl:template>
+
+<xsl:template match="uri">
+  <xsl:param name="class" />
+  <xsl:choose>
+    <xsl:when test="starts-with(@link, '::')">
+      <!-- Ideally we would work out how many levels to nest down to save
+           a few bytes but going down to root level works just as well
+           (and is faster). -->
+      <xsl:variable name="relative_path_depth"
+                    select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
+      <xsl:variable name="relative_path_depth_recursion">
         <xsl:call-template name="str:repeatString">
-          <xsl:with-param name="count" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+          <xsl:with-param name="count" select="$relative_path_depth"/>
           <xsl:with-param name="append">../</xsl:with-param>
         </xsl:call-template>
-      </xsl:if>
-    </xsl:param>
-    <xsl:param name="extraction" select="@extraction"/>
-    <xsl:param name="extraction_counting"/>
+      </xsl:variable>
+      <xsl:choose>
+        <xsl:when test="contains(@link, '##')">
+          <xsl:variable name="slash">
+            <xsl:if test="substring(substring-before(@link, '##'),
+                          string-length(substring-before(@link, '##'))) != '/'">/</xsl:if>
+          </xsl:variable>
+          <a class="{$class}"
+             href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'),
+                   $slash, 'index.html#', substring-after(@link, '##'))}">
+            <xsl:value-of select="."/>
+          </a>
+        </xsl:when>
+        <xsl:when test="contains(@link, '#')">
+          <xsl:variable name="anchor">
+            <xsl:call-template name="convert-to-anchor">
+              <xsl:with-param name="data" select="substring-after(@link, '#')"/>
+            </xsl:call-template>
+          </xsl:variable>
+          <xsl:variable name="slash">
+            <xsl:if test="substring(substring-before(@link, '#'),
+                          string-length(substring-before(@link, '#'))) != '/'">/</xsl:if>
+          </xsl:variable>
+          <xsl:choose>
+            <xsl:when test=". != ''">
+              <a class="{$class}"
+                 href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'),
+                       $slash, 'index.html#', $anchor)}">
+                <xsl:value-of select="."/>
+              </a>
+            </xsl:when>
+            <xsl:otherwise>
+              <a class="{$class}"
+                 href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'),
+                       $slash, 'index.html#', $anchor)}">
+                <xsl:value-of select="substring-after(@link, '#')"/>
+              </a>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:variable name="slash">
+            <xsl:if test="substring(@link, string-length(@link)) != '/'">/</xsl:if>
+          </xsl:variable>
+          <xsl:choose>
+            <xsl:when test=". != ''">
+              <a class="{$class}"
+                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
+                <xsl:value-of select="."/>
+              </a>
+            </xsl:when>
+            <xsl:when test="starts-with(@link, '::eclass-reference/')
+                            and substring-after(@link, '::eclass-reference/') != ''">
+              <!-- Eclass reference pages are generated with man2html,
+                   so there isn't any text.xml that could be loaded.
+                   Use the name of the eclass as link text. #442194 -->
+              <a class="{$class}"
+                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
+                <xsl:value-of select="substring-before(concat(substring-after(@link, '::eclass-reference/'), $slash), '/')"/>
+              </a>
+            </xsl:when>
+            <xsl:otherwise>
+              <a class="{$class}"
+                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
+                <xsl:value-of select="document(concat(/guide/@self, $relative_path_depth_recursion,
+                                      substring-after(@link, '::'), '/text.xml'))/guide/chapter[1]/title"/>
+              </a>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="@link">
+      <a class="{$class}" href="{@link}"><xsl:value-of select="."/></a>
+    </xsl:when>
+    <xsl:when test="contains(., '://')">
+      <a class="{$class}" href="{.}"><xsl:value-of select="."/></a>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:message>Error: No link target (<xsl:value-of select="."/>)</xsl:message>
+      <a class="{$class}"><xsl:value-of select="."/></a>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
 
-    <xsl:variable name="doc_self" select="concat($path, 'text.xml')"/>
-    <xsl:if test="count(document($doc_self)/guide/include) &gt; 0 and ($depth &lt; $maxdepth or $maxdepth = '0')">
+<!-- TOC Tree -->
+<xsl:template match="contentsTree" name="contentsTree">
+  <xsl:param name="depth" select="0"/>
+  <xsl:param name="maxdepth">
+    <xsl:choose>
+      <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
+      <xsl:otherwise>0</xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="path">
+    <xsl:choose>
+      <xsl:when test="@root"><xsl:value-of select="@root"/></xsl:when>
+      <xsl:otherwise><xsl:value-of select="/guide/@self"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="path_rel">
+    <xsl:if test="$depth = 0 and $path = '' and /guide/@self != ''">
+      <xsl:call-template name="str:repeatString">
+        <xsl:with-param name="count"
+                        select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
+        <xsl:with-param name="append">../</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:param>
+  <xsl:param name="extraction" select="@extraction"/>
+  <xsl:param name="extraction_counting"/>
+
+  <xsl:variable name="doc_self" select="concat($path, 'text.xml')"/>
+  <xsl:if test="count(document($doc_self)/guide/include) &gt; 0 and ($depth &lt; $maxdepth or $maxdepth = '0')">
     <xsl:choose>
       <xsl:when test="$extraction_counting = 1">
         <xsl:for-each select="document($doc_self)/guide/include">
-          <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}" path="{concat($path, @href)}">
+          <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}"
+                 path="{concat($path, @href)}">
             <xsl:call-template name="contentsTree">
               <xsl:with-param name="depth" select="$depth + 1"/>
               <xsl:with-param name="maxdepth" select="$maxdepth"/>
@@ -395,45 +424,50 @@
                 <xsl:with-param name="extraction_counting" select="1"/>
               </xsl:call-template>
             </xsl:variable>
-            <xsl:variable name="extraction_counter" select="count(exslt:node-set($extraction_counter_node)//*[@value != 0]) + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
+            <xsl:variable name="extraction_counter"
+                          select="count(exslt:node-set($extraction_counter_node)//*[@value != 0])
+                                  + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
             <xsl:if test="string($extraction) = '' or $extraction_counter &gt; 0">
-            <li>
-              <a class="reference" href="{concat($path_rel, @href, 'index.html')}"><xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/></a>
-              <xsl:if test="$extraction != ''">
-                <ul>
-                <xsl:for-each select="document(concat($path, @href, 'text.xml'))//*[name()=$extraction]">
-                  <xsl:variable name="extraction_id" select="position()"/>
-                  <li><xsl:apply-templates select="(//*[name()=$extraction])[position()=$extraction_id]"/></li>
-                </xsl:for-each>
-                </ul>
-              </xsl:if>
-              <xsl:call-template name="contentsTree">
-                <xsl:with-param name="depth" select="$depth + 1"/>
-                <xsl:with-param name="maxdepth" select="$maxdepth"/>
-                <xsl:with-param name="path" select="concat($path, @href)"/>
-                <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-                <xsl:with-param name="extraction" select="$extraction"/>
-              </xsl:call-template>
-            </li>
+              <li>
+                <a class="reference" href="{concat($path_rel, @href, 'index.html')}">
+                  <xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/>
+                </a>
+                <xsl:if test="$extraction != ''">
+                  <ul>
+                    <xsl:for-each select="document(concat($path, @href, 'text.xml'))//*[name()=$extraction]">
+                      <xsl:variable name="extraction_id" select="position()"/>
+                      <li><xsl:apply-templates select="(//*[name()=$extraction])[position()=$extraction_id]"/></li>
+                    </xsl:for-each>
+                  </ul>
+                </xsl:if>
+                <xsl:call-template name="contentsTree">
+                  <xsl:with-param name="depth" select="$depth + 1"/>
+                  <xsl:with-param name="maxdepth" select="$maxdepth"/>
+                  <xsl:with-param name="path" select="concat($path, @href)"/>
+                  <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+                  <xsl:with-param name="extraction" select="$extraction"/>
+                </xsl:call-template>
+              </li>
             </xsl:if>
           </xsl:for-each>
         </ul>
       </xsl:otherwise>
     </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="/">
-    <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-    <xsl:variable name="relative_path_depth_recursion">
-      <xsl:call-template name="str:repeatString">
-        <xsl:with-param name="count" select="$relative_path_depth"/>
-        <xsl:with-param name="append">../</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
-    <xsl:value-of select='$newline'/>
-    <html lang="en">
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="/">
+  <xsl:variable name="relative_path_depth"
+                select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
+  <xsl:variable name="relative_path_depth_recursion">
+    <xsl:call-template name="str:repeatString">
+      <xsl:with-param name="count" select="$relative_path_depth"/>
+      <xsl:with-param name="append">../</xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
+  <xsl:value-of select='$newline'/>
+  <html lang="en">
     <head>
       <title><xsl:value-of select="/guide/chapter[1]/title"/> &#x2013; Gentoo Development Guide</title>
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -503,7 +537,8 @@
               <div class="container">
                 <div class="row">
                   <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
+                    <button type="button" class="navbar-toggle"
+                            data-toggle="collapse" data-target=".navbar-main-collapse">
                       <span class="sr-only">Toggle navigation</span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
@@ -512,7 +547,9 @@
                   </div>
                   <div class="collapse navbar-collapse navbar-main-collapse">
                     <ul class="nav navbar-nav">
-                      <li><a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#160;Home</a></li>
+                      <li>
+                        <a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#160;Home</a>
+                      </li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#160;<span class="caret"></span></a>
                         <xsl:if test="/guide/chapter[1]/section or //contentsTree">
@@ -553,9 +590,11 @@
               <div class="container">
                 <div class="row">
                   <div class="input-group">
-                    <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
+                    <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]"
+                           accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
                     <div class="input-group-btn">
-                      <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
+                      <input type="submit" name="fulltext" value="Search" title="Search the pages for this text"
+                             id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
                     </div>
                   </div>
                 </div>
@@ -635,14 +674,14 @@
         <script src="{$relative_path_depth_recursion}search.js"></script>
       </xsl:if>
     </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="str:repeatString">
-    <xsl:param name="string"/>
-    <xsl:param name="count"/>
-    <xsl:param name="append"/>
-    <xsl:choose>
+  </html>
+</xsl:template>
+
+<xsl:template name="str:repeatString">
+  <xsl:param name="string"/>
+  <xsl:param name="count"/>
+  <xsl:param name="append"/>
+  <xsl:choose>
     <xsl:when test="$count != 0">
       <xsl:call-template name="str:repeatString">
         <xsl:with-param name="string" select="concat($string, $append)"/>
@@ -653,192 +692,205 @@
     <xsl:otherwise>
       <xsl:value-of select="$string"/>
     </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="findNext">
-    <xsl:param name="self" select="/guide/@self"/>
-    <xsl:choose>
-      <!-- To find the "next" node:
-           * See if this node includes any subnodes... if it does, that is
-             our next node
-           * Look at our parent and see if it includes any nodes after us, if
-             it does use it.
-           * Repeat recursively, going down parents if needed.
-           * End at the root item if needed.
-      -->
-      <xsl:when test="count(/guide/include) &gt; 0">
-        <xsl:variable name="doc" select="/guide/include[1]/@href"/>
-        <a class="w-250 text-center" href="{concat($doc, 'index.html')}">
-          <span class="truncated-text d-inline-block max-w-200 mr-2">
-            <xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/>
-          </span>
-          <span class="fa fa-arrow-right"/>
-        </a>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- This document's path -->
-        <xsl:variable name="doc_self" select="concat($self, 'text.xml')"/>
-        <!-- Turn the absolute path into a relative path so we can find ourselves in
-             the parent -->
-        <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
-        <xsl:variable name="index_self" select="count(document(concat($self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)+1"/>
-        <!-- Go down a parent, lookup the item after us... -->
-        <xsl:variable name="parentItem_lookup" select="document(concat($self, '../text.xml'))/guide/include[$index_self]/@href"/>
-        <xsl:variable name="parentItem_next" select="concat(document(concat($self, '../text.xml'))/guide/@self, $parentItem_lookup)"/>
-        <xsl:choose>
-          <!-- If we have an item after us, or we are at the root node (termination condition) we need to
-               not recurse any further... -->
-          <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
-            <xsl:variable name="parentItem_actual">
-              <xsl:choose>
-                <xsl:when test="$parentItem_next = ''"></xsl:when>
-                <xsl:otherwise><xsl:value-of select="$parentItem_next"/></xsl:otherwise>
-              </xsl:choose>
-            </xsl:variable>
-            <!-- This is where we do a little trickery. To count how many levels we need to go down,
-                 we count how far up we currently are (remember that the absolute link we get is relative to /...) and
-                 hence we can build a relative link... -->
-            <xsl:variable name="relative_path" select="$parentItem_actual"/>
-            <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-            <xsl:variable name="relative_path_depth_recursion">
-              <xsl:call-template name="str:repeatString">
-                <xsl:with-param name="count" select="$relative_path_depth"/>
-                <xsl:with-param name="append">../</xsl:with-param>
-              </xsl:call-template>
-            </xsl:variable>
-            <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}">
-              <span class="truncated-text d-inline-block max-w-200 mr-2">
-                <xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/>
-              </span>
-              <span class="fa fa-arrow-right"/>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- We need to recurse downwards; so we need to strip off a directory element off our absolute path to feed
-                 into the next iteration... -->
-            <xsl:variable name="relative_path_depth" select="string-length($self)-string-length(translate($self, '/' , ''))"/>
-            <xsl:variable name="relative_path_fixed">
-              <xsl:for-each select="str:tokenize_plasmaroo($self, '/')[position() &lt; (($relative_path_depth - 1)*2 + 1)]">
-                <xsl:value-of select="."/>
-              </xsl:for-each>
-            </xsl:variable>
-            <xsl:call-template name="findNext">
-              <xsl:with-param name="self" select="$relative_path_fixed"/>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="findNext">
+  <xsl:param name="self" select="/guide/@self"/>
+  <xsl:choose>
+    <!-- To find the "next" node:
+         * See if this node includes any subnodes... if it does, that is
+           our next node
+         * Look at our parent and see if it includes any nodes after us,
+           if it does use it.
+         * Repeat recursively, going down parents if needed.
+         * End at the root item if needed.
+    -->
+    <xsl:when test="count(/guide/include) &gt; 0">
+      <xsl:variable name="doc" select="/guide/include[1]/@href"/>
+      <a class="w-250 text-center" href="{concat($doc, 'index.html')}">
+        <span class="truncated-text d-inline-block max-w-200 mr-2">
+          <xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/>
+        </span>
+        <span class="fa fa-arrow-right"/>
+      </a>
+    </xsl:when>
+    <xsl:otherwise>
+      <!-- This document's path -->
+      <xsl:variable name="doc_self" select="concat($self, 'text.xml')"/>
+      <!-- Turn the absolute path into a relative path so we can find ourselves
+           in the parent -->
+      <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
+      <xsl:variable name="index_self"
+                    select="count(document(concat($self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)+1"/>
+      <!-- Go down a parent, lookup the item after us... -->
+      <xsl:variable name="parentItem_lookup"
+                    select="document(concat($self, '../text.xml'))/guide/include[$index_self]/@href"/>
+      <xsl:variable name="parentItem_next"
+                    select="concat(document(concat($self, '../text.xml'))/guide/@self, $parentItem_lookup)"/>
+      <xsl:choose>
+        <!-- If we have an item after us, or we are at the root node
+             (termination condition) we need to not recurse any further... -->
+        <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
+          <xsl:variable name="parentItem_actual">
+            <xsl:choose>
+              <xsl:when test="$parentItem_next = ''"></xsl:when>
+              <xsl:otherwise><xsl:value-of select="$parentItem_next"/></xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+          <!-- This is where we do a little trickery. To count how many levels
+               we need to go down, we count how far up we currently are
+               (remember that the absolute link we get is relative to /...)
+               and hence we can build a relative link... -->
+          <xsl:variable name="relative_path" select="$parentItem_actual"/>
+          <xsl:variable name="relative_path_depth"
+                        select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
+          <xsl:variable name="relative_path_depth_recursion">
+            <xsl:call-template name="str:repeatString">
+              <xsl:with-param name="count" select="$relative_path_depth"/>
+              <xsl:with-param name="append">../</xsl:with-param>
             </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="getLastNode">
-    <!-- This function recurses forward down nodes stopping at the very last include... -->
-    <xsl:param name="root"/>
-    <xsl:param name="path"/>
-    <xsl:variable name="include" select="document(concat($root, $path))/guide/include[last()]/@href"/>
-    <xsl:choose>
-      <xsl:when test="$include">
-        <xsl:call-template name="getLastNode">
-          <xsl:with-param name="root" select="$root"/>
-          <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$path"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="findPrevious">
-    <xsl:choose>
-      <!-- To find the "previous" node:
-           * Go down to our parent
-             * See if there are any nodes before us
-               * If we have a valid node that is before us
-               * Fully recurse up the node to get the last extremity
-             * Otherwise list the parent -->
-      <xsl:when test="/guide/@root">
-        <a class="w-250 text-center" href="#">
-          <span class="fa fa-arrow-left"/>
-          <span class="truncated-text d-inline-block max-w-200 ml-2">
-            <xsl:value-of select="/guide/chapter[1]/title"/>
-          </span>
-        </a>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- This document's path -->
-        <xsl:variable name="doc_self" select="concat(/guide/@self, 'text.xml')"/>
-        <!-- Turn the absolute path we have into a relative path so we can find ourselves in the
-             parent -->
-        <!-- FIXME: Bombproof the doc_self so it still works if it's missing a '/' on the end -->
-        <xsl:variable name="path_self" select="concat(str:tokenize(/guide/@self, '/')[last()], '/')"/>
-        <xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
-        <xsl:choose>
-          <xsl:when test="$index_self &gt; 0">
-            <!-- Relative path of the parent -->
-            <xsl:variable name="parentItem_path" select="document(concat(/guide/@self, '../text.xml'))/guide/@self"/>
-            <!-- Previous item in the parent -->
-            <xsl:variable name="parentItem_next" select="document(concat(/guide/@self, '../text.xml'))/guide/include[$index_self]/@href"/>
-            <xsl:variable name="myItem_path">
+          </xsl:variable>
+          <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}">
+            <span class="truncated-text d-inline-block max-w-200 mr-2">
+              <xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/>
+            </span>
+            <span class="fa fa-arrow-right"/>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- We need to recurse downwards; so we need to strip off a directory
+               element off our absolute path to feed into the next iteration... -->
+          <xsl:variable name="relative_path_depth"
+                        select="string-length($self) - string-length(translate($self, '/' , ''))"/>
+          <xsl:variable name="relative_path_fixed">
+            <xsl:for-each select="str:tokenize_plasmaroo($self, '/')[position() &lt; (($relative_path_depth - 1)*2 + 1)]">
+              <xsl:value-of select="."/>
+            </xsl:for-each>
+          </xsl:variable>
+          <xsl:call-template name="findNext">
+            <xsl:with-param name="self" select="$relative_path_fixed"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="getLastNode">
+  <!-- This function recurses forward down nodes stopping at the very last include... -->
+  <xsl:param name="root"/>
+  <xsl:param name="path"/>
+  <xsl:variable name="include" select="document(concat($root, $path))/guide/include[last()]/@href"/>
+  <xsl:choose>
+    <xsl:when test="$include">
+      <xsl:call-template name="getLastNode">
+        <xsl:with-param name="root" select="$root"/>
+        <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$path"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="findPrevious">
+  <xsl:choose>
+    <!-- To find the "previous" node:
+         * Go down to our parent
+           * See if there are any nodes before us
+             * If we have a valid node that is before us
+             * Fully recurse up the node to get the last extremity
+           * Otherwise list the parent -->
+    <xsl:when test="/guide/@root">
+      <a class="w-250 text-center" href="#">
+        <span class="fa fa-arrow-left"/>
+        <span class="truncated-text d-inline-block max-w-200 ml-2">
+          <xsl:value-of select="/guide/chapter[1]/title"/>
+        </span>
+      </a>
+    </xsl:when>
+    <xsl:otherwise>
+      <!-- This document's path -->
+      <xsl:variable name="doc_self" select="concat(/guide/@self, 'text.xml')"/>
+      <!-- Turn the absolute path we have into a relative path so we can find
+           ourselves in the parent -->
+      <!-- FIXME: Bombproof the doc_self so it still works if it's missing a '/'
+           on the end -->
+      <xsl:variable name="path_self" select="concat(str:tokenize(/guide/@self, '/')[last()], '/')"/>
+      <xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
+      <xsl:choose>
+        <xsl:when test="$index_self &gt; 0">
+          <!-- Relative path of the parent -->
+          <xsl:variable name="parentItem_path" select="document(concat(/guide/@self, '../text.xml'))/guide/@self"/>
+          <!-- Previous item in the parent -->
+          <xsl:variable name="parentItem_next"
+                        select="document(concat(/guide/@self, '../text.xml'))/guide/include[$index_self]/@href"/>
+          <xsl:variable name="myItem_path">
             <xsl:call-template name="getLastNode">
               <xsl:with-param name="root" select="$parentItem_path"/>
               <xsl:with-param name="path" select="concat($parentItem_next, 'text.xml')"/>
             </xsl:call-template>
-            </xsl:variable>
-            <!-- Make a relative <a> link; we need an absolute reference for the XSLT processor though... -->
-            <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">
-              <span class="fa fa-arrow-left"/>
-              <span class="truncated-text d-inline-block max-w-200 ml-2">
-                <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/>
-              </span>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <a class="w-250 text-center" href="../index.html">
-              <span class="fa fa-arrow-left"/>
-              <span class="truncated-text d-inline-block max-w-200 ml-2">
-                <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/>
-              </span>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="printParentDocs">
-    <xsl:param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/', ''))"/>
-    <xsl:choose>
-      <xsl:when test="$depth &gt; 0">
-        <xsl:variable name="relative_path_depth_recursion">
-          <xsl:call-template name="str:repeatString">
-            <xsl:with-param name="count" select="$depth"/>
-            <xsl:with-param name="append">../</xsl:with-param>
-          </xsl:call-template>
-        </xsl:variable>
-        <li>
-          <a href="{$relative_path_depth_recursion}index.html">
-            <xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/>
+          </xsl:variable>
+          <!-- Make a relative <a> link; we need an absolute reference
+               for the XSLT processor though... -->
+          <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">
+            <span class="fa fa-arrow-left"/>
+            <span class="truncated-text d-inline-block max-w-200 ml-2">
+              <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/>
+            </span>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <a class="w-250 text-center" href="../index.html">
+            <span class="fa fa-arrow-left"/>
+            <span class="truncated-text d-inline-block max-w-200 ml-2">
+              <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/>
+            </span>
           </a>
-        </li>
-        <xsl:call-template name="printParentDocs">
-          <xsl:with-param name="depth" select="$depth - 1"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="printParentDocs">
+  <xsl:param name="depth" select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/', ''))"/>
+  <xsl:choose>
+    <xsl:when test="$depth &gt; 0">
+      <xsl:variable name="relative_path_depth_recursion">
+        <xsl:call-template name="str:repeatString">
+          <xsl:with-param name="count" select="$depth"/>
+          <xsl:with-param name="append">../</xsl:with-param>
         </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="author">
-    <dt><xsl:value-of select="@name"/><xsl:if test="@email != ''"> &lt;<a href="mailto:{@email}"><xsl:value-of select="@email"/></a>&gt;</xsl:if></dt>
-    <dd><xsl:apply-templates/></dd>
-  </xsl:template>
-
-  <xsl:template match="authors">
-    <dl>
+      </xsl:variable>
+      <li>
+        <a href="{$relative_path_depth_recursion}index.html">
+          <xsl:value-of select="document(concat(/guide/@self, concat($relative_path_depth_recursion, 'text.xml')))/guide/chapter[1]/title"/>
+        </a>
+      </li>
+      <xsl:call-template name="printParentDocs">
+        <xsl:with-param name="depth" select="$depth - 1"/>
+      </xsl:call-template>
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="author">
+  <dt>
+    <xsl:value-of select="@name"/>
+    <xsl:if test="@email != ''"> &lt;<a href="mailto:{@email}"><xsl:value-of select="@email"/></a>&gt;</xsl:if>
+  </dt>
+  <dd><xsl:apply-templates/></dd>
+</xsl:template>
+
+<xsl:template match="authors">
+  <dl>
     <xsl:apply-templates select="author"/>
-    </dl>
-  </xsl:template>
+  </dl>
+</xsl:template>
+
 </xsl:stylesheet>
 
 <!-- Local Variables: -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     755232aed004ad81c54a2893788d0833e1fe6177
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 18:32:02 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 18:32:02 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=755232ae

devbook.xsl: Properly declare HTML 5 output

Instead of hand-crafting a DOCTYPE line. libxslt-1.1.30 and later
support version="5" for the html output method.

Drop indent="yes" and omit-xml-declaration="yes" because they are the
defaults anyway.

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

 devbook.xsl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 7e34e94..1dcb55e 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -12,7 +12,7 @@
 <xsl:import href="xsl/lang.highlight.m4.xsl"/>
 <xsl:import href="xsl/lang.highlight.sgml.xsl"/>
 
-<xsl:output method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
+<xsl:output method="html" version="5" encoding="UTF-8" doctype-system="about:legacy-compat"/>
 
 <!-- When true, disable external assets for offline browsing.
      The parameter can be passed with "xsltproc -\-param offline 1". -->
@@ -465,8 +465,6 @@
       <xsl:with-param name="append">../</xsl:with-param>
     </xsl:call-template>
   </xsl:variable>
-  <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
-  <xsl:value-of select='$newline'/>
   <html lang="en">
     <head>
       <title><xsl:value-of select="/guide/chapter[1]/title"/> &#x2013; Gentoo Development Guide</title>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e748fbad1c33ec741d8389464914e373f943644d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 19:48:06 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 19:48:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e748fbad

devbook.xsl: Drop unused variable in findNext and findPrevious

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

 devbook.xsl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1dcb55e..ac6ab38 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -714,8 +714,6 @@
       </a>
     </xsl:when>
     <xsl:otherwise>
-      <!-- This document's path -->
-      <xsl:variable name="doc_self" select="concat($self, 'text.xml')"/>
       <!-- Turn the absolute path into a relative path so we can find ourselves
            in the parent -->
       <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
@@ -810,12 +808,8 @@
       </a>
     </xsl:when>
     <xsl:otherwise>
-      <!-- This document's path -->
-      <xsl:variable name="doc_self" select="concat(/guide/@self, 'text.xml')"/>
       <!-- Turn the absolute path we have into a relative path so we can find
            ourselves in the parent -->
-      <!-- FIXME: Bombproof the doc_self so it still works if it's missing a '/'
-           on the end -->
       <xsl:variable name="path_self" select="concat(str:tokenize(/guide/@self, '/')[last()], '/')"/>
       <xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
       <xsl:choose>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     8ee0c9ecf48f52cd421ad7808f5fe9d97edaf5cd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 09:09:06 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 18:28:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8ee0c9ec

Revert "Drop duplicate info about contributions"

Having the list of contributors on the main page is what everybody
(including the original authors) had agreed upon in bug 150231,
comment #39 and following.

Update the list of contributors from appendices/contributors.

This reverts commit 68990c4329bc68b340627415e0c75e19035ad244.

Bug: https://bugs.gentoo.org/150231#39
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 text.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/text.xml b/text.xml
index 4bc295c..424a01f 100644
--- a/text.xml
+++ b/text.xml
@@ -10,6 +10,20 @@ inaccuracies, omissions, typos and the occasional outright lie. The
 intent is to make a handbook giving developers and users correct,
 detailed, up to date technical content.
 </p>
+
+<dl>
+  <dt>Contributors</dt>
+  <dd>
+    Ciaran McCreesh, Grant Goodyear, Aaron Walker, Robert Coie, Tom Martin,
+    Paul Varner, Ilya Volynets-Evenbakh, Diego Pettenò, Fernando J. Pereda,
+    Simon Stelling, Alin Dobre, Joseph Jezak, Ursula Maplehurst, Mark Loeser,
+    Petteri Räty, Ulrich Müller, Mike Pagano, Markus Meier, Markos Chandras,
+    Xavier Neys, Daniel Robbins, Jeremy Olexa, Julian Ospald,
+    Alexandre Rostovtsev, Göktürk Yüksek, Michael Orlitzky, Michał Górny,
+    Brian Evans, Lucas Ramage, Mike Frysinger, Sam James
+  </dd>
+</dl>
+
 <p>
 Contributions are encouraged. See the <uri link="::appendices/contributing"/>
 section for how to get started. If you have any corrections, suggestions or

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     0e6aeff2a1f4d6ed9ced2cde04c8484cb2da2307
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 18:08:16 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 17:52:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0e6aeff2

devbook.dtd: Dual-license under MIT or CC-BY-SA-4.0, update years

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

 devbook.dtd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index 8a8e6dd..77ba737 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -1,5 +1,6 @@
-<!-- Copyright 2019-2020 Gentoo Authors -->
-<!-- Distributed under the terms of the MIT/X11 license -->
+<!-- Copyright 2019-2021 Gentoo Authors -->
+<!-- Distributed under the terms of the MIT/X11 license
+     or the CC-BY-SA-4.0 license (dual-licensed) -->
 
 <!-- Document Type Definition for the Gentoo Devmanual -->
 <!-- Based on common.dtd from GuideXML -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a4c4652162c2a37a4809c2e9a7b825e765578378
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  6 17:48:12 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 17:52:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a4c46521

Automatically generate the author list on the homepage

Contributors are listed in appendices/contributors/, so we can take
the information from there without maintaining duplicate lists.

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

 devbook.dtd |  5 ++++-
 devbook.xsl | 12 +++++++++++-
 text.xml    | 15 +++------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/devbook.dtd b/devbook.dtd
index 17fb59b..8a8e6dd 100644
--- a/devbook.dtd
+++ b/devbook.dtd
@@ -27,10 +27,13 @@
 
 <!ELEMENT body          (authors|contentsTree|%block.class;)+>
 
-<!ELEMENT authors       (author)+>
+<!ELEMENT authors       (author+|authorlist+)>
 <!ELEMENT author        (#PCDATA|%inline.class;)*>
 <!ATTLIST author        name  CDATA #REQUIRED
                         email CDATA #IMPLIED>
+<!ELEMENT authorlist    EMPTY>
+<!ATTLIST authorlist    title CDATA #REQUIRED
+                        href  CDATA #REQUIRED>
 
 <!ELEMENT contentsTree  EMPTY>
 <!ATTLIST contentsTree  maxdepth   CDATA #IMPLIED

diff --git a/devbook.xsl b/devbook.xsl
index ac6ab38..5e8b260 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -877,9 +877,19 @@
   <dd><xsl:apply-templates/></dd>
 </xsl:template>
 
+<xsl:template match="authorlist">
+  <dt><xsl:value-of select="@title"/></dt>
+  <dd>
+    <xsl:for-each select="document(concat(@href, 'text.xml'))//author">
+      <xsl:value-of select="@name"/>
+      <xsl:if test="position() != last()">, </xsl:if>
+    </xsl:for-each>
+  </dd>
+</xsl:template>
+
 <xsl:template match="authors">
   <dl>
-    <xsl:apply-templates select="author"/>
+    <xsl:apply-templates/>
   </dl>
 </xsl:template>
 

diff --git a/text.xml b/text.xml
index ba88028..ed290f4 100644
--- a/text.xml
+++ b/text.xml
@@ -11,18 +11,9 @@ intent is to make a handbook giving developers and users correct,
 detailed, up to date technical content.
 </p>
 
-<dl>
-  <dt>Contributors</dt>
-  <dd>
-    Ciaran McCreesh, Grant Goodyear, Aaron Walker, Robert Coie, Tom Martin,
-    Paul Varner, Ilya Volynets-Evenbakh, Diego Pettenò, Fernando J. Pereda,
-    Simon Stelling, Alin Dobre, Joseph Jezak, Ursula Maplehurst, Mark Loeser,
-    Petteri Räty, Ulrich Müller, Mike Pagano, Markus Meier, Markos Chandras,
-    Xavier Neys, Daniel Robbins, Jeremy Olexa, Julian Ospald,
-    Alexandre Rostovtsev, Göktürk Yüksek, Michael Orlitzky, Michał Górny,
-    Brian Evans, Lucas Ramage, Mike Frysinger, Sam James
-  </dd>
-</dl>
+<authors>
+  <authorlist title="Contributors" href="appendices/contributors/"/>
+</authors>
 
 <p>
 Contributions are encouraged. See the <uri link="::appendices/contributing/"/>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     80e024ed24de7784c4c891a721d40816f5eab4b2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 10 10:27:49 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 10:33:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=80e024ed

devbook.xsl: td doesn't have a nowrap attribute in HTML 5

Problem seen with tidy from app-text/htmltidy-5.8.0-r1.

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

 Makefile    | 2 +-
 devbook.xsl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5d74d88..0a40cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ validate:
 	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
 	  && echo "xmllint validation successful"
 
-# Run app-text/tidy-html5 on the output to detect mistakes.
+# Run app-text/htmltidy on the output to detect mistakes.
 # We have to loop through them because otherwise tidy won't
 # tell you which file contains a mistake.
 tidy: $(HTMLS) $(ECLASS_HTMLS)

diff --git a/devbook.xsl b/devbook.xsl
index 5e8b260..1ebbb3b 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -84,7 +84,7 @@
     </xsl:if>
     <xsl:if test="@nowrap">
       <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
-      <xsl:attribute name="nowrap"><xsl:value-of select="@nowrap"/></xsl:attribute>
+      <xsl:attribute name="style">white-space:<xsl:value-of select="@nowrap"/></xsl:attribute>
     </xsl:if>
     <xsl:apply-templates/>
   </td>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     867c1219f744ac96c18ba44105008fce2dd60d70
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 10 10:31:02 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 10:33:59 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=867c1219

Makefile: Add "check" target

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

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0a40cc3..cf57852 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,8 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
 
+check: validate tidy
+
 dist:
 	COMMITDATE=$$(TZ=UTC git log -1 --pretty="format:%cd" \
 	  --date="format-local:%Y%m%d"); \
@@ -109,6 +111,6 @@ dist:
 clean:
 	@rm -f $(HTMLS) $(IMAGES) documents.js .depend
 
-.PHONY: all prereq build install validate tidy dist clean
+.PHONY: all prereq build install check validate tidy dist clean
 
 -include .depend

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     76f83d067b2ba64c7c1dca6659aa47bcefdca92d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 11 10:53:09 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 10:53:09 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=76f83d06

Makefile: Suppress warning about missing eclass-reference/text.xml

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

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cf57852..3409931 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ eclass-reference/text.xml:
 # the previous and next documents (for backward and forward links).
 # Generate the list of dependencies with XSLT, which appears to be a
 # better tool for this than make.
-.depend: $(XMLS) depend.xsl devbook.xsl
+.depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
 	@xsltproc depend.xsl $(XMLS) | sed ':x;s%[^ /]*/\.\./%%;tx' > $@
 
 install: all

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     dc82d8e45d48814b94458a3ce4edc396919a1d08
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 21:49:28 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 21:49:28 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dc82d8e4

Makefile: Simplify recipes for validate and tidy targets

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

 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3409931..2c7952a 100644
--- a/Makefile
+++ b/Makefile
@@ -83,8 +83,8 @@ install: all
 	fi
 
 validate:
-	@xmllint --noout --dtdvalid devbook.dtd $(XMLS) \
-	  && echo "xmllint validation successful"
+	@xmllint --noout --dtdvalid devbook.dtd $(XMLS)
+	@echo "xmllint validation successful"
 
 # Run app-text/htmltidy on the output to detect mistakes.
 # We have to loop through them because otherwise tidy won't
@@ -96,8 +96,8 @@ tidy: $(HTMLS) $(ECLASS_HTMLS)
 	    | tidy -q -errors --drop-empty-elements no 2>&1) \
 	  || { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
 	done; \
-	test $${status} -eq 0 && echo "tidy validation successful"; \
 	exit $${status}
+	@echo "tidy validation successful"
 
 check: validate tidy
 

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     ee1ca6dd07a2561d26029f4f0c1a5ef65160337e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 19:33:51 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 11:26:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ee1ca6dd

devbook.xsl: Support alignment of table cells

The "align" attribute is documented in the DevBook XML Guide,
but was not implemented in the XSL stylesheet.

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

 devbook.xsl | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1ebbb3b..bf68e9a 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -82,9 +82,12 @@
     <xsl:if test="@rowspan">
       <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
     </xsl:if>
-    <xsl:if test="@nowrap">
-      <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
-      <xsl:attribute name="style">white-space:<xsl:value-of select="@nowrap"/></xsl:attribute>
+    <xsl:if test="@nowrap or @align">
+      <xsl:attribute name="style">
+        <!-- Disable word wrapping for this table item. Usage: <ti nowrap="nowrap"> -->
+        <xsl:if test="@nowrap">white-space:<xsl:value-of select="@nowrap"/>;</xsl:if>
+        <xsl:if test="@align">text-align:<xsl:value-of select="@align"/>;</xsl:if>
+      </xsl:attribute>
     </xsl:if>
     <xsl:apply-templates/>
   </td>
@@ -95,16 +98,21 @@
   <th>
     <xsl:if test="@colspan">
       <xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute>
-      <!-- Center only when item spans several columns as
-           centering all <th> might disrupt some pages.
-           We might want to use a plain html <th> tag later.
-           Tip: to center a single-cell title, use <th colspan="1">
-      -->
-      <xsl:attribute name="style">text-align:center</xsl:attribute>
     </xsl:if>
     <xsl:if test="@rowspan">
       <xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute>
     </xsl:if>
+    <xsl:choose>
+      <xsl:when test="@align">
+        <xsl:attribute name="style">text-align:<xsl:value-of select="@align"/>;</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="@colspan">
+        <!-- Center only when item spans several columns as
+             centering all <th> might disrupt some pages.
+        -->
+        <xsl:attribute name="style">text-align:center;</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
     <xsl:apply-templates/>
   </th>
 </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6ef11f64a2d763360542bd6a3c74da46f15dfa23
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 21:59:15 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 18:16:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6ef11f64

devbook.rnc: Change from DTD to RELAX NG compact schema

The currently used DTD format has several limitations. It does not
support data types, and it is not expressive enough for some element
syntax used in the devmanual. For example, it cannot accurately
describe the uri element which comes in two alternative forms
(namely, with the link in its body text or as an attribute).

RELAX NG is chosen because it has a variant with a compact and very
readable non-XML syntax, and it is well supported both as an input and
as an output format by conversion tools like app-text/trang. Also, we
need RNC for app-emacs/nxml-gentoo-schemas anyway.

devbook.rnc is the source file, but the generated devbook.rng is also
committed to the repository, in order to avoid an additional
dependency on trang or rnc2rng.

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

 Makefile    |  10 +-
 devbook.dtd |  94 ---------------
 devbook.rnc | 113 ++++++++++++++++++
 devbook.rng | 391 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 512 insertions(+), 96 deletions(-)

diff --git a/Makefile b/Makefile
index 2c7952a..cbb31e7 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,16 @@ install: all
 	  install -m 644 $(JS_FILES) "$(DESTDIR)$(htmldir)"/; \
 	fi
 
-validate:
-	@xmllint --noout --dtdvalid devbook.dtd $(XMLS)
+# Not all versions of xmllint support --quiet, so test for it first
+validate: devbook.rng
+	@opt=--quiet; xmllint --help 2>&1 | grep -q -- --quiet || opt=; \
+	xmllint --noout $${opt} --relaxng $< $(XMLS)
 	@echo "xmllint validation successful"
 
+%.rng: %.rnc
+	trang $< $@
+	sed -i -e '2s/^/<!-- Auto-generated from $<; do not edit! -->\n/' $@
+
 # Run app-text/htmltidy on the output to detect mistakes.
 # We have to loop through them because otherwise tidy won't
 # tell you which file contains a mistake.

diff --git a/devbook.dtd b/devbook.dtd
deleted file mode 100644
index 77ba737..0000000
--- a/devbook.dtd
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- Copyright 2019-2021 Gentoo Authors -->
-<!-- Distributed under the terms of the MIT/X11 license
-     or the CC-BY-SA-4.0 license (dual-licensed) -->
-
-<!-- Document Type Definition for the Gentoo Devmanual -->
-<!-- Based on common.dtd from GuideXML -->
-
-<!ENTITY  % block.class     "p|pre|codesample|note|important|warning|todo
-                                |figure|table|ul|ol|dl">
-<!ENTITY  % attrib.class    "b|c|e">
-<!ENTITY  % inline.class    "%attrib.class;|d|uri">
-<!ENTITY  % all.class       "%block.class;|%inline.class;">
-
-<!ELEMENT guide         (chapter, include*)>
-<!ATTLIST guide         root (true) #IMPLIED
-                        self CDATA #IMPLIED>
-
-<!ELEMENT include       EMPTY>
-<!ATTLIST include       href CDATA #REQUIRED>
-
-<!ELEMENT chapter       (title, (body|section), section*)>
-<!ELEMENT section       (title, (body|subsection), subsection*)>
-<!ELEMENT subsection    (title, (body|subsubsection), subsubsection*)>
-<!ELEMENT subsubsection (title, body)>
-
-<!-- Title texts are used as anchors, so allow only text attributes -->
-<!ELEMENT title         (#PCDATA|%attrib.class;)*>
-
-<!ELEMENT body          (authors|contentsTree|%block.class;)+>
-
-<!ELEMENT authors       (author+|authorlist+)>
-<!ELEMENT author        (#PCDATA|%inline.class;)*>
-<!ATTLIST author        name  CDATA #REQUIRED
-                        email CDATA #IMPLIED>
-<!ELEMENT authorlist    EMPTY>
-<!ATTLIST authorlist    title CDATA #REQUIRED
-                        href  CDATA #REQUIRED>
-
-<!ELEMENT contentsTree  EMPTY>
-<!ATTLIST contentsTree  maxdepth   CDATA #IMPLIED
-                        root       CDATA #IMPLIED
-                        extraction CDATA #IMPLIED>
-
-<!ELEMENT p             (#PCDATA|%inline.class;)*>
-
-<!ELEMENT pre           (#PCDATA)>
-
-<!ELEMENT codesample    (#PCDATA)>
-<!ATTLIST codesample    lang (c|ebuild|make|m4|sgml) #REQUIRED
-                        numbering (lines) #IMPLIED>
-
-<!ELEMENT note          (#PCDATA|%inline.class;)*>
-<!ELEMENT important     (#PCDATA|%inline.class;)*>
-<!ELEMENT warning       (#PCDATA|%inline.class;)*>
-<!ELEMENT todo          (#PCDATA|%inline.class;)*>
-
-<!ELEMENT figure        EMPTY>
-<!ATTLIST figure        link CDATA #REQUIRED
-                        short CDATA #IMPLIED
-                        caption CDATA #IMPLIED>
-
-<!ELEMENT table         (tr)+>
-
-<!ELEMENT tr            (th|ti)+>
-
-<!ELEMENT th            (#PCDATA|%inline.class;)*>
-<!ATTLIST th            colspan CDATA #IMPLIED
-                        rowspan CDATA #IMPLIED
-                        align (left|center|right) "left">
-
-<!ELEMENT ti            (#PCDATA|%all.class;)*>
-<!ATTLIST ti            colspan CDATA #IMPLIED
-                        rowspan CDATA #IMPLIED
-                        nowrap  CDATA #IMPLIED
-                        align (left|center|right) "left">
-
-<!ELEMENT ul            (li)+>
-<!ATTLIST ul            class CDATA #IMPLIED>
-
-<!ELEMENT ol            (li)+>
-
-<!ELEMENT li            (#PCDATA|%all.class;)*>
-
-<!ELEMENT dl            (dt|dd)+>
-<!ELEMENT dt            (#PCDATA|%inline.class;)*>
-<!ELEMENT dd            (#PCDATA|%all.class;)*>
-
-<!ELEMENT b             (#PCDATA|%inline.class;)*>
-<!ELEMENT c             (#PCDATA|%inline.class;)*>
-<!ELEMENT e             (#PCDATA|%inline.class;)*>
-<!ELEMENT d             EMPTY>
-
-<!ELEMENT uri           (#PCDATA|%inline.class;)*>
-<!ATTLIST uri           link CDATA #IMPLIED>

diff --git a/devbook.rnc b/devbook.rnc
new file mode 100644
index 0000000..4ca931d
--- /dev/null
+++ b/devbook.rnc
@@ -0,0 +1,113 @@
+# Copyright 2022 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
+inline.class = attrib.class | d | uri
+
+attrib = attrib.class*
+inline = inline.class*
+all = (block.class | inline.class)*
+
+start = guide
+
+guide = element guide {
+  (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 | contentsTree | 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 }
+}
+
+contentsTree = element contentsTree {
+  attribute maxdepth { xsd:unsignedInt }?,
+  attribute root { text }?,
+  attribute extraction { text }?
+}
+
+p = element p { inline }
+
+pre = element pre { text }
+
+codesample = element codesample {
+  attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
+  attribute numbering { "lines" }?,
+  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 { 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 { 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 }
+d = element d { empty }
+
+uri = element uri {
+  # uri can have either an URI in the body text or a link attribute
+  xsd:anyURI
+  | (attribute link { text }, inline)
+}

diff --git a/devbook.rng b/devbook.rng
new file mode 100644
index 0000000..660e4d2
--- /dev/null
+++ b/devbook.rng
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Auto-generated from devbook.rnc; do not edit! -->
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    Copyright 2022 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
+  -->
+  <define name="block.class">
+    <choice>
+      <ref name="p"/>
+      <ref name="pre"/>
+      <ref name="codesample"/>
+      <ref name="note"/>
+      <ref name="important"/>
+      <ref name="warning"/>
+      <ref name="todo"/>
+      <ref name="figure"/>
+      <ref name="table"/>
+      <ref name="ul"/>
+      <ref name="ol"/>
+      <ref name="dl"/>
+    </choice>
+  </define>
+  <define name="attrib.class">
+    <choice>
+      <text/>
+      <ref name="b"/>
+      <ref name="c"/>
+      <ref name="e"/>
+    </choice>
+  </define>
+  <define name="inline.class">
+    <choice>
+      <ref name="attrib.class"/>
+      <ref name="d"/>
+      <ref name="uri"/>
+    </choice>
+  </define>
+  <define name="attrib">
+    <zeroOrMore>
+      <ref name="attrib.class"/>
+    </zeroOrMore>
+  </define>
+  <define name="inline">
+    <zeroOrMore>
+      <ref name="inline.class"/>
+    </zeroOrMore>
+  </define>
+  <define name="all">
+    <zeroOrMore>
+      <choice>
+        <ref name="block.class"/>
+        <ref name="inline.class"/>
+      </choice>
+    </zeroOrMore>
+  </define>
+  <start>
+    <ref name="guide"/>
+  </start>
+  <define name="guide">
+    <element name="guide">
+      <choice>
+        <attribute name="root">
+          <value>true</value>
+        </attribute>
+        <attribute name="self"/>
+      </choice>
+      <ref name="chapter"/>
+      <zeroOrMore>
+        <ref name="include"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="include">
+    <element name="include">
+      <attribute name="href"/>
+    </element>
+  </define>
+  <define name="chapter">
+    <element name="chapter">
+      <ref name="title"/>
+      <choice>
+        <ref name="body"/>
+        <ref name="section"/>
+      </choice>
+      <zeroOrMore>
+        <ref name="section"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="section">
+    <element name="section">
+      <ref name="title"/>
+      <choice>
+        <ref name="body"/>
+        <ref name="subsection"/>
+      </choice>
+      <zeroOrMore>
+        <ref name="subsection"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="subsection">
+    <element name="subsection">
+      <ref name="title"/>
+      <choice>
+        <ref name="body"/>
+        <ref name="subsubsection"/>
+      </choice>
+      <zeroOrMore>
+        <ref name="subsubsection"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="subsubsection">
+    <element name="subsubsection">
+      <ref name="title"/>
+      <ref name="body"/>
+    </element>
+  </define>
+  <!-- Title texts are used as anchors, so allow only text attributes -->
+  <define name="title">
+    <element name="title">
+      <ref name="attrib"/>
+    </element>
+  </define>
+  <define name="body">
+    <element name="body">
+      <oneOrMore>
+        <choice>
+          <ref name="authors"/>
+          <ref name="contentsTree"/>
+          <ref name="block.class"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="authors">
+    <element name="authors">
+      <choice>
+        <oneOrMore>
+          <ref name="author"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="authorlist"/>
+        </oneOrMore>
+      </choice>
+    </element>
+  </define>
+  <define name="author">
+    <element name="author">
+      <attribute name="name"/>
+      <optional>
+        <attribute name="email"/>
+      </optional>
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="authorlist">
+    <element name="authorlist">
+      <attribute name="title"/>
+      <attribute name="href"/>
+    </element>
+  </define>
+  <define name="contentsTree">
+    <element name="contentsTree">
+      <optional>
+        <attribute name="maxdepth">
+          <data type="unsignedInt"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="root"/>
+      </optional>
+      <optional>
+        <attribute name="extraction"/>
+      </optional>
+    </element>
+  </define>
+  <define name="p">
+    <element name="p">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="pre">
+    <element name="pre">
+      <text/>
+    </element>
+  </define>
+  <define name="codesample">
+    <element name="codesample">
+      <attribute name="lang">
+        <choice>
+          <value>c</value>
+          <value>ebuild</value>
+          <value>make</value>
+          <value>m4</value>
+          <value>sgml</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="numbering">
+          <value>lines</value>
+        </attribute>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="note">
+    <element name="note">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="important">
+    <element name="important">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="warning">
+    <element name="warning">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="todo">
+    <element name="todo">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="figure">
+    <element name="figure">
+      <attribute name="link"/>
+      <optional>
+        <attribute name="short"/>
+      </optional>
+      <optional>
+        <attribute name="caption"/>
+      </optional>
+    </element>
+  </define>
+  <define name="table">
+    <element name="table">
+      <oneOrMore>
+        <ref name="tr"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="tr">
+    <element name="tr">
+      <oneOrMore>
+        <choice>
+          <ref name="th"/>
+          <ref name="ti"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="th">
+    <element name="th">
+      <optional>
+        <attribute name="colspan">
+          <data type="unsignedInt"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rowspan">
+          <data type="unsignedInt"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="align">
+          <choice>
+            <value>left</value>
+            <value>center</value>
+            <value>right</value>
+          </choice>
+        </attribute>
+      </optional>
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="ti">
+    <element name="ti">
+      <optional>
+        <attribute name="colspan">
+          <data type="unsignedInt"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rowspan">
+          <data type="unsignedInt"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="nowrap">
+          <value>nowrap</value>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="align">
+          <choice>
+            <value>left</value>
+            <value>center</value>
+            <value>right</value>
+          </choice>
+        </attribute>
+      </optional>
+      <ref name="all"/>
+    </element>
+  </define>
+  <define name="ul">
+    <element name="ul">
+      <optional>
+        <attribute name="class">
+          <value>list-group</value>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="li"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="ol">
+    <element name="ol">
+      <oneOrMore>
+        <ref name="li"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="li">
+    <element name="li">
+      <ref name="all"/>
+    </element>
+  </define>
+  <define name="dl">
+    <element name="dl">
+      <oneOrMore>
+        <choice>
+          <ref name="dt"/>
+          <ref name="dd"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="dt">
+    <element name="dt">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="dd">
+    <element name="dd">
+      <ref name="all"/>
+    </element>
+  </define>
+  <define name="b">
+    <element name="b">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="c">
+    <element name="c">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="e">
+    <element name="e">
+      <ref name="inline"/>
+    </element>
+  </define>
+  <define name="d">
+    <element name="d">
+      <empty/>
+    </element>
+  </define>
+  <define name="uri">
+    <element name="uri">
+      <choice>
+        <!-- uri can have either an URI in the body text or a link attribute -->
+        <data type="anyURI"/>
+        <group>
+          <attribute name="link"/>
+          <ref name="inline"/>
+        </group>
+      </choice>
+    </element>
+  </define>
+</grammar>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     d925226a528dc974b765a41d20da937b97342ea6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 18:12:49 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 17:17:31 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d925226a

devbook.xsl: Eclass documentation needs GPL-2 in the footer

Eclasses are licensed GPL-2, therefore we need a different footer.
Hardcode this for all sub-pages of eclass-reference/.

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

 devbook.xsl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 9a254a7..1aebead 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -665,7 +665,15 @@
               <small>
                 Gentoo is a trademark of the Gentoo Foundation, Inc.
                 The text of this document is distributed under the
-                <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+                <xsl:choose>
+                  <!-- Eclasses are GPL-2, so we need a different footer -->
+                  <xsl:when test="starts-with(/guide/@self, 'eclass-reference/') and $relative_path_depth &gt;= 2">
+                    <a href="https://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License, version 2</a>.
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+                  </xsl:otherwise>
+                </xsl:choose>
                 The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
               </small>
             </div>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a73177f5f4a0b374bc380ffe391ef100e5cc01d5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 07:59:31 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 07:59:31 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a73177f5

devbook.rnc: Typo

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

 devbook.rnc | 2 +-
 devbook.rng | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.rnc b/devbook.rnc
index 4ca931d..9fe44b8 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -107,7 +107,7 @@ e = element e { inline }
 d = element d { empty }
 
 uri = element uri {
-  # uri can have either an URI in the body text or a link attribute
+  # uri can have either a URI in the body text or a link attribute
   xsd:anyURI
   | (attribute link { text }, inline)
 }

diff --git a/devbook.rng b/devbook.rng
index 660e4d2..cfca2b4 100644
--- a/devbook.rng
+++ b/devbook.rng
@@ -379,7 +379,7 @@
   <define name="uri">
     <element name="uri">
       <choice>
-        <!-- uri can have either an URI in the body text or a link attribute -->
+        <!-- uri can have either a URI in the body text or a link attribute -->
         <data type="anyURI"/>
         <group>
           <attribute name="link"/>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     eda597ec2ea071efc14af5c929e8c2a842d90509
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 14:34:53 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 14:34:53 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=eda597ec

devbook.xsl: Fix whitespace in <note> and friends

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

 devbook.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1aebead..f5b3e72 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -223,28 +223,28 @@
 
 <xsl:template match="note">
   <div class="alert alert-info" role="alert">
-    <strong>Note:</strong>
+    <strong>Note:</strong><xsl:text> </xsl:text>
     <xsl:apply-templates/>
   </div>
 </xsl:template>
 
 <xsl:template match="important">
   <div class="alert alert-warning" role="alert">
-    <strong>Important:</strong>
+    <strong>Important:</strong><xsl:text> </xsl:text>
     <xsl:apply-templates/>
   </div>
 </xsl:template>
 
 <xsl:template match="warning">
   <div class="alert alert-danger" role="alert">
-    <strong>Warning:</strong>
+    <strong>Warning:</strong><xsl:text> </xsl:text>
     <xsl:apply-templates/>
   </div>
 </xsl:template>
 
 <xsl:template match="todo">
   <div class="alert alert-info" role="alert">
-    <strong>Todo:</strong>
+    <strong>Todo:</strong><xsl:text> </xsl:text>
     <xsl:apply-templates/>
   </div>
 </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     10ce33173671f338b608d5cd5079a24d003f656e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 10:49:50 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 10:49:50 2022 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=10ce3317

Makefile: Dependencies for todo-list

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

 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index cbb31e7..054b720 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,8 @@ eclass-reference/text.xml:
 	@echo "Creating a placeholder index as fallback." >&2
 	bin/gen-eclass-html.sh -n
 
+appendices/todo-list/index.html: $(XMLS)
+
 # Each HTML file must depend on its XML file with all its descendants
 # (for the contents tree), all its ancestors (for breadcrumbs), and
 # the previous and next documents (for backward and forward links).

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     1fa2d305931d6e1593ff5120c427ae05fbf7bf08
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 20:42:42 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 20:42:42 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1fa2d305

devbook.xsl: Whitespace

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

 devbook.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index d998710..e06d6e0 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -658,9 +658,9 @@
                   <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
                   <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
                 </ul>
-		<div class="text-center">
-		  <a href="https://wiki.gentoo.org/wiki/Foundation:Privacy_Policy">Privacy Policy</a>
-		</div>
+                <div class="text-center">
+                  <a href="https://wiki.gentoo.org/wiki/Foundation:Privacy_Policy">Privacy Policy</a>
+                </div>
               </xsl:if>
             </div>
             <div class="col-xs-10 col-sm-9 col-md-10">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5fb4841a76b2dcfc5ec0e464f6aec698eb21a5ac
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 16:27:05 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 08:53:33 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5fb4841a

devbook.xsl: Support type and start attributes for ordered lists

Simply copy them to the HTML output.

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

 devbook.rnc | 14 +++++++++++---
 devbook.rng | 13 ++++++++++++-
 devbook.xsl |  7 ++++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/devbook.rnc b/devbook.rnc
index 9fe44b8..158f372 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the MIT license
 # or the CC-BY-SA-4.0 license (dual-licensed)
 
@@ -93,8 +93,16 @@ ti = element ti {
   all
 }
 
-ul = element ul { attribute class { "list-group" }?, li+ }
-ol = element ol { li+ }
+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)+ }

diff --git a/devbook.rng b/devbook.rng
index cfca2b4..c3c616f 100644
--- a/devbook.rng
+++ b/devbook.rng
@@ -2,7 +2,7 @@
 <!-- Auto-generated from devbook.rnc; do not edit! -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
-    Copyright 2022 Gentoo Authors
+    Copyright 2022-2023 Gentoo Authors
     Distributed under the terms of the MIT license
     or the CC-BY-SA-4.0 license (dual-licensed)
   -->
@@ -326,6 +326,17 @@
   </define>
   <define name="ol">
     <element name="ol">
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>1</value>
+            <value>A</value>
+            <value>a</value>
+            <value>I</value>
+            <value>i</value>
+          </choice>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

diff --git a/devbook.xsl b/devbook.xsl
index 9289eab..426b2fd 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -186,7 +186,12 @@
 </xsl:template>
 
 <xsl:template match="ol">
-  <ol><xsl:apply-templates/></ol>
+  <ol>
+    <xsl:if test="@type">
+      <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </ol>
 </xsl:template>
 
 <xsl:template match="ul">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     4ad0fdff94a8e51fa2be94eff28357d962c8063a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 08:39:05 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:35:52 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4ad0fdff

devbook.xsl: Work around a bug in tidy

tidy reports spurious warnings due to a bug in version tidy-html5-5.8.0:
https://github.com/htacg/tidy-html5/issues/1012

line 128 column 1 - Warning: <ol> attribute "type" not allowed for HTML5

Work around it by using "ol style" instead of "ol type".

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

 devbook.xsl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 426b2fd..f4ecc3e 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -188,7 +188,17 @@
 <xsl:template match="ol">
   <ol>
     <xsl:if test="@type">
-      <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
+      <xsl:attribute name="style">
+        <xsl:text>list-style-type:</xsl:text>
+        <xsl:choose>
+          <xsl:when test="@type = '1'">decimal</xsl:when>
+          <xsl:when test="@type = 'A'">upper-alpha</xsl:when>
+          <xsl:when test="@type = 'a'">lower-alpha</xsl:when>
+          <xsl:when test="@type = 'I'">upper-roman</xsl:when>
+          <xsl:when test="@type = 'i'">lower-roman</xsl:when>
+          <xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
     </xsl:if>
     <xsl:apply-templates/>
   </ol>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     cfb9ec62837857402c691a7c3ff096a9bb89dbbb
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 09:38:42 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 16:18:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=cfb9ec62

devbook.xsl: Rewrite the uri template

Create relative links with correct depth. Assign some variables,
instead of computing things multiple times. Simplify.

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

 devbook.xsl | 132 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 71 insertions(+), 61 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index f4ecc3e..1d101c1 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -290,30 +290,60 @@
   <xsl:value-of select="translate($lcdata, translate($lcdata, $allowed, ''), '')"/>
 </xsl:template>
 
+<xsl:template name="relative-path">
+  <xsl:param name="path"/>
+  <xsl:param name="self"/>
+  <xsl:choose>
+    <xsl:when test="$path = '' or $self = '' or substring-before($path, '/') != substring-before($self, '/')">
+      <xsl:call-template name="str:repeatString">
+        <xsl:with-param name="count" select="string-length($self) - string-length(translate($self, '/', ''))"/>
+        <xsl:with-param name="append">../</xsl:with-param>
+      </xsl:call-template>
+      <xsl:value-of select="$path"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="relative-path">
+        <xsl:with-param name="path" select="substring-after($path, '/')"/>
+        <xsl:with-param name="self" select="substring-after($self, '/')"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 <xsl:template match="uri">
   <xsl:param name="class" />
   <xsl:choose>
+    <!-- Intra-document reference -->
     <xsl:when test="starts-with(@link, '::')">
-      <!-- Ideally we would work out how many levels to nest down to save
-           a few bytes but going down to root level works just as well
-           (and is faster). -->
-      <xsl:variable name="relative_path_depth"
-                    select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
-      <xsl:variable name="relative_path_depth_recursion">
-        <xsl:call-template name="str:repeatString">
-          <xsl:with-param name="count" select="$relative_path_depth"/>
-          <xsl:with-param name="append">../</xsl:with-param>
+      <xsl:variable name="link_address">
+        <xsl:choose>
+          <xsl:when test="contains(@link, '#')">
+            <xsl:value-of select="substring-before(@link, '#')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="@link"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="path">
+        <xsl:value-of select="substring-after($link_address, '::')"/>
+        <xsl:if test="substring($link_address, string-length($link_address)) != '/'">/</xsl:if>
+      </xsl:variable>
+      <xsl:variable name="path_rel">
+        <xsl:call-template name="relative-path">
+          <xsl:with-param name="path" select="$path"/>
+          <xsl:with-param name="self" select="/guide/@self"/>
         </xsl:call-template>
       </xsl:variable>
+      <xsl:variable name="path_html">
+        <!-- Omit index.html if referencing an anchor in the same file. -->
+        <xsl:if test="$path_rel != ''">
+          <xsl:value-of select="concat($path_rel, 'index.html')"/>
+        </xsl:if>
+      </xsl:variable>
       <xsl:choose>
         <xsl:when test="contains(@link, '##')">
-          <xsl:variable name="slash">
-            <xsl:if test="substring(substring-before(@link, '##'),
-                          string-length(substring-before(@link, '##'))) != '/'">/</xsl:if>
-          </xsl:variable>
-          <a class="{$class}"
-             href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'),
-                   $slash, 'index.html#', substring-after(@link, '##'))}">
+          <a class="{$class}" href="{concat($path_html, '#', substring-after(@link, '##'))}">
             <xsl:value-of select="."/>
           </a>
         </xsl:when>
@@ -323,62 +353,42 @@
               <xsl:with-param name="data" select="substring-after(@link, '#')"/>
             </xsl:call-template>
           </xsl:variable>
-          <xsl:variable name="slash">
-            <xsl:if test="substring(substring-before(@link, '#'),
-                          string-length(substring-before(@link, '#'))) != '/'">/</xsl:if>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test=". != ''">
-              <a class="{$class}"
-                 href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'),
-                       $slash, 'index.html#', $anchor)}">
+          <a class="{$class}" href="{concat($path_html, '#', $anchor)}">
+            <xsl:choose>
+              <xsl:when test=". != ''">
                 <xsl:value-of select="."/>
-              </a>
-            </xsl:when>
-            <xsl:otherwise>
-              <a class="{$class}"
-                 href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '#'), '::'),
-                       $slash, 'index.html#', $anchor)}">
+              </xsl:when>
+              <xsl:otherwise>
                 <xsl:value-of select="substring-after(@link, '#')"/>
-              </a>
-            </xsl:otherwise>
-          </xsl:choose>
+              </xsl:otherwise>
+            </xsl:choose>
+          </a>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:variable name="slash">
-            <xsl:if test="substring(@link, string-length(@link)) != '/'">/</xsl:if>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test=". != ''">
-              <a class="{$class}"
-                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
+          <a class="{$class}" href="{$path_html}">
+            <xsl:choose>
+              <xsl:when test=". != ''">
                 <xsl:value-of select="."/>
-              </a>
-            </xsl:when>
-            <xsl:when test="starts-with(@link, '::eclass-reference/')
-                            and substring-after(@link, '::eclass-reference/') != ''">
-              <!-- Eclass reference pages are generated with man2html,
-                   so there isn't any text.xml that could be loaded.
-                   Use the name of the eclass as link text. #442194 -->
-              <a class="{$class}"
-                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
-                <xsl:value-of select="substring-before(concat(substring-after(@link, '::eclass-reference/'), $slash), '/')"/>
-              </a>
-            </xsl:when>
-            <xsl:otherwise>
-              <a class="{$class}"
-                 href="{concat($relative_path_depth_recursion, substring-after(@link, '::'), $slash, 'index.html')}">
-                <xsl:value-of select="document(concat(/guide/@self, $relative_path_depth_recursion,
-                                      substring-after(@link, '::'), '/text.xml'))/guide/chapter[1]/title"/>
-              </a>
-            </xsl:otherwise>
-          </xsl:choose>
+              </xsl:when>
+              <xsl:when test="starts-with($path, 'eclass-reference/') and substring-after($path, '/') != ''">
+                <!-- Eclass reference pages are generated with man2html,
+                     so there isn't any text.xml that could be loaded.
+                     Use the name of the eclass as link text. #442194 -->
+                <xsl:value-of select="substring-before(substring-after($path, '/'), '/')"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="document(concat($path, 'text.xml'))/guide/chapter[1]/title"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </a>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
+    <!-- External reference, URI in link attribute -->
     <xsl:when test="@link">
       <a class="{$class}" href="{@link}"><xsl:value-of select="."/></a>
     </xsl:when>
+    <!-- External reference, URI in body text -->
     <xsl:when test="contains(., '://')">
       <a class="{$class}" href="{.}"><xsl:value-of select="."/></a>
     </xsl:when>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     f2344f0b4e71e4b8c4aded22f47716bdeec35d0c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 20:49:00 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 16:18:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f2344f0b

devbook.xsl: Drop unused class parameter from uri template

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

 devbook.xsl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 1d101c1..8e4f3ec 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -311,7 +311,6 @@
 </xsl:template>
 
 <xsl:template match="uri">
-  <xsl:param name="class" />
   <xsl:choose>
     <!-- Intra-document reference -->
     <xsl:when test="starts-with(@link, '::')">
@@ -343,7 +342,7 @@
       </xsl:variable>
       <xsl:choose>
         <xsl:when test="contains(@link, '##')">
-          <a class="{$class}" href="{concat($path_html, '#', substring-after(@link, '##'))}">
+          <a href="{concat($path_html, '#', substring-after(@link, '##'))}">
             <xsl:value-of select="."/>
           </a>
         </xsl:when>
@@ -353,7 +352,7 @@
               <xsl:with-param name="data" select="substring-after(@link, '#')"/>
             </xsl:call-template>
           </xsl:variable>
-          <a class="{$class}" href="{concat($path_html, '#', $anchor)}">
+          <a href="{concat($path_html, '#', $anchor)}">
             <xsl:choose>
               <xsl:when test=". != ''">
                 <xsl:value-of select="."/>
@@ -365,7 +364,7 @@
           </a>
         </xsl:when>
         <xsl:otherwise>
-          <a class="{$class}" href="{$path_html}">
+          <a href="{$path_html}">
             <xsl:choose>
               <xsl:when test=". != ''">
                 <xsl:value-of select="."/>
@@ -386,15 +385,15 @@
     </xsl:when>
     <!-- External reference, URI in link attribute -->
     <xsl:when test="@link">
-      <a class="{$class}" href="{@link}"><xsl:value-of select="."/></a>
+      <a href="{@link}"><xsl:value-of select="."/></a>
     </xsl:when>
     <!-- External reference, URI in body text -->
     <xsl:when test="contains(., '://')">
-      <a class="{$class}" href="{.}"><xsl:value-of select="."/></a>
+      <a href="{.}"><xsl:value-of select="."/></a>
     </xsl:when>
     <xsl:otherwise>
       <xsl:message>Error: No link target (<xsl:value-of select="."/>)</xsl:message>
-      <a class="{$class}"><xsl:value-of select="."/></a>
+      <a><xsl:value-of select="."/></a>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     2334b4afc798d104d80fc51a66997c94d83e779e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 10:19:42 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 16:21:14 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=2334b4af

devbook.xsl: Warn about missing terminating slash in internal links

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

 devbook.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 8e4f3ec..8d4e1df 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -326,7 +326,10 @@
       </xsl:variable>
       <xsl:variable name="path">
         <xsl:value-of select="substring-after($link_address, '::')"/>
-        <xsl:if test="substring($link_address, string-length($link_address)) != '/'">/</xsl:if>
+        <xsl:if test="substring($link_address, string-length($link_address)) != '/'">
+          <xsl:message>Warning: No terminating slash in link (<xsl:value-of select="@link"/>)</xsl:message>
+          <xsl:text>/</xsl:text>
+        </xsl:if>
       </xsl:variable>
       <xsl:variable name="path_rel">
         <xsl:call-template name="relative-path">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     75aab18b528a3b76355da6fc6b36e4c6635375b8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 16:13:38 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 20:01:56 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=75aab18b

devbook.xsl: Update the findNext template for relative links

Create relative links with correct depth. Some other simplifications.

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

 devbook.xsl | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 8d4e1df..668fa01 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -774,28 +774,16 @@
         <!-- If we have an item after us, or we are at the root node
              (termination condition) we need to not recurse any further... -->
         <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
-          <xsl:variable name="parentItem_actual">
-            <xsl:choose>
-              <xsl:when test="$parentItem_next = ''"></xsl:when>
-              <xsl:otherwise><xsl:value-of select="$parentItem_next"/></xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          <!-- This is where we do a little trickery. To count how many levels
-               we need to go down, we count how far up we currently are
-               (remember that the absolute link we get is relative to /...)
-               and hence we can build a relative link... -->
-          <xsl:variable name="relative_path" select="$parentItem_actual"/>
-          <xsl:variable name="relative_path_depth"
-                        select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
-          <xsl:variable name="relative_path_depth_recursion">
-            <xsl:call-template name="str:repeatString">
-              <xsl:with-param name="count" select="$relative_path_depth"/>
-              <xsl:with-param name="append">../</xsl:with-param>
+          <!-- Compute a relative path for the link. -->
+          <xsl:variable name="path_rel">
+            <xsl:call-template name="relative-path">
+              <xsl:with-param name="path" select="$parentItem_next"/>
+              <xsl:with-param name="self" select="/guide/@self"/>
             </xsl:call-template>
           </xsl:variable>
-          <a class="w-250 text-center" href="{concat($relative_path_depth_recursion, $relative_path, 'index.html')}">
+          <a class="w-250 text-center" href="{concat($path_rel, 'index.html')}">
             <span class="truncated-text d-inline-block max-w-200 mr-2">
-              <xsl:value-of select="document(concat($parentItem_actual, 'text.xml'))/guide/chapter[1]/title"/>
+              <xsl:value-of select="document(concat($parentItem_next, 'text.xml'))/guide/chapter[1]/title"/>
             </span>
             <span class="fa fa-arrow-right"/>
           </a>
@@ -803,11 +791,9 @@
         <xsl:otherwise>
           <!-- We need to recurse downwards; so we need to strip off a directory
                element off our absolute path to feed into the next iteration... -->
-          <xsl:variable name="relative_path_depth"
-                        select="string-length($self) - string-length(translate($self, '/' , ''))"/>
           <xsl:variable name="relative_path_fixed">
-            <xsl:for-each select="str:tokenize_plasmaroo($self, '/')[position() &lt; (($relative_path_depth - 1)*2 + 1)]">
-              <xsl:value-of select="."/>
+            <xsl:for-each select="str:tokenize($self, '/')[position() &lt; last()]">
+              <xsl:value-of select="concat(., '/')"/>
             </xsl:for-each>
           </xsl:variable>
           <xsl:call-template name="findNext">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a1d3905fbbdae968ec4e99ede58a9d24f7e79c2e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 16:18:01 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 20:01:56 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a1d3905f

devbook.xsl: Replace str:repeatString by a non-recursive version

Also rename the template to repeat-string, i.e. move it out of the
str namespace.

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

 devbook.xsl | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 668fa01..ce617d3 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -290,12 +290,18 @@
   <xsl:value-of select="translate($lcdata, translate($lcdata, $allowed, ''), '')"/>
 </xsl:template>
 
+<xsl:template name="repeat-string">
+  <xsl:param name="count"/>
+  <xsl:param name="append"/>
+  <xsl:value-of select="str:padding($count * string-length($append), $append)"/>
+</xsl:template>
+
 <xsl:template name="relative-path">
   <xsl:param name="path"/>
   <xsl:param name="self"/>
   <xsl:choose>
     <xsl:when test="$path = '' or $self = '' or substring-before($path, '/') != substring-before($self, '/')">
-      <xsl:call-template name="str:repeatString">
+      <xsl:call-template name="repeat-string">
         <xsl:with-param name="count" select="string-length($self) - string-length(translate($self, '/', ''))"/>
         <xsl:with-param name="append">../</xsl:with-param>
       </xsl:call-template>
@@ -418,7 +424,7 @@
   </xsl:param>
   <xsl:param name="path_rel">
     <xsl:if test="$depth = 0 and $path = '' and /guide/@self != ''">
-      <xsl:call-template name="str:repeatString">
+      <xsl:call-template name="repeat-string">
         <xsl:with-param name="count"
                         select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
         <xsl:with-param name="append">../</xsl:with-param>
@@ -495,7 +501,7 @@
   <xsl:variable name="relative_path_depth"
                 select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
   <xsl:variable name="relative_path_depth_recursion">
-    <xsl:call-template name="str:repeatString">
+    <xsl:call-template name="repeat-string">
       <xsl:with-param name="count" select="$relative_path_depth"/>
       <xsl:with-param name="append">../</xsl:with-param>
     </xsl:call-template>
@@ -721,24 +727,6 @@
   </html>
 </xsl:template>
 
-<xsl:template name="str:repeatString">
-  <xsl:param name="string"/>
-  <xsl:param name="count"/>
-  <xsl:param name="append"/>
-  <xsl:choose>
-    <xsl:when test="$count != 0">
-      <xsl:call-template name="str:repeatString">
-        <xsl:with-param name="string" select="concat($string, $append)"/>
-        <xsl:with-param name="count" select="$count - 1"/>
-        <xsl:with-param name="append" select="$append"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
 <xsl:template name="findNext">
   <xsl:param name="self" select="/guide/@self"/>
   <xsl:choose>
@@ -884,7 +872,7 @@
   <xsl:choose>
     <xsl:when test="$depth &gt; 0">
       <xsl:variable name="relative_path_depth_recursion">
-        <xsl:call-template name="str:repeatString">
+        <xsl:call-template name="repeat-string">
           <xsl:with-param name="count" select="$depth"/>
           <xsl:with-param name="append">../</xsl:with-param>
         </xsl:call-template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     0982277a5ef77bbb91a8c7ef43150c36f78a9a24
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:03:25 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 17:03:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0982277a

devbook.xsl: Use hexadecimal for character entities

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

 devbook.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ce617d3..fe9c496 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -269,7 +269,7 @@
 </xsl:template>
 
 <xsl:template match="d">
-  <xsl:text>&#8212;</xsl:text>
+  <xsl:text>&#x2014;</xsl:text> <!-- em dash -->
 </xsl:template>
 
 <xsl:template match="e">
@@ -587,10 +587,10 @@
                   <div class="collapse navbar-collapse navbar-main-collapse">
                     <ul class="nav navbar-nav">
                       <li>
-                        <a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#160;Home</a>
+                        <a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#xa0;Home</a>
                       </li>
                       <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#160;<span class="caret"></span></a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#xa0;<span class="caret"></span></a>
                         <xsl:if test="/guide/chapter[1]/section or //contentsTree">
                           <ul class="dropdown-menu">
                             <!-- List sections of this chapter first. -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     bc2e4a7c7f83310ff46f1cf489fea0249ef63137
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 17:45:02 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 17:03:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bc2e4a7c

depend.xsl: Canonicalise output paths

Convert to absolute paths in XSLT, so postprocessing with sed is
no longer needed.

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

 Makefile   |  2 +-
 depend.xsl | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 89874ae..e75cbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ appendices/todo-list/index.html: $(XMLS)
 # Generate the list of dependencies with XSLT, which appears to be a
 # better tool for this than make.
 .depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
-	@xsltproc depend.xsl $(XMLS) | sed ':x;s%[^ /]*/\.\./%%;tx' > $@
+	@xsltproc depend.xsl $(XMLS) > $@
 
 install: all
 	set -e; \

diff --git a/depend.xsl b/depend.xsl
index abb139a..15c5e15 100644
--- a/depend.xsl
+++ b/depend.xsl
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+  xmlns:str="http://exslt.org/strings"
   xmlns:exslt="http://exslt.org/common"
-  extension-element-prefixes="exslt xsl"
-  exclude-result-prefixes="exslt xsl">
+  extension-element-prefixes="str exslt xsl"
+  exclude-result-prefixes="str exslt xsl">
 
 <xsl:import href="devbook.xsl"/>
 <xsl:output method="text"/>
@@ -20,12 +21,18 @@
   <xsl:variable name="self" select="/guide/@self"/>
   <xsl:value-of select="concat($self, 'index.html:')"/>
   <xsl:for-each select="exslt:node-set($refs)//a/@href[. != '#']">
-    <!-- At this point, the path can contain ".." components and
-         should be canonicalised, but string processing in XPath 1.0
-         sucks (no pattern matching!). It is easier to pipe the output
-         through sed instead. -->
-    <xsl:value-of select="concat(' ', $self,
-        substring-before(., 'index.html'), 'text.xml')"/>
+    <xsl:text> </xsl:text>
+    <xsl:variable name="path" select="substring-before(., 'index.html')"/>
+    <!-- At this point, $path can start with zero or more ".." components
+         and is relative to $self. Convert it to an absolute path. -->
+    <xsl:variable name="up" select="count(str:tokenize($path, '/')[. = '..'])"/>
+    <xsl:for-each select="str:tokenize($self, '/')[position() &lt;= last() - $up]">
+      <xsl:value-of select="concat(., '/')"/>
+    </xsl:for-each>
+    <xsl:for-each select="str:tokenize($path, '/')[position() &gt; $up]">
+      <xsl:value-of select="concat(., '/')"/>
+    </xsl:for-each>
+    <xsl:text>text.xml</xsl:text>
   </xsl:for-each>
   <xsl:value-of select="$newline"/>
 </xsl:template>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     bcca132de057cf520806200b1bcb925b955b0966
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 20:24:06 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 17:04:12 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bcca132d

devbook.xsl: Fix links created by contentsTree extraction

If the element that is extracted from the external document contains
internal references, these links would be relative to the wrong start
location, namely the one defined in that document. Therefore, define
our own copy of /guide/@self (pointing to the location of the target
document), and rebase the tree onto it.

This fixes the intra-document links in appendices/todo-list/.

Closes: https://bugs.gentoo.org/916523
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index fe9c496..626b97d 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -431,6 +431,7 @@
       </xsl:call-template>
     </xsl:if>
   </xsl:param>
+  <xsl:param name="orig_self" select="/guide/@self"/>
   <xsl:param name="extraction" select="@extraction"/>
   <xsl:param name="extraction_counting"/>
 
@@ -446,6 +447,7 @@
               <xsl:with-param name="maxdepth" select="$maxdepth"/>
               <xsl:with-param name="path" select="concat($path, @href)"/>
               <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+              <xsl:with-param name="orig_self" select="$orig_self"/>
               <xsl:with-param name="extraction" select="$extraction"/>
               <xsl:with-param name="extraction_counting" select="1"/>
             </xsl:call-template>
@@ -461,6 +463,7 @@
                 <xsl:with-param name="maxdepth" select="$maxdepth"/>
                 <xsl:with-param name="path" select="concat($path, @href)"/>
                 <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+                <xsl:with-param name="orig_self" select="$orig_self"/>
                 <xsl:with-param name="extraction" select="$extraction"/>
                 <xsl:with-param name="extraction_counting" select="1"/>
               </xsl:call-template>
@@ -474,10 +477,18 @@
                   <xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/>
                 </a>
                 <xsl:if test="$extraction != ''">
+                  <!-- If the extracted element from the other document contains
+                       any internal references, relative links would be based on
+                       the wrong start location. So we must replace /guide/@self
+                       by our own copy. Bug #916523. -->
+                  <xsl:variable name="document_tree">
+                    <guide self="{$orig_self}">
+                      <xsl:copy-of select="document(concat($path, @href, 'text.xml'))/guide/*"/>
+                    </guide>
+                  </xsl:variable>
                   <ul>
-                    <xsl:for-each select="document(concat($path, @href, 'text.xml'))//*[name()=$extraction]">
-                      <xsl:variable name="extraction_id" select="position()"/>
-                      <li><xsl:apply-templates select="(//*[name()=$extraction])[position()=$extraction_id]"/></li>
+                    <xsl:for-each select="exslt:node-set($document_tree)//*[name()=$extraction]">
+                      <li><xsl:apply-templates select="."/></li>
                     </xsl:for-each>
                   </ul>
                 </xsl:if>
@@ -486,6 +497,7 @@
                   <xsl:with-param name="maxdepth" select="$maxdepth"/>
                   <xsl:with-param name="path" select="concat($path, @href)"/>
                   <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
+                  <xsl:with-param name="orig_self" select="$orig_self"/>
                   <xsl:with-param name="extraction" select="$extraction"/>
                 </xsl:call-template>
               </li>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     bbe65af778d3201e21f0129b0864008164578e99
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:14:38 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 16:43:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bbe65af7

devbook.xsl: Manipulate paths in getLastNode consistently

Directory paths are used everywhere else, so append text.xml only when
actually accessing the file.

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

 devbook.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 626b97d..b50ecc5 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -809,12 +809,12 @@
   <!-- This function recurses forward down nodes stopping at the very last include... -->
   <xsl:param name="root"/>
   <xsl:param name="path"/>
-  <xsl:variable name="include" select="document(concat($root, $path))/guide/include[last()]/@href"/>
+  <xsl:variable name="include" select="document(concat($root, $path, 'text.xml'))/guide/include[last()]/@href"/>
   <xsl:choose>
     <xsl:when test="$include">
       <xsl:call-template name="getLastNode">
         <xsl:with-param name="root" select="$root"/>
-        <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
+        <xsl:with-param name="path" select="concat($path, $include)"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
@@ -854,15 +854,15 @@
           <xsl:variable name="myItem_path">
             <xsl:call-template name="getLastNode">
               <xsl:with-param name="root" select="$parentItem_path"/>
-              <xsl:with-param name="path" select="concat($parentItem_next, 'text.xml')"/>
+              <xsl:with-param name="path" select="$parentItem_next"/>
             </xsl:call-template>
           </xsl:variable>
           <!-- Make a relative <a> link; we need an absolute reference
                for the XSLT processor though... -->
-          <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">
+          <a class="w-250 text-center" href="{concat('../', $myItem_path, 'index.html')}">
             <span class="fa fa-arrow-left"/>
             <span class="truncated-text d-inline-block max-w-200 ml-2">
-              <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/>
+              <xsl:value-of select="document(concat($parentItem_path, $myItem_path, 'text.xml'))/guide/chapter[1]/title"/>
             </span>
           </a>
         </xsl:when>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     4282d691001af8b08765a71f50ddb7e32a93f8a4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 17:20:50 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 17:20:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4282d691

devbook.xsl: Use same test for eclass pages everywhere

Drop relative_path_depth variable which is no longer used.

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

 devbook.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index b50ecc5..322e267 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -510,11 +510,10 @@
 </xsl:template>
 
 <xsl:template match="/">
-  <xsl:variable name="relative_path_depth"
-                select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
   <xsl:variable name="relative_path_depth_recursion">
     <xsl:call-template name="repeat-string">
-      <xsl:with-param name="count" select="$relative_path_depth"/>
+      <xsl:with-param name="count" select="string-length(/guide/@self)
+                                           - string-length(translate(/guide/@self, '/' , ''))"/>
       <xsl:with-param name="append">../</xsl:with-param>
     </xsl:call-template>
   </xsl:variable>
@@ -715,7 +714,8 @@
                 The text of this document is distributed under the
                 <xsl:choose>
                   <!-- Eclasses are GPL-2, so we need a different footer -->
-                  <xsl:when test="starts-with(/guide/@self, 'eclass-reference/') and $relative_path_depth &gt;= 2">
+                  <xsl:when test="starts-with(/guide/@self, 'eclass-reference/')
+                                  and substring-after(/guide/@self, '/') != ''">
                     <a href="https://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License, version 2</a>.
                   </xsl:when>
                   <xsl:otherwise>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     2946a248b51498850ee7e672c13eaa85b7574eb3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 17:37:56 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 17:37:56 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=2946a248

Makefile: Drop obsolete test for xmllint --quiet

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

 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e75cbf1..1bfa86e 100644
--- a/Makefile
+++ b/Makefile
@@ -87,10 +87,8 @@ install: all
 	  install -m 644 $(JS_FILES) "$(DESTDIR)$(htmldir)"/; \
 	fi
 
-# Not all versions of xmllint support --quiet, so test for it first
 validate: devbook.rng
-	@opt=--quiet; xmllint --help 2>&1 | grep -q -- --quiet || opt=; \
-	xmllint --noout $${opt} --relaxng $< $(XMLS)
+	@xmllint --noout --quiet --relaxng $< $(XMLS)
 	@echo "xmllint validation successful"
 
 %.rng: %.rnc

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5747c058d35a947d7b8fcd4f9776c7384c2b2d4a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 07:10:39 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 07:10:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5747c058

devbook.xsl: Add Gentoo e.V. to page footer

Bug: https://bugs.gentoo.org/927555
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 6f2e4e9..91feffa 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -718,7 +718,7 @@
             <div class="col-xs-10 col-sm-9 col-md-10">
               <strong>Copyright (C) 2001-2024 Gentoo Authors</strong><br />
               <small>
-                Gentoo is a trademark of the Gentoo Foundation, Inc.
+                Gentoo is a trademark of the Gentoo Foundation, Inc. and of Förderverein Gentoo e.V.
                 The text of this document is distributed under the
                 <xsl:choose>
                   <!-- Eclasses are GPL-2, so we need a different footer -->

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     5997a5ca884c7fd97f8f54261d01a8a8e554175c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 10:33:25 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 11:55:31 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5997a5ca

.gitignore: Ignore Emacs backup files

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

 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7c45b92..0809650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 .depend
 documents.js
 eclass-reference/
+
+# Emacs backup files and locks
+*~
+.#*

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     7bbf2cfb18964e9a7cc51370b4adf06d765da817
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 17:25:18 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May  7 17:25:18 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7bbf2cfb

devbook.xsl: Use abbreviated CC-BY-SA-4.0 in footer

This agrees with the footer in other gentoo.org sites.

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

 devbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devbook.xsl b/devbook.xsl
index 91feffa..c9a1a1c 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -727,7 +727,7 @@
                     <a href="https://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License, version 2</a>.
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+                    <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA-4.0</a> license.
                   </xsl:otherwise>
                 </xsl:choose>
                 The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     daa56917313abaa5eaddf65492fc31795b1235fb
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 15:39:57 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 15:39:57 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=daa56917

devbook.xsl: Rename parameter of repeat-string template

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

 devbook.xsl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index c9a1a1c..5df9686 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -300,8 +300,8 @@
 
 <xsl:template name="repeat-string">
   <xsl:param name="count"/>
-  <xsl:param name="append"/>
-  <xsl:value-of select="str:padding($count * string-length($append), $append)"/>
+  <xsl:param name="string"/>
+  <xsl:value-of select="str:padding($count * string-length($string), $string)"/>
 </xsl:template>
 
 <xsl:template name="relative-path">
@@ -311,7 +311,7 @@
     <xsl:when test="$path = '' or $self = '' or substring-before($path, '/') != substring-before($self, '/')">
       <xsl:call-template name="repeat-string">
         <xsl:with-param name="count" select="string-length($self) - string-length(translate($self, '/', ''))"/>
-        <xsl:with-param name="append">../</xsl:with-param>
+        <xsl:with-param name="string">../</xsl:with-param>
       </xsl:call-template>
       <xsl:value-of select="$path"/>
     </xsl:when>
@@ -435,7 +435,7 @@
       <xsl:call-template name="repeat-string">
         <xsl:with-param name="count"
                         select="string-length(/guide/@self) - string-length(translate(/guide/@self, '/' , ''))"/>
-        <xsl:with-param name="append">../</xsl:with-param>
+        <xsl:with-param name="string">../</xsl:with-param>
       </xsl:call-template>
     </xsl:if>
   </xsl:param>
@@ -522,7 +522,7 @@
     <xsl:call-template name="repeat-string">
       <xsl:with-param name="count" select="string-length(/guide/@self)
                                            - string-length(translate(/guide/@self, '/' , ''))"/>
-      <xsl:with-param name="append">../</xsl:with-param>
+      <xsl:with-param name="string">../</xsl:with-param>
     </xsl:call-template>
   </xsl:variable>
   <html lang="en">
@@ -894,7 +894,7 @@
       <xsl:variable name="relative_path_depth_recursion">
         <xsl:call-template name="repeat-string">
           <xsl:with-param name="count" select="$depth"/>
-          <xsl:with-param name="append">../</xsl:with-param>
+          <xsl:with-param name="string">../</xsl:with-param>
         </xsl:call-template>
       </xsl:variable>
       <li>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     10510e60c2f5b5e3a3cc9c54d5a8d38ea6288b1a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 16:17:59 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 16:17:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=10510e60

Makefile: Check if /guide/@self agrees with the document path

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

 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index 1bfa86e..8f3014e 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,13 @@ install: all
 
 validate: devbook.rng
 	@xmllint --noout --quiet --relaxng $< $(XMLS)
+	@# Check if /guide/@self agrees with the document path
+	@for file in $(XMLS); do \
+	  self=$$(xmllint --quiet --xpath 'string(/guide/@self)' $${file}); \
+	  if test "$${self}text.xml" != "$${file#./}"; then \
+	    echo "$${file}: bad self attribute '$${self}'"; exit 1; \
+	  fi; \
+	done
 	@echo "xmllint validation successful"
 
 %.rng: %.rnc

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     238430eec3228209678c53fb8a78817cb17f7789
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 14:29:54 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 14:29:54 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=238430ee

devbook.xsl: Use self-closing tags when possible

This makes no difference for the HMTL output, i.e. xsltproc will
expand <foo/> to <foo></foo>.

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

 devbook.xsl | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 5df9686..0a3d7d8 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -559,23 +559,23 @@
                 <div class="row">
                   <div class="site-title-buttons">
                     <div class="btn-group btn-group-sm">
-                      <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong> Get Gentoo!</strong></a>
+                      <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"/> <strong> Get Gentoo!</strong></a>
                       <div class="btn-group btn-group-sm">
                         <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
-                          <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs"> gentoo.org sites </span> <span class="caret"></span>
+                          <span class="fa fa-fw fa-map-o"/> <span class="hidden-xs"> gentoo.org sites </span> <span class="caret"/>
                         </a>
                         <ul class="dropdown-menu dropdown-menu-right">
-                          <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
-                          <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
-                          <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
-                          <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
-                          <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
+                          <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"/> gentoo.org</a></li>
+                          <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"/> Wiki</a></li>
+                          <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"/> Bugs</a></li>
+                          <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"/> Forums</a></li>
+                          <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"/> Packages</a></li>
                           <li class="divider"><xsl:comment/></li>
-                          <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
-                          <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
-                          <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
+                          <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"/> Planet</a></li>
+                          <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"/> Archives</a></li>
+                          <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"/> Sources</a></li>
                           <li class="divider"><xsl:comment/></li>
-                          <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
+                          <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"/> Infra Status</a></li>
                         </ul>
                       </div>
                     </div>
@@ -598,9 +598,9 @@
                     <button type="button" class="navbar-toggle"
                             data-toggle="collapse" data-target=".navbar-main-collapse">
                       <span class="sr-only">Toggle navigation</span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
-                      <span class="icon-bar"></span>
+                      <span class="icon-bar"/>
+                      <span class="icon-bar"/>
+                      <span class="icon-bar"/>
                     </button>
                   </div>
                   <div class="collapse navbar-collapse navbar-main-collapse">
@@ -609,7 +609,7 @@
                         <a href="{$relative_path_depth_recursion}index.html"><span class="fa fa-home"/>&#xa0;Home</a>
                       </li>
                       <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#xa0;<span class="caret"></span></a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#xa0;<span class="caret"/></a>
                         <xsl:if test="/guide/chapter[1]/section or //contentsTree">
                           <ul class="dropdown-menu">
                             <!-- List sections of this chapter first. -->
@@ -622,7 +622,7 @@
                               <li><a class="reference" href="#{$anchor}"><xsl:value-of select="title"/></a></li>
                             </xsl:for-each>
                             <xsl:if test="//contentsTree">
-                              <li class="divider"></li>
+                              <li class="divider"><xsl:comment/></li>
                               <!-- List any sub-documents included at first level.
                                    We cannot call "contentsTree" directly, because it would
                                    insert another "ul" element. So, assign it to a variable,
@@ -707,8 +707,8 @@
             <div class="col-xs-2 col-sm-3 col-md-2">
               <xsl:if test="not($offline)">
                 <ul class="footerlinks three-icons">
-                  <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
-                  <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
+                  <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"/></a></li>
+                  <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"/></a></li>
                 </ul>
                 <div class="text-center">
                   <a href="https://wiki.gentoo.org/wiki/Foundation:Privacy_Policy">Privacy Policy</a>
@@ -737,11 +737,11 @@
         </div>
       </footer>
       <xsl:if test="not($offline)">
-        <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
-        <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
-        <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
+        <script src="https://assets.gentoo.org/tyrian/jquery.min.js"/>
+        <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"/>
+        <script src="https://assets.gentoo.org/lunr/lunr.min.js"/>
         <script>var documentsSrc = "<xsl:value-of select="$relative_path_depth_recursion"/>documents.js"</script>
-        <script src="{$relative_path_depth_recursion}search.js"></script>
+        <script src="{$relative_path_depth_recursion}search.js"/>
       </xsl:if>
     </body>
   </html>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     c4cb740d18964f28392c403df05b40b3d49296f8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 20:30:34 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 07:54:29 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c4cb740d

Makefile: Add distclean target

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

 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8f3014e..4fbbd90 100644
--- a/Makefile
+++ b/Makefile
@@ -125,8 +125,12 @@ dist:
 	git archive --format=tar --prefix=devmanual/ HEAD | xz > $${TARBALL}
 
 clean:
-	@rm -f $(HTMLS) $(IMAGES) documents.js .depend
+	@rm -f $(HTMLS) $(IMAGES) documents.js
 
-.PHONY: all prereq build install check validate tidy dist clean
+distclean: clean
+	@rm -f .depend
+	@rm -rf eclass-reference
+
+.PHONY: all prereq build install check validate tidy dist clean distclean
 
 -include .depend

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     448d00f8e1f8265fed716f9b5090ef6f7524d56e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 20:33:29 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 09:39:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=448d00f8

devbook.xsl: Rework templates for previous/next node

- Separate finding the node from HTML formatting.
- Determine the absolute parent path from the path of our own @self
  attribute, rather than from the parent document's @self attribute.
- Get the first node from the following-sibling or preceding-sibling
  axis directly, instead of laboriously calculating its index.

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

 devbook.xsl | 151 +++++++++++++++++++++++++-----------------------------------
 1 file changed, 62 insertions(+), 89 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 0a3d7d8..a10f5ab 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -747,7 +747,7 @@
   </html>
 </xsl:template>
 
-<xsl:template name="findNext">
+<xsl:template name="next-node">
   <xsl:param name="self" select="/guide/@self"/>
   <xsl:choose>
     <!-- To find the "next" node:
@@ -759,57 +759,29 @@
          * End at the root item if needed.
     -->
     <xsl:when test="count(/guide/include) &gt; 0">
-      <xsl:variable name="doc" select="/guide/include[1]/@href"/>
-      <a class="w-250 text-center" href="{concat($doc, 'index.html')}">
-        <span class="truncated-text d-inline-block max-w-200 mr-2">
-          <xsl:value-of select="document(concat(/guide/@self, $doc, 'text.xml'))/guide/chapter[1]/title"/>
-        </span>
-        <span class="fa fa-arrow-right"/>
-      </a>
+      <xsl:value-of select="/guide/include[1]/@href"/>
     </xsl:when>
-    <xsl:otherwise>
+    <xsl:when test="$self != ''">
       <!-- Turn the absolute path into a relative path so we can find ourselves
            in the parent -->
       <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
-      <xsl:variable name="index_self"
-                    select="count(document(concat($self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)+1"/>
+      <xsl:variable name="parent" select="substring($self, 1, string-length($self) - string-length($path_self))"/>
       <!-- Go down a parent, lookup the item after us... -->
-      <xsl:variable name="parentItem_lookup"
-                    select="document(concat($self, '../text.xml'))/guide/include[$index_self]/@href"/>
-      <xsl:variable name="parentItem_next"
-                    select="concat(document(concat($self, '../text.xml'))/guide/@self, $parentItem_lookup)"/>
+      <xsl:variable name="following" select="document(concat($parent, 'text.xml'))
+                                             /guide/include[@href=$path_self]/following-sibling::include[1]"/>
+      <xsl:text>../</xsl:text>
       <xsl:choose>
-        <!-- If we have an item after us, or we are at the root node
-             (termination condition) we need to not recurse any further... -->
-        <xsl:when test="$parentItem_lookup != '' or document(concat($self, '../text.xml'))/guide/@root">
-          <!-- Compute a relative path for the link. -->
-          <xsl:variable name="path_rel">
-            <xsl:call-template name="relative-path">
-              <xsl:with-param name="path" select="$parentItem_next"/>
-              <xsl:with-param name="self" select="/guide/@self"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <a class="w-250 text-center" href="{concat($path_rel, 'index.html')}">
-            <span class="truncated-text d-inline-block max-w-200 mr-2">
-              <xsl:value-of select="document(concat($parentItem_next, 'text.xml'))/guide/chapter[1]/title"/>
-            </span>
-            <span class="fa fa-arrow-right"/>
-          </a>
+        <!-- If we have an item after us, we need not recurse any further... -->
+        <xsl:when test="$following">
+          <xsl:value-of select="$following/@href"/>
         </xsl:when>
         <xsl:otherwise>
-          <!-- We need to recurse downwards; so we need to strip off a directory
-               element off our absolute path to feed into the next iteration... -->
-          <xsl:variable name="relative_path_fixed">
-            <xsl:for-each select="str:tokenize($self, '/')[position() &lt; last()]">
-              <xsl:value-of select="concat(., '/')"/>
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:call-template name="findNext">
-            <xsl:with-param name="self" select="$relative_path_fixed"/>
+          <xsl:call-template name="next-node">
+            <xsl:with-param name="self" select="$parent"/>
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:otherwise>
+    </xsl:when>
   </xsl:choose>
 </xsl:template>
 
@@ -831,60 +803,61 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template name="findPrevious">
-  <xsl:choose>
+<xsl:template name="previous-node">
+  <xsl:variable name="self" select="/guide/@self"/>
+  <xsl:if test="$self != ''">
     <!-- To find the "previous" node:
          * Go down to our parent
            * See if there are any nodes before us
              * If we have a valid node that is before us
              * Fully recurse up the node to get the last extremity
            * Otherwise list the parent -->
-    <xsl:when test="/guide/@root">
-      <a class="w-250 text-center" href="#">
-        <span class="fa fa-arrow-left"/>
-        <span class="truncated-text d-inline-block max-w-200 ml-2">
-          <xsl:value-of select="/guide/chapter[1]/title"/>
-        </span>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- Turn the absolute path we have into a relative path so we can find
-           ourselves in the parent -->
-      <xsl:variable name="path_self" select="concat(str:tokenize(/guide/@self, '/')[last()], '/')"/>
-      <xsl:variable name="index_self" select="count(document(concat(/guide/@self, '../text.xml'))/guide/include[@href=$path_self]/preceding-sibling::*)-1"/>
-      <xsl:choose>
-        <xsl:when test="$index_self &gt; 0">
-          <!-- Relative path of the parent -->
-          <xsl:variable name="parentItem_path" select="document(concat(/guide/@self, '../text.xml'))/guide/@self"/>
-          <!-- Previous item in the parent -->
-          <xsl:variable name="parentItem_next"
-                        select="document(concat(/guide/@self, '../text.xml'))/guide/include[$index_self]/@href"/>
-          <xsl:variable name="myItem_path">
-            <xsl:call-template name="getLastNode">
-              <xsl:with-param name="root" select="$parentItem_path"/>
-              <xsl:with-param name="path" select="$parentItem_next"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <!-- Make a relative <a> link; we need an absolute reference
-               for the XSLT processor though... -->
-          <a class="w-250 text-center" href="{concat('../', $myItem_path, 'index.html')}">
-            <span class="fa fa-arrow-left"/>
-            <span class="truncated-text d-inline-block max-w-200 ml-2">
-              <xsl:value-of select="document(concat($parentItem_path, $myItem_path, 'text.xml'))/guide/chapter[1]/title"/>
-            </span>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <a class="w-250 text-center" href="../index.html">
-            <span class="fa fa-arrow-left"/>
-            <span class="truncated-text d-inline-block max-w-200 ml-2">
-              <xsl:value-of select="document(concat(/guide/@self, '../text.xml'))/guide/chapter[1]/title"/>
-            </span>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
+    <!-- Turn the absolute path we have into a relative path so we can find
+         ourselves in the parent -->
+    <xsl:variable name="path_self" select="concat(str:tokenize($self, '/')[last()], '/')"/>
+    <xsl:variable name="parent" select="substring($self, 1, string-length($self) - string-length($path_self))"/>
+    <!-- Note that index 1 refers to the immediately preceding sibling looking
+         back from the context node, not the first sibling in document order. -->
+    <xsl:variable name="preceding" select="document(concat($parent, 'text.xml'))
+                                           /guide/include[@href=$path_self]/preceding-sibling::include[1]"/>
+    <xsl:text>../</xsl:text>
+    <xsl:if test="$preceding">
+      <xsl:call-template name="getLastNode">
+        <xsl:with-param name="root" select="$parent"/>
+        <xsl:with-param name="path" select="$preceding/@href"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="findNext">
+  <xsl:variable name="next">
+    <xsl:call-template name="next-node"/>
+  </xsl:variable>
+  <a class="w-250 text-center" href="{concat($next, 'index.html')}">
+    <span class="truncated-text d-inline-block max-w-200 mr-2">
+      <xsl:value-of select="document(concat(/guide/@self, $next, 'text.xml'))/guide/chapter[1]/title"/>
+    </span>
+    <span class="fa fa-arrow-right"/>
+  </a>
+</xsl:template>
+
+<xsl:template name="findPrevious">
+  <xsl:variable name="previous">
+    <xsl:call-template name="previous-node"/>
+  </xsl:variable>
+  <xsl:variable name="link">
+    <xsl:choose>
+      <xsl:when test="$previous = ''">#</xsl:when> <!-- root node refers to itself -->
+      <xsl:otherwise><xsl:value-of select="concat($previous, 'index.html')"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <a class="w-250 text-center" href="{$link}">
+    <span class="fa fa-arrow-left"/>
+    <span class="truncated-text d-inline-block max-w-200 ml-2">
+      <xsl:value-of select="document(concat(/guide/@self, $previous, 'text.xml'))/guide/chapter[1]/title"/>
+    </span>
+  </a>
 </xsl:template>
 
 <xsl:template name="printParentDocs">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     1af877406f2e99eafef2dbaaf5b0530da52a0dc8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 18:46:28 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 18:46:28 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1af87740

devbook.xsl: Drop obsolete comment

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

 devbook.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 4895290..a492efe 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -118,13 +118,11 @@
 </xsl:template>
 <!-- End Table Jojo -->
 
-<!-- FIXME: Handle lang=... -->
 <xsl:template match="codesample">
   <xsl:variable name="ctype"><xsl:if test="@lang = 'ebuild'">Constant</xsl:if></xsl:variable>
   <xsl:variable name="numbering" select="@numbering"/>
   <xsl:variable name="lang" select="@lang"/>
   <pre><span class="{$ctype}">
-
     <xsl:for-each select="str:tokenize_plasmaroo(., $newline)">
       <xsl:choose>
         <xsl:when test=". = $newline">

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     2d18e35b630f77920199f9c3fe8b4a878b4b4bb1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 18:48:34 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 18:48:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=2d18e35b

devbook.xsl: Delete redundant xsl:text

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

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index a492efe..fb7ae25 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -128,7 +128,7 @@
         <xsl:when test=". = $newline">
           <xsl:if test="position() != 1"><xsl:value-of select="$newline"/></xsl:if>
           <xsl:if test="$numbering = 'lines' and position() != last()-1">
-            <span style="float: left;"><xsl:number format="01"/>:<xsl:text> </xsl:text></span>
+            <span style="float: left;"><xsl:number format="01"/>: </span>
           </xsl:if>
         </xsl:when>
         <xsl:otherwise>
@@ -289,7 +289,7 @@
 <xsl:template name="convert-to-anchor">
   <xsl:param name="data"/>
   <xsl:variable name="lcletters">abcdefghijklmnopqrstuvwxyz-</xsl:variable>
-  <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ<xsl:text> </xsl:text></xsl:variable>
+  <xsl:variable name="ucletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ </xsl:variable>
   <xsl:variable name="lcdata" select="translate(normalize-space($data), $ucletters, $lcletters)"/>
   <!-- Delete anything but letters, digits, hyphen, dot, underscore -->
   <xsl:variable name="allowed">abcdefghijklmnopqrstuvwxyz0123456789-._</xsl:variable>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     a104fe1378cebfb50494565fb0d2cb589a682831
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 19:04:05 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 18:56:03 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a104fe13

Support caption attribute for pre, codesample and table

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

 devbook.rnc   | 12 ++++++++++--
 devbook.rng   |  9 +++++++++
 devbook.xsl   | 13 ++++++++++++-
 devmanual.css |  4 ++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/devbook.rnc b/devbook.rnc
index 22f7c09..06b5f5b 100644
--- a/devbook.rnc
+++ b/devbook.rnc
@@ -56,11 +56,15 @@ contentsTree = element contentsTree {
 
 p = element p { inline }
 
-pre = element pre { text }
+pre = element pre {
+  attribute caption { text }?,
+  text
+}
 
 codesample = element codesample {
   attribute lang { "c" | "ebuild" | "make" | "m4" | "sgml" },
   attribute numbering { "lines" }?,
+  attribute caption { text }?,
   text
 }
 
@@ -75,7 +79,11 @@ figure = element figure {
   attribute caption { text }?
 }
 
-table = element table { tr+ }
+table = element table {
+  attribute caption { text }?,
+  tr+
+}
+
 tr = element tr { (th | ti)+ }
 
 th = element th {

diff --git a/devbook.rng b/devbook.rng
index 3963ab1..c482fd0 100644
--- a/devbook.rng
+++ b/devbook.rng
@@ -191,6 +191,9 @@
   </define>
   <define name="pre">
     <element name="pre">
+      <optional>
+        <attribute name="caption"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -210,6 +213,9 @@
           <value>lines</value>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="caption"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -246,6 +252,9 @@
   </define>
   <define name="table">
     <element name="table">
+      <optional>
+        <attribute name="caption"/>
+      </optional>
       <oneOrMore>
         <ref name="tr"/>
       </oneOrMore>

diff --git a/devbook.xsl b/devbook.xsl
index fb7ae25..87aa0e8 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -60,13 +60,21 @@
 </xsl:template>
 
 <xsl:template match="pre">
+  <xsl:if test="@caption">
+    <p class="caption"><xsl:value-of select="@caption"/></p>
+  </xsl:if>
   <pre><xsl:apply-templates/></pre>
 </xsl:template>
 
 <!-- Tables -->
 <!-- From the Gentoo GuideXML Stylesheet -->
 <xsl:template match="table">
-  <table class="table"><xsl:apply-templates/></table>
+  <table class="table">
+    <xsl:if test="@caption">
+      <caption><xsl:value-of select="@caption"/></caption>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </table>
 </xsl:template>
 
 <xsl:template match="tr">
@@ -122,6 +130,9 @@
   <xsl:variable name="ctype"><xsl:if test="@lang = 'ebuild'">Constant</xsl:if></xsl:variable>
   <xsl:variable name="numbering" select="@numbering"/>
   <xsl:variable name="lang" select="@lang"/>
+  <xsl:if test="@caption">
+    <p class="caption"><xsl:value-of select="@caption"/></p>
+  </xsl:if>
   <pre><span class="{$ctype}">
     <xsl:for-each select="str:tokenize_plasmaroo(., $newline)">
       <xsl:choose>

diff --git a/devmanual.css b/devmanual.css
index 83f6b14..d636585 100644
--- a/devmanual.css
+++ b/devmanual.css
@@ -13,6 +13,10 @@ dd {
     margin-left: 2em;
 }
 
+caption, p.caption {
+    font-weight: bold;
+}
+
 div.figure, div.figure p {
     text-align: center;
     font-weight: bold;

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     70a4a5abadb22440889b6b30558862d4b26ca5df
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:28:58 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:28:58 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=70a4a5ab

Makefile: Don't warn about missing eclass doc when in ebuild context

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

 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d022a32..c4bb713 100644
--- a/Makefile
+++ b/Makefile
@@ -60,10 +60,12 @@ documents.js: bin/build_search_documents.py $(XMLS)
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
 eclass-reference/text.xml:
-	@echo "*** Warning: No eclass documentation found." >&2
-	@echo "Install app-doc/eclass-manpages and" >&2
-	@echo "run bin/gen-eclass-html.sh before calling make." >&2
-	@echo "Creating a placeholder index as fallback." >&2
+	@if [[ -z $${EBUILD_PHASE} ]]; then \
+	  echo "*** Warning: No eclass documentation found." >&2; \
+	  echo "Install app-doc/eclass-manpages and" >&2; \
+	  echo "run bin/gen-eclass-html.sh before calling make." >&2; \
+	  echo "Creating a placeholder index as fallback." >&2; \
+	fi
 	bin/gen-eclass-html.sh -n
 
 appendices/todo-list/index.html: $(XMLS)

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     e541eca137b72837ac5bc1218e6952c35752c873
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:27:34 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:27:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e541eca1

Makefile: More specific prerequisites for install target

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

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4fbbd90..d022a32 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ appendices/todo-list/index.html: $(XMLS)
 .depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
 	@xsltproc depend.xsl $(XMLS) > $@
 
-install: all
+install: build documents.js
 	set -e; \
 	for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \
 	  install -d "$(DESTDIR)$(htmldir)"/$${file%/*}; \

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     86cdbfd7efdb5bc5c089891ccb50533e58b62529
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 16:39:11 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 16:39:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=86cdbfd7

Makefile: Remove the separate "build" target

This had been added in commit aa6e1e365fff48b6e1e5470791f499a0589d39c3,
so that app-doc/devmanual[offline] could call "emake build" without
building documents.js. This is no longer needed; the offline condition
can be tested by the Makefile itself.

Drop validate as prerequisite of all because it required libxml2 as
additional build dependency.

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

 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c4bb713..042ffa7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,13 @@ DESTDIR =
 # Nonzero value disables external assets for offline browsing.
 OFFLINE = 0
 
-all: prereq validate build documents.js
+ifeq ($(OFFLINE),0)
+  JS_BUILD = documents.js
+else
+  JS_BUILD =
+endif
+
+all: prereq $(HTMLS) $(IMAGES) $(JS_BUILD)
 
 prereq:
 	@type rsvg-convert >/dev/null 2>&1 || \
@@ -27,15 +33,10 @@ prereq:
 	@type xsltproc >/dev/null 2>&1 || \
 	{ echo "dev-libs/libxslt is with python required" >&2;\
 	  exit 1; }
-	@type xmllint >/dev/null 2>&1 || \
-	{ echo "dev-libs/libxml2 is required" >&2;\
-	  exit 1; }
 	@fc-list -q "Open Sans" || \
 	{ echo "media-fonts/open-sans is required" >&2;\
 	  exit 1; }
 
-build: $(HTMLS) $(IMAGES)
-
 # We need to parse all the XMLs every time, not just the ones
 # that are newer than the target. This is because each search
 # document in devmanual gets a unique ID, which is used to
@@ -78,7 +79,7 @@ appendices/todo-list/index.html: $(XMLS)
 .depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
 	@xsltproc depend.xsl $(XMLS) > $@
 
-install: build documents.js
+install: all
 	set -e; \
 	for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \
 	  install -d "$(DESTDIR)$(htmldir)"/$${file%/*}; \
@@ -133,6 +134,6 @@ distclean: clean
 	@rm -f .depend
 	@rm -rf eclass-reference
 
-.PHONY: all prereq build install check validate tidy dist clean distclean
+.PHONY: all prereq install check validate tidy dist clean distclean
 
 -include .depend

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     489be66826523c8ba5e7bc92ad42d4b40445bbbd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 16:56:38 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 16:56:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=489be668

devbook.xsl: Suppress permalinks in offline mode

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

 devbook.xsl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 87aa0e8..9bbac18 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -26,7 +26,9 @@
 <xsl:template match="chapter">
   <h1 class="first-header">
     <xsl:apply-templates select="title"/>
-    <a class="permalink" href=""><span class="fa fa-link"/></a>
+    <xsl:if test="not($offline)">
+      <a class="permalink" href=""><span class="fa fa-link"/></a>
+    </xsl:if>
   </h1>
   <xsl:apply-templates select="*[not(self::title)]"/>
 </xsl:template>
@@ -43,7 +45,9 @@
     <xsl:element name="h{$level}">
       <xsl:attribute name="id"><xsl:value-of select="$anchor"/></xsl:attribute>
       <xsl:apply-templates select="title"/>
-      <a class="permalink" href="#{$anchor}"><span class="fa fa-link"/></a>
+      <xsl:if test="not($offline)">
+        <a class="permalink" href="#{$anchor}"><span class="fa fa-link"/></a>
+      </xsl:if>
     </xsl:element>
     <xsl:apply-templates select="*[not(self::title)]"/>
   </div>

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     9e945e68383fc3d338830239fd7339a24635c389
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 02:27:07 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 02:27:07 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9e945e68

Makefile: Secondary expansion is not needed

Drop .SECONDEXPANSION and use a static pattern rule instead.

The problem addressed by secondary expansion was that % in a "normal"
pattern rule doesn't match the empty string, therefore %index.html
won't match the top-level index.html target. By contract, % in a
static pattern rule matches any part of the target name.

Using a pattern rule like "ind%x.html: t%xt.xml ..." would also be
possible but seems a little hackish.

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

 Makefile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 042ffa7..c377d5d 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,9 @@ documents.js: bin/build_search_documents.py $(XMLS)
 %.png : %.svg
 	rsvg-convert --output=$@ $<
 
-# Secondary expansion allows us to use the automatic variable $@ in
-# the prerequisites.
-#
-# We use the pattern %.html rather than the more-sensible %index.html
-# because the latter doesn't match our top-level index.html target.
-#
-.SECONDEXPANSION:
-%.html: $$(dir $$@)text.xml devbook.xsl xsl/*.xsl
+# Use a static pattern rule, otherwise %index.html won't match the
+# top-level index.html target.
+$(HTMLS): %index.html: %text.xml devbook.xsl xsl/*.xsl
 	xsltproc --param offline "$(OFFLINE)" devbook.xsl $< > $@
 
 eclass-reference/text.xml:

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     dd4420fbd76d3a13012d3a8b8e4357a9bc5424eb
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 19:13:38 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 19:13:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=dd4420fb

devbook.xsl: Fix dropdown menu in appendices/todo-list

The contentsTree element must be skipped when it comes with an
extraction attribute.

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

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 9bbac18..44aa0f5 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -623,7 +623,7 @@
                       </li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#xa0;<span class="caret"/></a>
-                        <xsl:if test="/guide/chapter[1]/section or //contentsTree">
+                        <xsl:if test="/guide/chapter[1]/section or //contentsTree[not(@extraction)]">
                           <ul class="dropdown-menu">
                             <!-- List sections of this chapter first. -->
                             <xsl:for-each select="/guide/chapter[1]/section">
@@ -634,7 +634,7 @@
                               </xsl:variable>
                               <li><a class="reference" href="#{$anchor}"><xsl:value-of select="title"/></a></li>
                             </xsl:for-each>
-                            <xsl:if test="//contentsTree">
+                            <xsl:if test="//contentsTree[not(@extraction)]">
                               <li class="divider"><xsl:comment/></li>
                               <!-- List any sub-documents included at first level.
                                    We cannot call "contentsTree" directly, because it would

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     1ee8c33b1b6d01b83ca1d545fb1f73e88707b783
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 06:51:28 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:51:28 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1ee8c33b

devbook.xsl: Test for include instead of contentsTree in dropdown menu

This is cleaner and coincides with what is done in the contentsTree
template itself.

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

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 44aa0f5..6011e3f 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -623,7 +623,7 @@
                       </li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Index&#xa0;<span class="caret"/></a>
-                        <xsl:if test="/guide/chapter[1]/section or //contentsTree[not(@extraction)]">
+                        <xsl:if test="/guide/chapter[1]/section or /guide/include">
                           <ul class="dropdown-menu">
                             <!-- List sections of this chapter first. -->
                             <xsl:for-each select="/guide/chapter[1]/section">
@@ -634,7 +634,7 @@
                               </xsl:variable>
                               <li><a class="reference" href="#{$anchor}"><xsl:value-of select="title"/></a></li>
                             </xsl:for-each>
-                            <xsl:if test="//contentsTree[not(@extraction)]">
+                            <xsl:if test="/guide/include">
                               <li class="divider"><xsl:comment/></li>
                               <!-- List any sub-documents included at first level.
                                    We cannot call "contentsTree" directly, because it would

[gentoo-commits] proj/devmanual:master commit in: /

[Ulrich Müller]

commit:     6a6a071ba6e6d5561915259ceb00d894b7110a4b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 19:54:36 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:57:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6a6a071b

devbook.xsl: Rework the contents template

- New extraction-count template, split off from contents
- Fix path_rel; it was correct only for the two special cases of an
  empty path or a path equal to @self
- Suppress empty <ul></ul> in output

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

 devbook.xsl | 155 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 75 insertions(+), 80 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 529365c..8615fec 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -428,105 +428,100 @@
   </xsl:choose>
 </xsl:template>
 
+<xsl:template name="extraction-count">
+  <xsl:param name="depth"/>
+  <xsl:param name="maxdepth"/>
+  <xsl:param name="path"/>
+  <xsl:param name="extraction"/>
+  <xsl:if test="$depth &lt; $maxdepth or $maxdepth = 0">
+    <xsl:for-each select="document(concat($path, 'text.xml'))/devbook/include">
+      <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}">
+        <xsl:call-template name="extraction-count">
+          <xsl:with-param name="depth" select="$depth + 1"/>
+          <xsl:with-param name="maxdepth" select="$maxdepth"/>
+          <xsl:with-param name="path" select="concat($path, @href)"/>
+          <xsl:with-param name="extraction" select="$extraction"/>
+        </xsl:call-template>
+      </count>
+    </xsl:for-each>
+  </xsl:if>
+</xsl:template>
+
 <!-- TOC Tree -->
 <xsl:template match="contents" name="contents">
   <xsl:param name="depth" select="0"/>
-  <xsl:param name="maxdepth">
-    <xsl:choose>
-      <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
+  <xsl:param name="maxdepth" select="sum(@maxdepth)"/>
   <xsl:param name="path">
     <xsl:choose>
       <xsl:when test="@root"><xsl:value-of select="@root"/></xsl:when>
       <xsl:otherwise><xsl:value-of select="/devbook/@self"/></xsl:otherwise>
     </xsl:choose>
   </xsl:param>
-  <xsl:param name="path_rel">
-    <xsl:if test="$depth = 0 and $path = '' and /devbook/@self != ''">
-      <xsl:call-template name="repeat-string">
-        <xsl:with-param name="count"
-                        select="string-length(/devbook/@self) - string-length(translate(/devbook/@self, '/' , ''))"/>
-        <xsl:with-param name="string">../</xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:param>
   <xsl:param name="orig_self" select="/devbook/@self"/>
   <xsl:param name="extraction" select="@extraction"/>
-  <xsl:param name="extraction_counting"/>
 
-  <xsl:variable name="doc_self" select="concat($path, 'text.xml')"/>
-  <xsl:if test="count(document($doc_self)/devbook/include) &gt; 0 and ($depth &lt; $maxdepth or $maxdepth = 0)">
-    <xsl:choose>
-      <xsl:when test="$extraction_counting = 1">
-        <xsl:for-each select="document($doc_self)/devbook/include">
-          <count value="{count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])}"
-                 path="{concat($path, @href)}">
-            <xsl:call-template name="contents">
-              <xsl:with-param name="depth" select="$depth + 1"/>
-              <xsl:with-param name="maxdepth" select="$maxdepth"/>
-              <xsl:with-param name="path" select="concat($path, @href)"/>
-              <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-              <xsl:with-param name="orig_self" select="$orig_self"/>
-              <xsl:with-param name="extraction" select="$extraction"/>
-              <xsl:with-param name="extraction_counting" select="1"/>
-            </xsl:call-template>
-          </count>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <ul>
-          <xsl:for-each select="document($doc_self)/devbook/include">
-            <xsl:variable name="extraction_counter_node">
+  <xsl:if test="($depth &lt; $maxdepth or $maxdepth = 0)
+                and count(document(concat($path, 'text.xml'))/devbook/include) &gt; 0">
+    <xsl:variable name="extraction_counter_node">
+      <xsl:if test="$extraction">
+        <xsl:call-template name="extraction-count">
+          <xsl:with-param name="depth" select="$depth"/>
+          <xsl:with-param name="maxdepth" select="$maxdepth"/>
+          <xsl:with-param name="path" select="$path"/>
+          <xsl:with-param name="extraction" select="$extraction"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:variable>
+    <xsl:variable name="extraction_count" select="exslt:node-set($extraction_counter_node)"/>
+    <xsl:if test="not($extraction) or sum($extraction_count//@value) &gt; 0">
+      <xsl:variable name="path_rel">
+        <xsl:call-template name="relative-path">
+          <xsl:with-param name="path" select="$path"/>
+          <xsl:with-param name="self" select="$orig_self"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <ul>
+        <xsl:for-each select="document(concat($path, 'text.xml'))/devbook/include">
+          <xsl:variable name="index" select="position()"/>
+          <!-- We emit a list item with the included document's title:
+               * always if this is a normal table of contents; or
+               * when extracting, if there is at least one "extraction"
+                 element in the document or any of its subdocuments
+          -->
+          <xsl:if test="not($extraction) or sum($extraction_count/count[$index]//@value) &gt; 0">
+            <li>
+              <a class="reference" href="{concat($path_rel, @href, 'index.html')}">
+                <xsl:value-of select="document(concat($path, @href, 'text.xml'))/devbook/chapter[1]/title"/>
+              </a>
+              <xsl:if test="$extraction and $extraction_count/count[$index]/@value &gt; 0">
+                <!-- If the extracted element from the other document contains
+                     any internal references, relative links would be based on
+                     the wrong start location. So we replace /devbook/@self by
+                     our own copy. Bug #916523. -->
+                <xsl:variable name="document_tree">
+                  <devbook self="{$orig_self}">
+                    <xsl:copy-of select="document(concat($path, @href, 'text.xml'))/devbook/*"/>
+                  </devbook>
+                </xsl:variable>
+                <ul>
+                  <xsl:for-each select="exslt:node-set($document_tree)//*[name()=$extraction]">
+                    <li><xsl:apply-templates select="."/></li>
+                  </xsl:for-each>
+                </ul>
+              </xsl:if>
+              <!-- Call ourselves recursively for the next level -->
               <xsl:call-template name="contents">
                 <xsl:with-param name="depth" select="$depth + 1"/>
                 <xsl:with-param name="maxdepth" select="$maxdepth"/>
                 <xsl:with-param name="path" select="concat($path, @href)"/>
-                <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
                 <xsl:with-param name="orig_self" select="$orig_self"/>
                 <xsl:with-param name="extraction" select="$extraction"/>
-                <xsl:with-param name="extraction_counting" select="1"/>
               </xsl:call-template>
-            </xsl:variable>
-            <xsl:variable name="extraction_counter"
-                          select="count(exslt:node-set($extraction_counter_node)//*[@value != 0])
-                                  + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
-            <xsl:if test="string($extraction) = '' or $extraction_counter &gt; 0">
-              <li>
-                <a class="reference" href="{concat($path_rel, @href, 'index.html')}">
-                  <xsl:value-of select="document(concat($path, @href, 'text.xml'))/devbook/chapter[1]/title"/>
-                </a>
-                <xsl:if test="$extraction != ''">
-                  <!-- If the extracted element from the other document contains
-                       any internal references, relative links would be based on
-                       the wrong start location. So we replace /devbook/@self by
-                       our own copy. Bug #916523. -->
-                  <xsl:variable name="document_tree">
-                    <devbook self="{$orig_self}">
-                      <xsl:copy-of select="document(concat($path, @href, 'text.xml'))/devbook/*"/>
-                    </devbook>
-                  </xsl:variable>
-                  <ul>
-                    <xsl:for-each select="exslt:node-set($document_tree)//*[name()=$extraction]">
-                      <li><xsl:apply-templates select="."/></li>
-                    </xsl:for-each>
-                  </ul>
-                </xsl:if>
-                <xsl:call-template name="contents">
-                  <xsl:with-param name="depth" select="$depth + 1"/>
-                  <xsl:with-param name="maxdepth" select="$maxdepth"/>
-                  <xsl:with-param name="path" select="concat($path, @href)"/>
-                  <xsl:with-param name="path_rel" select="concat($path_rel, @href)"/>
-                  <xsl:with-param name="orig_self" select="$orig_self"/>
-                  <xsl:with-param name="extraction" select="$extraction"/>
-                </xsl:call-template>
-              </li>
-            </xsl:if>
-          </xsl:for-each>
-        </ul>
-      </xsl:otherwise>
-    </xsl:choose>
+            </li>
+          </xsl:if>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
   </xsl:if>
 </xsl:template>