|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68994 - in sandbox/tools/auto_index: doc doc/html doc/html/autoindex doc/html/autoindex/tut doc/html/index src
From: john_at_[hidden]
Date: 2011-02-18 12:48:16
Author: johnmaddock
Date: 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
New Revision: 68994
URL: http://svn.boost.org/trac/boost/changeset/68994
Log:
Fix Index location.
Fix optional index inclusion in source.
Fix tool to generate an error if no script file exists.
Regenerate docs.
Binary files modified:
sandbox/tools/auto_index/doc/auto_index.pdf
Text files modified:
sandbox/tools/auto_index/doc/Jamfile.v2 | 12 +-----------
sandbox/tools/auto_index/doc/auto_index.qbk | 8 ++------
sandbox/tools/auto_index/doc/html/autoindex/comm_ref.html | 5 ++---
sandbox/tools/auto_index/doc/html/autoindex/script_ref.html | 16 ++++++++--------
sandbox/tools/auto_index/doc/html/autoindex/tut/configure.html | 2 +-
sandbox/tools/auto_index/doc/html/autoindex/tut/refine.html | 2 +-
sandbox/tools/auto_index/doc/html/index.html | 5 ++---
sandbox/tools/auto_index/doc/html/index/s07.html | 2 +-
sandbox/tools/auto_index/src/file_scanning.cpp | 4 ++--
9 files changed, 20 insertions(+), 36 deletions(-)
Modified: sandbox/tools/auto_index/doc/Jamfile.v2
==============================================================================
--- sandbox/tools/auto_index/doc/Jamfile.v2 (original)
+++ sandbox/tools/auto_index/doc/Jamfile.v2 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -20,20 +20,12 @@
# Choose indexing method (separately for html and pdf):
<format>html:<auto-index-internal>on # on (or off) to use internally generated indexes.
- # <format>html:<xsl:param>generate.index=0 # Don't let the XSL stylesheets generate indexes.
<format>pdf:<auto-index-internal>off # on (or off) to use internally generated indexes.
- # <auto-index-type>index # Use <index>...</index> as the XML wrapper.
-
- <format>html:<xsl:param>index.on.type=1 # = 1 For the native stylesheets to generate multiple different indexes.
-
- <format>pdf:<xsl:param>index.on.type=1 # For the native stylesheets to generate multiple different indexes.
+ <xsl:param>index.on.type=1 # = 1 For the native stylesheets to generate multiple different indexes.
# PDF native index support is probably better for PDFs as then you actually get page numbers.
<auto-index-script>autoindex.idx # Specifies the name of the script to load for mylibrary.
- #<auto-index-prefix>../../.. # Will get you back up to /mylibrary, so !scan-path "boost/mylibrary/" is where *.hpp will be,
- # and /libs/mylibrary for other files.
- # Without this would need !scan-path "../../../boost/mylibrary"
<quickbook-define>enable_index ;
}
@@ -106,8 +98,6 @@
<format>pdf:<xsl:param>draft.mode="no"
;
-# install pdf-install : standalone : <install-type>PDF <location>. ;
-
install pdf-install : standalone : <install-type>PDF <location>. <name>auto_index.pdf ;
Modified: sandbox/tools/auto_index/doc/auto_index.pdf
==============================================================================
Binary files. No diff available.
Modified: sandbox/tools/auto_index/doc/auto_index.qbk
==============================================================================
--- sandbox/tools/auto_index/doc/auto_index.qbk (original)
+++ sandbox/tools/auto_index/doc/auto_index.qbk 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -995,13 +995,9 @@
[endsect] [/section:comm_ref Command Line Reference]
-[section:index Index]
-[/Insert a single index of the documentation text.]
-
-[endsect] [/section:index Index]
-
+[? enable_index
'''
<index/>
'''
-
+]
Modified: sandbox/tools/auto_index/doc/html/autoindex/comm_ref.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/autoindex/comm_ref.html (original)
+++ sandbox/tools/auto_index/doc/html/autoindex/comm_ref.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -7,13 +7,12 @@
<link rel="home" href="../index.html" title="AutoIndex">
<link rel="up" href="../index.html" title="AutoIndex">
<link rel="prev" href="xml.html" title="XML Handling">
-<link rel="next" href="../index/s07.html" title="Index">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="xml.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="../index/s07.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="xml.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -82,7 +81,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="xml.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="../index/s07.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="xml.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
</div>
</body>
</html>
Modified: sandbox/tools/auto_index/doc/html/autoindex/script_ref.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/autoindex/script_ref.html (original)
+++ sandbox/tools/auto_index/doc/html/autoindex/script_ref.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -23,7 +23,7 @@
The following elements can occur in a script:
</p>
<a name="autoindex.script_ref.comments_and_blank_lines"></a><h5>
-<a name="id878251"></a>
+<a name="id999699"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.comments_and_blank_lines">Comments and
blank lines</a>
</h5>
@@ -32,7 +32,7 @@
comments onto the end of a line!).
</p>
<a name="autoindex.script_ref.inclusion_of_index_terms"></a><h5>
-<a name="id878274"></a>
+<a name="id999720"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.inclusion_of_index_terms">Inclusion of
Index terms</a>
</h5>
@@ -207,7 +207,7 @@
</dl>
</div>
<a name="autoindex.script_ref.source_file_scanning"></a><h5>
-<a name="id879285"></a>
+<a name="id1000193"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.source_file_scanning">Source File Scanning</a>
</h5>
<pre class="programlisting"><span class="special">!</span><span class="identifier">scan</span> <span class="identifier">source</span><span class="special">-</span><span class="identifier">file</span><span class="special">-</span><span class="identifier">name</span>
@@ -236,7 +236,7 @@
</p></td></tr>
</table></div>
<a name="autoindex.script_ref.directory_and_source_file_scanning"></a><h5>
-<a name="id879362"></a>
+<a name="id1000271"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.directory_and_source_file_scanning">Directory
and Source File Scanning</a>
</h5>
@@ -265,7 +265,7 @@
</dl>
</div>
<a name="autoindex.script_ref.excluding_terms"></a><h5>
-<a name="id879486"></a>
+<a name="id1000396"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.excluding_terms">Excluding Terms</a>
</h5>
<pre class="programlisting"><span class="special">!</span><span class="identifier">exclude</span> <span class="identifier">term</span><span class="special">-</span><span class="identifier">list</span>
@@ -278,7 +278,7 @@
of things to index.
</p>
<a name="autoindex.script_ref.rewriting_section_names"></a><h5>
-<a name="id879542"></a>
+<a name="id1000451"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.rewriting_section_names">Rewriting Section
Names</a>
</h5>
@@ -325,7 +325,7 @@
all index entries - thus preventing lots of entries under "The" etc!
</p>
<a name="autoindex.script_ref.defining_or_changing_the_file_scanners"></a><h5>
-<a name="id879695"></a>
+<a name="id1000603"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.defining_or_changing_the_file_scanners">Defining
or Changing the File Scanners</a>
</h5>
@@ -428,7 +428,7 @@
scanner may find in the documentation.
</p>
<a name="autoindex.script_ref.debugging_scanning"></a><h5>
-<a name="id880197"></a>
+<a name="id1001106"></a>
<a class="link" href="script_ref.html#autoindex.script_ref.debugging_scanning">Debugging scanning</a>
</h5>
<p>
Modified: sandbox/tools/auto_index/doc/html/autoindex/tut/configure.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/autoindex/tut/configure.html (original)
+++ sandbox/tools/auto_index/doc/html/autoindex/tut/configure.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -78,7 +78,7 @@
<auto-index-prefix>../../..
# Tell Quickbook that it should enable indexing.
- <quickbook-define> ;
+ <quickbook-define>enable_index ;
;
</pre>
Modified: sandbox/tools/auto_index/doc/html/autoindex/tut/refine.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/autoindex/tut/refine.html (original)
+++ sandbox/tools/auto_index/doc/html/autoindex/tut/refine.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -52,7 +52,7 @@
</p></td></tr>
</table></div>
<a name="autoindex.tut.refine.restricting_which_sections_are_indexed_for_a_particular_term"></a><h5>
-<a name="id878190"></a>
+<a name="id999636"></a>
<a class="link" href="refine.html#autoindex.tut.refine.restricting_which_sections_are_indexed_for_a_particular_term">Restricting
which Sections are indexed for a particular term</a>
</h5>
Modified: sandbox/tools/auto_index/doc/html/index.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/index.html (original)
+++ sandbox/tools/auto_index/doc/html/index.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -21,7 +21,7 @@
</h3></div></div></div>
<div><p class="copyright">Copyright © 2008 , 2011 John Maddock</p></div>
<div><div class="legalnotice">
-<a name="id868174"></a><p>
+<a name="id989501"></a><p>
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
</p>
@@ -58,12 +58,11 @@
<dt><span class="section">Understanding The AutoIndex Workflow</span></dt>
<dt><span class="section">XML Handling</span></dt>
<dt><span class="section">Command Line Reference</span></dt>
-<dt><span class="section">Index</span></dt>
</dl>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: February 10, 2011 at 18:05:00 GMT</small></p></td>
+<td align="left"><p><small>Last revised: February 18, 2011 at 17:44:08 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: sandbox/tools/auto_index/doc/html/index/s07.html
==============================================================================
--- sandbox/tools/auto_index/doc/html/index/s07.html (original)
+++ sandbox/tools/auto_index/doc/html/index/s07.html 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -16,7 +16,7 @@
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id880560"></a>Index</h2></div></div></div>
+<a name="id1018186"></a>Index</h2></div></div></div>
<p></p>
<div class="variablelist"><dl></dl></div>
</div>
Modified: sandbox/tools/auto_index/src/file_scanning.cpp
==============================================================================
--- sandbox/tools/auto_index/src/file_scanning.cpp (original)
+++ sandbox/tools/auto_index/src/file_scanning.cpp 2011-02-18 12:48:14 EST (Fri, 18 Feb 2011)
@@ -332,9 +332,9 @@
boost::smatch what;
std::string line;
std::ifstream is(script);
- if(is.bad())
+ if(is.bad() || !exists(boost::filesystem::path(script)))
{
- throw std::runtime_error("Could not open script file");
+ throw std::runtime_error(std::string("Could not open script file: ") + script);
}
while(std::getline(is, line).good())
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk