gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-13 02:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2024-01-27 00:30:17 +01:00
commit f6a43f612c
23 changed files with 184 additions and 138 deletions

2
chapter02/hostreqs.xml
View File

@ -30,7 +30,7 @@
modern Linux distributions. Also note that many distributions will
place software headers into separate packages, often in the form of
<quote>&lt;package-name&gt;-devel</quote> or
<quote>&lt;package-name&gt;-dev</quote>. Be sure to install those if
<quote>&lt;package-name&gt;-dev.</quote> Be sure to install those if
your distribution provides them.</para>
<para>Earlier versions of the listed software packages may work, but have

2
chapter02/mounting.xml
View File

@ -16,7 +16,7 @@
<envar>LFS</envar> environment variable described in the previous section.
</para>
<para>Strictly speaking, one cannot "mount a partition". One mounts the <emphasis>file
<para>Strictly speaking, one cannot "mount a partition." One mounts the <emphasis>file
system</emphasis> embedded in that partition. But since a single partition can't contain
more than one file system, people often speak of the partition and the
associated file system as if they were one and the same.</para>

2
chapter02/stages.xml
View File

@ -69,7 +69,7 @@
<listitem>
<para>A few operations, from <quote>Changing Ownership</quote> to
<quote>Entering the Chroot Environment</quote>, must be done as the
<quote>Entering the Chroot Environment,</quote> must be done as the
<systemitem class="username">root</systemitem> user, with the LFS
environment variable set for the &root; user.</para>
</listitem>

4
chapter05/glibc.xml
View File

@ -170,8 +170,8 @@ cd build</userinput></screen>
Gettext package, which the host distribution should provide.</para>
<note><para>There have been reports that this package may fail when
building as a "parallel make". If that occurs, rerun the make command
with the "-j1" option.</para></note>
building as a <quote>parallel make.</quote> If that occurs, rerun the make command
with the <option>-j1</option> option.</para></note>
<para>Compile the package:</para>

5
chapter06/file.xml
View File

@ -78,11 +78,6 @@ popd</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess)</userinput></screen>
<!-- devs: if using - -build here, the build system wants to compile
the signature file with "file" on the build system, but stops if it is not
the same version. One possibility would be to build "file" on the build
system first, but it is simpler to have the system think it is not
cross-compiling, and use the just built "file". -->
<para>Compile the package:</para>
<screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>

2
chapter07/python.xml
View File

@ -45,7 +45,7 @@
<note>
<para>There are two package files whose name starts with
<quote>python</quote>. The one to extract from is
<quote>python.</quote> The one to extract from is
<filename>Python-&python-version;.tar.xz</filename> (notice the
uppercase first letter).</para>
</note>

2
chapter08/coreutils.xml
View File

@ -1261,7 +1261,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="yes">
<term><command>yes</command></term>
<listitem>
<para>Repeatedly outputs <quote>y</quote>, or a given string, until
<para>Repeatedly outputs <quote>y,</quote> or a given string, until
killed</para>
<indexterm zone="ch-system-coreutils yes">
<primary sortas="b-yes">yes</primary>

4
chapter08/expect.xml
View File

@ -92,8 +92,8 @@
<screen><userinput remap="test">make test</userinput></screen>
<para>If any test fails with the message
<quote><computeroutput>The system has no more ptys. Ask your system
administrator to create more</computeroutput></quote>, it indicates
<quote><computeroutput>The system has no more ptys. Ask your system
administrator to create more</computeroutput>,</quote> it indicates
you've not mounted the
<systemitem class="filesystem">devpts</systemitem> file system
correctly. You need to exit from the chroot environment, read

7
chapter08/gmp.xml
View File

