Author: bdubbs
Date: Sat Apr 16 16:52:17 2016
New Revision: 17265
Log:
Added Asciidoc
Added:
trunk/BOOK/general/genutils/asciidoc.xml
- copied, changed from r17262, trunk/BOOK/general/genutils/gtk-doc.xml
Modified:
trunk/BOOK/general/genutils/genutils.xml
trunk/BOOK/general/graphlib/gegl.xml
trunk/BOOK/general/graphlib/graphite2.xml
trunk/BOOK/general/prog/git.xml
trunk/BOOK/general/sysutils/p7zip.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/audiofile.xml
trunk/BOOK/packages.ent
trunk/BOOK/x/installing/x7proto.xml
Copied and modified: trunk/BOOK/general/genutils/asciidoc.xml (from r17262,
trunk/BOOK/general/genutils/gtk-doc.xml)
==============================================================================
--- trunk/BOOK/general/genutils/gtk-doc.xml Sat Apr 16 11:53:13 2016
(r17262, copy source)
+++ trunk/BOOK/general/genutils/asciidoc.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -4,105 +4,83 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY gtk-doc-download-http
"&gnome-download-http;/gtk-doc/>k-doc-version;/gtk-doc->k-doc-version;.tar.xz">
- <!ENTITY gtk-doc-download-ftp
"&gnome-download-ftp;/gtk-doc/>k-doc-version;/gtk-doc->k-doc-version;.tar.xz">
- <!ENTITY gtk-doc-md5sum "0dc6570953112a464a409fb99258ccbc">
- <!ENTITY gtk-doc-size "660 KB">
- <!ENTITY gtk-doc-buildsize "12.2 MB (with tests)">
- <!ENTITY gtk-doc-time "0.3 SBU (with tests)">
+ <!ENTITY asciidoc-download-http
"http://sourceforge.net/projects/asciidoc/files/asciidoc/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz";>
+ <!ENTITY asciidoc-download-ftp " ">
+ <!ENTITY asciidoc-md5sum "c59018f105be8d022714b826b0be130a">
+ <!ENTITY asciidoc-size "888 KB">
+ <!ENTITY asciidoc-buildsize "3.9 MB">
+ <!ENTITY asciidoc-time "less than 0.1 SBU">
]>
-<sect1 id="gtk-doc" xreflabel="GTK-Doc->k-doc-version;">
- <?dbhtml filename="gtk-doc.html"?>
+<sect1 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
+ <?dbhtml filename="asciidoc.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>GTK-Doc->k-doc-version;</title>
+ <title>Asciidoc-&asciidoc-version;</title>
- <indexterm zone="gtk-doc">
- <primary sortas="a-GTK-Doc">GTK-Doc</primary>
+ <indexterm zone="asciidoc">
+ <primary sortas="a-asciidoc">asciidoc</primary>
</indexterm>
<sect2 role="package">
- <title>Introduction to GTK-Doc</title>
+ <title>Introduction to Asciidoc</title>
- <para>The <application>GTK-Doc</application> package
- contains a code documenter. This is useful for extracting specially
formatted
- comments from the code to create API documentation. This
- package is <emphasis>optional</emphasis>; if it is not installed, packages
will
- not build the documentation. This does not mean that you will not have any
- documentation. If <application>GTK-Doc</application> is not
- available, the install process will copy any pre-built documentation to
your
- system.</para>
+ <para>The <application>Asciidoc</application> package is a text document
+ format for writing notes, documentation, articles, books, ebooks,
+ slideshows, web pages, man pages and blogs. AsciiDoc files can be
+ translated to many formats including HTML, PDF, EPUB, and man page.
</para>
&lfs79_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
- <para>Download (HTTP): <ulink url=">k-doc-download-http;"/></para>
+ <para>Download (HTTP): <ulink url="&asciidoc-download-http;"/></para>
</listitem>
<listitem>
- <para>Download (FTP): <ulink url=">k-doc-download-ftp;"/></para>
+ <para>Download (FTP): <ulink url="&asciidoc-download-ftp;"/></para>
</listitem>
<listitem>
- <para>Download MD5 sum: >k-doc-md5sum;</para>
+ <para>Download MD5 sum: &asciidoc-md5sum;</para>
</listitem>
<listitem>
- <para>Download size: >k-doc-size;</para>
+ <para>Download size: &asciidoc-size;</para>
</listitem>
<listitem>
- <para>Estimated disk space required: >k-doc-buildsize;</para>
+ <para>Estimated disk space required: &asciidoc-buildsize;</para>
</listitem>
<listitem>
- <para>Estimated build time: >k-doc-time;</para>
+ <para>Estimated build time: &asciidoc-time;</para>
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">GTK-Doc Dependencies</bridgehead>
+ <bridgehead renderas="sect3">Asciidoc Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="DocBook"/>,
- <xref linkend="docbook-xsl"/>,
- <xref linkend="itstool"/> and
- <xref linkend="libxslt"/>
- </para>
-
- <bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">
- <ulink url="http://sourceforge.net/projects/dblatex/";>dblatex</ulink> or
- <xref linkend="fop"/> (XML PDF support),
- <xref linkend="glib2"/> (for the test suite),
- <ulink url="&gnome-download-http;/gnome-doc-utils/">
- GNOME Doc Utils</ulink> and
- <xref linkend="which"/> (required for the test suite and gtk-doc
documentation),
- <xref linkend="openjade"/> with
- <xref linkend="sgml-dtd"/> and
- <xref linkend="docbook-dsssl"/>
- (SGML support, not actively maintained any more),
- <xref linkend="python2"/> (builds gtkdoc-depscan), and
- <xref linkend="rarian"/>
+ <xref linkend="python2"/> or
+ <xref linkend="python3"/>
</para>
<para condition="html" role="usernotes">User Notes:
- <ulink url="&blfs-wiki;/gtk-doc"/></para>
+ <ulink url="&blfs-wiki;/asciidoc"/></para>
</sect2>
<sect2 role="installation">
- <title>Installation of GTK-Doc</title>
+ <title>Installation of Asciidoc</title>
- <para>Install <application>GTK-Doc</application> by running
+ <para>Install <application>Asciidoc</application> by running
the following commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
make</userinput></screen>
- <para>To test the results, issue: <command>make check</command>.</para>
+ <para>This package does not come with a test suite.</para>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -119,11 +97,14 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>gtkdoc-check, gtkdoc-depscan, gtkdoc-fixxref, gtkdocize,
- gtkdoc-mkdb, gtkdoc-mkhtml, gtkdoc-mkman, gtkdoc-mkpdf,
- gtkdoc-mktmpl, gtkdoc-rebase, gtkdoc-scan, and gtkdoc-scangobj</seg>
+ <seg>
+ a2x (symlink to a2x.py),
+ a2x.py,
+ asciidoc (symlink to asciidoc.py), and
+ asciidoc.py
+ </seg>
<seg>None</seg>
- <seg>/usr/share/{gtk-doc,help/*/gtk-doc-manual,sgml/gtk-doc}</seg>
+ <seg>/etc/asciidoc</seg>
</seglistitem>
</segmentedlist>
@@ -132,15 +113,23 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="gtkdoc">
- <term><command>gtkdoc*</command></term>
+ <varlistentry id="a2x">
+ <term><command>a2x</command></term>
+ <listitem>
+ <para>is a toolchain manager for AsciiDoc
+ (converts Asciidoc text files to other file formats).</para>
+ <indexterm zone="asciidoc a2x">
+ <primary sortas="b-a2x">a2x</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="asciidoc-prog">
+ <term><command>asciidoc</command></term>
<listitem>
- <para>these are all shell, <application>Perl</application>, or
- <application>Python</application> scripts used by
- package <filename>Makefile</filename> scripts to generate
- documentation for the package being built.</para>
- <indexterm zone="gtk-doc gtkdoc">
- <primary sortas="b-gtkdoc*">gtkdoc*</primary>
+ <para>converts an AsciiDoc text file to HTML or DocBook</para>
+ <indexterm zone="asciidoc asciidoc-prog">
+ <primary sortas="b-asciidoc-prog">asciidoc</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: trunk/BOOK/general/genutils/genutils.xml
==============================================================================
--- trunk/BOOK/general/genutils/genutils.xml Sat Apr 16 14:17:01 2016
(r17264)
+++ trunk/BOOK/general/genutils/genutils.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -20,16 +20,13 @@
text and graphics, a program to interface with a palm-pilot, a program for
entering
PIN numbers and pass-phrases, and a hash generator.</para>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="appdata-tools.xml"/> -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="appstream-glib.xml"/> -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="asciidoc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="chrpath.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="compface.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="desktop-file-utils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="graphviz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk-doc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="hd2u.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="hicolor-icon-theme.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="icon-naming-utils.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="imagemagick.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="iso-codes.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="lsof.xml"/>
Modified: trunk/BOOK/general/graphlib/gegl.xml
==============================================================================
--- trunk/BOOK/general/graphlib/gegl.xml Sat Apr 16 14:17:01 2016
(r17264)
+++ trunk/BOOK/general/graphlib/gegl.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -81,6 +81,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
+ <xref linkend="asciidoc"/>,
<xref linkend="cairo"/>,
<xref linkend="enscript"/>,
<xref linkend="exiv2"/>,
@@ -98,7 +99,6 @@
<xref linkend="gobject-introspection"/>,
<xref linkend="vala"/>,
<xref linkend="w3m"/>,
- <ulink url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink>,
<ulink url="http://lensfun.berlios.de/";>lensfun</ulink>,
<ulink url="http://libopenraw.freedesktop.org/wiki/";>libopenraw</ulink>,
<ulink url="http://libspiro.sourceforge.net/";>libspiro</ulink>,
Modified: trunk/BOOK/general/graphlib/graphite2.xml
==============================================================================
--- trunk/BOOK/general/graphlib/graphite2.xml Sat Apr 16 14:17:01 2016
(r17264)
+++ trunk/BOOK/general/graphlib/graphite2.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -99,7 +99,7 @@
</para>
<para>To build the documentation:
- <ulink url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink>,
+ <xref linkend="asciidoc"/>,
<xref linkend="doxygen"/>,
<xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
<ulink url="http://dblatex.sourceforge.net/";>
Modified: trunk/BOOK/general/prog/git.xml
==============================================================================
--- trunk/BOOK/general/prog/git.xml Sat Apr 16 14:17:01 2016 (r17264)
+++ trunk/BOOK/general/prog/git.xml Sat Apr 16 16:52:17 2016 (r17265)
@@ -90,8 +90,9 @@
<para>
<ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
&git-root;/git-manpages-&git-version;.tar.xz</ulink>
- (if you prefer the original, not needed if you've installed asciidoc
- and xmlto and prefer to build them).
+ (if you prefer the original, not needed if you've installed
+ <xref linkend="asciidoc"/> and <xref linkend="xmlto"/>
+ prefer to build them).
</para>
</listitem>
<listitem>
@@ -99,7 +100,7 @@
<ulink url="&git-root;/git-htmldocs-&git-version;.tar.xz">
&git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
and other docs (if you prefer the original, not needed if you've
- installed asciidoc and prefer to build them).
+ installed <xref linkend="asciidoc"/> and prefer to build them).
</para>
</listitem>
</itemizedlist>
@@ -127,7 +128,7 @@
and other docs)</bridgehead>
<para>
<xref linkend="xmlto"/> and
- <ulink url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> or
+ <xref linkend="asciidoc"/> or
<ulink url="http://asciidoctor.org/";>AsciiDoctor</ulink>, and also
<ulink url="http://dblatex.sourceforge.net/";>dblatex</ulink>
(for the PDF version of the user manual), and
@@ -158,16 +159,14 @@
</para>
<para>
- If you have installed <ulink
- url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> you can
+ If you have installed <xref linkend="asciidoc"/> you can
create the html version of the man pages and other docs:
</para>
<screen><userinput>make html</userinput></screen>
<para>
- If you have installed <ulink
- url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> and
+ If you have installed <xref linkend="asciidoc"/> and
<xref linkend="xmlto"/> you can create the man pages:
</para>
Modified: trunk/BOOK/general/sysutils/p7zip.xml
==============================================================================
--- trunk/BOOK/general/sysutils/p7zip.xml Sat Apr 16 14:17:01 2016
(r17264)
+++ trunk/BOOK/general/sysutils/p7zip.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -6,7 +6,7 @@
<!ENTITY p7zip-download-http
"&sourceforge-repo;/projects/p7zip/files/p7zip/&p7zip-version;/p7zip_&p7zip-version;_src_all.tar.bz2">
<!ENTITY p7zip-download-ftp " ">
- <!ENTITY p7zip-md5sum "92cca093312b5a71a7be7dc7d1d32509">
+ <!ENTITY p7zip-md5sum "7d80fff55855a72f024d0af0064b1707">
<!ENTITY p7zip-size "4,0 MB">
<!ENTITY p7zip-buildsize "33 MB">
<!ENTITY p7zip-time "1.2 SBU (with tests)">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 16 14:17:01
2016 (r17264)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 16 16:52:17
2016 (r17265)
@@ -48,6 +48,9 @@
<para>April 16th, 2016</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Added Asciidoc. </para>
+ </listitem>
+ <listitem>
<para>[igor] - Update to feh-2.15.1. Fixes
<ulink url="&blfs-ticket-root;7734">#7734</ulink>.</para>
</listitem>
Modified: trunk/BOOK/multimedia/libdriv/audiofile.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/audiofile.xml Sat Apr 16 14:17:01 2016
(r17264)
+++ trunk/BOOK/multimedia/libdriv/audiofile.xml Sat Apr 16 16:52:17 2016
(r17265)
@@ -85,7 +85,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <ulink url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> and
+ <xref linkend="asciidoc"/> and
<xref linkend="valgrind"/>
</para>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sat Apr 16 14:17:01 2016 (r17264)
+++ trunk/BOOK/packages.ent Sat Apr 16 16:52:17 2016 (r17265)
@@ -191,6 +191,7 @@
<!ENTITY qpdf-version "6.0.0">
<!-- Chapter 11 -->
+<!ENTITY asciidoc-version "8.6.9">
<!ENTITY chrpath-version "0.16">
<!ENTITY compface-version "1.5.2">
<!ENTITY desktop-file-utils-version "0.22">
Modified: trunk/BOOK/x/installing/x7proto.xml
==============================================================================
--- trunk/BOOK/x/installing/x7proto.xml Sat Apr 16 14:17:01 2016 (r17264)
+++ trunk/BOOK/x/installing/x7proto.xml Sat Apr 16 16:52:17 2016 (r17265)
@@ -146,8 +146,7 @@
<xref linkend="fop"/>,
<xref linkend="libxslt"/>,
<xref linkend="xmlto"/> and
- <ulink url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> (to
build
- additional documentation)
+ <xref linkend="asciidoc"/> (to build additional documentation)
</para>
<note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