@ -58,7 +58,7 @@
to the <command>configure</command> command.</para>
<!-- To editors: the configure script says "the none host is obsolete,
use - -disable-assembly", but don't believe it: with the latter
use - -disable-assembly," but don't believe it: with the latter
CFLAGS is still automatically set to -march=something. -->
</note>
@ -106,8 +106,9 @@ make html</userinput></screen>
<caution><para>The code in gmp is highly optimized for the processor where
it is built. Occasionally, the code that detects the processor misidentifies
the system capabilities and there will be errors in the tests or other
applications using the gmp libraries with the message "Illegal
instruction". In this case, gmp should be reconfigured with the option
applications using the gmp libraries with the message
<computeroutput>Illegal instruction</computeroutput>.
In this case, gmp should be reconfigured with the option
<option>--host=none-linux-gnu</option> and rebuilt.</para></caution>
<!-- Some tests PASS on a specific uarch but SKIP on other CPUs.

2
chapter08/stripping.xml
View File

@ -52,7 +52,7 @@
<note><para>The ELF loader's name is ld-linux-x86-64.so.2 on 64-bit systems
and ld-linux.so.2 on 32-bit systems. The construct below selects the
correct name for the current architecture, excluding anything ending
with <quote>g</quote>, in case the commands below have already been
with <quote>g,</quote> in case the commands below have already been
run.</para></note>
<important>

2
chapter09/consoled.xml
View File

@ -30,7 +30,7 @@
directory for valid screen fonts.</para>
<para>The <filename>/etc/vconsole.conf</filename> file should contain lines
of the form: VARIABLE="value". The following variables are recognized:</para>
of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
<variablelist>

30
chapter09/locale.xml
View File

@ -39,11 +39,11 @@
</itemizedlist>
<para>Replace <replaceable>&lt;ll&gt;</replaceable> below with the two-letter code
for your desired language (e.g., <quote>en</quote>) and
for your desired language (e.g., <literal>en</literal>) and
<replaceable>&lt;CC&gt;</replaceable> with the two-letter code for the appropriate
country (e.g., <quote>GB</quote>). <replaceable>&lt;charmap&gt;</replaceable> should
country (e.g., <literal>GB</literal>). <replaceable>&lt;charmap&gt;</replaceable> should
be replaced with the canonical charmap for your chosen locale. Optional
modifiers such as <quote>@euro</quote> may also be present.</para>
modifiers such as <literal>@euro</literal> may also be present.</para>
<para>The list of all locales supported by Glibc can be obtained by running
the following command:</para>
@ -51,10 +51,10 @@
<screen role="nodump"><userinput>locale -a</userinput></screen>
<para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
is also referred to as <quote>iso8859-1</quote> and <quote>iso88591.</quote>
Some applications cannot handle the various synonyms correctly (e.g., require
that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
<quote>utf8</quote>), so it is the safest in most
that <quote>UTF-8</quote> is written as <literal>UTF-8,</literal> not
<literal>utf8</literal>), so it is the safest in most
cases to choose the canonical name for a particular locale. To determine
the canonical name, run the following command, where <replaceable>&lt;locale
name&gt;</replaceable> is the output given by <command>locale -a</command> for
@ -67,7 +67,7 @@
<screen><computeroutput>ISO-8859-1</computeroutput></screen>
<para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
<para>This results in a final locale setting of <literal>en_GB.ISO-8859-1</literal>.
It is important that the locale found using the heuristic above is tested prior
to it being added to the Bash startup files:</para>
@ -90,22 +90,6 @@ LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
Further instructions assume that there are no such error messages from
Glibc.</para>
<!-- FIXME: the xlib example will become obsolete in the future.-->
<para>Some packages beyond LFS may also lack support for your chosen locale. One
example is the X library (part of the X Window System), which outputs the
following error message if the locale does not exactly match one of the character
map names in its internal files:</para>
<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
<para>In several cases Xlib expects that the character map will be listed in
uppercase notation with canonical dashes. For instance, "ISO-8859-1" rather
than "iso88591". It is also possible to find an appropriate specification by
removing the charmap part of the locale specification. This can be checked
by running the <command>locale charmap</command> command in both locales.
For example, one would have to change "de_DE.ISO-8859-15@euro" to
"de_DE@euro" in order to get this locale recognized by Xlib.</para>
<para>Other packages can also function incorrectly (but may not necessarily
display any error messages) if the locale name does not meet their expectations.
In those cases, investigating how other Linux distributions support your locale

4
chapter09/network.xml
View File

@ -62,9 +62,9 @@ EOF</userinput></screen>
<para>The values in italics must be changed in each file, to set
the interfaces up correctly.</para>
<para>If the <envar>ONBOOT</envar> variable is set to <quote>yes</quote> the
<para>If the <envar>ONBOOT</envar> variable is set to <literal>yes</literal> the
System V network script will bring up the Network Interface Card (NIC) during
the system boot process. If set to anything besides <quote>yes</quote>, the NIC
the system boot process. If set to anything besides <literal>yes</literal>, the NIC
will be ignored by the network script and will not be started automatically.
Interfaces can be manually started or stopped with the
<command>ifup</command> and <command>ifdown</command> commands.</para>

11
chapter09/networkd.xml
View File

@ -98,11 +98,12 @@
<listitem>
<para>
Create a manual naming scheme, for example by naming the
interfaces something like "internet0", "dmz0", or "lan0".
To do that, create .link files in /etc/systemd/network/ that
select an explicit name or a better naming scheme for your
network interfaces. For example:
Create a manual naming scheme, for example by naming the
interfaces something like <literal>internet0</literal>,
<literal>dmz0</literal>, or <literal>lan0</literal>.
To do that, create .link files in /etc/systemd/network/ that
select an explicit name or a better naming scheme for your
network interfaces. For example:
</para>
<screen role="nodump"><userinput>cat &gt; /etc/systemd/network/10-ether0.link &lt;&lt; "EOF"

24
chapter09/profile.xml
View File

@ -75,10 +75,10 @@
<screen role="nodump"><userinput>locale -a</userinput></screen>
<para>Charmaps can have a number of aliases, e.g., <quote>ISO-8859-1</quote>
is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
is also referred to as <quote>iso8859-1</quote> and <quote>iso88591.</quote>
Some applications cannot handle the various synonyms correctly (e.g., require
that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
<quote>utf8</quote>), so it is safest in most
that <quote>UTF-8</quote> is written as <literal>UTF-8</literal>, not
<literal>utf8</literal>), so it is safest in most
cases to choose the canonical name for a particular locale. To determine
the canonical name, run the following command, where <replaceable>&lt;locale
name&gt;</replaceable> is the output given by <command>locale -a</command> for
@ -91,7 +91,7 @@
<screen><computeroutput>ISO-8859-1</computeroutput></screen>
<para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
<para>This results in a final locale setting of <literal>en_GB.ISO-8859-1</literal>.
It is important that the locale found using the heuristic above is tested before
it is added to the Bash startup files:</para>
@ -114,22 +114,6 @@ LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
Further instructions assume that there are no such error messages from
Glibc.</para>
<!-- FIXME: the xlib example will became obsolete real soon -->
<!--<para>Some packages beyond LFS may also lack support for your chosen locale. One
example is the X library (part of the X Window System), which outputs the
following error message if the locale does not exactly match one of the character
map names in its internal files:</para>
<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
<para>In several cases Xlib expects that the character map will be listed in
uppercase notation with canonical dashes. For instance, "ISO-8859-1" rather
than "iso88591". It is also possible to find an appropriate specification by
removing the charmap part of the locale specification. This can be checked
by running the <command>locale charmap</command> command in both locales.
For example, one would have to change "de_DE.ISO-8859-15@euro" to
"de_DE@euro" in order to get this locale recognized by Xlib.</para>
-->
<para>Other packages may also function incorrectly (but will not necessarily
display any error messages) if the locale name does not meet their expectations.
In such cases, investigating how other Linux distributions support your locale

6
chapter09/udev.xml
View File

@ -129,13 +129,13 @@
program and are usually related to the bus-specific identifiers of devices
supported by a module. For example, the <emphasis>snd-fm801</emphasis>
driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
and has an alias of <literal>pci:v00001319d00000801sv*sd*bc04sc01i*</literal>.
For most devices, the bus driver exports the alias of the driver that
would handle the device via <systemitem
class="filesystem">sysfs</systemitem>. E.g., the
<filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
might contain the string
<quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
<literal>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</literal>.
The default rules provided with udev will cause <command>udevd</command>
to call out to <command>/sbin/modprobe</command> with the contents of the
<envar>MODALIAS</envar> uevent environment variable (which should be the
@ -301,7 +301,7 @@
<para>This is due to the fact that udev, by design, handles uevents and
loads modules in parallel, and thus in an unpredictable order. This will
never be <quote>fixed</quote>. You should not rely upon the kernel device
never be <quote>fixed.</quote> You should not rely upon the kernel device
names being stable. Instead, create your own rules that make symlinks with
stable names based on some stable attributes of the device, such as a
serial number or the output of various *_id utilities installed by udev.

28
chapter09/usage.xml
View File

@ -48,11 +48,11 @@
<note>
<para>
Classically, run level 2 above was defined as
"multi-user mode without networking", but this was only the case
many years ago when multiple users could connect to a system via
serial ports. In today's environment it makes no sense, and
we now say it is "reserved".
Classically, run level 2 above was defined as <quote>multi-user
mode without networking,</quote> but this was only the case
many years ago when multiple users could connect to a system via
serial ports. In today's environment it makes no sense, and
we now say it is <quote>reserved.</quote>
</para>
</note>
@ -348,7 +348,7 @@ EOF</userinput></screen>
correct arguments for these programs.</para>
<para>The <filename>/etc/sysconfig/console</filename> file should contain lines
of the form: VARIABLE="value". The following variables are recognized:</para>
of the form: <envar>VARIABLE=value</envar>. The following variables are recognized:</para>
<variablelist>
<varlistentry>
@ -356,7 +356,7 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the log level for kernel messages sent
to the console as set by <command>dmesg -n</command>. Valid levels are
from "1" (no messages) to "8". The default level is "7".</para>
from <literal>1</literal> (no messages) to <literal>8</literal>. The default level is <literal>7</literal>, which is quite verbose.</para>
</listitem>
</varlistentry>
@ -365,7 +365,7 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the arguments for the
<command>loadkeys</command> program, typically, the name of the keymap
to load, e.g., <quote>it</quote>. If this variable is not set, the
to load, e.g., <literal>it</literal>. If this variable is not set, the
bootscript will not run the <command>loadkeys</command> program,
and the default kernel keymap will be used. Note that a few keymaps
have multiple versions with the same name (cz and its variants in
@ -384,7 +384,7 @@ EOF</userinput></screen>
<command>loadkeys</command> program. This is useful if the stock keymap
is not completely satisfactory and a small adjustment has to be made. E.g.,
to include the Euro sign into a keymap that normally doesn't have it,
set this variable to <quote>euro2</quote>.</para>
set this variable to <literal>euro2</literal>.</para>
</listitem>
</varlistentry>
@ -393,12 +393,12 @@ EOF</userinput></screen>
<listitem>
<para>This variable specifies the arguments for the
<command>setfont</command> program. Typically, this includes the font
name, <quote>-m</quote>, and the name of the application character
name, <literal>-m</literal>, and the name of the application character
map to load. E.g., in order to load the <quote>lat1-16</quote> font
together with the <quote>8859-1</quote> application character map
(appropriate in the USA),
<!-- because of the copyright sign -->
set this variable to <quote>lat1-16 -m 8859-1</quote>.
set this variable to <literal>lat1-16 -m 8859-1</literal>.
In UTF-8 mode, the kernel uses the application character map to
convert 8-bit key codes to UTF-8. Therefore
the argument of the "-m" parameter should be set to the encoding of the
@ -410,8 +410,8 @@ EOF</userinput></screen>
<varlistentry>
<term>UNICODE</term>
<listitem>
<para>Set this variable to <quote>1</quote>, <quote>yes</quote>, or
<quote>true</quote> in order to put the
<para>Set this variable to <literal>1</literal>, <literal>yes</literal>, or
<literal>true</literal> in order to put the
console into UTF-8 mode. This is useful in UTF-8 based locales and
harmful otherwise.</para>
</listitem>
@ -526,7 +526,7 @@ EOF</userinput></screen>
languages, because there accents are added to unaccented ASCII
characters, or two ASCII characters are composed together. However, in
UTF-8 mode it is a problem; e.g., for the Greek language, where one
sometimes needs to put an accent on the letter <quote>alpha</quote>.
sometimes needs to put an accent on the letter <quote>alpha.</quote>
The solution is either to avoid the use of UTF-8, or to install the
X window system, which doesn't have this limitation, in its input
handling.</para>

11
chapter10/grub.xml
View File

@ -120,17 +120,6 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
command above.</para>
</note>
<!-- This does not seem to be true any more
<note><para><application>grub-install</application> is a script and calls another
program, grub-probe, that may fail with a message "cannot stat `/dev/root'".
If so, create a temporary symbolic link from your root partition to /dev/root:</para>
<screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen>
<para>The symbolic link will only be present until the system is rebooted.
The link is only needed for the installation procedure.
</para></note>
-->
</sect2>
<sect2 id="grub-cfg">

2
part3intro/toolchaintechnotes.xml
View File

@ -56,7 +56,7 @@
<variablelist>
<varlistentry><term>The build</term><listitem>
<para>is the machine where we build programs. Note that this machine
is also referred to as the <quote>host</quote>.</para></listitem>
is also referred to as the <quote>host.</quote></para></listitem>
</varlistentry>
<varlistentry><term>The host</term><listitem>

2
prologue/standards.xml
View File

@ -49,7 +49,7 @@
</itemizedlist>
<para>While it is possible to create a complete system that will pass the LSB
certification tests "from scratch", this can't be done without many additional packages
certification tests <quote>from scratch,</quote> this can't be done without many additional packages
that are beyond the scope of the LFS book. Installation instructions for these
additional packages can be found in BLFS. </para>

2
prologue/typography.xml
View File

@ -85,7 +85,7 @@ EOF</userinput></screen>
<ulink role='man' url='&man;/passwd.5'>passwd(5)</ulink> it is
specifically referring to <filename>/usr/share/man/man5/passwd.5</filename>.
<command>man passwd</command> will print the first man page it finds that
matches <quote>passwd</quote>, which will be
matches <quote>passwd,</quote> which will be
<filename>/usr/share/man/man1/passwd.1</filename>. For this example, you will
need to run <command>man 5 passwd</command> in order to read the page
being specified. Note that most man pages do not have duplicate

86
stylesheets/lfs-xsl/lfs.css
View File

@ -1,13 +1,13 @@
/* Global settings */
body {
font-family: verdana, tahoma, helvetica, arial, sans-serif;
font-family: verdana, tahoma, arial, sans-serif;
text-align: left;
background: #fff;
color: #222;
margin: 1em;
padding: 0;
font-size: 1em;
line-height: 1.2em
line-height: 1.2em;
}
@ -38,10 +38,36 @@ div.dedication {
padding-left: 1em;
}
/* Section titles */
h1.sect1, h1.preface, h1.part, h1.chapter, h1.appendix, .glossary h1, .index h1
{
background: #f5f6f7;
border-bottom: .1em solid #dbddec;
margin-bottom:1em;
margin-top: 0;
padding: .4em;
}
/* Sections */
div.sect1, div.appendix {
padding-left: .3em;
/* Scrolling parts
The header is taller for sect1 and chapter pages than on the
other pages. Since we want fixed boxes, their top has to be calculated
by trial and errors to fit below the static header box.*/
div.sect1, div.chapter, div.appendix, div.wrap {
top: 11.55em;
}
div.preface, div.part, .index div.index {
top: 10.15em;
}
div.sect1, div.appendix, div.preface, div.part, div.chapter, div.wrap, .index div.index {
/* padding-left: .3em;*/
overflow:auto;
height: auto;
position: fixed;
left:1em;
right:1em;
bottom: 1em;
border-bottom: 1em solid #dbddec;
}
div.important ul {
@ -63,8 +89,12 @@ div.important ul li p {
background: #f5f6f7;
border-bottom: 0.2em solid #dbddec;
padding-top: .1em;
margin-top: 0;
/* margin-top: 0;*/
}
/*
.lfs .package p:first-child {
margin-top: 0;
}*/
.lfs .configuration {
background: #fefefe;
@ -74,11 +104,11 @@ div.important ul li p {
.lfs .content {
background: #f5f6f7;
border-top: 0.2em solid #dbddec;
border-bottom: 0.2em solid #dbddec;
padding-bottom: .1em;
margin-bottom: 0;
margin-bottom: .5em;
}
/* Headers */
h1, h2, h3, h4, h5, h6, b, .strong {
color: #000;
@ -96,18 +126,6 @@ h1 {
padding: 0.4em;
}
.preface h1, .part h1, .chapter h1, .appendix h1, .index h1, .sect1 h1, .glossary h1 {
background: #f5f6f7;
border-bottom: .1em solid #dbddec;
margin-bottom: 1em;
margin-top: 0;
padding: .4em;
}
.sect1 h1, .appendix h1 {
margin-left: -.2em;
}
.wrap h1 {
background: #f5f6f7;
margin: 0;
@ -157,13 +175,19 @@ div.navheader, div.navfooter {
}
div.navheader {
border-bottom: 1px solid #dbddec;
position: sticky;
top: 0;
border-bottom: .1em solid #dbddec;
}
/* no need for a footer now that the header is always visible */
div.navfooter {
border-top: 1px solid #dbddec;
display:none;
}
/* Except for the first page (TOC), where the bottom is the only
place where navigation is displayed. */
div.book + div.navfooter {
display:block
}
div.navheader h4 {
@ -179,7 +203,7 @@ div.navheader h3 {
}
div.navheader ul, div.navfooter ul {
padding: .2em .5em .5em 0;
padding: .2em .5em .5em .5em; /*top right bottom left*/
margin: .5em 0;
position: relative;
background: #dbddec;
@ -196,29 +220,29 @@ div.navheader ul li.prev, div.navfooter ul li.prev {
left: 0;
text-align: left;
padding: 0.2em 1em;
margin-left: 6px;
margin-left: .4em;
}
div.navheader ul li.next, div.navfooter ul li.next {
position: absolute;
display: block;
text-align: right;
right: 5px;
padding: 0.2em 0.5em;
margin-right: 7px;
right: 0;
padding: 0.2em 1em;
margin-right: .4em;
}
div.navheader ul li.prev p, div.navfooter ul li.prev p,
div.navheader ul li.next p, div.navfooter ul li.next p {
padding: 0;
margin: 1px 0px;
margin: .1em 0;
}
div.navheader ul li.home, div.navheader ul li.up,
div.navfooter ul li.home, div.navfooter ul li.up {
text-align: center;
padding: 0;
margin: 0px auto;
margin: 0 auto;
display: block;
color: #dbddec;
}

82
stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
View File

@ -11,10 +11,14 @@
<xsl:param name="chunk.first.sections" select="1"/>
<!-- preface:
Output non sect1 child elements before the TOC -->
Output non sect1 child elements before the TOC
Output title outside of the <div> because we want to be able to
use it at a fixed position -->
<!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
<xsl:template match="preface">
<xsl:call-template name="id.warning"/>
<xsl:call-template name="preface.titlepage"/>
<xsl:call-template name="component.separator"/>
<div>
<xsl:apply-templates select="." mode="class.attribute"/>
<xsl:call-template name="dir">
@ -26,8 +30,6 @@
<xsl:call-template name="object.id"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="component.separator"/>
<xsl:call-template name="preface.titlepage"/>
<xsl:apply-templates/>
<xsl:variable name="toc.params">
<xsl:call-template name="find.path.params">
@ -44,11 +46,42 @@
</div>
</xsl:template>
<!-- part:
Output non sect1 child elements before the TOC
Output title outside of the <div> because we want to be able to
use it at a fixed position -->
<!-- The original template is in {docbook-xsl}/xhtml/divisions.xsl -->
<xsl:template match="part">
<xsl:call-template name="id.warning"/>
<xsl:call-template name="part.titlepage"/>
<div>
<xsl:apply-templates select="." mode="common.html.attributes"/>
<xsl:call-template name="id.attribute">
<xsl:with-param name="conditional" select="0"/>
</xsl:call-template>
<xsl:apply-templates/>
<xsl:variable name="toc.params">
<xsl:call-template name="find.path.params">
<xsl:with-param name="table" select="normalize-space($generate.toc)"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="not(partintro) and contains($toc.params, 'toc')">
<xsl:call-template name="division.toc"/>
</xsl:if>
</div>
</xsl:template>
<!-- chapter:
Output non sect1 child elements before the TOC -->
Output non sect1 child elements before the TOC
Output title before div to be able to fix the title position -->
<!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
<xsl:template match="chapter">
<xsl:call-template name="id.warning"/>
<xsl:call-template name="chapter.titlepage"/>
<xsl:call-template name="component.separator"/>
<div>
<xsl:apply-templates select="." mode="class.attribute"/>
<xsl:call-template name="dir">
@ -60,8 +93,6 @@
<xsl:call-template name="object.id"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="component.separator"/>
<xsl:call-template name="chapter.titlepage"/>
<xsl:apply-templates/>
<xsl:variable name="toc.params">
<xsl:call-template name="find.path.params">
@ -78,12 +109,50 @@
</div>
</xsl:template>
<!-- appendix:
Output non sect1 child elements before the TOC
Output title before div to be able to fix the title position -->
<!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
<xsl:template match="appendix">
<xsl:call-template name="id.warning"/>
<xsl:call-template name="appendix.titlepage"/>
<xsl:element name="div" namespace="http://www.w3.org/1999/xhtml">
<xsl:call-template name="common.html.attributes">
<xsl:with-param name="inherit" select="1"/>
</xsl:call-template>
<xsl:call-template name="id.attribute">
<xsl:with-param name="conditional" select="0"/>
</xsl:call-template>
<xsl:apply-templates/>
<xsl:variable name="toc.params">
<xsl:call-template name="find.path.params">
<xsl:with-param name="table" select="normalize-space($generate.toc)"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="contains($toc.params, 'toc')">
<xsl:call-template name="component.toc">
<xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
</xsl:call-template>
</xsl:if>
</xsl:element>
</xsl:template>
<!-- sect1:
When there is a role attibute, use it as the class value.
Process the SVN keywords found in sect1info as a footnote.
Output title before the containing <div> so that the title
can be at a fixed position.
Removed unused code. -->
<!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
<xsl:template match="sect1">
<xsl:call-template name="sect1.titlepage"/>
<div>
<xsl:choose>
<xsl:when test="@role">
@ -96,7 +165,6 @@
</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="language.attribute"/>
<xsl:call-template name="sect1.titlepage"/>
<xsl:apply-templates/>
<xsl:apply-templates select="sect1info" mode="svn-keys"/>
</div>