From 101671ae44e1686680c80cd07b452aabeb88fb63 Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 20 Apr 2002 03:01:52 +0000 Subject: Initial revision git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@18 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/html.py | 31 +++++++ tools/publish.py | 27 ++++++ tools/quicktest.py | 185 ++++++++++++++++++++++++++++++++++++++++++ tools/stylesheets/default.css | 157 +++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100755 tools/html.py create mode 100755 tools/publish.py create mode 100755 tools/quicktest.py create mode 100644 tools/stylesheets/default.css (limited to 'tools') diff --git a/tools/html.py b/tools/html.py new file mode 100755 index 000000000..66f029364 --- /dev/null +++ b/tools/html.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python + +""" +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Revision: $Revision$ +:Date: $Date$ +:Copyright: This module has been placed in the public domain. + +A minimal front-end to the Docutils Publisher. + +This module takes advantage of the default values defined in `publish()`. +""" + +import sys +from docutils.core import publish +from docutils import utils + +reporter = utils.Reporter(2, 4) +#reporter.setconditions('nodes.Node.walkabout', 2, 4, debug=1) + +if len(sys.argv) == 2: + publish(writername='html', source=sys.argv[1], reporter=reporter) +elif len(sys.argv) == 3: + publish(writername='html', source=sys.argv[1], destination=sys.argv[2], + reporter=reporter) +elif len(sys.argv) > 3: + print >>sys.stderr, 'Maximum 2 arguments allowed.' + sys.exit(1) +else: + publish() diff --git a/tools/publish.py b/tools/publish.py new file mode 100755 index 000000000..539548911 --- /dev/null +++ b/tools/publish.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +""" +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Revision: $Revision$ +:Date: $Date$ +:Copyright: This module has been placed in the public domain. + +A minimal front-end to the Docutils Publisher. + +This module takes advantage of the default values defined in `publish()`. +""" + +import sys +from docutils.core import publish + + +if len(sys.argv) == 2: + publish(source=sys.argv[1]) +elif len(sys.argv) == 3: + publish(source=sys.argv[1], destination=sys.argv[2]) +elif len(sys.argv) > 3: + print >>sys.stderr, 'Maximum 2 arguments allowed.' + sys.exit(1) +else: + publish() diff --git a/tools/quicktest.py b/tools/quicktest.py new file mode 100755 index 000000000..df295f66a --- /dev/null +++ b/tools/quicktest.py @@ -0,0 +1,185 @@ +#!/usr/bin/env python + +""" +:Author: Garth Kidd +:Contact: garth@deadlybloodyserious.com +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Revision: $Revision$ +:Date: $Date$ +:Copyright: This module has been placed in the public domain. +""" + +import sys, os, getopt +import docutils.utils +from docutils.parsers.rst import Parser + + +usage_header = """\ +quicktest.py: quickly test the restructuredtext parser. + +Usage:: + + quicktest.py [options] [filename] + +``filename`` is the name of the file to use as input (default is stdin). + +Options: +""" + +options = [('pretty', 'p', + 'output pretty pseudo-xml: no "&abc;" entities (default)'), + ('test', 't', 'output test-ready data (input & expected output, ' + 'ready to be copied to a parser test module)'), + ('rawxml', 'r', 'output raw XML'), + ('styledxml=', 's', 'output raw XML with XSL style sheet reference ' + '(filename supplied in the option argument)'), + ('xml', 'x', 'output pretty XML (indented)'), + ('debug', 'd', 'debug mode (lots of output)'), + ('help', 'h', 'show help text')] +"""See distutils.fancy_getopt.FancyGetopt.__init__ for a description of the +data structure: (long option, short option, description).""" + +def usage(): + print usage_header + for longopt, shortopt, description in options: + if longopt[-1:] == '=': + opts = '-%s arg, --%sarg' % (shortopt, longopt) + else: + opts = '-%s, --%s' % (shortopt, longopt), + print '%-15s' % opts, + if len(opts) > 14: + print '%-16s' % '\n', + while len(description) > 60: + limit = description.rindex(' ', 0, 60) + print description[:limit].strip() + description = description[limit + 1:] + print '%-15s' % ' ', + print description + +def _pretty(input, document, optargs): + return document.pformat() + +def _rawxml(input, document, optargs): + return document.asdom().toxml() + +def _styledxml(input, document, optargs): + docnode = document.asdom().childNodes[0] + return '%s\n%s\n%s' % ( + '', + '' % optargs['styledxml'], + docnode.toxml()) + +def _prettyxml(input, document, optargs): + return document.asdom().toprettyxml(' ', '\n') + +def _test(input, document, optargs): + tq = '"""' + output = document.pformat() # same as _pretty() + return """\ + totest['change_this_test_name'] = [ +[%s\\ +%s +%s, +%s\\ +%s +%s], +] +""" % ( tq, escape(input.rstrip()), tq, tq, escape(output.rstrip()), tq ) + +def escape(text): + """ + Return `text` in a form compatible with triple-double-quoted Python strings. + """ + text = text.replace('\\', '\\\\') # escape backslashes + text = text.replace('"""', '""\\"') # break up triple-double-quotes + text = text.replace(' \n', ' \\n\\\n') # protect trailing whitespace + return text + +_outputFormatters = { + 'rawxml': _rawxml, + 'styledxml': _styledxml, + 'xml': _prettyxml, + 'pretty' : _pretty, + 'test': _test + } + +def format(outputFormat, input, document, optargs): + formatter = _outputFormatters[outputFormat] + return formatter(input, document, optargs) + +def getArgs(): + if os.name == 'mac' and len(sys.argv) <= 1: + return macGetArgs() + else: + return posixGetArgs(sys.argv[1:]) + +def posixGetArgs(argv): + outputFormat = 'pretty' + # convert fancy_getopt style option list to getopt.getopt() arguments + shortopts = ''.join([option[1] + ':' * (option[0][-1:] == '=') + for option in options if option[1]]) + longopts = [option[0] for option in options if option[0]] + try: + opts, args = getopt.getopt(argv, shortopts, longopts) + except getopt.GetoptError: + usage() + sys.exit(2) + optargs = {'debug': 0} + for o, a in opts: + if o in ['-h', '--help']: + usage() + sys.exit() + elif o in ['-r', '--rawxml']: + outputFormat = 'rawxml' + elif o in ['-s', '--styledxml']: + outputFormat = 'styledxml' + optargs['styledxml'] = a + elif o in ['-x', '--xml']: + outputFormat = 'xml' + elif o in ['-p', '--pretty']: + outputFormat = 'pretty' + elif o in ['-t', '--test']: + outputFormat = 'test' + elif o in ['-d', '--debug']: + optargs['debug'] = 1 + else: + raise getopt.GetoptError, "getopt should have saved us!" + if len(args) > 1: + print "Only one file at a time, thanks." + usage() + sys.exit(1) + if len(args) == 1: + inputFile = open(args[0]) + else: + inputFile = sys.stdin + return inputFile, outputFormat, optargs + +def macGetArgs(): + import EasyDialogs + EasyDialogs.Message("""\ +In the following window, please: + +1. Choose an output format from the "Option" list. +2. Click "Add" (if you don't, the default format will + be "pretty"). +3. Click "Add existing file..." and choose an input file. +4. Click "OK".""") + optionlist = [(longopt, description) + for (longopt, shortopt, description) in options] + argv = EasyDialogs.GetArgv(optionlist=optionlist, addnewfile=0, addfolder=0) + return posixGetArgs(argv) + +def main(): + inputFile, outputFormat, optargs = getArgs() # process cmdline arguments + parser = Parser() + input = inputFile.read() + document = docutils.utils.newdocument(debug=optargs['debug']) + parser.parse(input, document) + output = format(outputFormat, input, document, optargs) + print output, + + +if __name__ == '__main__': + sys.stderr = sys.stdout + main() diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css new file mode 100644 index 000000000..2db991782 --- /dev/null +++ b/tools/stylesheets/default.css @@ -0,0 +1,157 @@ +/* +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:date: $Date$ +:version: $Revision$ +:copyright: This stylesheet has been placed in the public domain. + +Default cascading style sheet for the HTML output of Docutils. +*/ + +a.footnote-reference { + font-size: smaller ; + vertical-align: super } + +a.target { + color: blue } + +code { + background-color: #eeeeee } + +div.abstract { + margin: 2em 5em } + +div.abstract p.topic-title { + font-weight: bold ; + text-align: center } + +div.attention, div.caution, div.danger, div.error, div.hint, +div.important, div.note, div.tip, div.warning { + margin: 2em ; + border: medium outset ; + padding: 1em } + +div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title { + color: red ; + font-weight: bold ; + font-family: sans-serif } + +div.hint p.admonition-title, div.important p.admonition-title, +div.note p.admonition-title, div.tip p.admonition-title { + font-weight: bold ; + font-family: sans-serif } + +div.field-body { + margin-bottom: 1em } + +div.field-list { + margin-bottom: -1em } + +div.figure { + margin-left: 2em } + +div.system-messages { + margin: 5em } + +div.system-messages h1 { + color: red } + +div.system-message { + border: medium outset ; + padding: 1em } + +div.system-message p.system-message-title { + color: red ; + font-weight: bold } + +div.topic { + margin: 2em } + +dt { + margin-bottom: -1em } + +h1.title { + text-align: center } + +h2.subtitle { + text-align: center } + +hr { + width: 75% } + +ol.arabic { + list-style: decimal } + +ol.loweralpha { + list-style: lower-alpha } + +ol.upperalpha { + list-style: upper-alpha } + +ol.lowerroman { + list-style: lower-roman } + +ol.upperroman { + list-style: upper-roman } + +p.caption { + font-style: italic } + +p.credits { + font-style: italic ; + font-size: smaller } + +p.docinfo-name { + font-weight: bold ; + text-align: right } + +p.field-name { + font-weight: bold ; + margin-bottom: 1em } + +p.label { + white-space: nowrap } + +p.topic-title { + font-weight: bold } + +pre.literal-block, pre.doctest-block { + margin-left: 2em ; + margin-right: 2em ; + background-color: #eeeeee } + +span.classifier { + font-family: sans-serif ; + font-style: oblique } + +span.classifier-delimiter { + font-family: sans-serif ; + font-weight: bold } + +span.field-argument { + font-style: italic } + +span.interpreted { + font-family: sans-serif } + +span.option-argument { + font-style: italic } + +span.problematic { + color: red } + +table { + margin-top: 1em } + +table.citation { + border-left: solid thin gray ; + padding-left: 0.5ex } + +table.docinfo { + margin: 2em 4em } + +table.footnote { + border-left: solid thin black ; + padding-left: 0.5ex } -- cgit v1.2.1 From 34f7a6d1ac6f52cf920a933aba804f54c7be5525 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 5 May 2002 15:49:41 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@91 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/quicktest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/quicktest.py b/tools/quicktest.py index df295f66a..fab25adce 100755 --- a/tools/quicktest.py +++ b/tools/quicktest.py @@ -174,7 +174,7 @@ def main(): inputFile, outputFormat, optargs = getArgs() # process cmdline arguments parser = Parser() input = inputFile.read() - document = docutils.utils.newdocument(debug=optargs['debug']) + document = docutils.utils.new_document(debug=optargs['debug']) parser.parse(input, document) output = format(outputFormat, input, document, optargs) print output, -- cgit v1.2.1 From cff9de2e203bbe10708a99c99b1d67672b1ae4a1 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 5 May 2002 15:50:10 +0000 Subject: simplified git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@92 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/html.py | 15 ++++++++++----- tools/publish.py | 13 ++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/html.py b/tools/html.py index 66f029364..2b9d727ea 100755 --- a/tools/html.py +++ b/tools/html.py @@ -16,16 +16,21 @@ import sys from docutils.core import publish from docutils import utils -reporter = utils.Reporter(2, 4) + +reporter = utils.Reporter(1, 4) #reporter.setconditions('nodes.Node.walkabout', 2, 4, debug=1) if len(sys.argv) == 2: - publish(writername='html', source=sys.argv[1], reporter=reporter) + source = sys.argv[1] + destination = None elif len(sys.argv) == 3: - publish(writername='html', source=sys.argv[1], destination=sys.argv[2], - reporter=reporter) + source = sys.argv[1] + destination = sys.argv[2] elif len(sys.argv) > 3: print >>sys.stderr, 'Maximum 2 arguments allowed.' sys.exit(1) else: - publish() + source = None + destination = None +publish(source=source, destination=destination, reporter=reporter, + writer_name='html') diff --git a/tools/publish.py b/tools/publish.py index 539548911..33655d6b6 100755 --- a/tools/publish.py +++ b/tools/publish.py @@ -14,14 +14,21 @@ This module takes advantage of the default values defined in `publish()`. import sys from docutils.core import publish +from docutils import utils +reporter = utils.Reporter(1, 4) + if len(sys.argv) == 2: - publish(source=sys.argv[1]) + source = sys.argv[1] + destination = None elif len(sys.argv) == 3: - publish(source=sys.argv[1], destination=sys.argv[2]) + source = sys.argv[1] + destination = sys.argv[2] elif len(sys.argv) > 3: print >>sys.stderr, 'Maximum 2 arguments allowed.' sys.exit(1) else: - publish() + source = None + destination = None +publish(source=source, destination=destination, reporter=reporter) -- cgit v1.2.1 From b21ee64ccb2daeb368843a84972bfdece858b6c3 Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 24 May 2002 03:03:19 +0000 Subject: Removed
space reduction; didn't work. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@142 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/default.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'tools') diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css index 2db991782..17bc06900 100644 --- a/tools/stylesheets/default.css +++ b/tools/stylesheets/default.css @@ -69,9 +69,6 @@ div.system-message p.system-message-title { div.topic { margin: 2em } -dt { - margin-bottom: -1em } - h1.title { text-align: center } -- cgit v1.2.1 From 00a4065f9d8c7bd420ab5e7662b06cb5e43639ab Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 30 May 2002 02:19:18 +0000 Subject: Updated front-ends to use the new command-line processing facilities of ``docutils.frontend`` (exposed in ``docutils.core.Publisher``), reducing each to just a few lines of code. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@156 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/html.py | 24 +++--------------------- tools/publish.py | 22 +++------------------- 2 files changed, 6 insertions(+), 40 deletions(-) (limited to 'tools') diff --git a/tools/html.py b/tools/html.py index 2b9d727ea..e93abe3ca 100755 --- a/tools/html.py +++ b/tools/html.py @@ -7,30 +7,12 @@ :Date: $Date$ :Copyright: This module has been placed in the public domain. -A minimal front-end to the Docutils Publisher. - -This module takes advantage of the default values defined in `publish()`. +A minimal front-end to the Docutils Publisher, producing HTML. """ -import sys from docutils.core import publish -from docutils import utils -reporter = utils.Reporter(1, 4) -#reporter.setconditions('nodes.Node.walkabout', 2, 4, debug=1) +usage = 'usage:\n %prog [options] [source [destination]]' -if len(sys.argv) == 2: - source = sys.argv[1] - destination = None -elif len(sys.argv) == 3: - source = sys.argv[1] - destination = sys.argv[2] -elif len(sys.argv) > 3: - print >>sys.stderr, 'Maximum 2 arguments allowed.' - sys.exit(1) -else: - source = None - destination = None -publish(source=source, destination=destination, reporter=reporter, - writer_name='html') +publish(writer_name='html', usage=usage) diff --git a/tools/publish.py b/tools/publish.py index 33655d6b6..606cb7645 100755 --- a/tools/publish.py +++ b/tools/publish.py @@ -7,28 +7,12 @@ :Date: $Date$ :Copyright: This module has been placed in the public domain. -A minimal front-end to the Docutils Publisher. - -This module takes advantage of the default values defined in `publish()`. +A minimal front-end to the Docutils Publisher, producing pseudo-XML. """ -import sys from docutils.core import publish -from docutils import utils -reporter = utils.Reporter(1, 4) +usage = 'usage:\n %prog [options] [source [destination]]' -if len(sys.argv) == 2: - source = sys.argv[1] - destination = None -elif len(sys.argv) == 3: - source = sys.argv[1] - destination = sys.argv[2] -elif len(sys.argv) > 3: - print >>sys.stderr, 'Maximum 2 arguments allowed.' - sys.exit(1) -else: - source = None - destination = None -publish(source=source, destination=destination, reporter=reporter) +publish(usage=usage) -- cgit v1.2.1 From 1be17ead1d6e210c5a8d76cd44a283879f932d69 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 30 May 2002 02:29:07 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@158 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/quicktest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/quicktest.py b/tools/quicktest.py index fab25adce..d76845023 100755 --- a/tools/quicktest.py +++ b/tools/quicktest.py @@ -10,7 +10,9 @@ :Copyright: This module has been placed in the public domain. """ -import sys, os, getopt +import sys +import os +import getopt import docutils.utils from docutils.parsers.rst import Parser -- cgit v1.2.1 From 14a0689d77ea855ef7f983a3cad114bb7ae4df5f Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 1 Jun 2002 01:45:11 +0000 Subject: - Added support for ``header`` and ``footer`` elements. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@174 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/default.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools') diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css index 17bc06900..802c83c76 100644 --- a/tools/stylesheets/default.css +++ b/tools/stylesheets/default.css @@ -52,6 +52,11 @@ div.field-list { div.figure { margin-left: 2em } +div.footer, div.header { + font-size: smaller ; + font-style: italic ; + text-align: center } + div.system-messages { margin: 5em } -- cgit v1.2.1 From 147e98fd9a033cc75331cf9fe3417258e5ab761a Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 1 Jun 2002 02:38:12 +0000 Subject: Removed italics & centering from footer; hard to read. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@176 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/default.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css index 802c83c76..690caf82b 100644 --- a/tools/stylesheets/default.css +++ b/tools/stylesheets/default.css @@ -53,9 +53,7 @@ div.figure { margin-left: 2em } div.footer, div.header { - font-size: smaller ; - font-style: italic ; - text-align: center } + font-size: smaller } div.system-messages { margin: 5em } -- cgit v1.2.1 From 87a136ed0c7a0e107cd58bb96e587daacd265eeb Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 13 Jun 2002 03:34:19 +0000 Subject: Updated for new Optik functionality. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@184 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/html.py | 6 ++++-- tools/publish.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/html.py b/tools/html.py index e93abe3ca..faee09f9c 100755 --- a/tools/html.py +++ b/tools/html.py @@ -13,6 +13,8 @@ A minimal front-end to the Docutils Publisher, producing HTML. from docutils.core import publish -usage = 'usage:\n %prog [options] [source [destination]]' +usage = '%prog [options] [source [destination]]' +description = ('Generate HTML documents from standalone reStructuredText ' + 'sources.') -publish(writer_name='html', usage=usage) +publish(writer_name='html', usage=usage, description=description) diff --git a/tools/publish.py b/tools/publish.py index 606cb7645..14c0ea09a 100755 --- a/tools/publish.py +++ b/tools/publish.py @@ -13,6 +13,8 @@ A minimal front-end to the Docutils Publisher, producing pseudo-XML. from docutils.core import publish -usage = 'usage:\n %prog [options] [source [destination]]' +usage = '%prog [options] [source [destination]]' +description = ('Generate pseudo-XML from standalone reStructuredText sources ' + '(for testing purposes).') -publish(usage=usage) +publish(usage=usage, description=description) -- cgit v1.2.1 From 12566a28180aa8448773ffd892fe841fa3f2314c Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 24 Jun 2002 04:32:42 +0000 Subject: Remove the extra whitespace from the top of the first paragraph of a
or
  • . git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@201 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/default.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tools') diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css index 690caf82b..ffeec0d69 100644 --- a/tools/stylesheets/default.css +++ b/tools/stylesheets/default.css @@ -96,6 +96,14 @@ ol.lowerroman { ol.upperroman { list-style: upper-roman } +dd p:first-child { + margin-top: 0px; +} + +li p:first-child { + margin-top: 0px; +} + p.caption { font-style: italic } -- cgit v1.2.1 From a9913f6dfaab8d568b019f4d700c966c44bb1032 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 27 Jun 2002 01:24:56 +0000 Subject: Added the "--attributes" option, hacked a bit. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@213 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/quicktest.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/quicktest.py b/tools/quicktest.py index d76845023..cf3884875 100755 --- a/tools/quicktest.py +++ b/tools/quicktest.py @@ -13,7 +13,8 @@ import sys import os import getopt -import docutils.utils +from docutils.frontend import OptionParser +from docutils.utils import new_document from docutils.parsers.rst import Parser @@ -37,6 +38,7 @@ options = [('pretty', 'p', ('styledxml=', 's', 'output raw XML with XSL style sheet reference ' '(filename supplied in the option argument)'), ('xml', 'x', 'output pretty XML (indented)'), + ('attributes', '', 'dump document attributes after processing'), ('debug', 'd', 'debug mode (lots of output)'), ('help', 'h', 'show help text')] """See distutils.fancy_getopt.FancyGetopt.__init__ for a description of the @@ -127,7 +129,7 @@ def posixGetArgs(argv): except getopt.GetoptError: usage() sys.exit(2) - optargs = {'debug': 0} + optargs = {'debug': 0, 'attributes': 0} for o, a in opts: if o in ['-h', '--help']: usage() @@ -143,6 +145,8 @@ def posixGetArgs(argv): outputFormat = 'pretty' elif o in ['-t', '--test']: outputFormat = 'test' + elif o == '--attributes': + optargs['attributes'] = 1 elif o in ['-d', '--debug']: optargs['debug'] = 1 else: @@ -174,12 +178,17 @@ In the following window, please: def main(): inputFile, outputFormat, optargs = getArgs() # process cmdline arguments + options = OptionParser().get_default_values() + options.debug = optargs['debug'] parser = Parser() input = inputFile.read() - document = docutils.utils.new_document(debug=optargs['debug']) + document = new_document(options) parser.parse(input, document) output = format(outputFormat, input, document, optargs) print output, + if optargs['attributes']: + import pprint + pprint.pprint(document.__dict__) if __name__ == '__main__': -- cgit v1.2.1 From 02b1f1efbb561ab4e396cd44f4edb4fa5f671863 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 4 Jul 2002 01:29:40 +0000 Subject: - Added ``locale.setlocale()`` calls to front-ends. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@246 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/html.py | 3 +++ tools/publish.py | 3 +++ tools/quicktest.py | 3 +++ 3 files changed, 9 insertions(+) (limited to 'tools') diff --git a/tools/html.py b/tools/html.py index faee09f9c..c1c29b2b6 100755 --- a/tools/html.py +++ b/tools/html.py @@ -10,6 +10,9 @@ A minimal front-end to the Docutils Publisher, producing HTML. """ +import locale +locale.setlocale(locale.LC_ALL, '') + from docutils.core import publish diff --git a/tools/publish.py b/tools/publish.py index 14c0ea09a..6e814ea67 100755 --- a/tools/publish.py +++ b/tools/publish.py @@ -10,6 +10,9 @@ A minimal front-end to the Docutils Publisher, producing pseudo-XML. """ +import locale +locale.setlocale(locale.LC_ALL, '') + from docutils.core import publish diff --git a/tools/quicktest.py b/tools/quicktest.py index cf3884875..9517b95cc 100755 --- a/tools/quicktest.py +++ b/tools/quicktest.py @@ -10,6 +10,9 @@ :Copyright: This module has been placed in the public domain. """ +import locale +locale.setlocale(locale.LC_ALL, '') + import sys import os import getopt -- cgit v1.2.1 From 0fd8121cc0dcf7cc0a8bd9c30856844e4e917134 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 4 Jul 2002 01:31:27 +0000 Subject: Added to project. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@247 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/docutils-xml.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 tools/docutils-xml.py (limited to 'tools') diff --git a/tools/docutils-xml.py b/tools/docutils-xml.py new file mode 100755 index 000000000..9269376bf --- /dev/null +++ b/tools/docutils-xml.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +""" +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Revision: $Revision$ +:Date: $Date$ +:Copyright: This module has been placed in the public domain. + +A minimal front-end to the Docutils Publisher, producing Docutils XML. +""" + +import locale +locale.setlocale(locale.LC_ALL, '') + +from docutils.core import publish + + +usage = '%prog [options] [source [destination]]' +description = ('Generate Docutils XML from standalone reStructuredText ' + 'sources.') + +publish(writer_name='xml', usage=usage, description=description) -- cgit v1.2.1 From 8139dee08117675b9882c2c5fc02be7c66a9341e Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 14 Jul 2002 03:14:29 +0000 Subject: Added to project; stylesheet for PEPs. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@286 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/pep.css | 206 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 tools/stylesheets/pep.css (limited to 'tools') diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css new file mode 100644 index 000000000..00e586c50 --- /dev/null +++ b/tools/stylesheets/pep.css @@ -0,0 +1,206 @@ +/* +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:date: $Date$ +:version: $Revision$ +:copyright: This stylesheet has been placed in the public domain. + +Default cascading style sheet for the PEP HTML output of Docutils. +*/ + +.navigation { + width: 100% ; + background: #99ccff } + +.navigation .navicon { + width: 150px ; + height: 35 } + +.navigation .textlinks { + padding-left: 1em ; + text-align: left } + +.rfc2822 { + margin-top: 0.5em ; + margin-left: 1em ; + margin-right: 1em } + +.rfc2822 div.field-body { + text-align: left } + +.rfc2822 p.field-name { + text-align: right ; + font-family: sans-serif ; + padding-right: 0.5em ; + font-weight: bold ; + margin-bottom: 0em } + +a.footnote-reference { + font-size: smaller ; + vertical-align: super } + +a.target { + color: blue } + +body { + margin: 0px ; + margin-bottom: 1em ; + padding: 0px } + +code { + background-color: #eeeeee } + +div.section { + margin-left: 1em ; + margin-right: 1em } + +div.abstract { + margin: 2em 5em } + +div.abstract p.topic-title { + font-weight: bold ; + text-align: center } + +div.attention, div.caution, div.danger, div.error, div.hint, +div.important, div.note, div.tip, div.warning { + margin: 2em ; + border: medium outset ; + padding: 1em } + +div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title { + color: red ; + font-weight: bold ; + font-family: sans-serif } + +div.hint p.admonition-title, div.important p.admonition-title, +div.note p.admonition-title, div.tip p.admonition-title { + font-weight: bold ; + font-family: sans-serif } + +div.figure { + margin-left: 2em } + +div.footer, div.header { + font-size: smaller } + +div.footer p { + margin-left: 1em ; + margin-right: 1em } + +div.system-messages { + margin: 5em } + +div.system-messages h1 { + color: red } + +div.system-message { + border: medium outset ; + padding: 1em } + +div.system-message p.system-message-title { + color: red ; + font-weight: bold } + +div.topic { + margin: 2em } + +h1 { + font-family: sans-serif ; + font-size: large } + +h2 { + font-family: sans-serif ; + font-size: medium } + +h3 { + font-family: sans-serif ; + font-size: small } + +h4 { + font-family: sans-serif ; + font-style: italic ; + font-size: small } + +h5 { + font-family: sans-serif; + font-size: x-small } + +h6 { + font-family: sans-serif; + font-style: italic ; + font-size: x-small } + +.section hr { + width: 75% } + +ol.arabic { + list-style: decimal } + +ol.loweralpha { + list-style: lower-alpha } + +ol.upperalpha { + list-style: upper-alpha } + +ol.lowerroman { + list-style: lower-roman } + +ol.upperroman { + list-style: upper-roman } + +dd p:first-child { + margin-top: 0px } + +li p:first-child { + margin-top: 0px } + +p.caption { + font-style: italic } + +p.credits { + font-style: italic ; + font-size: smaller } + +p.field-name { + font-weight: bold ; + margin-bottom: 1em } + +p.label { + white-space: nowrap } + +p.topic-title { + font-family: sans-serif ; + font-weight: bold } + +pre.literal-block, pre.doctest-block { + margin-left: 2em ; + margin-right: 2em ; + background-color: #eeeeee } + +span.classifier { + font-family: sans-serif ; + font-style: oblique } + +span.classifier-delimiter { + font-family: sans-serif ; + font-weight: bold } + +span.field-argument { + font-style: italic } + +span.interpreted { + font-family: sans-serif } + +span.option-argument { + font-style: italic } + +span.problematic { + color: red } + +table.citation { + margin-bottom: 1em } + +table.footnote { + margin-bottom: 1em } -- cgit v1.2.1 From 4f9dc43240ea31269c8fdc2aa877ffed51f7060c Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 14 Jul 2002 03:15:19 +0000 Subject: Added to project; template for PEP HTML. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@287 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep-template.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tools/pep-template.html (limited to 'tools') diff --git a/tools/pep-template.html b/tools/pep-template.html new file mode 100644 index 000000000..eabd3bcb8 --- /dev/null +++ b/tools/pep-template.html @@ -0,0 +1,23 @@ + + + + + + + PEP %(pep)s -- %(title)s + + + + + +
    + +[Python] +[Python Home] +[PEP Index] +[PEP Source] +
    +%(body)s +%(body_suffix)s -- cgit v1.2.1 From 078916ea45ccd1d7e40328c148be92e69ad25519 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 14 Jul 2002 03:18:57 +0000 Subject: Added to project; PEP to HTML front-end. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@288 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 tools/pep.py (limited to 'tools') diff --git a/tools/pep.py b/tools/pep.py new file mode 100755 index 000000000..acaab10c4 --- /dev/null +++ b/tools/pep.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +""" +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Revision: $Revision$ +:Date: $Date$ +:Copyright: This module has been placed in the public domain. + +A minimal front-end to the Docutils Publisher, producing HTML from PEP +(Python Enhancement Proposal) documents. +""" + +import locale +locale.setlocale(locale.LC_ALL, '') + +from docutils.core import publish + + +usage = 'usage:\n %prog [options] [source [destination]]' + +publish(reader_name='pep', writer_name='pep_html', usage=usage) -- cgit v1.2.1 From acb21b5d5622d284a3ed98236bf15ee70bb03069 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 14 Jul 2002 03:40:35 +0000 Subject: parameterized the stylesheet reference git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@291 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep-template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/pep-template.html b/tools/pep-template.html index eabd3bcb8..49e989ba4 100644 --- a/tools/pep-template.html +++ b/tools/pep-template.html @@ -5,7 +5,7 @@ PEP %(pep)s -- %(title)s - + Date: Thu, 18 Jul 2002 01:40:16 +0000 Subject: tweaking git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@310 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/default.css | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css index ffeec0d69..81de8ba2c 100644 --- a/tools/stylesheets/default.css +++ b/tools/stylesheets/default.css @@ -43,12 +43,6 @@ div.note p.admonition-title, div.tip p.admonition-title { font-weight: bold ; font-family: sans-serif } -div.field-body { - margin-bottom: 1em } - -div.field-list { - margin-bottom: -1em } - div.figure { margin-left: 2em } @@ -111,14 +105,6 @@ p.credits { font-style: italic ; font-size: smaller } -p.docinfo-name { - font-weight: bold ; - text-align: right } - -p.field-name { - font-weight: bold ; - margin-bottom: 1em } - p.label { white-space: nowrap } @@ -163,3 +149,10 @@ table.docinfo { table.footnote { border-left: solid thin black ; padding-left: 0.5ex } + +td.docinfo-name { + font-weight: bold ; + text-align: right } + +td.field-name { + font-weight: bold } -- cgit v1.2.1 From 32367a27ba4aa267d9d0ecfe10c8395e4044ad47 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 18 Jul 2002 01:43:09 +0000 Subject: Parameterized the Python graphic. Separately parematerized the PEP index path. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@311 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep-template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/pep-template.html b/tools/pep-template.html index 49e989ba4..de0c0d4c8 100644 --- a/tools/pep-template.html +++ b/tools/pep-template.html @@ -12,11 +12,11 @@ width="100%%" border="0">
    -[Python] [Python Home] -[PEP Index] +[PEP Index] [PEP Source]
    %(body)s -- cgit v1.2.1 From d502067bbf507b4f370972b7ee8cc54645ca3ccc Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 18 Jul 2002 01:44:22 +0000 Subject: Renamed pep-template.html to pep-html-template git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@312 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep-html-template | 23 +++++++++++++++++++++++ tools/pep-template.html | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 tools/pep-html-template delete mode 100644 tools/pep-template.html (limited to 'tools') diff --git a/tools/pep-html-template b/tools/pep-html-template new file mode 100644 index 000000000..de0c0d4c8 --- /dev/null +++ b/tools/pep-html-template @@ -0,0 +1,23 @@ + + + + + + + PEP %(pep)s -- %(title)s + + + + + +
    + +[Python] +[Python Home] +[PEP Index] +[PEP Source] +
    +%(body)s +%(body_suffix)s diff --git a/tools/pep-template.html b/tools/pep-template.html deleted file mode 100644 index de0c0d4c8..000000000 --- a/tools/pep-template.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - PEP %(pep)s -- %(title)s - - - - - -
    - -[Python] -[Python Home] -[PEP Index] -[PEP Source] -
    -%(body)s -%(body_suffix)s -- cgit v1.2.1 From 072c69c92964642a05d2b9c91b4e4321890d933b Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 18 Jul 2002 01:48:14 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@313 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/stylesheets/pep.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css index 00e586c50..69fc0f087 100644 --- a/tools/stylesheets/pep.css +++ b/tools/stylesheets/pep.css @@ -28,7 +28,7 @@ Default cascading style sheet for the PEP HTML output of Docutils. .rfc2822 div.field-body { text-align: left } -.rfc2822 p.field-name { +.rfc2822 td.field-name { text-align: right ; font-family: sans-serif ; padding-right: 0.5em ; -- cgit v1.2.1 From 2a27bb35bdadbee15b24709e03c1cca08c7c8615 Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 19 Jul 2002 02:05:40 +0000 Subject: From python/nondist/peps. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@319 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- tools/pep2html.py | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100755 tools/pep2html.py (limited to 'tools') diff --git a/tools/pep2html.py b/tools/pep2html.py new file mode 100755 index 000000000..47cf1be1e --- /dev/null +++ b/tools/pep2html.py @@ -0,0 +1,392 @@ +#!/usr/bin/env python +""" +convert PEP's to (X)HTML - courtesy of /F + +Usage: %(PROGRAM)s [options] [peps] + +Options: + + -u/--user + SF username + + -b/--browse + After generating the HTML, direct your web browser to view it + (using the Python webbrowser module). If both -i and -b are + given, this will browse the on-line HTML; otherwise it will + browse the local HTML. If no pep arguments are given, this + will browse PEP 0. + + -i/--install + After generating the HTML, install it and the plain text source file + (.txt) SourceForge. In that case the user's name is used in the scp + and ssh commands, unless -u sf_username is given (in which case, it is + used instead). Without -i, -u is ignored. + + -q/--quiet + Turn off verbose messages. + + -h/--help + Print this help message and exit. + +The optional argument `peps' is a list of either pep numbers or .txt files. +""" + +import sys +import os +import re +import cgi +import glob +import getopt +import errno +import random +import time + +PROGRAM = sys.argv[0] +RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html' +PEPURL = 'pep-%04d.html' +PEPCVSURL = 'http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/python/nondist/peps/pep-%04d.txt' +PEPDIRRUL = 'http://www.python.org/peps/' + + +HOST = "www.python.org" # host for update +HDIR = "/ftp/ftp.python.org/pub/www.python.org/peps" # target host directory +LOCALVARS = "Local Variables:" + +# The generated HTML doesn't validate -- you cannot use
    and

    inside +# 
     tags.  But if I change that, the result doesn't look very nice...
+DTD = ('')
+
+fixpat = re.compile("((http|ftp):[-_a-zA-Z0-9/.+~:?#$=&,]+)|(pep-\d+(.txt)?)|"
+                    "(RFC[- ]?(?P\d+))|"
+                    "(PEP\s+(?P\d+))|"
+                    ".")
+
+EMPTYSTRING = ''
+SPACE = ' '
+
+
+
+def usage(code, msg=''):
+    print >> sys.stderr, __doc__ % globals()
+    if msg:
+        print >> sys.stderr, msg
+    sys.exit(code)
+
+
+
+def fixanchor(current, match):
+    text = match.group(0)
+    link = None
+    if text.startswith('http:') or text.startswith('ftp:'):
+        # Strip off trailing punctuation.  Pattern taken from faqwiz.
+        ltext = list(text)
+        while ltext:
+            c = ltext.pop()
+            if c not in '();:,.?\'"<>':
+                ltext.append(c)
+                break
+        link = EMPTYSTRING.join(ltext)
+    elif text.startswith('pep-') and text <> current:
+        link = os.path.splitext(text)[0] + ".html"
+    elif text.startswith('PEP'):
+        pepnum = int(match.group('pepnum'))
+        link = PEPURL % pepnum
+    elif text.startswith('RFC'):
+        rfcnum = int(match.group('rfcnum'))
+        link = RFCURL % rfcnum
+    if link:
+        return '%s' % (link, cgi.escape(text))
+    return cgi.escape(match.group(0)) # really slow, but it works...
+
+
+
+NON_MASKED_EMAILS = [
+    'peps@python.org',
+    'python-list@python.org',
+    'python-dev@python.org',
+    ]
+
+def fixemail(address, pepno):
+    if address.lower() in NON_MASKED_EMAILS:
+        # return hyperlinked version of email address
+        return linkemail(address, pepno)
+    else:
+        # return masked version of email address
+        parts = address.split('@', 1)
+        return '%s at %s' % (parts[0], parts[1])
+
+
+def linkemail(address, pepno):
+    parts = address.split('@', 1)
+    return (''
+            '%s at %s'
+            % (parts[0], parts[1], pepno, parts[0], parts[1]))
+
+
+def fixfile(infile, outfile):
+    basename = os.path.basename(infile)
+    # convert plain text pep to minimal XHTML markup
+    try:
+        fi = open(infile)
+    except IOError, e:
+        if e.errno <> errno.ENOENT: raise
+        print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
+        return
+    fo = open(outfile, "w")
+    print >> fo, DTD
+    print >> fo, ''
+    print >> fo, ''
+    # head
+    header = []
+    pep = ""
+    title = ""
+    while 1:
+        line = fi.readline()
+        if not line.strip():
+            break
+        if line[0].strip():
+            if ":" not in line:
+                break
+            key, value = line.split(":", 1)
+            value = value.strip()
+            header.append((key, value))
+        else:
+            # continuation line
+            key, value = header[-1]
+            value = value + line
+            header[-1] = key, value
+        if key.lower() == "title":
+            title = value
+        elif key.lower() == "pep":
+            pep = value
+    if pep:
+        title = "PEP " + pep + " -- " + title
+    if title:
+        print >> fo, '  %s' % cgi.escape(title)
+    print >> fo, '  '
+    print >> fo, ''
+    # body
+    print >> fo, ''
+    print >> fo, '> fo, '       width="100%" border="0">'
+    print >> fo, ''
+    print >> fo, '
    '
+    r = random.choice(range(64))
+    print >> fo, ''
+    print >> fo, '[Python]> fo, ' border="0" width="150" height="35" />'
+    print >> fo, '[Python Home]'
+    if basename <> 'pep-0000.txt':
+        print >> fo, '[PEP Index]'
+    if pep:
+        print >> fo, '[PEP Source]' \
+              % int(pep)
+    print >> fo, '
    '
+    print >> fo, '
    \n'
+    for k, v in header:
+        if k.lower() in ('author', 'discussions-to'):
+            mailtos = []
+            for addr in v.split():
+                if '@' in addr:
+                    if k.lower() == 'discussions-to':
+                        m = linkemail(addr, pep)
+                    else:
+                        m = fixemail(addr, pep)
+                    mailtos.append(m)
+                elif addr.startswith('http:'):
+                    mailtos.append(
+                        '%s' % (addr, addr))
+                else:
+                    mailtos.append(addr)
+            v = SPACE.join(mailtos)
+        elif k.lower() in ('replaces', 'replaced-by'):
+            otherpeps = ''
+            for otherpep in v.split():
+                otherpep = int(otherpep)
+                otherpeps += '%i ' % (otherpep, 
+                                                                  otherpep)
+            v = otherpeps
+        elif k.lower() in ('last-modified',):
+            url = PEPCVSURL % int(pep)
+            date = v or time.strftime('%d-%b-%Y',
+                                      time.localtime(os.stat(infile)[8]))
+            v = '%s ' % (url, cgi.escape(date))
+        else:
+            v = cgi.escape(v)
+        print >> fo, '  ' \
+              % (cgi.escape(k), v)
+    print >> fo, '
    %s: %s
    '
+    print >> fo, '
    '
+    print >> fo, '
    '
+    print >> fo, '
    '
+    need_pre = 1
+    while 1:
+        line = fi.readline()
+        if not line:
+            break
+        if line[0] == '\f':
+            continue
+        if line.strip() == LOCALVARS:
+            break
+        if line[0].strip():
+            if line.strip() == LOCALVARS:
+                break
+            if not need_pre:
+                print >> fo, '
    ' + print >> fo, '

    %s

    ' % line.strip() + need_pre = 1 + elif not line.strip() and need_pre: + continue + else: + # PEP 0 has some special treatment + if basename == 'pep-0000.txt': + parts = line.split() + if len(parts) > 1 and re.match(r'\s*\d{1,4}', parts[1]): + # This is a PEP summary line, which we need to hyperlink + url = PEPURL % int(parts[1]) + if need_pre: + print >> fo, '
    '
+                        need_pre = 0
+                    print >> fo, re.sub(
+                        parts[1],
+                        '%s' % (url, parts[1]),
+                        line, 1),
+                    continue
+                elif parts and '@' in parts[-1]:
+                    # This is a pep email address line, so filter it.
+                    url = fixemail(parts[-1], pep)
+                    if need_pre:
+                        print >> fo, '
    '
+                        need_pre = 0
+                    print >> fo, re.sub(
+                        parts[-1], url, line, 1),
+                    continue
+            line = fixpat.sub(lambda x, c=infile: fixanchor(c, x), line)
+            if need_pre:
+                print >> fo, '
    '
+                need_pre = 0
+            fo.write(line)
+    if not need_pre:
+        print >> fo, '
    '
+    print >> fo, ''
+    print >> fo, ''
+    print >> fo, ''
+    fo.close()
+    os.chmod(outfile, 0664)
+
+
+
+def find_pep(pep_str):
+    """Find the .txt file indicated by a cmd line argument"""
+    if os.path.exists(pep_str):
+        return pep_str
+    num = int(pep_str)
+    return "pep-%04d.txt" % num
+
+def make_html(file, verbose=0):
+    newfile = os.path.splitext(file)[0] + ".html"
+    if verbose:
+        print file, "->", newfile
+    fixfile(file, newfile)
+    return newfile
+
+def push_pep(htmlfiles, txtfiles, username, verbose):
+    if verbose:
+        quiet = ""
+    else:
+        quiet = "-q"
+    if username:
+        username = username + "@"
+    target = username + HOST + ":" + HDIR
+    files = htmlfiles[:]
+    files.extend(txtfiles)
+    files.append("style.css")
+    filelist = SPACE.join(files)
+    rc = os.system("scp %s %s %s" % (quiet, filelist, target))
+    if rc:
+        sys.exit(rc)
+    rc = os.system("ssh %s%s chmod 664 %s/*" % (username, HOST, HDIR))
+    if rc:
+        sys.exit(rc)
+
+
+def browse_file(pep):
+    import webbrowser
+    file = find_pep(pep)
+    if file.endswith(".txt"):
+        file = file[:-3] + "html"
+    file = os.path.abspath(file)
+    url = "file:" + file
+    webbrowser.open(url)
+
+def browse_remote(pep):
+    import webbrowser
+    file = find_pep(pep)
+    if file.endswith(".txt"):
+        file = file[:-3] + "html"
+    url = PEPDIRRUL + file
+    webbrowser.open(url)
+
+
+def main():
+    # defaults
+    update = 0
+    username = ''
+    verbose = 1
+    browse = 0
+
+    try:
+        opts, args = getopt.getopt(
+            sys.argv[1:], 'bihqu:',
+            ['browse', 'install', 'help', 'quiet', 'user='])
+    except getopt.error, msg:
+        usage(1, msg)
+
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            usage(0)
+        elif opt in ('-i', '--install'):
+            update = 1
+        elif opt in ('-u', '--user'):
+            username = arg
+        elif opt in ('-q', '--quiet'):
+            verbose = 0
+        elif opt in ('-b', '--browse'):
+            browse = 1
+
+    if args:
+        peptxt = []
+        html = []
+        for pep in args:
+            file = find_pep(pep)
+            peptxt.append(file)
+            newfile = make_html(file, verbose=verbose)
+            html.append(newfile)
+            if browse and not update:
+                browse_file(pep)
+    else:
+        # do them all
+        peptxt = []
+        files = glob.glob("pep-*.txt")
+        files.sort()
+        for file in files:
+            peptxt.append(file)
+            make_html(file, verbose=verbose)
+        html = ["pep-*.html"]
+        if browse and not update:
+            browse_file("0")
+
+    if update:
+        push_pep(html, peptxt, username, verbose)
+        if browse:
+            if args:
+                for pep in args:
+                    browse_remote(pep)
+            else:
+                browse_remote("0")
+
+
+
+if __name__ == "__main__":
+    main()
-- 
cgit v1.2.1


From c999a0671a217dcdd8a6e2bd38332a021d48632a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 19 Jul 2002 02:38:13 +0000
Subject: Added support for reStructuredText PEPs.  Refactored naming in
 ``fixfile``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@326 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 170 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 115 insertions(+), 55 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 47cf1be1e..d5d3221d0 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -125,24 +125,17 @@ def linkemail(address, pepno):
 
 
 def fixfile(infile, outfile):
-    basename = os.path.basename(infile)
+    basename = os.path.basename(infile.name)
     # convert plain text pep to minimal XHTML markup
-    try:
-        fi = open(infile)
-    except IOError, e:
-        if e.errno <> errno.ENOENT: raise
-        print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
-        return
-    fo = open(outfile, "w")
-    print >> fo, DTD
-    print >> fo, ''
-    print >> fo, ''
+    print >> outfile, DTD
+    print >> outfile, ''
+    print >> outfile, ''
     # head
     header = []
     pep = ""
     title = ""
     while 1:
-        line = fi.readline()
+        line = infile.readline()
         if not line.strip():
             break
         if line[0].strip():
@@ -163,27 +156,27 @@ def fixfile(infile, outfile):
     if pep:
         title = "PEP " + pep + " -- " + title
     if title:
-        print >> fo, '  %s' % cgi.escape(title)
-    print >> fo, '  '
-    print >> fo, ''
+        print >> outfile, '  %s' % cgi.escape(title)
+    print >> outfile, '  '
+    print >> outfile, ''
     # body
-    print >> fo, ''
-    print >> fo, '> fo, '       width="100%" border="0">'
-    print >> fo, '
    '
+    print >> outfile, ''
+    print >> outfile, '> outfile, '       width="100%" border="0">'
+    print >> outfile, ''
-    print >> fo, ''
+    print >> outfile, '
    '
     r = random.choice(range(64))
-    print >> fo, ''
-    print >> fo, '[Python]> fo, ' border="0" width="150" height="35" />'
-    print >> fo, '[Python Home]'
+    print >> outfile, ''
+    print >> outfile, '[Python]> outfile, ' border="0" width="150" height="35" />'
+    print >> outfile, '[Python Home]'
     if basename <> 'pep-0000.txt':
-        print >> fo, '[PEP Index]'
+        print >> outfile, '[PEP Index]'
     if pep:
-        print >> fo, '[PEP Source]' \
+        print >> outfile, '[PEP Source]' \
               % int(pep)
-    print >> fo, '
    '
-    print >> fo, '
    \n'
+    print >> outfile, '
    '
+    print >> outfile, '
    \n'
     for k, v in header:
         if k.lower() in ('author', 'discussions-to'):
             mailtos = []
@@ -210,19 +203,19 @@ def fixfile(infile, outfile):
         elif k.lower() in ('last-modified',):
             url = PEPCVSURL % int(pep)
             date = v or time.strftime('%d-%b-%Y',
-                                      time.localtime(os.stat(infile)[8]))
+                                      time.localtime(os.stat(infile.name)[8]))
             v = '%s ' % (url, cgi.escape(date))
         else:
             v = cgi.escape(v)
-        print >> fo, '  ' \
+        print >> outfile, '  ' \
               % (cgi.escape(k), v)
-    print >> fo, '
    %s: %s
    %s: %s
    '
-    print >> fo, '
    '
-    print >> fo, '
    '
-    print >> fo, '
    '
+    print >> outfile, '
    '
+    print >> outfile, ''
+    print >> outfile, '
    '
+    print >> outfile, '
    '
     need_pre = 1
     while 1:
-        line = fi.readline()
+        line = infile.readline()
         if not line:
             break
         if line[0] == '\f':
@@ -233,8 +226,8 @@ def fixfile(infile, outfile):
             if line.strip() == LOCALVARS:
                 break
             if not need_pre:
-                print >> fo, '
    '
-            print >> fo, '
    %s
    ' % line.strip()
+                print >> outfile, '
    ' + print >> outfile, '

    %s

    ' % line.strip() need_pre = 1 elif not line.strip() and need_pre: continue @@ -246,9 +239,9 @@ def fixfile(infile, outfile): # This is a PEP summary line, which we need to hyperlink url = PEPURL % int(parts[1]) if need_pre: - print >> fo, '
    '
+                        print >> outfile, '
    '
                         need_pre = 0
-                    print >> fo, re.sub(
+                    print >> outfile, re.sub(
                         parts[1],
                         '%s' % (url, parts[1]),
                         line, 1),
@@ -257,26 +250,86 @@ def fixfile(infile, outfile):
                     # This is a pep email address line, so filter it.
                     url = fixemail(parts[-1], pep)
                     if need_pre:
-                        print >> fo, '
    '
+                        print >> outfile, '
    '
                         need_pre = 0
-                    print >> fo, re.sub(
+                    print >> outfile, re.sub(
                         parts[-1], url, line, 1),
                     continue
-            line = fixpat.sub(lambda x, c=infile: fixanchor(c, x), line)
+            line = fixpat.sub(lambda x, c=infile.name: fixanchor(c, x), line)
             if need_pre:
-                print >> fo, '
    '
+                print >> outfile, '
    '
                 need_pre = 0
-            fo.write(line)
+            outfile.write(line)
     if not need_pre:
-        print >> fo, '
    '
-    print >> fo, ''
-    print >> fo, ''
-    print >> fo, ''
-    fo.close()
-    os.chmod(outfile, 0664)
+        print >> outfile, '
    '
+    print >> outfile, ''
+    print >> outfile, ''
+    print >> outfile, ''
 
+
+def fix_rst_pep(infile, outfile):
+    from docutils import core, io
+    pub = core.Publisher()
+    pub.set_reader(reader_name='pep', parser_name='restructuredtext',
+                   parser=None)
+    pub.set_writer(writer_name='pep_html')
+    options = pub.set_options(generator=1, datestamp='%Y-%m-%d %H:%M UTC')
+    pub.source = io.FileIO(options, source=infile, source_path=infile.name)
+    pub.destination = io.FileIO(options, destination=outfile,
+                                destination_path=outfile.name)
+    pub.publish()
+
+
+underline = re.compile('[!-/:-@[-`{-~]{4,}$')
+
+def check_rst_pep(infile):
+    """
+    Check if `infile` is a reStructuredText PEP.  Return 1 for yes, 0 for no.
+
+    If the result is indeterminate, return None.  Reset `infile` to the
+    beginning.
+    """
+    result = None
+    underline_match = underline.match
+    # Find the end of the RFC 2822 header (first blank line):
+    while 1:
+        line = infile.readline().strip()
+        if not line:
+            break
+    # Determine if the PEP is old-style or new (reStructuredText):
+    while result is None:
+        line = infile.readline()
+        if not line:
+            break
+        line = line.rstrip()
+        if len(line.lstrip()) < len(line):
+            # Indented section; this is an old-style PEP.
+            result = 0
+        elif underline_match(line):
+            # Matched a section header underline;
+            # this is a reStructuredText PEP.
+            result = 1
+    infile.seek(0)
+    return result
 
 
+def open_files(inpath, outpath):
+    try:
+        infile = open(inpath)
+    except IOError, e:
+        if e.errno <> errno.ENOENT: raise
+        print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
+        sys.stderr.flush()
+        return None, None
+    outfile = open(outpath, "w")
+    return infile, outfile
+
+def close_files(infile, outfile):
+    infile.close()
+    outfile.close()
+    os.chmod(outfile.name, 0664)
+    
+
 def find_pep(pep_str):
     """Find the .txt file indicated by a cmd line argument"""
     if os.path.exists(pep_str):
@@ -284,12 +337,19 @@ def find_pep(pep_str):
     num = int(pep_str)
     return "pep-%04d.txt" % num
 
-def make_html(file, verbose=0):
-    newfile = os.path.splitext(file)[0] + ".html"
+def make_html(inpath, verbose=0):
+    outpath = os.path.splitext(inpath)[0] + ".html"
     if verbose:
-        print file, "->", newfile
-    fixfile(file, newfile)
-    return newfile
+        print inpath, "->", outpath
+        sys.stdout.flush()
+    infile, outfile = open_files(inpath, outpath)
+    if infile is not None:
+        if check_rst_pep(infile):
+            fix_rst_pep(infile, outfile)
+        else:
+            fixfile(infile, outfile)
+        close_files(infile, outfile)
+    return outpath
 
 def push_pep(htmlfiles, txtfiles, username, verbose):
     if verbose:
-- 
cgit v1.2.1


From d485602ebab4977879b816aa4f2ba0c9eaedf6b3 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 19 Jul 2002 02:42:34 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@328 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 9 ++-------
 tools/stylesheets/pep.css     | 8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 81de8ba2c..b5b2d148c 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -15,9 +15,6 @@ a.footnote-reference {
 a.target {
   color: blue }
 
-code {
-  background-color: #eeeeee }
-
 div.abstract {
   margin: 2em 5em }
 
@@ -91,12 +88,10 @@ ol.upperroman {
   list-style: upper-roman }
 
 dd p:first-child {
-  margin-top: 0px;
-}
+  margin-top: 0px }
 
 li p:first-child {
-  margin-top: 0px;
-}
+  margin-top: 0px }
 
 p.caption {
   font-style: italic }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 69fc0f087..e84b7a7cf 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -47,8 +47,8 @@ body {
   margin-bottom: 1em ;
   padding: 0px }
 
-code {
-  background-color: #eeeeee }
+col.num {
+  text-align: center }
 
 div.section {
   margin-left: 1em ;
@@ -163,10 +163,6 @@ p.credits {
   font-style: italic ;
   font-size: smaller }
 
-p.field-name {
-  font-weight: bold ;
-  margin-bottom: 1em }
-
 p.label {
   white-space: nowrap }
 
-- 
cgit v1.2.1


From 6f03aeb4f23233eca8173b07f195560eef55fcec Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 23 Jul 2002 02:40:35 +0000
Subject: Many changes to optimize vertical space: compact simple lists etc.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@350 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 28 ++++++++++++++++++++-------
 tools/stylesheets/pep.css     | 44 +++++++++++++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 21 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index b5b2d148c..dc8881606 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -63,6 +63,10 @@ div.system-message p.system-message-title {
 div.topic {
   margin: 2em }
 
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+  text-decoration: none ;
+  color: black }
+
 h1.title {
   text-align: center }
 
@@ -72,6 +76,9 @@ h2.subtitle {
 hr {
   width: 75% }
 
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
 ol.arabic {
   list-style: decimal }
 
@@ -87,12 +94,10 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
-dd p:first-child {
-  margin-top: 0px }
-
-li p:first-child {
-  margin-top: 0px }
-
+/*dd p:first-child, li p:first-child, td p:first-child, th p:first-child {
+  margin-top: 0 ;
+  padding-top: 0 }
+*/
 p.caption {
   font-style: italic }
 
@@ -100,6 +105,9 @@ p.credits {
   font-style: italic ;
   font-size: smaller }
 
+p.first {
+  margin-top: 0 }
+
 p.label {
   white-space: nowrap }
 
@@ -132,7 +140,8 @@ span.problematic {
   color: red }
 
 table {
-  margin-top: 1em }
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
 
 table.citation {
   border-left: solid thin gray ;
@@ -145,6 +154,11 @@ table.footnote {
   border-left: solid thin black ;
   padding-left: 0.5ex }
 
+td, th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: baseline }
+
 td.docinfo-name {
   font-weight: bold ;
   text-align: right }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index e84b7a7cf..53b67b303 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -10,7 +10,9 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 
 .navigation {
   width: 100% ;
-  background: #99ccff }
+  background: #99ccff ;
+  margin-top: 0px ;
+  margin-bottom: 0px }
 
 .navigation .navicon {
   width: 150px ;
@@ -20,10 +22,16 @@ Default cascading style sheet for the PEP HTML output of Docutils.
   padding-left: 1em ;
   text-align: left }
 
+.navigation td, .navigation th {
+  padding-left: 0em ;
+  padding-right: 0em ;
+  vertical-align: middle }
+
 .rfc2822 {
   margin-top: 0.5em ;
-  margin-left: 1em ;
-  margin-right: 1em }
+  margin-left: 0.5em ;
+  margin-right: 0.5em ;
+  margin-bottom: 0em }
 
 .rfc2822 div.field-body {
   text-align: left }
@@ -42,17 +50,22 @@ a.footnote-reference {
 a.target {
   color: blue }
 
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+  text-decoration: none ;
+  color: black }
+
 body {
   margin: 0px ;
   margin-bottom: 1em ;
   padding: 0px }
 
-col.num {
-  text-align: center }
+td.num {
+  text-align: right }
 
 div.section {
   margin-left: 1em ;
-  margin-right: 1em }
+  margin-right: 1em ;
+  margin-bottom: 1.5em }
 
 div.abstract {
   margin: 2em 5em }
@@ -135,6 +148,9 @@ h6 {
 .section hr {
   width: 75% }
 
+ol, ul {
+  margin-bottom: 1em }
+
 ol.arabic {
   list-style: decimal }
 
@@ -150,10 +166,7 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
-dd p:first-child {
-  margin-top: 0px }
-
-li p:first-child {
+dd p:first-child, li p:first-child, td p:first-child, th p:first-child {
   margin-top: 0px }
 
 p.caption {
@@ -195,8 +208,11 @@ span.option-argument {
 span.problematic {
   color: red }
 
-table.citation {
-  margin-bottom: 1em }
+table {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
 
-table.footnote {
-  margin-bottom: 1em }
+td, th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: baseline }
-- 
cgit v1.2.1


From 18fba0d32c5d883296ddb64ee8ad6dc9fa1ddcd2 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 24 Jul 2002 01:51:41 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@364 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index dc8881606..a9bd01a18 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -94,10 +94,6 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
-/*dd p:first-child, li p:first-child, td p:first-child, th p:first-child {
-  margin-top: 0 ;
-  padding-top: 0 }
-*/
 p.caption {
   font-style: italic }
 
-- 
cgit v1.2.1


From 880c53928e14b1c38276722cb82a60e1c6dd10f8 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 25 Jul 2002 01:52:07 +0000
Subject: updates & improvements

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@370 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 11 +++++++----
 tools/stylesheets/pep.css     | 15 +++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index a9bd01a18..8d880c7cb 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -15,6 +15,13 @@ a.footnote-reference {
 a.target {
   color: blue }
 
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+  text-decoration: none ;
+  color: black }
+
+dd {
+  margin-bottom: 0.5em }
+
 div.abstract {
   margin: 2em 5em }
 
@@ -63,10 +70,6 @@ div.system-message p.system-message-title {
 div.topic {
   margin: 2em }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-  text-decoration: none ;
-  color: black }
-
 h1.title {
   text-align: center }
 
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 53b67b303..3a41e6b58 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -59,8 +59,8 @@ body {
   margin-bottom: 1em ;
   padding: 0px }
 
-td.num {
-  text-align: right }
+dd {
+  margin-bottom: 0.5em }
 
 div.section {
   margin-left: 1em ;
@@ -148,7 +148,7 @@ h6 {
 .section hr {
   width: 75% }
 
-ol, ul {
+ol.simple, ul.simple {
   margin-bottom: 1em }
 
 ol.arabic {
@@ -166,9 +166,6 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
-dd p:first-child, li p:first-child, td p:first-child, th p:first-child {
-  margin-top: 0px }
-
 p.caption {
   font-style: italic }
 
@@ -176,6 +173,9 @@ p.credits {
   font-style: italic ;
   font-size: smaller }
 
+p.first {
+  margin-top: 0 }
+
 p.label {
   white-space: nowrap }
 
@@ -212,6 +212,9 @@ table {
   margin-top: 0.5em ;
   margin-bottom: 0.5em }
 
+td.num {
+  text-align: right }
+
 td, th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
-- 
cgit v1.2.1


From c1cdf743e8823711597a7a0ed47822af56c030e2 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 25 Jul 2002 01:55:51 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@371 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils-xml.py | 11 +++++------
 tools/html.py         | 11 +++++------
 tools/pep.py          |  9 +++++----
 tools/publish.py      | 11 +++++------
 4 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'tools')

diff --git a/tools/docutils-xml.py b/tools/docutils-xml.py
index 9269376bf..72f72ca86 100755
--- a/tools/docutils-xml.py
+++ b/tools/docutils-xml.py
@@ -7,17 +7,16 @@
 :Date: $Date$
 :Copyright: This module has been placed in the public domain.
 
-A minimal front-end to the Docutils Publisher, producing Docutils XML.
+A minimal front end to the Docutils Publisher, producing Docutils XML.
 """
 
 import locale
 locale.setlocale(locale.LC_ALL, '')
 
-from docutils.core import publish
+from docutils.core import publish, default_description
 
 
-usage = '%prog [options] [source [destination]]'
-description = ('Generate Docutils XML from standalone reStructuredText '
-               'sources.')
+description = ('Generates Docutils-native XML from standalone '
+               'reStructuredText sources.  ' + default_description)
 
-publish(writer_name='xml', usage=usage, description=description)
+publish(writer_name='xml', description=description)
diff --git a/tools/html.py b/tools/html.py
index c1c29b2b6..a79aefca8 100755
--- a/tools/html.py
+++ b/tools/html.py
@@ -7,17 +7,16 @@
 :Date: $Date$
 :Copyright: This module has been placed in the public domain.
 
-A minimal front-end to the Docutils Publisher, producing HTML.
+A minimal front end to the Docutils Publisher, producing HTML.
 """
 
 import locale
 locale.setlocale(locale.LC_ALL, '')
 
-from docutils.core import publish
+from docutils.core import publish, default_description
 
 
-usage = '%prog [options] [source [destination]]'
-description = ('Generate HTML documents from standalone reStructuredText '
-               'sources.')
+description = ('Generates (X)HTML documents from standalone reStructuredText '
+               'sources.  ' + default_description)
 
-publish(writer_name='html', usage=usage, description=description)
+publish(writer_name='html', description=description)
diff --git a/tools/pep.py b/tools/pep.py
index acaab10c4..837221495 100755
--- a/tools/pep.py
+++ b/tools/pep.py
@@ -7,16 +7,17 @@
 :Date: $Date$
 :Copyright: This module has been placed in the public domain.
 
-A minimal front-end to the Docutils Publisher, producing HTML from PEP
+A minimal front end to the Docutils Publisher, producing HTML from PEP
 (Python Enhancement Proposal) documents.
 """
 
 import locale
 locale.setlocale(locale.LC_ALL, '')
 
-from docutils.core import publish
+from docutils.core import publish, default_description
 
 
-usage = 'usage:\n  %prog [options] [source [destination]]'
+description = ('Generates (X)HTML from reStructuredText-format PEP files.  '
+               + default_description)
 
-publish(reader_name='pep', writer_name='pep_html', usage=usage)
+publish(reader_name='pep', writer_name='pep_html', description=description)
diff --git a/tools/publish.py b/tools/publish.py
index 6e814ea67..edd643b04 100755
--- a/tools/publish.py
+++ b/tools/publish.py
@@ -7,17 +7,16 @@
 :Date: $Date$
 :Copyright: This module has been placed in the public domain.
 
-A minimal front-end to the Docutils Publisher, producing pseudo-XML.
+A minimal front end to the Docutils Publisher, producing pseudo-XML.
 """
 
 import locale
 locale.setlocale(locale.LC_ALL, '')
 
-from docutils.core import publish
+from docutils.core import publish, default_description
 
 
-usage = '%prog [options] [source [destination]]'
-description = ('Generate pseudo-XML from standalone reStructuredText sources '
-               '(for testing purposes).')
+description = ('Generates pseudo-XML from standalone reStructuredText '
+               'sources (for testing purposes).  ' + default_description)
 
-publish(usage=usage, description=description)
+publish(description=description)
-- 
cgit v1.2.1


From f03140adb17f496124ff185331d2ab204eccb4fa Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 27 Jul 2002 03:52:46 +0000
Subject: Added a second command-line argument (output file); cleaned up.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@380 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index 9517b95cc..133cfc815 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -26,9 +26,11 @@ quicktest.py: quickly test the restructuredtext parser.
 
 Usage::
 
-    quicktest.py [options] [filename]
+    quicktest.py [options] [ []]
 
-``filename`` is the name of the file to use as input (default is stdin).
+``source`` is the name of the file to use as input (default is stdin).
+``destination`` is the name of the file to create as output (default is
+stdout).
 
 Options:
 """
@@ -38,8 +40,8 @@ options = [('pretty', 'p',
            ('test', 't', 'output test-ready data (input & expected output, '
             'ready to be copied to a parser test module)'),
            ('rawxml', 'r', 'output raw XML'),
-           ('styledxml=', 's', 'output raw XML with XSL style sheet reference '
-            '(filename supplied in the option argument)'),
+           ('styledxml=', 's', 'output raw XML with XSL style sheet '
+            'reference (filename supplied in the option argument)'),
            ('xml', 'x', 'output pretty XML (indented)'),
            ('attributes', '', 'dump document attributes after processing'),
            ('debug', 'd', 'debug mode (lots of output)'),
@@ -74,8 +76,8 @@ def _styledxml(input, document, optargs):
     docnode = document.asdom().childNodes[0]
     return '%s\n%s\n%s' % (
           '',
-          '' % optargs['styledxml'],
-          docnode.toxml())
+          ''
+          % optargs['styledxml'], docnode.toxml())
 
 def _prettyxml(input, document, optargs):
     return document.asdom().toprettyxml('    ', '\n')
@@ -96,7 +98,7 @@ def _test(input, document, optargs):
 
 def escape(text):
     """
-    Return `text` in a form compatible with triple-double-quoted Python strings.
+    Return `text` in triple-double-quoted Python string form.
     """
     text = text.replace('\\', '\\\\')   # escape backslashes
     text = text.replace('"""', '""\\"') # break up triple-double-quotes
@@ -154,33 +156,36 @@ def posixGetArgs(argv):
             optargs['debug'] = 1
         else:
             raise getopt.GetoptError, "getopt should have saved us!"
-    if len(args) > 1:
-        print "Only one file at a time, thanks."
+    if len(args) > 2:
+        print 'Maximum 2 arguments allowed.'
         usage()
         sys.exit(1)
-    if len(args) == 1:
-        inputFile = open(args[0])
-    else:
-        inputFile = sys.stdin
-    return inputFile, outputFormat, optargs
+    inputFile = sys.stdin
+    outputFile = sys.stdout
+    if args:
+        inputFile = open(args.pop(0))
+    if args:
+        outputFile = open(args.pop(0), 'w')
+    return inputFile, outputFile, outputFormat, optargs
 
 def macGetArgs():
     import EasyDialogs
     EasyDialogs.Message("""\
-In the following window, please:
+Use the next dialog to build a command line:
 
-1. Choose an output format from the "Option" list.
-2. Click "Add" (if you don't, the default format will
-   be "pretty").
-3. Click "Add existing file..." and choose an input file.
-4. Click "OK".""")
+1. Choose an output format from the [Option] list 
+2. Click [Add]
+3. Choose an input file: [Add existing file...]
+4. Save the output: [Add new file...]
+5. [OK]""")
     optionlist = [(longopt, description)
                   for (longopt, shortopt, description) in options]
-    argv = EasyDialogs.GetArgv(optionlist=optionlist, addnewfile=0, addfolder=0)
+    argv = EasyDialogs.GetArgv(optionlist=optionlist, addfolder=0)
     return posixGetArgs(argv)
 
 def main():
-    inputFile, outputFormat, optargs = getArgs() # process cmdline arguments
+    # process cmdline arguments:
+    inputFile, outputFile, outputFormat, optargs = getArgs()
     options = OptionParser().get_default_values()
     options.debug = optargs['debug']
     parser = Parser()
@@ -188,7 +193,7 @@ def main():
     document = new_document(options)
     parser.parse(input, document)
     output = format(outputFormat, input, document, optargs)
-    print output,
+    outputFile.write(output)
     if optargs['attributes']:
         import pprint
         pprint.pprint(document.__dict__)
-- 
cgit v1.2.1


From 983fbe0421320e73abaf91159e3eac91db386a2e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 27 Jul 2002 04:33:42 +0000
Subject: Added a style for dedications.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@385 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 8d880c7cb..495188af2 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -47,6 +47,15 @@ div.note p.admonition-title, div.tip p.admonition-title {
   font-weight: bold ;
   font-family: sans-serif }
 
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
 div.figure {
   margin-left: 2em }
 
-- 
cgit v1.2.1


From ee4147188574574db105b733162e3ce6c854555e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 27 Jul 2002 14:56:03 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@390 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 2 +-
 tools/stylesheets/pep.css     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 495188af2..a7842ed3c 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -15,7 +15,7 @@ a.footnote-reference {
 a.target {
   color: blue }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+a.toc-backref {
   text-decoration: none ;
   color: black }
 
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 3a41e6b58..601872253 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -50,7 +50,7 @@ a.footnote-reference {
 a.target {
   color: blue }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+a.toc-backref {
   text-decoration: none ;
   color: black }
 
-- 
cgit v1.2.1


From 1cc7535a35c2fc5cd335e6c91aad7226f47ddb24 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 27 Jul 2002 15:08:43 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@392 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 601872253..a38cb1d61 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -98,7 +98,7 @@ div.figure {
 div.footer, div.header {
   font-size: smaller }
 
-div.footer p {
+div.footer {
   margin-left: 1em ;
   margin-right: 1em }
 
-- 
cgit v1.2.1


From 52307a7656fe38d3f35126a9bd90170e4fd10912 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 28 Jul 2002 17:20:00 +0000
Subject: Source & destination paths now returned inside option values object.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@397 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index d5d3221d0..49d925b37 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -273,7 +273,8 @@ def fix_rst_pep(infile, outfile):
     pub.set_reader(reader_name='pep', parser_name='restructuredtext',
                    parser=None)
     pub.set_writer(writer_name='pep_html')
-    options = pub.set_options(generator=1, datestamp='%Y-%m-%d %H:%M UTC')
+    options = pub.set_options(source=infile.name, destination=outfile.name,
+                              generator=1, datestamp='%Y-%m-%d %H:%M UTC')
     pub.source = io.FileIO(options, source=infile, source_path=infile.name)
     pub.destination = io.FileIO(options, destination=outfile,
                                 destination_path=outfile.name)
-- 
cgit v1.2.1


From 9d05481bb58063c956fc9c9bf910ee4ef7956b14 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 28 Jul 2002 18:51:20 +0000
Subject: Moved from spec/ to tools/, since that's where processing is done
 now.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@407 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tools/docutils.conf

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
new file mode 100644
index 000000000..5d53f9b7d
--- /dev/null
+++ b/tools/docutils.conf
@@ -0,0 +1,6 @@
+[options]
+
+# These entries affect reStructuredText-style PEPs:
+pep-stylesheet: stylesheets/pep.css
+python-home: http://www.python.org
+no-random: 1
-- 
cgit v1.2.1


From 22cd52f0533d812aa24cdc92226e148adf9d168e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 28 Jul 2002 19:55:59 +0000
Subject: Made footer options persistent.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@410 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 5d53f9b7d..88838eac6 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -1,5 +1,10 @@
 [options]
 
+# These entries affect all processing:
+source-link: 1
+datestamp: %%Y-%%m-%%d %%H:%%M UTC
+generator: 1
+
 # These entries affect reStructuredText-style PEPs:
 pep-stylesheet: stylesheets/pep.css
 python-home: http://www.python.org
-- 
cgit v1.2.1


From 77eae9bf49c5f60bd96f133b02499dc6034f25d0 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 28 Jul 2002 20:00:56 +0000
Subject: Single "%" is OK

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@412 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 88838eac6..26ddddb5c 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -2,7 +2,7 @@
 
 # These entries affect all processing:
 source-link: 1
-datestamp: %%Y-%%m-%%d %%H:%%M UTC
+datestamp: %Y-%m-%d %H:%M UTC
 generator: 1
 
 # These entries affect reStructuredText-style PEPs:
-- 
cgit v1.2.1


From 777adc1e1ebbcef09ddf6c07ed2e2c7ab607a334 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 31 Jul 2002 01:41:46 +0000
Subject: updated for improved front-end handling

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@423 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 26ddddb5c..4dfabae6e 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -5,7 +5,11 @@ source-link: 1
 datestamp: %Y-%m-%d %H:%M UTC
 generator: 1
 
+# These entries affect HTML output:
+stylesheet: default.css
+
 # These entries affect reStructuredText-style PEPs:
+pep-template: pep-html-template
 pep-stylesheet: stylesheets/pep.css
 python-home: http://www.python.org
 no-random: 1
-- 
cgit v1.2.1


From 9e2088dd544b377896ec7c893212cd6f0aa6422d Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 31 Jul 2002 01:42:43 +0000
Subject: made importable (for RST PEP handling)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@424 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 49d925b37..c4b52d47b 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -267,14 +267,21 @@ def fixfile(infile, outfile):
     print >> outfile, ''
 
 
+docutils_options = None
+
 def fix_rst_pep(infile, outfile):
     from docutils import core, io
     pub = core.Publisher()
     pub.set_reader(reader_name='pep', parser_name='restructuredtext',
                    parser=None)
     pub.set_writer(writer_name='pep_html')
-    options = pub.set_options(source=infile.name, destination=outfile.name,
-                              generator=1, datestamp='%Y-%m-%d %H:%M UTC')
+    if docutils_options:
+        options = docutils_options
+        pub.options = options
+    else:
+        options = pub.set_options()
+    options._source = infile.name
+    options._destination = outfile.name
     pub.source = io.FileIO(options, source=infile, source_path=infile.name)
     pub.destination = io.FileIO(options, destination=outfile,
                                 destination_path=outfile.name)
@@ -287,8 +294,8 @@ def check_rst_pep(infile):
     """
     Check if `infile` is a reStructuredText PEP.  Return 1 for yes, 0 for no.
 
-    If the result is indeterminate, return None.  Reset `infile` to the
-    beginning.
+    If the result is indeterminate, return None.  When the check is complete,
+    rewind `infile` to the beginning.
     """
     result = None
     underline_match = underline.match
-- 
cgit v1.2.1


From b2f915ec237d6c11b15261ae4e0b70baf2bb53bf Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 31 Jul 2002 01:54:01 +0000
Subject: Added to project; batch-generates .html from all the .txt files in
 directories and subdirectories.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@426 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100755 tools/buildhtml.py

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
new file mode 100755
index 000000000..310790899
--- /dev/null
+++ b/tools/buildhtml.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+
+"""
+Generates .html from all the .txt files in a directory.
+
+Ordinary .txt files are understood to be standalone reStructuredText.
+Files named ``pep-*.txt`` are interpreted as PEPs (either old-style or
+new reStructuredText PEPs).
+"""
+# Once PySource is here, build .html from .py as well.
+
+__docformat__ = 'reStructuredText'
+
+
+import sys
+import os
+import os.path
+import copy
+from docutils import core, frontend, io
+from docutils.parsers import rst
+from docutils.readers import pep
+from docutils.writers import pep_html
+import pep2html
+
+
+usage = '%prog [options] [ ...]'
+description = ('Generates .html from all the .txt files (including PEPs) '
+               'in each  (default is the current directory).')
+
+
+class OptionSpec:
+
+    """
+    Command-line options for the ``buildhtml.py`` front end.
+    """
+
+    # Can't be included in OptionParser below because we don't want to
+    # override the base class.
+    cmdline_options = (
+        'Build-HTML Options',
+        None,
+        (('Recursively scan subdirectories for files to process.  This is '
+          'the default.',
+          ['--recurse'], {'action': 'store_true', 'default': 1}),
+         ('Do not scan subdirectories for files to process.',
+          ['--local'], {'dest': 'recurse', 'action': 'store_false'}),))
+
+    
+class OptionParser(frontend.OptionParser):
+
+    """
+    Command-line option processing for the ``buildhtml.py`` front end.
+    """
+
+    def check_values(self, values, args):
+        frontend.OptionParser.check_values(self, values, args)
+        values._source = None
+        return values
+
+    def check_args(self, args):
+        source = destination = None
+        if args:
+            self.values._directories = args
+        else:
+            self.values._directories = [os.getcwd()]
+        return source, destination
+
+
+class Builder:
+
+    def run(self, directory=None, recurse=1):
+        self.process_command_line()
+        initial_options = self.get_options()
+        recurse = recurse and initial_options.recurse
+        self.setup_html_publisher()
+        if directory:
+            self.directories = [directory]
+        elif self.cmdline_options._directories:
+            self.directories = self.cmdline_options._directories
+        else:
+            self.directories = [os.getcwd()]
+        for directory in self.directories:
+            os.path.walk(directory, self.visit, recurse)
+
+    def visit(self, recurse, directory, names):
+        print >>sys.stderr, '/// Processing directory:', directory
+        sys.stderr.flush()
+        options = self.get_options(directory)
+        peps_found = 0
+        for name in names:
+            if name.endswith('.txt'):
+                if name.startswith('pep-'):
+                    peps_found = 1
+                else:
+                    self.process_txt(directory, name, options)
+        if peps_found:
+            self.process_peps(options, directory)
+        if not recurse:
+            del names[:]
+
+    def process_txt(self, directory, name, options):
+        options._source = os.path.normpath(os.path.join(directory, name))
+        options._destination = options._source[:-4]+'.html'
+        self.pub.options = options
+        print >>sys.stderr, '    ::: Processing .txt:', name
+        sys.stderr.flush()
+        self.pub.source = io.FileIO(options, source_path=options._source)
+        self.pub.destination = io.FileIO(
+            options, destination_path=options._destination)
+        self.pub.publish()
+
+    def process_peps(self, options, directory):
+        old_directory = os.getcwd()
+        os.chdir(directory)
+        print >>sys.stderr, '    ::: Processing PEPs:'
+        sys.stderr.flush()
+        pep2html.docutils_options = options
+        pep2html.main()
+        os.chdir(old_directory)
+
+    def process_command_line(self):
+        option_parser = OptionParser(
+            components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
+            usage=usage, description=description)
+        self.option_defaults = option_parser.get_default_values()
+        config_parser = frontend.ConfigParser()
+        config_parser.read_standard_files()
+        self.config_settings = config_parser.get_section('options')
+        frontend.make_paths_absolute(self.config_settings)
+        self.cmdline_options = option_parser.parse_args(
+            values=frontend.Values())   # no defaults
+        # Clear out the command-line options so pep2html doesn't see them:
+        del sys.argv[1:]
+
+    def get_options(self, directory=None):
+        """
+        Return an option values object, from multiple sources.
+
+        Copy the option defaults, overlay the startup config file settings,
+        then the local config file settings, then the command-line options.
+        Assumes the current directory has been set.
+        """
+        options = copy.deepcopy(self.option_defaults)
+        options.__dict__.update(self.config_settings)
+        if directory:
+            config_parser = frontend.ConfigParser()
+            config_parser.read(os.path.join(directory, 'docutils.conf'))
+            local_config = config_parser.get_section('options')
+            frontend.make_paths_absolute(local_config, directory)
+            options.__dict__.update(local_config)
+        options.__dict__.update(self.cmdline_options.__dict__)
+        return options
+
+    def setup_html_publisher(self):
+        pub = core.Publisher()
+        pub.set_reader(reader_name='standalone',
+                       parser_name='restructuredtext', parser=None)
+        pub.set_writer(writer_name='html')
+        self.pub = pub
+
+
+if __name__ == "__main__":
+    Builder().run()
-- 
cgit v1.2.1


From e8d4289000e3ab952b2e465f462b89deed93bbdb Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 31 Jul 2002 02:21:49 +0000
Subject: be gone!

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@429 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 163 -----------------------------------------------------
 1 file changed, 163 deletions(-)
 delete mode 100755 tools/buildhtml.py

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
deleted file mode 100755
index 310790899..000000000
--- a/tools/buildhtml.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Generates .html from all the .txt files in a directory.
-
-Ordinary .txt files are understood to be standalone reStructuredText.
-Files named ``pep-*.txt`` are interpreted as PEPs (either old-style or
-new reStructuredText PEPs).
-"""
-# Once PySource is here, build .html from .py as well.
-
-__docformat__ = 'reStructuredText'
-
-
-import sys
-import os
-import os.path
-import copy
-from docutils import core, frontend, io
-from docutils.parsers import rst
-from docutils.readers import pep
-from docutils.writers import pep_html
-import pep2html
-
-
-usage = '%prog [options] [ ...]'
-description = ('Generates .html from all the .txt files (including PEPs) '
-               'in each  (default is the current directory).')
-
-
-class OptionSpec:
-
-    """
-    Command-line options for the ``buildhtml.py`` front end.
-    """
-
-    # Can't be included in OptionParser below because we don't want to
-    # override the base class.
-    cmdline_options = (
-        'Build-HTML Options',
-        None,
-        (('Recursively scan subdirectories for files to process.  This is '
-          'the default.',
-          ['--recurse'], {'action': 'store_true', 'default': 1}),
-         ('Do not scan subdirectories for files to process.',
-          ['--local'], {'dest': 'recurse', 'action': 'store_false'}),))
-
-    
-class OptionParser(frontend.OptionParser):
-
-    """
-    Command-line option processing for the ``buildhtml.py`` front end.
-    """
-
-    def check_values(self, values, args):
-        frontend.OptionParser.check_values(self, values, args)
-        values._source = None
-        return values
-
-    def check_args(self, args):
-        source = destination = None
-        if args:
-            self.values._directories = args
-        else:
-            self.values._directories = [os.getcwd()]
-        return source, destination
-
-
-class Builder:
-
-    def run(self, directory=None, recurse=1):
-        self.process_command_line()
-        initial_options = self.get_options()
-        recurse = recurse and initial_options.recurse
-        self.setup_html_publisher()
-        if directory:
-            self.directories = [directory]
-        elif self.cmdline_options._directories:
-            self.directories = self.cmdline_options._directories
-        else:
-            self.directories = [os.getcwd()]
-        for directory in self.directories:
-            os.path.walk(directory, self.visit, recurse)
-
-    def visit(self, recurse, directory, names):
-        print >>sys.stderr, '/// Processing directory:', directory
-        sys.stderr.flush()
-        options = self.get_options(directory)
-        peps_found = 0
-        for name in names:
-            if name.endswith('.txt'):
-                if name.startswith('pep-'):
-                    peps_found = 1
-                else:
-                    self.process_txt(directory, name, options)
-        if peps_found:
-            self.process_peps(options, directory)
-        if not recurse:
-            del names[:]
-
-    def process_txt(self, directory, name, options):
-        options._source = os.path.normpath(os.path.join(directory, name))
-        options._destination = options._source[:-4]+'.html'
-        self.pub.options = options
-        print >>sys.stderr, '    ::: Processing .txt:', name
-        sys.stderr.flush()
-        self.pub.source = io.FileIO(options, source_path=options._source)
-        self.pub.destination = io.FileIO(
-            options, destination_path=options._destination)
-        self.pub.publish()
-
-    def process_peps(self, options, directory):
-        old_directory = os.getcwd()
-        os.chdir(directory)
-        print >>sys.stderr, '    ::: Processing PEPs:'
-        sys.stderr.flush()
-        pep2html.docutils_options = options
-        pep2html.main()
-        os.chdir(old_directory)
-
-    def process_command_line(self):
-        option_parser = OptionParser(
-            components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
-            usage=usage, description=description)
-        self.option_defaults = option_parser.get_default_values()
-        config_parser = frontend.ConfigParser()
-        config_parser.read_standard_files()
-        self.config_settings = config_parser.get_section('options')
-        frontend.make_paths_absolute(self.config_settings)
-        self.cmdline_options = option_parser.parse_args(
-            values=frontend.Values())   # no defaults
-        # Clear out the command-line options so pep2html doesn't see them:
-        del sys.argv[1:]
-
-    def get_options(self, directory=None):
-        """
-        Return an option values object, from multiple sources.
-
-        Copy the option defaults, overlay the startup config file settings,
-        then the local config file settings, then the command-line options.
-        Assumes the current directory has been set.
-        """
-        options = copy.deepcopy(self.option_defaults)
-        options.__dict__.update(self.config_settings)
-        if directory:
-            config_parser = frontend.ConfigParser()
-            config_parser.read(os.path.join(directory, 'docutils.conf'))
-            local_config = config_parser.get_section('options')
-            frontend.make_paths_absolute(local_config, directory)
-            options.__dict__.update(local_config)
-        options.__dict__.update(self.cmdline_options.__dict__)
-        return options
-
-    def setup_html_publisher(self):
-        pub = core.Publisher()
-        pub.set_reader(reader_name='standalone',
-                       parser_name='restructuredtext', parser=None)
-        pub.set_writer(writer_name='html')
-        self.pub = pub
-
-
-if __name__ == "__main__":
-    Builder().run()
-- 
cgit v1.2.1


From 8225e8771b884608aed60523eef8daa2981927e5 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 31 Jul 2002 02:24:34 +0000
Subject: give up

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@430 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100755 tools/buildhtml.py

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
new file mode 100755
index 000000000..310790899
--- /dev/null
+++ b/tools/buildhtml.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+
+"""
+Generates .html from all the .txt files in a directory.
+
+Ordinary .txt files are understood to be standalone reStructuredText.
+Files named ``pep-*.txt`` are interpreted as PEPs (either old-style or
+new reStructuredText PEPs).
+"""
+# Once PySource is here, build .html from .py as well.
+
+__docformat__ = 'reStructuredText'
+
+
+import sys
+import os
+import os.path
+import copy
+from docutils import core, frontend, io
+from docutils.parsers import rst
+from docutils.readers import pep
+from docutils.writers import pep_html
+import pep2html
+
+
+usage = '%prog [options] [ ...]'
+description = ('Generates .html from all the .txt files (including PEPs) '
+               'in each  (default is the current directory).')
+
+
+class OptionSpec:
+
+    """
+    Command-line options for the ``buildhtml.py`` front end.
+    """
+
+    # Can't be included in OptionParser below because we don't want to
+    # override the base class.
+    cmdline_options = (
+        'Build-HTML Options',
+        None,
+        (('Recursively scan subdirectories for files to process.  This is '
+          'the default.',
+          ['--recurse'], {'action': 'store_true', 'default': 1}),
+         ('Do not scan subdirectories for files to process.',
+          ['--local'], {'dest': 'recurse', 'action': 'store_false'}),))
+
+    
+class OptionParser(frontend.OptionParser):
+
+    """
+    Command-line option processing for the ``buildhtml.py`` front end.
+    """
+
+    def check_values(self, values, args):
+        frontend.OptionParser.check_values(self, values, args)
+        values._source = None
+        return values
+
+    def check_args(self, args):
+        source = destination = None
+        if args:
+            self.values._directories = args
+        else:
+            self.values._directories = [os.getcwd()]
+        return source, destination
+
+
+class Builder:
+
+    def run(self, directory=None, recurse=1):
+        self.process_command_line()
+        initial_options = self.get_options()
+        recurse = recurse and initial_options.recurse
+        self.setup_html_publisher()
+        if directory:
+            self.directories = [directory]
+        elif self.cmdline_options._directories:
+            self.directories = self.cmdline_options._directories
+        else:
+            self.directories = [os.getcwd()]
+        for directory in self.directories:
+            os.path.walk(directory, self.visit, recurse)
+
+    def visit(self, recurse, directory, names):
+        print >>sys.stderr, '/// Processing directory:', directory
+        sys.stderr.flush()
+        options = self.get_options(directory)
+        peps_found = 0
+        for name in names:
+            if name.endswith('.txt'):
+                if name.startswith('pep-'):
+                    peps_found = 1
+                else:
+                    self.process_txt(directory, name, options)
+        if peps_found:
+            self.process_peps(options, directory)
+        if not recurse:
+            del names[:]
+
+    def process_txt(self, directory, name, options):
+        options._source = os.path.normpath(os.path.join(directory, name))
+        options._destination = options._source[:-4]+'.html'
+        self.pub.options = options
+        print >>sys.stderr, '    ::: Processing .txt:', name
+        sys.stderr.flush()
+        self.pub.source = io.FileIO(options, source_path=options._source)
+        self.pub.destination = io.FileIO(
+            options, destination_path=options._destination)
+        self.pub.publish()
+
+    def process_peps(self, options, directory):
+        old_directory = os.getcwd()
+        os.chdir(directory)
+        print >>sys.stderr, '    ::: Processing PEPs:'
+        sys.stderr.flush()
+        pep2html.docutils_options = options
+        pep2html.main()
+        os.chdir(old_directory)
+
+    def process_command_line(self):
+        option_parser = OptionParser(
+            components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
+            usage=usage, description=description)
+        self.option_defaults = option_parser.get_default_values()
+        config_parser = frontend.ConfigParser()
+        config_parser.read_standard_files()
+        self.config_settings = config_parser.get_section('options')
+        frontend.make_paths_absolute(self.config_settings)
+        self.cmdline_options = option_parser.parse_args(
+            values=frontend.Values())   # no defaults
+        # Clear out the command-line options so pep2html doesn't see them:
+        del sys.argv[1:]
+
+    def get_options(self, directory=None):
+        """
+        Return an option values object, from multiple sources.
+
+        Copy the option defaults, overlay the startup config file settings,
+        then the local config file settings, then the command-line options.
+        Assumes the current directory has been set.
+        """
+        options = copy.deepcopy(self.option_defaults)
+        options.__dict__.update(self.config_settings)
+        if directory:
+            config_parser = frontend.ConfigParser()
+            config_parser.read(os.path.join(directory, 'docutils.conf'))
+            local_config = config_parser.get_section('options')
+            frontend.make_paths_absolute(local_config, directory)
+            options.__dict__.update(local_config)
+        options.__dict__.update(self.cmdline_options.__dict__)
+        return options
+
+    def setup_html_publisher(self):
+        pub = core.Publisher()
+        pub.set_reader(reader_name='standalone',
+                       parser_name='restructuredtext', parser=None)
+        pub.set_writer(writer_name='html')
+        self.pub = pub
+
+
+if __name__ == "__main__":
+    Builder().run()
-- 
cgit v1.2.1


From e3645352686aa984895833ad4c300e570c506ee8 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 2 Aug 2002 03:27:50 +0000
Subject: Made ``argv`` a parameter to ``main()``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@437 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index c4b52d47b..b03a6019a 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -397,16 +397,19 @@ def browse_remote(pep):
     webbrowser.open(url)
 
 
-def main():
+def main(argv=None):
     # defaults
     update = 0
     username = ''
     verbose = 1
     browse = 0
 
+    if argv is None:
+        argv = sys.argv[1:]
+
     try:
         opts, args = getopt.getopt(
-            sys.argv[1:], 'bihqu:',
+            argv, 'bihqu:',
             ['browse', 'install', 'help', 'quiet', 'user='])
     except getopt.error, msg:
         usage(1, msg)
-- 
cgit v1.2.1


From 7991633913061d37950de322af8b9367f26e6fdc Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 2 Aug 2002 03:30:22 +0000
Subject: Added "--silent" option.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@438 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index 310790899..97b1bf000 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -43,7 +43,9 @@ class OptionSpec:
           'the default.',
           ['--recurse'], {'action': 'store_true', 'default': 1}),
          ('Do not scan subdirectories for files to process.',
-          ['--local'], {'dest': 'recurse', 'action': 'store_false'}),))
+          ['--local'], {'dest': 'recurse', 'action': 'store_false'}),
+         ('Work silently (no progress messages).  Independent of "--quiet".',
+          ['--silent'], {'action': 'store_true'}),))
 
     
 class OptionParser(frontend.OptionParser):
@@ -83,9 +85,10 @@ class Builder:
             os.path.walk(directory, self.visit, recurse)
 
     def visit(self, recurse, directory, names):
-        print >>sys.stderr, '/// Processing directory:', directory
-        sys.stderr.flush()
         options = self.get_options(directory)
+        if not options.silent:
+            print >>sys.stderr, '/// Processing directory:', directory
+            sys.stderr.flush()
         peps_found = 0
         for name in names:
             if name.endswith('.txt'):
@@ -102,8 +105,9 @@ class Builder:
         options._source = os.path.normpath(os.path.join(directory, name))
         options._destination = options._source[:-4]+'.html'
         self.pub.options = options
-        print >>sys.stderr, '    ::: Processing .txt:', name
-        sys.stderr.flush()
+        if not options.silent:
+            print >>sys.stderr, '    ::: Processing .txt:', name
+            sys.stderr.flush()
         self.pub.source = io.FileIO(options, source_path=options._source)
         self.pub.destination = io.FileIO(
             options, destination_path=options._destination)
@@ -112,10 +116,14 @@ class Builder:
     def process_peps(self, options, directory):
         old_directory = os.getcwd()
         os.chdir(directory)
-        print >>sys.stderr, '    ::: Processing PEPs:'
-        sys.stderr.flush()
+        if options.silent:
+            argv = ['-q']
+        else:
+            print >>sys.stderr, '    ::: Processing PEPs:'
+            sys.stderr.flush()
+            argv = []
         pep2html.docutils_options = options
-        pep2html.main()
+        pep2html.main(argv)
         os.chdir(old_directory)
 
     def process_command_line(self):
@@ -129,8 +137,6 @@ class Builder:
         frontend.make_paths_absolute(self.config_settings)
         self.cmdline_options = option_parser.parse_args(
             values=frontend.Values())   # no defaults
-        # Clear out the command-line options so pep2html doesn't see them:
-        del sys.argv[1:]
 
     def get_options(self, directory=None):
         """
-- 
cgit v1.2.1


From 3876764b213354e4a6e86017ca3fc7d12fadf235 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 3 Aug 2002 20:23:00 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@452 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 4 ++--
 tools/stylesheets/pep.css     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index a7842ed3c..d1dd52155 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -167,9 +167,9 @@ td, th {
   padding-right: 0.5em ;
   vertical-align: baseline }
 
-td.docinfo-name {
+th.docinfo-name {
   font-weight: bold ;
   text-align: right }
 
-td.field-name {
+th.field-name {
   font-weight: bold }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index a38cb1d61..0af6d129d 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -36,7 +36,7 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 .rfc2822 div.field-body {
   text-align: left }
 
-.rfc2822 td.field-name {
+.rfc2822 th.field-name {
   text-align: right ;
   font-family: sans-serif ;
   padding-right: 0.5em ;
@@ -219,3 +219,6 @@ td, th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
   vertical-align: baseline }
+
+th.field-name {
+  font-weight: bold }
-- 
cgit v1.2.1


From a55a4fb8cf2a716bfecabe1e292fa945a4d3b06a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 4 Aug 2002 04:10:07 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@453 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 0af6d129d..8c6a2424f 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -33,10 +33,10 @@ Default cascading style sheet for the PEP HTML output of Docutils.
   margin-right: 0.5em ;
   margin-bottom: 0em }
 
-.rfc2822 div.field-body {
+.rfc2822 td {
   text-align: left }
 
-.rfc2822 th.field-name {
+.rfc2822 th {
   text-align: right ;
   font-family: sans-serif ;
   padding-right: 0.5em ;
-- 
cgit v1.2.1


From 9ce4ad12cb84b65e8c52697119ed2fce6dc3babe Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 4 Aug 2002 20:04:20 +0000
Subject: Merged changes from Python's revision 1.39.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@454 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index b03a6019a..9952087d2 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -31,6 +31,8 @@ Options:
 The optional argument `peps' is a list of either pep numbers or .txt files.
 """
 
+# Requires Python 2.2
+
 import sys
 import os
 import re
@@ -40,6 +42,7 @@ import getopt
 import errno
 import random
 import time
+from email.Utils import parseaddr
 
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
@@ -64,6 +67,7 @@ fixpat = re.compile("((http|ftp):[-_a-zA-Z0-9/.+~:?#$=&,]+)|(pep-\d+(.txt)?)|"
 
 EMPTYSTRING = ''
 SPACE = ' '
+COMMASPACE = ', '
 
 
 
@@ -180,19 +184,20 @@ def fixfile(infile, outfile):
     for k, v in header:
         if k.lower() in ('author', 'discussions-to'):
             mailtos = []
-            for addr in v.split():
-                if '@' in addr:
+            for part in re.split(',\s*', v):
+                if '@' in part:
+                    realname, addr = parseaddr(part)
                     if k.lower() == 'discussions-to':
                         m = linkemail(addr, pep)
                     else:
                         m = fixemail(addr, pep)
-                    mailtos.append(m)
-                elif addr.startswith('http:'):
+                    mailtos.append('%s <%s>' % (realname, m))
+                elif part.startswith('http:'):
                     mailtos.append(
-                        '%s' % (addr, addr))
+                        '%s' % (part, part))
                 else:
-                    mailtos.append(addr)
-            v = SPACE.join(mailtos)
+                    mailtos.append(part)
+            v = COMMASPACE.join(mailtos)
         elif k.lower() in ('replaces', 'replaced-by'):
             otherpeps = ''
             for otherpep in v.split():
-- 
cgit v1.2.1


From e9989ec41dc36cbef0e6e199ce65d786965643bc Mon Sep 17 00:00:00 2001
From: goodger 
Date: Mon, 5 Aug 2002 19:51:20 +0000
Subject: Added support for "Content-Type:" header & arbitrary PEP formats.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@459 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 126 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 70 insertions(+), 56 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 9952087d2..28cfd9a0b 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -44,6 +44,11 @@ import random
 import time
 from email.Utils import parseaddr
 
+try:
+    import docutils
+except ImportError:
+    docutils = None
+
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
@@ -128,8 +133,9 @@ def linkemail(address, pepno):
             % (parts[0], parts[1], pepno, parts[0], parts[1]))
 
 
-def fixfile(infile, outfile):
-    basename = os.path.basename(infile.name)
+def fixfile(inpath, input_lines, outfile):
+    basename = os.path.basename(inpath)
+    infile = iter(input_lines)
     # convert plain text pep to minimal XHTML markup
     print >> outfile, DTD
     print >> outfile, ''
@@ -139,7 +145,10 @@ def fixfile(infile, outfile):
     pep = ""
     title = ""
     while 1:
-        line = infile.readline()
+        try:
+            line = infile.next()
+        except StopIteration:
+            break
         if not line.strip():
             break
         if line[0].strip():
@@ -202,13 +211,13 @@ def fixfile(infile, outfile):
             otherpeps = ''
             for otherpep in v.split():
                 otherpep = int(otherpep)
-                otherpeps += '%i ' % (otherpep, 
+                otherpeps += '%i ' % (otherpep,
                                                                   otherpep)
             v = otherpeps
         elif k.lower() in ('last-modified',):
             url = PEPCVSURL % int(pep)
             date = v or time.strftime('%d-%b-%Y',
-                                      time.localtime(os.stat(infile.name)[8]))
+                                      time.localtime(os.stat(inpath)[8]))
             v = '%s ' % (url, cgi.escape(date))
         else:
             v = cgi.escape(v)
@@ -220,8 +229,9 @@ def fixfile(infile, outfile):
     print >> outfile, '
    '
     need_pre = 1
     while 1:
-        line = infile.readline()
-        if not line:
+        try:
+            line = infile.next()
+        except StopIteration:
             break
         if line[0] == '\f':
             continue
@@ -260,7 +270,7 @@ def fixfile(infile, outfile):
                     print >> outfile, re.sub(
                         parts[-1], url, line, 1),
                     continue
-            line = fixpat.sub(lambda x, c=infile.name: fixanchor(c, x), line)
+            line = fixpat.sub(lambda x, c=inpath: fixanchor(c, x), line)
             if need_pre:
                 print >> outfile, '
    '
                 need_pre = 0
@@ -273,8 +283,10 @@ def fixfile(infile, outfile):
 
 
 docutils_options = None
+"""Option value object used by Docutils.  Can be set by the client application
+when this module is imported."""
 
-def fix_rst_pep(infile, outfile):
+def fix_rst_pep(inpath, input_lines, outfile):
     from docutils import core, io
     pub = core.Publisher()
     pub.set_reader(reader_name='pep', parser_name='restructuredtext',
@@ -285,48 +297,36 @@ def fix_rst_pep(infile, outfile):
         pub.options = options
     else:
         options = pub.set_options()
-    options._source = infile.name
+    options._source = inpath
     options._destination = outfile.name
-    pub.source = io.FileIO(options, source=infile, source_path=infile.name)
-    pub.destination = io.FileIO(options, destination=outfile,
-                                destination_path=outfile.name)
+    pub.source = io.StringIO(
+        options, source=''.join(input_lines), source_path=inpath)
+    pub.destination = io.FileIO(
+        options, destination=outfile, destination_path=outfile.name)
     pub.publish()
 
 
-underline = re.compile('[!-/:-@[-`{-~]{4,}$')
-
-def check_rst_pep(infile):
+def get_pep_type(input_lines):
     """
-    Check if `infile` is a reStructuredText PEP.  Return 1 for yes, 0 for no.
-
-    If the result is indeterminate, return None.  When the check is complete,
-    rewind `infile` to the beginning.
+    Return the Content-Type of the input.  "text/plain" is the default.
+    Return ``None`` if the input is not a PEP.
     """
-    result = None
-    underline_match = underline.match
-    # Find the end of the RFC 2822 header (first blank line):
-    while 1:
-        line = infile.readline().strip()
+    pep_type = None
+    for line in input_lines:
+        line = line.rstrip().lower()
         if not line:
+            # End of the RFC 2822 header (first blank line).
             break
-    # Determine if the PEP is old-style or new (reStructuredText):
-    while result is None:
-        line = infile.readline()
-        if not line:
+        elif line.startswith('content-type: '):
+            pep_type = line.split()[1]
             break
-        line = line.rstrip()
-        if len(line.lstrip()) < len(line):
-            # Indented section; this is an old-style PEP.
-            result = 0
-        elif underline_match(line):
-            # Matched a section header underline;
-            # this is a reStructuredText PEP.
-            result = 1
-    infile.seek(0)
-    return result
+        elif line.startswith('pep: '):
+            # Default PEP type, used if no explicit content-type specified:
+            pep_type = 'text/plain'
+    return pep_type
 
 
-def open_files(inpath, outpath):
+def get_input_lines(inpath):
     try:
         infile = open(inpath)
     except IOError, e:
@@ -334,14 +334,10 @@ def open_files(inpath, outpath):
         print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
         sys.stderr.flush()
         return None, None
-    outfile = open(outpath, "w")
-    return infile, outfile
-
-def close_files(infile, outfile):
+    lines = infile.readlines()
     infile.close()
-    outfile.close()
-    os.chmod(outfile.name, 0664)
-    
+    return lines
+
 
 def find_pep(pep_str):
     """Find the .txt file indicated by a cmd line argument"""
@@ -350,18 +346,35 @@ def find_pep(pep_str):
     num = int(pep_str)
     return "pep-%04d.txt" % num
 
+PEP_TYPE_DISPATCH = {'text/plain': fixfile,
+                     'text/x-rst': fix_rst_pep}
+
 def make_html(inpath, verbose=0):
+    input_lines = get_input_lines(inpath)
+    pep_type = get_pep_type(input_lines)
+    if pep_type is None:
+        print >> sys.stderr, 'Error: Input file %s is not a PEP.' % inpath
+        sys.stdout.flush()
+        return None
+    elif not PEP_TYPE_DISPATCH.has_key(pep_type):
+        print >> sys.stderr, ('Error: Unknown PEP type for input file %s: %s'
+                              % (inpath, pep_type))
+        sys.stdout.flush()
+        return None
+    elif pep_type == 'text/x-rst' and not docutils:
+        print >> sys.stderr, ('Error: Docutils not present for "%s" PEP file '
+                              '%s.  See README.txt for installation.'
+                              % (pep_type, inpath))
+        sys.stdout.flush()
+        return None
     outpath = os.path.splitext(inpath)[0] + ".html"
     if verbose:
-        print inpath, "->", outpath
+        print inpath, "(%s)" % pep_type, "->", outpath
         sys.stdout.flush()
-    infile, outfile = open_files(inpath, outpath)
-    if infile is not None:
-        if check_rst_pep(infile):
-            fix_rst_pep(infile, outfile)
-        else:
-            fixfile(infile, outfile)
-        close_files(infile, outfile)
+    outfile = open(outpath, "w")
+    PEP_TYPE_DISPATCH[pep_type](inpath, input_lines, outfile)
+    outfile.close()
+    os.chmod(outfile.name, 0664)
     return outpath
 
 def push_pep(htmlfiles, txtfiles, username, verbose):
@@ -438,7 +451,8 @@ def main(argv=None):
             file = find_pep(pep)
             peptxt.append(file)
             newfile = make_html(file, verbose=verbose)
-            html.append(newfile)
+            if newfile:
+                html.append(newfile)
             if browse and not update:
                 browse_file(pep)
     else:
-- 
cgit v1.2.1


From 60e31f05a8a0edd5eca8ea046c3ff6a98e46e581 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 7 Aug 2002 01:20:34 +0000
Subject: Fixed nested section margins.  Added style for chunks of inline
 literals.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@471 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 8c6a2424f..818c4cd20 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -67,6 +67,11 @@ div.section {
   margin-right: 1em ;
   margin-bottom: 1.5em }
 
+div.section div.section {
+  margin-left: 0em ;
+  margin-right: 0em ;
+  margin-top: 1.5em }
+
 div.abstract {
   margin: 2em 5em }
 
@@ -205,6 +210,9 @@ span.interpreted {
 span.option-argument {
   font-style: italic }
 
+span.pre {
+  white-space: pre }
+
 span.problematic {
   color: red }
 
-- 
cgit v1.2.1


From f5b6a9b7a5bd51366e4878b953bb7cf42b5f1a6e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 7 Aug 2002 01:20:52 +0000
Subject: Added style for chunks of inline literals.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@472 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index d1dd52155..6f4cde5b4 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -144,6 +144,9 @@ span.interpreted {
 span.option-argument {
   font-style: italic }
 
+span.pre {
+  white-space: pre }
+
 span.problematic {
   color: red }
 
-- 
cgit v1.2.1


From 9eb27da5f41ace80bb1ecd48f6cc5839cd96b6e7 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 7 Aug 2002 01:22:54 +0000
Subject: Linked "Content-Type: text/plain" to PEP 9.  Updated.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@473 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 28cfd9a0b..42328ae9c 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -207,9 +207,9 @@ def fixfile(inpath, input_lines, outfile):
                 else:
                     mailtos.append(part)
             v = COMMASPACE.join(mailtos)
-        elif k.lower() in ('replaces', 'replaced-by'):
+        elif k.lower() in ('replaces', 'replaced-by', 'requires'):
             otherpeps = ''
-            for otherpep in v.split():
+            for otherpep in re.split(',?\s+', v):
                 otherpep = int(otherpep)
                 otherpeps += '%i ' % (otherpep,
                                                                   otherpep)
@@ -219,6 +219,10 @@ def fixfile(inpath, input_lines, outfile):
             date = v or time.strftime('%d-%b-%Y',
                                       time.localtime(os.stat(inpath)[8]))
             v = '%s ' % (url, cgi.escape(date))
+        elif k.lower() in ('content-type',):
+            url = PEPURL % 9
+            pep_type = v or 'text/plain'
+            v = '%s ' % (url, cgi.escape(pep_type))
         else:
             v = cgi.escape(v)
         print >> outfile, '  %s: %s' \
@@ -318,7 +322,7 @@ def get_pep_type(input_lines):
             # End of the RFC 2822 header (first blank line).
             break
         elif line.startswith('content-type: '):
-            pep_type = line.split()[1]
+            pep_type = line.split()[1] or 'text/plain'
             break
         elif line.startswith('pep: '):
             # Default PEP type, used if no explicit content-type specified:
@@ -334,7 +338,7 @@ def get_input_lines(inpath):
         print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
         sys.stderr.flush()
         return None, None
-    lines = infile.readlines()
+    lines = infile.read().splitlines(1) # handles x-platform line endings
     infile.close()
     return lines
 
-- 
cgit v1.2.1


From 10d83bcc524ddbd5f8c9f7399aca1f8bb8633dc1 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 8 Aug 2002 00:27:19 +0000
Subject: Fixed bug with absolute paths & ``--config``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@482 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index 97b1bf000..b04f811d1 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -131,6 +131,7 @@ class Builder:
             components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
             usage=usage, description=description)
         self.option_defaults = option_parser.get_default_values()
+        frontend.make_paths_absolute(self.option_defaults.__dict__)
         config_parser = frontend.ConfigParser()
         config_parser.read_standard_files()
         self.config_settings = config_parser.get_section('options')
-- 
cgit v1.2.1


From ed4dad1927fd297c6312aacac6e4d1295fe9de63 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 8 Aug 2002 00:28:48 +0000
Subject: Removed margin for first child of table cells.  Right-aligned field
 list names.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@483 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css |  6 +++++-
 tools/stylesheets/pep.css     | 12 ++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 6f4cde5b4..d160c6b9d 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -170,9 +170,13 @@ td, th {
   padding-right: 0.5em ;
   vertical-align: baseline }
 
+td > p:first-child, th > p:first-child {
+  margin-top: 0em }
+
 th.docinfo-name {
   font-weight: bold ;
   text-align: right }
 
 th.field-name {
-  font-weight: bold }
+  font-weight: bold ;
+  text-align: right }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 818c4cd20..2e0c7865e 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -220,13 +220,17 @@ table {
   margin-top: 0.5em ;
   margin-bottom: 0.5em }
 
-td.num {
-  text-align: right }
-
 td, th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
   vertical-align: baseline }
 
+td > :first-child, th > :first-child {
+  margin-top: 0em }
+
+td.num {
+  text-align: right }
+
 th.field-name {
-  font-weight: bold }
+  font-weight: bold ;
+  text-align: right }
-- 
cgit v1.2.1


From af07d173f8976717923b4bf4b188fec0e86d6670 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 8 Aug 2002 00:29:40 +0000
Subject: Parameterized output encoding.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@484 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index de0c0d4c8..47d71daef 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -1,8 +1,8 @@
-
+
 
 
 
-  
+  
   
   PEP %(pep)s -- %(title)s
   
-- 
cgit v1.2.1


From b926207786b97cc60fe4480fa55ee8ba5286415d Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 8 Aug 2002 00:30:45 +0000
Subject: Files skipped (due to an error) are not pushed onto the server.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@485 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 42328ae9c..e48ee6bd7 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -462,12 +462,14 @@ def main(argv=None):
     else:
         # do them all
         peptxt = []
+        html = []
         files = glob.glob("pep-*.txt")
         files.sort()
         for file in files:
             peptxt.append(file)
-            make_html(file, verbose=verbose)
-        html = ["pep-*.html"]
+            newfile = make_html(file, verbose=verbose)
+            if newfile:
+                html.append(newfile)
         if browse and not update:
             browse_file("0")
 
-- 
cgit v1.2.1


From 080ca828742f9e92ad4f5eca867035ae4bd7bf8e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 9 Aug 2002 01:17:21 +0000
Subject:   - Updated for new I/O classes.   - Added ``check_requirements()`` &
 ``pep_type_error()``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@491 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 66 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 19 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index e48ee6bd7..42f6809c2 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -31,8 +31,6 @@ Options:
 The optional argument `peps' is a list of either pep numbers or .txt files.
 """
 
-# Requires Python 2.2
-
 import sys
 import os
 import re
@@ -42,13 +40,9 @@ import getopt
 import errno
 import random
 import time
-from email.Utils import parseaddr
-
-try:
-    import docutils
-except ImportError:
-    docutils = None
 
+REQUIRES = {'python': '2.2',
+            'docutils': '0.2.1'}
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
@@ -134,6 +128,7 @@ def linkemail(address, pepno):
 
 
 def fixfile(inpath, input_lines, outfile):
+    from email.Utils import parseaddr
     basename = os.path.basename(inpath)
     infile = iter(input_lines)
     # convert plain text pep to minimal XHTML markup
@@ -303,10 +298,11 @@ def fix_rst_pep(inpath, input_lines, outfile):
         options = pub.set_options()
     options._source = inpath
     options._destination = outfile.name
-    pub.source = io.StringIO(
+    pub.source = io.StringInput(
         options, source=''.join(input_lines), source_path=inpath)
-    pub.destination = io.FileIO(
-        options, destination=outfile, destination_path=outfile.name)
+    pub.destination = io.FileOutput(
+        options, destination=outfile, destination_path=outfile.name,
+        autoclose=0)
     pub.publish()
 
 
@@ -350,9 +346,6 @@ def find_pep(pep_str):
     num = int(pep_str)
     return "pep-%04d.txt" % num
 
-PEP_TYPE_DISPATCH = {'text/plain': fixfile,
-                     'text/x-rst': fix_rst_pep}
-
 def make_html(inpath, verbose=0):
     input_lines = get_input_lines(inpath)
     pep_type = get_pep_type(input_lines)
@@ -365,11 +358,8 @@ def make_html(inpath, verbose=0):
                               % (inpath, pep_type))
         sys.stdout.flush()
         return None
-    elif pep_type == 'text/x-rst' and not docutils:
-        print >> sys.stderr, ('Error: Docutils not present for "%s" PEP file '
-                              '%s.  See README.txt for installation.'
-                              % (pep_type, inpath))
-        sys.stdout.flush()
+    elif PEP_TYPE_DISPATCH[pep_type] == None:
+        pep_type_error(inpath, pep_type)
         return None
     outpath = os.path.splitext(inpath)[0] + ".html"
     if verbose:
@@ -401,6 +391,42 @@ def push_pep(htmlfiles, txtfiles, username, verbose):
         sys.exit(rc)
 
 
+PEP_TYPE_DISPATCH = {'text/plain': fixfile,
+                     'text/x-rst': fix_rst_pep}
+PEP_TYPE_MESSAGES = {}
+
+def check_requirements():
+    # Check Python:
+    try:
+        from email.Utils import parseaddr
+    except ImportError:
+        PEP_TYPE_DISPATCH['text/plain'] = None
+        PEP_TYPE_MESSAGES['text/plain'] = (
+            'Python %s or better required for "%%(pep_type)s" PEP '
+            'processing; %s present (%%(inpath)s).'
+            % (REQUIRES['python'], sys.version.split()[0]))
+    # Check Docutils:
+    try:
+        import docutils
+    except ImportError:
+        PEP_TYPE_DISPATCH['text/x-rst'] = None
+        PEP_TYPE_MESSAGES['text/x-rst'] = (
+            'Docutils not present for "%(pep_type)s" PEP file %(inpath)s.  '
+            'See README.txt for installation.')
+    else:
+        if docutils.__version__ < REQUIRES['docutils']:
+            PEP_TYPE_DISPATCH['text/x-rst'] = None
+            PEP_TYPE_MESSAGES['text/x-rst'] = (
+                'Docutils must be reinstalled for "%%(pep_type)s" PEP '
+                'processing (%%(inpath)s).  Version %s or better required; '
+                '%s present.  See README.txt for installation.'
+                % (REQUIRES['docutils'], docutils.__version__))
+
+def pep_type_error(inpath, pep_type):
+    print >> sys.stderr, 'Error: ' + PEP_TYPE_MESSAGES[pep_type] % locals()
+    sys.stdout.flush()
+
+
 def browse_file(pep):
     import webbrowser
     file = find_pep(pep)
@@ -426,6 +452,8 @@ def main(argv=None):
     verbose = 1
     browse = 0
 
+    check_requirements()
+
     if argv is None:
         argv = sys.argv[1:]
 
-- 
cgit v1.2.1


From d5f026e798598f57d02ab02ffa4b20efb818473f Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 9 Aug 2002 01:19:11 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@492 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index b04f811d1..ac9ab75b0 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -108,8 +108,8 @@ class Builder:
         if not options.silent:
             print >>sys.stderr, '    ::: Processing .txt:', name
             sys.stderr.flush()
-        self.pub.source = io.FileIO(options, source_path=options._source)
-        self.pub.destination = io.FileIO(
+        self.pub.source = io.FileInput(options, source_path=options._source)
+        self.pub.destination = io.FileOutput(
             options, destination_path=options._destination)
         self.pub.publish()
 
-- 
cgit v1.2.1


From 4f85bd78669fa7afd0cc5e0f531bd2a357554b1c Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 10 Aug 2002 19:48:17 +0000
Subject: Cleaned up long lines.  Simplified line iteration.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@497 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 42f6809c2..fc0814a39 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -46,7 +46,8 @@ REQUIRES = {'python': '2.2',
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
-PEPCVSURL = 'http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/python/nondist/peps/pep-%04d.txt'
+PEPCVSURL = ('http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/python'
+             '/nondist/peps/pep-%04d.txt')
 PEPDIRRUL = 'http://www.python.org/peps/'
 
 
@@ -139,11 +140,7 @@ def fixfile(inpath, input_lines, outfile):
     header = []
     pep = ""
     title = ""
-    while 1:
-        try:
-            line = infile.next()
-        except StopIteration:
-            break
+    for line in infile:
         if not line.strip():
             break
         if line[0].strip():
@@ -165,19 +162,19 @@ def fixfile(inpath, input_lines, outfile):
         title = "PEP " + pep + " -- " + title
     if title:
         print >> outfile, '  %s' % cgi.escape(title)
-    print >> outfile, '  '
-    print >> outfile, ''
-    # body
-    print >> outfile, ''
-    print >> outfile, '> outfile, '       width="100%" border="0">'
-    print >> outfile, ''
-    print >> outfile, '
    '
     r = random.choice(range(64))
-    print >> outfile, ''
-    print >> outfile, '[Python]> outfile, ' border="0" width="150" height="35" />'
-    print >> outfile, '[Python Home]'
+    print >> outfile, (
+        '  \n'
+        '\n'
+        '\n'
+        '\n'
+        '\n'
+        '
    \n'
+        '\n'
+        '[Python]\n'
+        '[Python Home]' % r)
     if basename <> 'pep-0000.txt':
         print >> outfile, '[PEP Index]'
     if pep:
@@ -227,11 +224,7 @@ def fixfile(inpath, input_lines, outfile):
     print >> outfile, '
    '
     print >> outfile, '
    '
     need_pre = 1
-    while 1:
-        try:
-            line = infile.next()
-        except StopIteration:
-            break
+    for line in infile:
         if line[0] == '\f':
             continue
         if line.strip() == LOCALVARS:
-- 
cgit v1.2.1


From 362bd3e6cb3cc4c6114f0b7e99d37656b4de57c3 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 13 Aug 2002 01:03:04 +0000
Subject: Support for auto-numbered section titles in TOCs.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@513 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 +++
 tools/stylesheets/pep.css     | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index d160c6b9d..ae7d0976b 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -180,3 +180,6 @@ th.docinfo-name {
 th.field-name {
   font-weight: bold ;
   text-align: right }
+
+ul.auto-toc {
+  list-style-type: none }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 2e0c7865e..43efdd0e3 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -234,3 +234,6 @@ td.num {
 th.field-name {
   font-weight: bold ;
   text-align: right }
+
+ul.auto-toc {
+  list-style-type: none }
-- 
cgit v1.2.1


From 7bc7837c77a658e592fbda77ac3e85dd95a30717 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 14 Aug 2002 02:45:28 +0000
Subject: string fix

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@524 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index fc0814a39..6e7bdbcdf 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -168,7 +168,7 @@ def fixfile(inpath, input_lines, outfile):
         '\n'
         '\n'
         '\n'
+        '       width="100%%" border="0">\n'
         '
    \n'
         '\n'
         '[Python]
Date: Thu, 15 Aug 2002 01:52:23 +0000
Subject:   - Increased the size of inline literals () in titles.  Windows
 needs it; Mac could do without it.  Linux?   - Restored the light gray
 background for inline literals.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@531 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 6 ++++++
 tools/stylesheets/pep.css     | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index ae7d0976b..6b9d9fd25 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -181,5 +181,11 @@ th.field-name {
   font-weight: bold ;
   text-align: right }
 
+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+  font-size: larger }
+
+tt {
+  background-color: #eeeeee }
+
 ul.auto-toc {
   list-style-type: none }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 43efdd0e3..6be4b1f72 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -235,5 +235,11 @@ th.field-name {
   font-weight: bold ;
   text-align: right }
 
+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+  font-size: larger }
+
+tt {
+  background-color: #eeeeee }
+
 ul.auto-toc {
   list-style-type: none }
-- 
cgit v1.2.1


From c5c11347867378eae80e48d95726857de68c5143 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 16 Aug 2002 00:43:24 +0000
Subject: Added support for "line_block" elements.  "font-size: 100%" for 
 in  seems to work better.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@544 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 7 ++++++-
 tools/stylesheets/pep.css     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 6b9d9fd25..b7058ef87 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -122,6 +122,11 @@ p.label {
 p.topic-title {
   font-weight: bold }
 
+pre.line-block {
+  margin-left: 2em ;
+  font-family: serif ;
+  font-size: 100% }
+
 pre.literal-block, pre.doctest-block {
   margin-left: 2em ;
   margin-right: 2em ;
@@ -182,7 +187,7 @@ th.field-name {
   text-align: right }
 
 h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: larger }
+  font-size: 100% }
 
 tt {
   background-color: #eeeeee }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 6be4b1f72..2e357ecaf 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -188,6 +188,11 @@ p.topic-title {
   font-family: sans-serif ;
   font-weight: bold }
 
+pre.line-block {
+  margin-left: 2em ;
+  font-family: serif ;
+  font-size: 100% }
+
 pre.literal-block, pre.doctest-block {
   margin-left: 2em ;
   margin-right: 2em ;
@@ -236,7 +241,7 @@ th.field-name {
   text-align: right }
 
 h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: larger }
+  font-size: 100% }
 
 tt {
   background-color: #eeeeee }
-- 
cgit v1.2.1


From 13ed20d392cc6c5e727344dad0c3aca8cea125f1 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 21 Aug 2002 03:00:07 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@572 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index 133cfc815..2f0c46454 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -190,7 +190,7 @@ def main():
     options.debug = optargs['debug']
     parser = Parser()
     input = inputFile.read()
-    document = new_document(options)
+    document = new_document(inputFile.name, options)
     parser.parse(input, document)
     output = format(outputFormat, input, document, optargs)
     outputFile.write(output)
-- 
cgit v1.2.1


From 94db259cd479a7b885e2034d8b906a0d759ed0ca Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 23 Aug 2002 01:57:47 +0000
Subject: Added some exception handling.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@582 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index ac9ab75b0..ff875db36 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -16,6 +16,7 @@ import sys
 import os
 import os.path
 import copy
+from docutils import ApplicationError
 from docutils import core, frontend, io
 from docutils.parsers import rst
 from docutils.readers import pep
@@ -111,7 +112,11 @@ class Builder:
         self.pub.source = io.FileInput(options, source_path=options._source)
         self.pub.destination = io.FileOutput(
             options, destination_path=options._destination)
-        self.pub.publish()
+        try:
+            self.pub.publish()
+        except ApplicationError, error:
+            print >>sys.stderr, ('        Error (%s): %s'
+                                 % (error.__class__.__name__, error))
 
     def process_peps(self, options, directory):
         old_directory = os.getcwd()
@@ -123,7 +128,11 @@ class Builder:
             sys.stderr.flush()
             argv = []
         pep2html.docutils_options = options
-        pep2html.main(argv)
+        try:
+            pep2html.main(argv)
+        except Exception, error:
+            print >>sys.stderr, ('        Error (%s): %s'
+                                 % (error.__class__.__name__, error))
         os.chdir(old_directory)
 
     def process_command_line(self):
-- 
cgit v1.2.1


From 8a706d48cce6bba99937ec7d728d86b59a64874e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 23 Aug 2002 01:58:50 +0000
Subject: Added style for "address" elements.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@583 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index b7058ef87..ca98c7717 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -122,6 +122,11 @@ p.label {
 p.topic-title {
   font-weight: bold }
 
+pre.address {
+  margin-bottom: 0 ;
+  font-family: serif ;
+  font-size: 100% }
+
 pre.line-block {
   margin-left: 2em ;
   font-family: serif ;
-- 
cgit v1.2.1


From 86c9fa281fc54b2dadf81d47d69656a8dbefd841 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 23 Aug 2002 02:00:22 +0000
Subject: Added some exception handling.  Updated module docstring.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@584 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 6e7bdbcdf..584ac8965 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -7,7 +7,7 @@ Usage: %(PROGRAM)s [options] [peps]
 Options:
 
     -u/--user
-        SF username
+        python.org username
 
     -b/--browse
         After generating the HTML, direct your web browser to view it
@@ -18,8 +18,8 @@ Options:
 
     -i/--install
         After generating the HTML, install it and the plain text source file
-        (.txt) SourceForge.  In that case the user's name is used in the scp
-        and ssh commands, unless -u sf_username is given (in which case, it is
+        (.txt) on python.org.  In that case the user's name is used in the scp
+        and ssh commands, unless "-u username" is given (in which case, it is
         used instead).  Without -i, -u is ignored.
 
     -q/--quiet
@@ -178,8 +178,11 @@ def fixfile(inpath, input_lines, outfile):
     if basename <> 'pep-0000.txt':
         print >> outfile, '[PEP Index]'
     if pep:
-        print >> outfile, '[PEP Source]' \
-              % int(pep)
+        try:
+            print >> outfile, ('[PEP Source'
+                               ']' % int(pep))
+        except ValueError, error:
+            print >> sys.stderr, '%s: %s' % (error.__class__.__name__, error)
     print >> outfile, '
    '
     print >> outfile, '
    \n'
     for k, v in header:
@@ -207,10 +210,13 @@ def fixfile(inpath, input_lines, outfile):
                                                                   otherpep)
             v = otherpeps
         elif k.lower() in ('last-modified',):
-            url = PEPCVSURL % int(pep)
             date = v or time.strftime('%d-%b-%Y',
                                       time.localtime(os.stat(inpath)[8]))
-            v = '%s ' % (url, cgi.escape(date))
+            try:
+                url = PEPCVSURL % int(pep)
+                v = '%s ' % (url, cgi.escape(date))
+            except ValueError, error:
+                v = date
         elif k.lower() in ('content-type',):
             url = PEPURL % 9
             pep_type = v or 'text/plain'
-- 
cgit v1.2.1


From 473739633ba059db86d233b2b383bc0108d65083 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 24 Aug 2002 01:27:18 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@592 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py  | 13 +++++++++----
 tools/docutils.conf |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index ff875db36..8d664b0ff 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -16,6 +16,7 @@ import sys
 import os
 import os.path
 import copy
+import docutils
 from docutils import ApplicationError
 from docutils import core, frontend, io
 from docutils.parsers import rst
@@ -29,7 +30,7 @@ description = ('Generates .html from all the .txt files (including PEPs) '
                'in each  (default is the current directory).')
 
 
-class OptionSpec:
+class OptionSpec(docutils.OptionSpec):
 
     """
     Command-line options for the ``buildhtml.py`` front end.
@@ -140,11 +141,14 @@ class Builder:
             components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
             usage=usage, description=description)
         self.option_defaults = option_parser.get_default_values()
-        frontend.make_paths_absolute(self.option_defaults.__dict__)
+        self.relative_path_options = option_parser.relative_path_options
+        frontend.make_paths_absolute(self.option_defaults.__dict__,
+                                     self.relative_path_options)
         config_parser = frontend.ConfigParser()
         config_parser.read_standard_files()
         self.config_settings = config_parser.get_section('options')
-        frontend.make_paths_absolute(self.config_settings)
+        frontend.make_paths_absolute(self.config_settings,
+                                     self.relative_path_options)
         self.cmdline_options = option_parser.parse_args(
             values=frontend.Values())   # no defaults
 
@@ -162,7 +166,8 @@ class Builder:
             config_parser = frontend.ConfigParser()
             config_parser.read(os.path.join(directory, 'docutils.conf'))
             local_config = config_parser.get_section('options')
-            frontend.make_paths_absolute(local_config, directory)
+            frontend.make_paths_absolute(
+                local_config, self.relative_path_options, directory)
             options.__dict__.update(local_config)
         options.__dict__.update(self.cmdline_options.__dict__)
         return options
diff --git a/tools/docutils.conf b/tools/docutils.conf
index 4dfabae6e..218e1c7c4 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -6,10 +6,10 @@ datestamp: %Y-%m-%d %H:%M UTC
 generator: 1
 
 # These entries affect HTML output:
-stylesheet: default.css
+stylesheet-path: default.css
 
 # These entries affect reStructuredText-style PEPs:
 pep-template: pep-html-template
-pep-stylesheet: stylesheets/pep.css
+pep-stylesheet-path: stylesheets/pep.css
 python-home: http://www.python.org
 no-random: 1
-- 
cgit v1.2.1


From c5ef16554b0caf7d1a4063b078d9027e9d6831c3 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 29 Aug 2002 01:41:16 +0000
Subject: Removed "a.footnote-reference" style; doing it with "" instead.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@605 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 4 ----
 tools/stylesheets/pep.css     | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index ca98c7717..e31c9beaf 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -8,10 +8,6 @@
 Default cascading style sheet for the HTML output of Docutils.
 */
 
-a.footnote-reference {
-  font-size: smaller ;
-  vertical-align: super }
-
 a.target {
   color: blue }
 
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 2e357ecaf..3ad0a9dc8 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -43,10 +43,6 @@ Default cascading style sheet for the PEP HTML output of Docutils.
   font-weight: bold ;
   margin-bottom: 0em }
 
-a.footnote-reference {
-  font-size: smaller ;
-  vertical-align: super }
-
 a.target {
   color: blue }
 
-- 
cgit v1.2.1


From 6024d38e132cde5a682694da34be08ec0137b677 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 29 Aug 2002 03:35:33 +0000
Subject: Merged changes from Python's CVS.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@612 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 584ac8965..9e13db2e0 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-"""
-convert PEP's to (X)HTML - courtesy of /F
+"""Convert PEP's to (X)HTML - courtesy of /F
 
 Usage: %(PROGRAM)s [options] [peps]
 
@@ -381,6 +380,7 @@ def push_pep(htmlfiles, txtfiles, username, verbose):
     files = htmlfiles[:]
     files.extend(txtfiles)
     files.append("style.css")
+    files.append("pep.css")
     filelist = SPACE.join(files)
     rc = os.system("scp %s %s %s" % (quiet, filelist, target))
     if rc:
-- 
cgit v1.2.1


From 8f497c956b6102f1b7753e321a392ff53bc14c94 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 30 Aug 2002 01:45:06 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@614 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 218e1c7c4..63d8f4f5b 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -6,7 +6,7 @@ datestamp: %Y-%m-%d %H:%M UTC
 generator: 1
 
 # These entries affect HTML output:
-stylesheet-path: default.css
+stylesheet-path: stylesheets/default.css
 
 # These entries affect reStructuredText-style PEPs:
 pep-template: pep-html-template
-- 
cgit v1.2.1


From 963f9d995aeef21fe55b1cf938ed42237968e84e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 30 Aug 2002 04:28:53 +0000
Subject: sync with python.org's copy

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@617 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 9e13db2e0..8efabde88 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-"""Convert PEP's to (X)HTML - courtesy of /F
+"""Convert PEPs to (X)HTML - courtesy of /F
 
 Usage: %(PROGRAM)s [options] [peps]
 
@@ -16,7 +16,7 @@ Options:
         will browse PEP 0.
 
     -i/--install
-        After generating the HTML, install it and the plain text source file
+        After generating the HTML, install it and the plaintext source file
         (.txt) on python.org.  In that case the user's name is used in the scp
         and ssh commands, unless "-u username" is given (in which case, it is
         used instead).  Without -i, -u is ignored.
@@ -131,7 +131,7 @@ def fixfile(inpath, input_lines, outfile):
     from email.Utils import parseaddr
     basename = os.path.basename(inpath)
     infile = iter(input_lines)
-    # convert plain text pep to minimal XHTML markup
+    # convert plaintext pep to minimal XHTML markup
     print >> outfile, DTD
     print >> outfile, ''
     print >> outfile, ''
@@ -181,7 +181,8 @@ def fixfile(inpath, input_lines, outfile):
             print >> outfile, ('[PEP Source'
                                ']' % int(pep))
         except ValueError, error:
-            print >> sys.stderr, '%s: %s' % (error.__class__.__name__, error)
+            print >> sys.stderr, ('ValueError (invalid PEP number): %s'
+                                  % error)
     print >> outfile, '
    '
     print >> outfile, '
    \n'
     for k, v in header:
-- 
cgit v1.2.1


From c8db0efbe820766afdbeff6939de45a6dd640391 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 5 Sep 2002 03:10:05 +0000
Subject: tweak

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@630 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index e31c9beaf..309ea87cb 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -120,6 +120,7 @@ p.topic-title {
 
 pre.address {
   margin-bottom: 0 ;
+  margin-top: 0 ;
   font-family: serif ;
   font-size: 100% }
 
-- 
cgit v1.2.1


From 889f8193c3d3d2e1c1718287e54c25cc3b35b752 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 7 Sep 2002 02:40:11 +0000
Subject: Removed the left margin for line blocks.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@651 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 1 -
 tools/stylesheets/pep.css     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 309ea87cb..b58948ed0 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -125,7 +125,6 @@ pre.address {
   font-size: 100% }
 
 pre.line-block {
-  margin-left: 2em ;
   font-family: serif ;
   font-size: 100% }
 
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 3ad0a9dc8..feb37d06e 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -185,7 +185,6 @@ p.topic-title {
   font-weight: bold }
 
 pre.line-block {
-  margin-left: 2em ;
   font-family: serif ;
   font-size: 100% }
 
-- 
cgit v1.2.1


From a07bc663d7654004db7594bb1601525b18d46f4a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 11 Sep 2002 02:52:01 +0000
Subject: Removed "field_argument" element & support; "field_name" may contain
 multiple words and whitespace.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@664 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 ---
 tools/stylesheets/pep.css     | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index b58948ed0..85a8fb32a 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -141,9 +141,6 @@ span.classifier-delimiter {
   font-family: sans-serif ;
   font-weight: bold }
 
-span.field-argument {
-  font-style: italic }
-
 span.interpreted {
   font-family: sans-serif }
 
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index feb37d06e..583a0f6ce 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -201,9 +201,6 @@ span.classifier-delimiter {
   font-family: sans-serif ;
   font-weight: bold }
 
-span.field-argument {
-  font-style: italic }
-
 span.interpreted {
   font-family: sans-serif }
 
-- 
cgit v1.2.1


From 17cdc4297776252e32be7fc4ee167199310d8793 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 12 Sep 2002 02:22:29 +0000
Subject: Allow for ``--embed-stylesheet``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@671 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 47d71daef..58280a544 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -5,8 +5,7 @@
   
   
   PEP %(pep)s -- %(title)s
-  
-
+  %(stylesheet)s
 
 
    
-- 
cgit v1.2.1


From 09f3c4b8f5f2e43aa7e18f98cba546b72d910470 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 12 Sep 2002 02:22:54 +0000
Subject: Update for ``--embed-stylesheet``.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@672 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 8efabde88..ecc3de363 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -41,7 +41,7 @@ import random
 import time
 
 REQUIRES = {'python': '2.2',
-            'docutils': '0.2.1'}
+            'docutils': '0.2.3'}
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
-- 
cgit v1.2.1


From 0eb793180f6cf161f7e12e4cb5ca0ee115e02ca0 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 15 Sep 2002 16:30:27 +0000
Subject: Reworked.  Separated publishers' option defaults; prevents
 interference.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@679 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 161 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 100 insertions(+), 61 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index 8d664b0ff..f2d3b80a4 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -20,8 +20,8 @@ import docutils
 from docutils import ApplicationError
 from docutils import core, frontend, io
 from docutils.parsers import rst
-from docutils.readers import pep
-from docutils.writers import pep_html
+from docutils.readers import standalone, pep
+from docutils.writers import html4css1, pep_html
 import pep2html
 
 
@@ -70,13 +70,93 @@ class OptionParser(frontend.OptionParser):
         return source, destination
 
 
+class Struct:
+
+    """Stores data attributes for dotted-attribute access."""
+
+    def __init__(self, **keywordargs):
+        self.__dict__.update(keywordargs)
+
+
 class Builder:
 
+    def __init__(self):
+        self.publishers = {
+            '': Struct(components=(OptionSpec, pep.Reader, rst.Parser,
+                                   pep_html.Writer),
+                       setup=None),
+            '.txt': Struct(components=(rst.Parser, standalone.Reader,
+                                       html4css1.Writer),
+                           setup=self.setup_html_publisher),
+            'PEPs': Struct(components=(rst.Parser, pep.Reader,
+                                       pep_html.Writer),
+                           setup=None)}
+        """Publisher-specific settings.  Key '' is for the front-end script
+        itself.  ``self.publishers[''].components`` must contain a superset of
+        all components used by individual publishers."""
+
+        self.setup_publishers()
+
+    def setup_publishers(self):
+        """
+        Manage configurations for individual publishers.
+
+        Each publisher (combination of parser, reader, and writer) may have
+        its own configuration defaults, which must be kept separate from those
+        of the other publishers.  Option defaults are combined with the config
+        file settings and command-line options by `self.get_options()`.
+        """
+        for name, publisher in self.publishers.items():
+            option_parser = OptionParser(
+                components=publisher.components,
+                usage=usage, description=description)
+            publisher.option_parser = option_parser
+            publisher.option_defaults = option_parser.get_default_values()
+            frontend.make_paths_absolute(publisher.option_defaults.__dict__,
+                                         option_parser.relative_path_options)
+            if publisher.setup:
+                publisher.setup()
+        config_parser = frontend.ConfigParser()
+        config_parser.read_standard_files()
+        self.config_settings = config_parser.get_section('options')
+        frontend.make_paths_absolute(
+            self.config_settings,
+            self.publishers[''].option_parser.relative_path_options)
+        self.cmdline_options = self.publishers[''].option_parser.parse_args(
+            values=frontend.Values())   # no defaults; just the cmdline opts
+        self.initial_options = self.get_options('')
+
+    def get_options(self, publisher_name, directory=None):
+        """
+        Return an option values object, from multiple sources.
+
+        Copy the option defaults, overlay the startup config file settings,
+        then the local config file settings, then the command-line options.
+        Assumes the current directory has been set.
+        """
+        publisher = self.publishers[publisher_name]
+        options = copy.deepcopy(publisher.option_defaults)
+        options.__dict__.update(self.config_settings)
+        if directory:
+            config_parser = frontend.ConfigParser()
+            config_parser.read(os.path.join(directory, 'docutils.conf'))
+            local_config = config_parser.get_section('options')
+            frontend.make_paths_absolute(
+                local_config, publisher.option_parser.relative_path_options,
+                directory)
+            options.__dict__.update(local_config)
+        options.__dict__.update(self.cmdline_options.__dict__)
+        return options
+
+    def setup_html_publisher(self):
+        pub = core.Publisher()
+        pub.set_reader(reader_name='standalone',
+                       parser_name='restructuredtext', parser=None)
+        pub.set_writer(writer_name='html')
+        self.html_publisher = pub
+
     def run(self, directory=None, recurse=1):
-        self.process_command_line()
-        initial_options = self.get_options()
-        recurse = recurse and initial_options.recurse
-        self.setup_html_publisher()
+        recurse = recurse and self.initial_options.recurse
         if directory:
             self.directories = [directory]
         elif self.cmdline_options._directories:
@@ -87,8 +167,7 @@ class Builder:
             os.path.walk(directory, self.visit, recurse)
 
     def visit(self, recurse, directory, names):
-        options = self.get_options(directory)
-        if not options.silent:
+        if not self.initial_options.silent:
             print >>sys.stderr, '/// Processing directory:', directory
             sys.stderr.flush()
         peps_found = 0
@@ -97,32 +176,35 @@ class Builder:
                 if name.startswith('pep-'):
                     peps_found = 1
                 else:
-                    self.process_txt(directory, name, options)
+                    self.process_txt(directory, name)
         if peps_found:
-            self.process_peps(options, directory)
+            self.process_peps(directory)
         if not recurse:
             del names[:]
 
-    def process_txt(self, directory, name, options):
+    def process_txt(self, directory, name):
+        options = self.get_options('.txt', directory)
         options._source = os.path.normpath(os.path.join(directory, name))
         options._destination = options._source[:-4]+'.html'
-        self.pub.options = options
-        if not options.silent:
+        pub = self.html_publisher
+        pub.options = options
+        if not self.initial_options.silent:
             print >>sys.stderr, '    ::: Processing .txt:', name
             sys.stderr.flush()
-        self.pub.source = io.FileInput(options, source_path=options._source)
-        self.pub.destination = io.FileOutput(
+        pub.source = io.FileInput(options, source_path=options._source)
+        pub.destination = io.FileOutput(
             options, destination_path=options._destination)
         try:
-            self.pub.publish()
+            pub.publish()
         except ApplicationError, error:
             print >>sys.stderr, ('        Error (%s): %s'
                                  % (error.__class__.__name__, error))
 
-    def process_peps(self, options, directory):
+    def process_peps(self, directory):
+        options = self.get_options('PEPs', directory)
         old_directory = os.getcwd()
         os.chdir(directory)
-        if options.silent:
+        if self.initial_options.silent:
             argv = ['-q']
         else:
             print >>sys.stderr, '    ::: Processing PEPs:'
@@ -136,49 +218,6 @@ class Builder:
                                  % (error.__class__.__name__, error))
         os.chdir(old_directory)
 
-    def process_command_line(self):
-        option_parser = OptionParser(
-            components=(OptionSpec, pep.Reader, rst.Parser, pep_html.Writer),
-            usage=usage, description=description)
-        self.option_defaults = option_parser.get_default_values()
-        self.relative_path_options = option_parser.relative_path_options
-        frontend.make_paths_absolute(self.option_defaults.__dict__,
-                                     self.relative_path_options)
-        config_parser = frontend.ConfigParser()
-        config_parser.read_standard_files()
-        self.config_settings = config_parser.get_section('options')
-        frontend.make_paths_absolute(self.config_settings,
-                                     self.relative_path_options)
-        self.cmdline_options = option_parser.parse_args(
-            values=frontend.Values())   # no defaults
-
-    def get_options(self, directory=None):
-        """
-        Return an option values object, from multiple sources.
-
-        Copy the option defaults, overlay the startup config file settings,
-        then the local config file settings, then the command-line options.
-        Assumes the current directory has been set.
-        """
-        options = copy.deepcopy(self.option_defaults)
-        options.__dict__.update(self.config_settings)
-        if directory:
-            config_parser = frontend.ConfigParser()
-            config_parser.read(os.path.join(directory, 'docutils.conf'))
-            local_config = config_parser.get_section('options')
-            frontend.make_paths_absolute(
-                local_config, self.relative_path_options, directory)
-            options.__dict__.update(local_config)
-        options.__dict__.update(self.cmdline_options.__dict__)
-        return options
-
-    def setup_html_publisher(self):
-        pub = core.Publisher()
-        pub.set_reader(reader_name='standalone',
-                       parser_name='restructuredtext', parser=None)
-        pub.set_writer(writer_name='html')
-        self.pub = pub
-
 
 if __name__ == "__main__":
     Builder().run()
-- 
cgit v1.2.1


From 9ac643158b26bf30d7493eac1e6a1acd6345914f Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 19 Sep 2002 00:46:05 +0000
Subject: Improved field list rendering.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@692 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 12 ++++--------
 tools/stylesheets/pep.css     |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 85a8fb32a..a61d0e01d 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -170,19 +170,15 @@ table.footnote {
 
 td, th {
   padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: baseline }
+  padding-right: 0.5em }
 
 td > p:first-child, th > p:first-child {
   margin-top: 0em }
 
-th.docinfo-name {
+th.docinfo-name, th.field-name {
   font-weight: bold ;
-  text-align: right }
-
-th.field-name {
-  font-weight: bold ;
-  text-align: right }
+  text-align: left ;
+  white-space: nowrap }
 
 h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
   font-size: 100% }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 583a0f6ce..6580b01a0 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -219,8 +219,7 @@ table {
 
 td, th {
   padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: baseline }
+  padding-right: 0.5em }
 
 td > :first-child, th > :first-child {
   margin-top: 0em }
@@ -230,7 +229,8 @@ td.num {
 
 th.field-name {
   font-weight: bold ;
-  text-align: right }
+  text-align: left ;
+  white-space: nowrap }
 
 h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
   font-size: 100% }
-- 
cgit v1.2.1


From c2291595af5c117f10061fd9bf68fa0ff69d74fa Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 19 Sep 2002 00:51:03 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@695 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index 2f0c46454..fc74d5121 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -1,14 +1,12 @@
 #!/usr/bin/env python
 
-"""
-:Author: Garth Kidd
-:Contact: garth@deadlybloodyserious.com
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Revision: $Revision$
-:Date: $Date$
-:Copyright: This module has been placed in the public domain.
-"""
+# Author: Garth Kidd
+# Contact: garth@deadlybloodyserious.com
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
 
 import locale
 locale.setlocale(locale.LC_ALL, '')
@@ -46,8 +44,8 @@ options = [('pretty', 'p',
            ('attributes', '', 'dump document attributes after processing'),
            ('debug', 'd', 'debug mode (lots of output)'),
            ('help', 'h', 'show help text')]
-"""See distutils.fancy_getopt.FancyGetopt.__init__ for a description of the
-data structure: (long option, short option, description)."""
+"""See ``distutils.fancy_getopt.FancyGetopt.__init__`` for a description of
+the data structure: (long option, short option, description)."""
 
 def usage():
     print usage_header
@@ -186,7 +184,7 @@ Use the next dialog to build a command line:
 def main():
     # process cmdline arguments:
     inputFile, outputFile, outputFormat, optargs = getArgs()
-    options = OptionParser().get_default_values()
+    options = OptionParser(components=(Parser,)).get_default_values()
     options.debug = optargs['debug']
     parser = Parser()
     input = inputFile.read()
-- 
cgit v1.2.1


From fe1222623a8f8eae5552984bb8186e69e735cbed Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 20 Sep 2002 02:49:01 +0000
Subject: Made the ``locale.setlocale()`` calls in front ends fault-tolerant.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@697 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py    |  6 ++++++
 tools/docutils-xml.py | 17 ++++++++++-------
 tools/html.py         | 17 ++++++++++-------
 tools/pep.py          | 17 ++++++++++-------
 tools/publish.py      | 17 ++++++++++-------
 tools/quicktest.py    |  5 ++++-
 6 files changed, 50 insertions(+), 29 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index f2d3b80a4..8375cd844 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -12,6 +12,12 @@ new reStructuredText PEPs).
 __docformat__ = 'reStructuredText'
 
 
+import locale
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
+
 import sys
 import os
 import os.path
diff --git a/tools/docutils-xml.py b/tools/docutils-xml.py
index 72f72ca86..688a38786 100755
--- a/tools/docutils-xml.py
+++ b/tools/docutils-xml.py
@@ -1,17 +1,20 @@
 #!/usr/bin/env python
 
-"""
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Revision: $Revision$
-:Date: $Date$
-:Copyright: This module has been placed in the public domain.
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
 
+"""
 A minimal front end to the Docutils Publisher, producing Docutils XML.
 """
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 from docutils.core import publish, default_description
 
diff --git a/tools/html.py b/tools/html.py
index a79aefca8..81c34ab4b 100755
--- a/tools/html.py
+++ b/tools/html.py
@@ -1,17 +1,20 @@
 #!/usr/bin/env python
 
-"""
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Revision: $Revision$
-:Date: $Date$
-:Copyright: This module has been placed in the public domain.
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
 
+"""
 A minimal front end to the Docutils Publisher, producing HTML.
 """
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 from docutils.core import publish, default_description
 
diff --git a/tools/pep.py b/tools/pep.py
index 837221495..e44eabe18 100755
--- a/tools/pep.py
+++ b/tools/pep.py
@@ -1,18 +1,21 @@
 #!/usr/bin/env python
 
-"""
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Revision: $Revision$
-:Date: $Date$
-:Copyright: This module has been placed in the public domain.
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
 
+"""
 A minimal front end to the Docutils Publisher, producing HTML from PEP
 (Python Enhancement Proposal) documents.
 """
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 from docutils.core import publish, default_description
 
diff --git a/tools/publish.py b/tools/publish.py
index edd643b04..75de3a141 100755
--- a/tools/publish.py
+++ b/tools/publish.py
@@ -1,17 +1,20 @@
 #!/usr/bin/env python
 
-"""
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Revision: $Revision$
-:Date: $Date$
-:Copyright: This module has been placed in the public domain.
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
 
+"""
 A minimal front end to the Docutils Publisher, producing pseudo-XML.
 """
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 from docutils.core import publish, default_description
 
diff --git a/tools/quicktest.py b/tools/quicktest.py
index fc74d5121..ccabf4ed6 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -9,7 +9,10 @@
 # Copyright: This module has been placed in the public domain.
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 import sys
 import os
-- 
cgit v1.2.1


From 2394f6dec411fc9ae223f838d162878d370edff7 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 20 Sep 2002 03:52:48 +0000
Subject: table tweak

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@702 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 ++-
 tools/stylesheets/pep.css     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index a61d0e01d..a17b4b9cb 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -170,7 +170,8 @@ table.footnote {
 
 td, th {
   padding-left: 0.5em ;
-  padding-right: 0.5em }
+  padding-right: 0.5em ;
+  vertical-align: top }
 
 td > p:first-child, th > p:first-child {
   margin-top: 0em }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 6580b01a0..2a7f61ecc 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -219,7 +219,8 @@ table {
 
 td, th {
   padding-left: 0.5em ;
-  padding-right: 0.5em }
+  padding-right: 0.5em ;
+  vertical-align: top }
 
 td > :first-child, th > :first-child {
   margin-top: 0em }
-- 
cgit v1.2.1


From 6b624cc273300380e802d70677249d754fe6365d Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 24 Sep 2002 02:18:31 +0000
Subject: Added Docutils version to "generator" meta tag.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@714 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 2 +-
 tools/pep2html.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 58280a544..49f367bf8 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -3,7 +3,7 @@
 
 
   
-  
+  
   PEP %(pep)s -- %(title)s
   %(stylesheet)s
 
diff --git a/tools/pep2html.py b/tools/pep2html.py
index ecc3de363..c0a4fc31d 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -41,7 +41,7 @@ import random
 import time
 
 REQUIRES = {'python': '2.2',
-            'docutils': '0.2.3'}
+            'docutils': '0.2.4'}
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
-- 
cgit v1.2.1


From b53fe4bfc549c05db10526da6555fbd1ed73a57e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 3 Oct 2002 22:17:55 +0000
Subject: Added ``-V``/``--version`` option.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@758 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index ccabf4ed6..200f46c20 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -17,6 +17,7 @@ except:
 import sys
 import os
 import getopt
+import docutils
 from docutils.frontend import OptionParser
 from docutils.utils import new_document
 from docutils.parsers.rst import Parser
@@ -46,7 +47,8 @@ options = [('pretty', 'p',
            ('xml', 'x', 'output pretty XML (indented)'),
            ('attributes', '', 'dump document attributes after processing'),
            ('debug', 'd', 'debug mode (lots of output)'),
-           ('help', 'h', 'show help text')]
+           ('version', 'V', 'show Docutils version then exit'),
+           ('help', 'h', 'show help text then exit')]
 """See ``distutils.fancy_getopt.FancyGetopt.__init__`` for a description of
 the data structure: (long option, short option, description)."""
 
@@ -140,6 +142,10 @@ def posixGetArgs(argv):
         if o in ['-h', '--help']:
             usage()
             sys.exit()
+        elif o in ['-V', '--version']:
+            print >>sys.stderr, ('quicktest.py (Docutils %s)'
+                                 % docutils.__version)
+            sys.exit()
         elif o in ['-r', '--rawxml']:
             outputFormat = 'rawxml'
         elif o in ['-s', '--styledxml']:
-- 
cgit v1.2.1


From 0590bfaf42788314fb22491b5497079843713f2e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 8 Oct 2002 01:28:42 +0000
Subject: Added "-A" option.  Fixed typo.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@773 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index 200f46c20..1ee77b3c4 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -45,7 +45,7 @@ options = [('pretty', 'p',
            ('styledxml=', 's', 'output raw XML with XSL style sheet '
             'reference (filename supplied in the option argument)'),
            ('xml', 'x', 'output pretty XML (indented)'),
-           ('attributes', '', 'dump document attributes after processing'),
+           ('attributes', 'A', 'dump document attributes after processing'),
            ('debug', 'd', 'debug mode (lots of output)'),
            ('version', 'V', 'show Docutils version then exit'),
            ('help', 'h', 'show help text then exit')]
@@ -58,7 +58,7 @@ def usage():
         if longopt[-1:] == '=':
             opts = '-%s arg, --%sarg' % (shortopt, longopt)
         else:
-            opts = '-%s, --%s' % (shortopt, longopt),
+            opts = '-%s, --%s' % (shortopt, longopt)
         print '%-15s' % opts,
         if len(opts) > 14:
             print '%-16s' % '\n',
-- 
cgit v1.2.1


From 8016246d7ce753e06932376eaed76ab26e6eeb22 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 9 Oct 2002 00:48:31 +0000
Subject: fixed DOCTYPE declaration

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@776 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 49f367bf8..5549c5d6d 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -1,5 +1,5 @@
 
-
+
 
 
   
-- 
cgit v1.2.1


From 3620667162c07ecf1949ba2ea8b131656c8a4246 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 11 Oct 2002 22:51:46 +0000
Subject: Improve vertical spacing?

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@790 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index a17b4b9cb..97b7b6032 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -131,6 +131,7 @@ pre.line-block {
 pre.literal-block, pre.doctest-block {
   margin-left: 2em ;
   margin-right: 2em ;
+  margin-bottom: 0 ;
   background-color: #eeeeee }
 
 span.classifier {
-- 
cgit v1.2.1


From 86fdc1b7f9f5b407fb2ee5881799b5120e277992 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 17 Oct 2002 01:30:45 +0000
Subject: Vertical whitespace improvements.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@805 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 13 ++++++-------
 tools/stylesheets/pep.css     | 12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 97b7b6032..b929f6503 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -8,6 +8,12 @@
 Default cascading style sheet for the HTML output of Docutils.
 */
 
+.first {
+  margin-top: 0 }
+
+.last {
+  margin-bottom: 0 }
+
 a.target {
   color: blue }
 
@@ -109,9 +115,6 @@ p.credits {
   font-style: italic ;
   font-size: smaller }
 
-p.first {
-  margin-top: 0 }
-
 p.label {
   white-space: nowrap }
 
@@ -131,7 +134,6 @@ pre.line-block {
 pre.literal-block, pre.doctest-block {
   margin-left: 2em ;
   margin-right: 2em ;
-  margin-bottom: 0 ;
   background-color: #eeeeee }
 
 span.classifier {
@@ -174,9 +176,6 @@ td, th {
   padding-right: 0.5em ;
   vertical-align: top }
 
-td > p:first-child, th > p:first-child {
-  margin-top: 0em }
-
 th.docinfo-name, th.field-name {
   font-weight: bold ;
   text-align: left ;
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 2a7f61ecc..8cc2a13fb 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -8,6 +8,12 @@
 Default cascading style sheet for the PEP HTML output of Docutils.
 */
 
+.first {
+  margin-top: 0 }
+
+.last {
+  margin-bottom: 0 }
+
 .navigation {
   width: 100% ;
   background: #99ccff ;
@@ -174,9 +180,6 @@ p.credits {
   font-style: italic ;
   font-size: smaller }
 
-p.first {
-  margin-top: 0 }
-
 p.label {
   white-space: nowrap }
 
@@ -222,9 +225,6 @@ td, th {
   padding-right: 0.5em ;
   vertical-align: top }
 
-td > :first-child, th > :first-child {
-  margin-top: 0em }
-
 td.num {
   text-align: right }
 
-- 
cgit v1.2.1


From afeedfb343c2904e9357997d2a50f8f3cabb2568 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Oct 2002 04:55:21 +0000
Subject: Refactored names (options -> settings; .transform() -> .apply();
 etc.); updated.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@825 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py    | 71 ++++++++++++++++++++++++++-------------------------
 tools/docutils-xml.py |  4 +--
 tools/html.py         |  4 +--
 tools/pep.py          |  5 ++--
 tools/pep2html.py     | 24 ++++++++---------
 tools/publish.py      |  4 +--
 tools/quicktest.py    |  6 ++---
 7 files changed, 60 insertions(+), 58 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index 8375cd844..9b10a8f96 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -36,15 +36,15 @@ description = ('Generates .html from all the .txt files (including PEPs) '
                'in each  (default is the current directory).')
 
 
-class OptionSpec(docutils.OptionSpec):
+class SettingsSpec(docutils.SettingsSpec):
 
     """
-    Command-line options for the ``buildhtml.py`` front end.
+    Runtime settings & command-line options for the front end.
     """
 
     # Can't be included in OptionParser below because we don't want to
     # override the base class.
-    cmdline_options = (
+    settings_spec = (
         'Build-HTML Options',
         None,
         (('Recursively scan subdirectories for files to process.  This is '
@@ -88,7 +88,7 @@ class Builder:
 
     def __init__(self):
         self.publishers = {
-            '': Struct(components=(OptionSpec, pep.Reader, rst.Parser,
+            '': Struct(components=(SettingsSpec, pep.Reader, rst.Parser,
                                    pep_html.Writer),
                        setup=None),
             '.txt': Struct(components=(rst.Parser, standalone.Reader,
@@ -109,17 +109,18 @@ class Builder:
 
         Each publisher (combination of parser, reader, and writer) may have
         its own configuration defaults, which must be kept separate from those
-        of the other publishers.  Option defaults are combined with the config
-        file settings and command-line options by `self.get_options()`.
+        of the other publishers.  Setting defaults are combined with the
+        config file settings and command-line options by
+        `self.get_settings()`.
         """
         for name, publisher in self.publishers.items():
             option_parser = OptionParser(
                 components=publisher.components,
                 usage=usage, description=description)
             publisher.option_parser = option_parser
-            publisher.option_defaults = option_parser.get_default_values()
-            frontend.make_paths_absolute(publisher.option_defaults.__dict__,
-                                         option_parser.relative_path_options)
+            publisher.setting_defaults = option_parser.get_default_values()
+            frontend.make_paths_absolute(publisher.setting_defaults.__dict__,
+                                         option_parser.relative_path_settings)
             if publisher.setup:
                 publisher.setup()
         config_parser = frontend.ConfigParser()
@@ -127,32 +128,32 @@ class Builder:
         self.config_settings = config_parser.get_section('options')
         frontend.make_paths_absolute(
             self.config_settings,
-            self.publishers[''].option_parser.relative_path_options)
-        self.cmdline_options = self.publishers[''].option_parser.parse_args(
+            self.publishers[''].option_parser.relative_path_settings)
+        self.settings_spec = self.publishers[''].option_parser.parse_args(
             values=frontend.Values())   # no defaults; just the cmdline opts
-        self.initial_options = self.get_options('')
+        self.initial_settings = self.get_settings('')
 
-    def get_options(self, publisher_name, directory=None):
+    def get_settings(self, publisher_name, directory=None):
         """
-        Return an option values object, from multiple sources.
+        Return a settings object, from multiple sources.
 
-        Copy the option defaults, overlay the startup config file settings,
+        Copy the setting defaults, overlay the startup config file settings,
         then the local config file settings, then the command-line options.
         Assumes the current directory has been set.
         """
         publisher = self.publishers[publisher_name]
-        options = copy.deepcopy(publisher.option_defaults)
-        options.__dict__.update(self.config_settings)
+        settings = copy.deepcopy(publisher.setting_defaults)
+        settings.__dict__.update(self.config_settings)
         if directory:
             config_parser = frontend.ConfigParser()
             config_parser.read(os.path.join(directory, 'docutils.conf'))
             local_config = config_parser.get_section('options')
             frontend.make_paths_absolute(
-                local_config, publisher.option_parser.relative_path_options,
+                local_config, publisher.option_parser.relative_path_settings,
                 directory)
-            options.__dict__.update(local_config)
-        options.__dict__.update(self.cmdline_options.__dict__)
-        return options
+            settings.__dict__.update(local_config)
+        settings.__dict__.update(self.settings_spec.__dict__)
+        return settings
 
     def setup_html_publisher(self):
         pub = core.Publisher()
@@ -162,18 +163,18 @@ class Builder:
         self.html_publisher = pub
 
     def run(self, directory=None, recurse=1):
-        recurse = recurse and self.initial_options.recurse
+        recurse = recurse and self.initial_settings.recurse
         if directory:
             self.directories = [directory]
-        elif self.cmdline_options._directories:
-            self.directories = self.cmdline_options._directories
+        elif self.settings_spec._directories:
+            self.directories = self.settings_spec._directories
         else:
             self.directories = [os.getcwd()]
         for directory in self.directories:
             os.path.walk(directory, self.visit, recurse)
 
     def visit(self, recurse, directory, names):
-        if not self.initial_options.silent:
+        if not self.initial_settings.silent:
             print >>sys.stderr, '/// Processing directory:', directory
             sys.stderr.flush()
         peps_found = 0
@@ -189,17 +190,17 @@ class Builder:
             del names[:]
 
     def process_txt(self, directory, name):
-        options = self.get_options('.txt', directory)
-        options._source = os.path.normpath(os.path.join(directory, name))
-        options._destination = options._source[:-4]+'.html'
+        settings = self.get_settings('.txt', directory)
+        settings._source = os.path.normpath(os.path.join(directory, name))
+        settings._destination = settings._source[:-4]+'.html'
         pub = self.html_publisher
-        pub.options = options
-        if not self.initial_options.silent:
+        pub.settings = settings
+        if not self.initial_settings.silent:
             print >>sys.stderr, '    ::: Processing .txt:', name
             sys.stderr.flush()
-        pub.source = io.FileInput(options, source_path=options._source)
+        pub.source = io.FileInput(settings, source_path=settings._source)
         pub.destination = io.FileOutput(
-            options, destination_path=options._destination)
+            settings, destination_path=settings._destination)
         try:
             pub.publish()
         except ApplicationError, error:
@@ -207,16 +208,16 @@ class Builder:
                                  % (error.__class__.__name__, error))
 
     def process_peps(self, directory):
-        options = self.get_options('PEPs', directory)
+        settings = self.get_settings('PEPs', directory)
         old_directory = os.getcwd()
         os.chdir(directory)
-        if self.initial_options.silent:
+        if self.initial_settings.silent:
             argv = ['-q']
         else:
             print >>sys.stderr, '    ::: Processing PEPs:'
             sys.stderr.flush()
             argv = []
-        pep2html.docutils_options = options
+        pep2html.docutils_settings = settings
         try:
             pep2html.main(argv)
         except Exception, error:
diff --git a/tools/docutils-xml.py b/tools/docutils-xml.py
index 688a38786..42c879cc8 100755
--- a/tools/docutils-xml.py
+++ b/tools/docutils-xml.py
@@ -16,10 +16,10 @@ try:
 except:
     pass
 
-from docutils.core import publish, default_description
+from docutils.core import publish_cmdline, default_description
 
 
 description = ('Generates Docutils-native XML from standalone '
                'reStructuredText sources.  ' + default_description)
 
-publish(writer_name='xml', description=description)
+publish_cmdline(writer_name='xml', description=description)
diff --git a/tools/html.py b/tools/html.py
index 81c34ab4b..98293b3a1 100755
--- a/tools/html.py
+++ b/tools/html.py
@@ -16,10 +16,10 @@ try:
 except:
     pass
 
-from docutils.core import publish, default_description
+from docutils.core import publish_cmdline, default_description
 
 
 description = ('Generates (X)HTML documents from standalone reStructuredText '
                'sources.  ' + default_description)
 
-publish(writer_name='html', description=description)
+publish_cmdline(writer_name='html', description=description)
diff --git a/tools/pep.py b/tools/pep.py
index e44eabe18..4c38980b6 100755
--- a/tools/pep.py
+++ b/tools/pep.py
@@ -17,10 +17,11 @@ try:
 except:
     pass
 
-from docutils.core import publish, default_description
+from docutils.core import publish_cmdline, default_description
 
 
 description = ('Generates (X)HTML from reStructuredText-format PEP files.  '
                + default_description)
 
-publish(reader_name='pep', writer_name='pep_html', description=description)
+publish_cmdline(reader_name='pep', writer_name='pep_html',
+                description=description)
diff --git a/tools/pep2html.py b/tools/pep2html.py
index c0a4fc31d..2cc7434e9 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -41,7 +41,7 @@ import random
 import time
 
 REQUIRES = {'python': '2.2',
-            'docutils': '0.2.4'}
+            'docutils': '0.2.6'}
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
@@ -280,9 +280,9 @@ def fixfile(inpath, input_lines, outfile):
     print >> outfile, ''
 
 
-docutils_options = None
-"""Option value object used by Docutils.  Can be set by the client application
-when this module is imported."""
+docutils_settings = None
+"""Runtime settings object used by Docutils.  Can be set by the client
+application when this module is imported."""
 
 def fix_rst_pep(inpath, input_lines, outfile):
     from docutils import core, io
@@ -290,17 +290,17 @@ def fix_rst_pep(inpath, input_lines, outfile):
     pub.set_reader(reader_name='pep', parser_name='restructuredtext',
                    parser=None)
     pub.set_writer(writer_name='pep_html')
-    if docutils_options:
-        options = docutils_options
-        pub.options = options
+    if docutils_settings:
+        settings = docutils_settings
+        pub.settings = settings
     else:
-        options = pub.set_options()
-    options._source = inpath
-    options._destination = outfile.name
+        settings = pub.get_settings()
+    settings._source = inpath
+    settings._destination = outfile.name
     pub.source = io.StringInput(
-        options, source=''.join(input_lines), source_path=inpath)
+        settings, source=''.join(input_lines), source_path=inpath)
     pub.destination = io.FileOutput(
-        options, destination=outfile, destination_path=outfile.name,
+        settings, destination=outfile, destination_path=outfile.name,
         autoclose=0)
     pub.publish()
 
diff --git a/tools/publish.py b/tools/publish.py
index 75de3a141..d360cd124 100755
--- a/tools/publish.py
+++ b/tools/publish.py
@@ -16,10 +16,10 @@ try:
 except:
     pass
 
-from docutils.core import publish, default_description
+from docutils.core import publish_cmdline, default_description
 
 
 description = ('Generates pseudo-XML from standalone reStructuredText '
                'sources (for testing purposes).  ' + default_description)
 
-publish(description=description)
+publish_cmdline(description=description)
diff --git a/tools/quicktest.py b/tools/quicktest.py
index 1ee77b3c4..83b5a622b 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -193,11 +193,11 @@ Use the next dialog to build a command line:
 def main():
     # process cmdline arguments:
     inputFile, outputFile, outputFormat, optargs = getArgs()
-    options = OptionParser(components=(Parser,)).get_default_values()
-    options.debug = optargs['debug']
+    settings = OptionParser(components=(Parser,)).get_default_values()
+    settings.debug = optargs['debug']
     parser = Parser()
     input = inputFile.read()
-    document = new_document(inputFile.name, options)
+    document = new_document(inputFile.name, settings)
     parser.parse(input, document)
     output = format(outputFormat, input, document, optargs)
     outputFile.write(output)
-- 
cgit v1.2.1


From 6c098e17d8e414894609dab0c4e5f08634db81b8 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Oct 2002 23:46:56 +0000
Subject: Updated for new ``publish_file()`` convenience function; simplified.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@832 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index 9b10a8f96..9486229de 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -89,14 +89,11 @@ class Builder:
     def __init__(self):
         self.publishers = {
             '': Struct(components=(SettingsSpec, pep.Reader, rst.Parser,
-                                   pep_html.Writer),
-                       setup=None),
+                                   pep_html.Writer)),
             '.txt': Struct(components=(rst.Parser, standalone.Reader,
-                                       html4css1.Writer),
-                           setup=self.setup_html_publisher),
+                                       html4css1.Writer)),
             'PEPs': Struct(components=(rst.Parser, pep.Reader,
-                                       pep_html.Writer),
-                           setup=None)}
+                                       pep_html.Writer))}
         """Publisher-specific settings.  Key '' is for the front-end script
         itself.  ``self.publishers[''].components`` must contain a superset of
         all components used by individual publishers."""
@@ -121,8 +118,6 @@ class Builder:
             publisher.setting_defaults = option_parser.get_default_values()
             frontend.make_paths_absolute(publisher.setting_defaults.__dict__,
                                          option_parser.relative_path_settings)
-            if publisher.setup:
-                publisher.setup()
         config_parser = frontend.ConfigParser()
         config_parser.read_standard_files()
         self.config_settings = config_parser.get_section('options')
@@ -155,13 +150,6 @@ class Builder:
         settings.__dict__.update(self.settings_spec.__dict__)
         return settings
 
-    def setup_html_publisher(self):
-        pub = core.Publisher()
-        pub.set_reader(reader_name='standalone',
-                       parser_name='restructuredtext', parser=None)
-        pub.set_writer(writer_name='html')
-        self.html_publisher = pub
-
     def run(self, directory=None, recurse=1):
         recurse = recurse and self.initial_settings.recurse
         if directory:
@@ -193,16 +181,16 @@ class Builder:
         settings = self.get_settings('.txt', directory)
         settings._source = os.path.normpath(os.path.join(directory, name))
         settings._destination = settings._source[:-4]+'.html'
-        pub = self.html_publisher
-        pub.settings = settings
         if not self.initial_settings.silent:
             print >>sys.stderr, '    ::: Processing .txt:', name
             sys.stderr.flush()
-        pub.source = io.FileInput(settings, source_path=settings._source)
-        pub.destination = io.FileOutput(
-            settings, destination_path=settings._destination)
         try:
-            pub.publish()
+            core.publish_file(source_path=settings._source,
+                              destination_path=settings._destination,
+                              reader_name='standalone',
+                              parser_name='restructuredtext',
+                              writer_name='html',
+                              settings=settings)
         except ApplicationError, error:
             print >>sys.stderr, ('        Error (%s): %s'
                                  % (error.__class__.__name__, error))
-- 
cgit v1.2.1


From e649ed80f03f669e7a18b1a2412240dff931a6a9 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Oct 2002 23:47:35 +0000
Subject: Updated for new ``publish_string()`` convenience function.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@833 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index 2cc7434e9..fe78026f4 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -41,7 +41,7 @@ import random
 import time
 
 REQUIRES = {'python': '2.2',
-            'docutils': '0.2.6'}
+            'docutils': '0.2.7'}
 PROGRAM = sys.argv[0]
 RFCURL = 'http://www.faqs.org/rfcs/rfc%d.html'
 PEPURL = 'pep-%04d.html'
@@ -286,23 +286,15 @@ application when this module is imported."""
 
 def fix_rst_pep(inpath, input_lines, outfile):
     from docutils import core, io
-    pub = core.Publisher()
-    pub.set_reader(reader_name='pep', parser_name='restructuredtext',
-                   parser=None)
-    pub.set_writer(writer_name='pep_html')
-    if docutils_settings:
-        settings = docutils_settings
-        pub.settings = settings
-    else:
-        settings = pub.get_settings()
-    settings._source = inpath
-    settings._destination = outfile.name
-    pub.source = io.StringInput(
-        settings, source=''.join(input_lines), source_path=inpath)
-    pub.destination = io.FileOutput(
-        settings, destination=outfile, destination_path=outfile.name,
-        autoclose=0)
-    pub.publish()
+    output = core.publish_string(
+        source=''.join(input_lines),
+        source_path=inpath,
+        destination_path=outfile.name,
+        reader_name='pep',
+        parser_name='restructuredtext',
+        writer_name='pep_html',
+        settings=docutils_settings)
+    outfile.write(output)
 
 
 def get_pep_type(input_lines):
-- 
cgit v1.2.1


From a8529d5c7ba55461db6427c9858ca7f21c18464c Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 23 Oct 2002 01:07:40 +0000
Subject: Removed "a.target" style.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@840 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 ---
 tools/stylesheets/pep.css     | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index b929f6503..2e1fddb9e 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -14,9 +14,6 @@ Default cascading style sheet for the HTML output of Docutils.
 .last {
   margin-bottom: 0 }
 
-a.target {
-  color: blue }
-
 a.toc-backref {
   text-decoration: none ;
   color: black }
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 8cc2a13fb..08274817d 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -49,9 +49,6 @@ Default cascading style sheet for the PEP HTML output of Docutils.
   font-weight: bold ;
   margin-bottom: 0em }
 
-a.target {
-  color: blue }
-
 a.toc-backref {
   text-decoration: none ;
   color: black }
-- 
cgit v1.2.1


From 0e08813dff384af5edcd26e1cce8005f904f0cc7 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 29 Oct 2002 03:49:35 +0000
Subject: Updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@865 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index fe78026f4..6e031d72c 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -285,7 +285,7 @@ docutils_settings = None
 application when this module is imported."""
 
 def fix_rst_pep(inpath, input_lines, outfile):
-    from docutils import core, io
+    from docutils import core
     output = core.publish_string(
         source=''.join(input_lines),
         source_path=inpath,
-- 
cgit v1.2.1


From 55970b7661292e2494bf92109f38c4a3f90de7ed Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 7 Nov 2002 01:47:19 +0000
Subject: small fixes

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@899 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 08274817d..9ff72b162 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -22,7 +22,8 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 
 .navigation .navicon {
   width: 150px ;
-  height: 35 }
+  height: 35 ;
+  margin-bottom: 0em }
 
 .navigation .textlinks {
   padding-left: 1em ;
@@ -42,7 +43,7 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 .rfc2822 td {
   text-align: left }
 
-.rfc2822 th {
+.rfc2822 th.field-name {
   text-align: right ;
   font-family: sans-serif ;
   padding-right: 0.5em ;
-- 
cgit v1.2.1


From 2c6aa283bb09769bc8f2e19fa716f789b3f7d16f Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 7 Nov 2002 01:48:26 +0000
Subject: Added "auto-generated file" comment.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@900 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 5 +++++
 tools/pep2html.py       | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 5549c5d6d..3f4bbdd40 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -1,4 +1,9 @@
 
+
 
 
 
diff --git a/tools/pep2html.py b/tools/pep2html.py
index 6e031d72c..c74de27db 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -54,6 +54,12 @@ HOST = "www.python.org"                    # host for update
 HDIR = "/ftp/ftp.python.org/pub/www.python.org/peps" # target host directory
 LOCALVARS = "Local Variables:"
 
+COMMENT = """"""
+
 # The generated HTML doesn't validate -- you cannot use 
     and 
     inside
 # 
     tags.  But if I change that, the result doesn't look very nice...
 DTD = ('> outfile, COMMENT
     print >> outfile, DTD
     print >> outfile, ''
     print >> outfile, ''
-- 
cgit v1.2.1


From 47e460c659b1e295d43604762eff2e9147d7df6c Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 8 Nov 2002 01:38:11 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@917 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py         | 2 --
 tools/stylesheets/pep.css | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index c74de27db..deb65c813 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -243,8 +243,6 @@ def fixfile(inpath, input_lines, outfile):
         if line.strip() == LOCALVARS:
             break
         if line[0].strip():
-            if line.strip() == LOCALVARS:
-                break
             if not need_pre:
                 print >> outfile, '
    '
             print >> outfile, '
    %s
    ' % line.strip()
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 9ff72b162..5f055d2b9 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -22,8 +22,7 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 
 .navigation .navicon {
   width: 150px ;
-  height: 35 ;
-  margin-bottom: 0em }
+  height: 35 }
 
 .navigation .textlinks {
   padding-left: 1em ;
-- 
cgit v1.2.1


From 482f7623f06aa1f55b5f09198a78254fd6f11ff1 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 8 Nov 2002 22:04:42 +0000
Subject: Fixed meta tags.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@922 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 3f4bbdd40..4434e269e 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -7,8 +7,8 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
 
 
 
-  
-  
+  
+  
   PEP %(pep)s -- %(title)s
   %(stylesheet)s
 
-- 
cgit v1.2.1


From f6ee688991dabc8826b6cc203758900113a3995a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 12 Nov 2002 00:51:03 +0000
Subject: removed illegal attributes

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@930 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 4434e269e..6b42976c5 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -11,7 +11,7 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
   
   PEP %(pep)s -- %(title)s
   %(stylesheet)s
-
+
 
    
 
    
-- 
cgit v1.2.1


From efc524e7686abc667eda0b64497e16f59816f057 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 12 Nov 2002 00:52:37 +0000
Subject: Added --local/-l option to make my life easier on creosote.  Removed
 bogus  attributes.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@931 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep2html.py | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

(limited to 'tools')

diff --git a/tools/pep2html.py b/tools/pep2html.py
index deb65c813..3be522494 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -21,6 +21,10 @@ Options:
         and ssh commands, unless "-u username" is given (in which case, it is
         used instead).  Without -i, -u is ignored.
 
+    -l/--local
+        Same as -i/--install, except run on the local machine.  Use this when
+        logged in to the python.org machine (creosote).
+
     -q/--quiet
         Turn off verbose messages.
 
@@ -105,7 +109,7 @@ def fixanchor(current, match):
         rfcnum = int(match.group('rfcnum'))
         link = RFCURL % rfcnum
     if link:
-        return '%s' % (link, cgi.escape(text))
+        return '%s' % (cgi.escape(link), cgi.escape(text))
     return cgi.escape(match.group(0)) # really slow, but it works...
 
 
@@ -170,9 +174,9 @@ def fixfile(inpath, input_lines, outfile):
         print >> outfile, '  %s' % cgi.escape(title)
     r = random.choice(range(64))
     print >> outfile, (
-        '  \n'
+        '  \n'
         '\n'
-        '\n'
+        '\n'
         '\n'
         '
    \n'
@@ -367,23 +371,31 @@ def make_html(inpath, verbose=0):
     os.chmod(outfile.name, 0664)
     return outpath
 
-def push_pep(htmlfiles, txtfiles, username, verbose):
-    if verbose:
-        quiet = ""
+def push_pep(htmlfiles, txtfiles, username, verbose, local=0):
+    quiet = ""
+    if local:
+        if verbose:
+            quiet = "-v"
+        target = HDIR
+        copy_cmd = "cp"
+        chmod_cmd = "chmod"
     else:
-        quiet = "-q"
-    if username:
-        username = username + "@"
-    target = username + HOST + ":" + HDIR
+        if not verbose:
+            quiet = "-q"
+        if username:
+            username = username + "@"
+        target = username + HOST + ":" + HDIR
+        copy_cmd = "scp"
+        chmod_cmd = "ssh %s%s chmod" % (username, HOST)
     files = htmlfiles[:]
     files.extend(txtfiles)
     files.append("style.css")
     files.append("pep.css")
     filelist = SPACE.join(files)
-    rc = os.system("scp %s %s %s" % (quiet, filelist, target))
+    rc = os.system("%s %s %s %s" % (copy_cmd, quiet, filelist, target))
     if rc:
         sys.exit(rc)
-    rc = os.system("ssh %s%s chmod 664 %s/*" % (username, HOST, HDIR))
+    rc = os.system("%s 664 %s/*" % (chmod_cmd, HDIR))
     if rc:
         sys.exit(rc)
 
@@ -445,6 +457,7 @@ def browse_remote(pep):
 def main(argv=None):
     # defaults
     update = 0
+    local = 0
     username = ''
     verbose = 1
     browse = 0
@@ -456,8 +469,8 @@ def main(argv=None):
 
     try:
         opts, args = getopt.getopt(
-            argv, 'bihqu:',
-            ['browse', 'install', 'help', 'quiet', 'user='])
+            argv, 'bilhqu:',
+            ['browse', 'install', 'local', 'help', 'quiet', 'user='])
     except getopt.error, msg:
         usage(1, msg)
 
@@ -466,6 +479,9 @@ def main(argv=None):
             usage(0)
         elif opt in ('-i', '--install'):
             update = 1
+        elif opt in ('-l', '--local'):
+            update = 1
+            local = 1
         elif opt in ('-u', '--user'):
             username = arg
         elif opt in ('-q', '--quiet'):
@@ -499,7 +515,7 @@ def main(argv=None):
             browse_file("0")
 
     if update:
-        push_pep(html, peptxt, username, verbose)
+        push_pep(html, peptxt, username, verbose, local=local)
         if browse:
             if args:
                 for pep in args:
-- 
cgit v1.2.1


From 37db800f626fd7542df00bc32ebc49f9d84fe9d6 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 12 Nov 2002 03:05:57 +0000
Subject: fix

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@932 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index 5f055d2b9..a82045bc9 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -22,7 +22,7 @@ Default cascading style sheet for the PEP HTML output of Docutils.
 
 .navigation .navicon {
   width: 150px ;
-  height: 35 }
+  height: 35px }
 
 .navigation .textlinks {
   padding-left: 1em ;
-- 
cgit v1.2.1


From d6b7443c22b9595fef827fdddb96bda3df8fad03 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 12 Nov 2002 05:32:53 +0000
Subject: moved comment inside  to appease MSIE

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@934 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 4 ++--
 tools/pep2html.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 6b42976c5..79fd983c9 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -1,11 +1,11 @@
 
+
+
 
-
-
 
   
   
diff --git a/tools/pep2html.py b/tools/pep2html.py
index 3be522494..55a7d8b07 100755
--- a/tools/pep2html.py
+++ b/tools/pep2html.py
@@ -142,9 +142,9 @@ def fixfile(inpath, input_lines, outfile):
     basename = os.path.basename(inpath)
     infile = iter(input_lines)
     # convert plaintext pep to minimal XHTML markup
-    print >> outfile, COMMENT
     print >> outfile, DTD
     print >> outfile, ''
+    print >> outfile, COMMENT
     print >> outfile, ''
     # head
     header = []
-- 
cgit v1.2.1


From 70098d7e03145e387fe42e600123f306791c339b Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 13 Nov 2002 01:24:07 +0000
Subject: Conform to XHTML spec.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@943 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index 79fd983c9..94ecafb70 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -1,6 +1,6 @@
-
+
 
-
+
 """
-
-# The generated HTML doesn't validate -- you cannot use 
     and 
     inside
-# 
     tags.  But if I change that, the result doesn't look very nice...
-DTD = ('')
-
-fixpat = re.compile("((https?|ftp):[-_a-zA-Z0-9/.+~:?#$=&,]+)|(pep-\d+(.txt)?)|"
-                    "(RFC[- ]?(?P\d+))|"
-                    "(PEP\s+(?P\d+))|"
-                    ".")
-
-EMPTYSTRING = ''
-SPACE = ' '
-COMMASPACE = ', '
-
-
-
-def usage(code, msg=''):
-    """Print usage message and exit.  Uses stderr if code != 0."""
-    if code == 0:
-        out = sys.stdout
-    else:
-        out = sys.stderr
-    print >> out, __doc__ % globals()
-    if msg:
-        print >> out, msg
-    sys.exit(code)
-
-
-
-def fixanchor(current, match):
-    text = match.group(0)
-    link = None
-    if (text.startswith('http:') or text.startswith('https:')
-        or text.startswith('ftp:')):
-        # Strip off trailing punctuation.  Pattern taken from faqwiz.
-        ltext = list(text)
-        while ltext:
-            c = ltext.pop()
-            if c not in '();:,.?\'"<>':
-                ltext.append(c)
-                break
-        link = EMPTYSTRING.join(ltext)
-    elif text.startswith('pep-') and text <> current:
-        link = os.path.splitext(text)[0] + ".html"
-    elif text.startswith('PEP'):
-        pepnum = int(match.group('pepnum'))
-        link = PEPURL % pepnum
-    elif text.startswith('RFC'):
-        rfcnum = int(match.group('rfcnum'))
-        link = RFCURL % rfcnum
-    if link:
-        return '%s' % (cgi.escape(link), cgi.escape(text))
-    return cgi.escape(match.group(0)) # really slow, but it works...
-
-
-
-NON_MASKED_EMAILS = [
-    'peps@python.org',
-    'python-list@python.org',
-    'python-dev@python.org',
-    ]
-
-def fixemail(address, pepno):
-    if address.lower() in NON_MASKED_EMAILS:
-        # return hyperlinked version of email address
-        return linkemail(address, pepno)
-    else:
-        # return masked version of email address
-        parts = address.split('@', 1)
-        return '%s at %s' % (parts[0], parts[1])
-
-
-def linkemail(address, pepno):
-    parts = address.split('@', 1)
-    return (''
-            '%s at %s'
-            % (parts[0], parts[1], pepno, parts[0], parts[1]))
-
-
-def fixfile(inpath, input_lines, outfile):
-    from email.Utils import parseaddr
-    basename = os.path.basename(inpath)
-    infile = iter(input_lines)
-    # convert plaintext pep to minimal XHTML markup
-    print >> outfile, DTD
-    print >> outfile, ''
-    print >> outfile, COMMENT
-    print >> outfile, ''
-    # head
-    header = []
-    pep = ""
-    title = ""
-    for line in infile:
-        if not line.strip():
-            break
-        if line[0].strip():
-            if ":" not in line:
-                break
-            key, value = line.split(":", 1)
-            value = value.strip()
-            header.append((key, value))
-        else:
-            # continuation line
-            key, value = header[-1]
-            value = value + line
-            header[-1] = key, value
-        if key.lower() == "title":
-            title = value
-        elif key.lower() == "pep":
-            pep = value
-    if pep:
-        title = "PEP " + pep + " -- " + title
-    if title:
-        print >> outfile, '  %s' % cgi.escape(title)
-    r = random.choice(range(64))
-    print >> outfile, (
-        '  \n'
-        '\n'
-        '\n'
-        '\n'
-        '\n'
-        '
    \n'
-        '\n'
-        '[Python]\n'
-        '[Python Home]' % r)
-    if basename <> 'pep-0000.txt':
-        print >> outfile, '[PEP Index]'
-    if pep:
-        try:
-            print >> outfile, ('[PEP Source'
-                               ']' % int(pep))
-        except ValueError, error:
-            print >> sys.stderr, ('ValueError (invalid PEP number): %s'
-                                  % error)
-    print >> outfile, '
    '
-    print >> outfile, '
    \n'
-    for k, v in header:
-        if k.lower() in ('author', 'discussions-to'):
-            mailtos = []
-            for part in re.split(',\s*', v):
-                if '@' in part:
-                    realname, addr = parseaddr(part)
-                    if k.lower() == 'discussions-to':
-                        m = linkemail(addr, pep)
-                    else:
-                        m = fixemail(addr, pep)
-                    mailtos.append('%s <%s>' % (realname, m))
-                elif part.startswith('http:'):
-                    mailtos.append(
-                        '%s' % (part, part))
-                else:
-                    mailtos.append(part)
-            v = COMMASPACE.join(mailtos)
-        elif k.lower() in ('replaces', 'replaced-by', 'requires'):
-            otherpeps = ''
-            for otherpep in re.split(',?\s+', v):
-                otherpep = int(otherpep)
-                otherpeps += '%i ' % (otherpep,
-                                                                  otherpep)
-            v = otherpeps
-        elif k.lower() in ('last-modified',):
-            date = v or time.strftime('%d-%b-%Y',
-                                      time.localtime(os.stat(inpath)[8]))
-            try:
-                url = PEPCVSURL % int(pep)
-                v = '%s ' % (url, cgi.escape(date))
-            except ValueError, error:
-                v = date
-        elif k.lower() in ('content-type',):
-            url = PEPURL % 9
-            pep_type = v or 'text/plain'
-            v = '%s ' % (url, cgi.escape(pep_type))
-        else:
-            v = cgi.escape(v)
-        print >> outfile, '  ' \
-              % (cgi.escape(k), v)
-    print >> outfile, '
    %s: %s
    '
-    print >> outfile, '
    '
-    print >> outfile, '
    '
-    print >> outfile, '
    '
-    need_pre = 1
-    for line in infile:
-        if line[0] == '\f':
-            continue
-        if line.strip() == LOCALVARS:
-            break
-        if line[0].strip():
-            if not need_pre:
-                print >> outfile, '
    '
-            print >> outfile, '
    %s
    ' % line.strip()
-            need_pre = 1
-        elif not line.strip() and need_pre:
-            continue
-        else:
-            # PEP 0 has some special treatment
-            if basename == 'pep-0000.txt':
-                parts = line.split()
-                if len(parts) > 1 and re.match(r'\s*\d{1,4}', parts[1]):
-                    # This is a PEP summary line, which we need to hyperlink
-                    url = PEPURL % int(parts[1])
-                    if need_pre:
-                        print >> outfile, '
    '
-                        need_pre = 0
-                    print >> outfile, re.sub(
-                        parts[1],
-                        '%s' % (url, parts[1]),
-                        line, 1),
-                    continue
-                elif parts and '@' in parts[-1]:
-                    # This is a pep email address line, so filter it.
-                    url = fixemail(parts[-1], pep)
-                    if need_pre:
-                        print >> outfile, '
    '
-                        need_pre = 0
-                    print >> outfile, re.sub(
-                        parts[-1], url, line, 1),
-                    continue
-            line = fixpat.sub(lambda x, c=inpath: fixanchor(c, x), line)
-            if need_pre:
-                print >> outfile, '
    '
-                need_pre = 0
-            outfile.write(line)
-    if not need_pre:
-        print >> outfile, '
    '
-    print >> outfile, ''
-    print >> outfile, ''
-    print >> outfile, ''
-
-
-docutils_settings = None
-"""Runtime settings object used by Docutils.  Can be set by the client
-application when this module is imported."""
-
-def fix_rst_pep(inpath, input_lines, outfile):
-    from docutils import core
-    output = core.publish_string(
-        source=''.join(input_lines),
-        source_path=inpath,
-        destination_path=outfile.name,
-        reader_name='pep',
-        parser_name='restructuredtext',
-        writer_name='pep_html',
-        settings=docutils_settings,
-        # Allow Docutils traceback if there's an exception:
-        settings_overrides={'traceback': 1})
-    outfile.write(output)
-
-
-def get_pep_type(input_lines):
-    """
-    Return the Content-Type of the input.  "text/plain" is the default.
-    Return ``None`` if the input is not a PEP.
-    """
-    pep_type = None
-    for line in input_lines:
-        line = line.rstrip().lower()
-        if not line:
-            # End of the RFC 2822 header (first blank line).
-            break
-        elif line.startswith('content-type: '):
-            pep_type = line.split()[1] or 'text/plain'
-            break
-        elif line.startswith('pep: '):
-            # Default PEP type, used if no explicit content-type specified:
-            pep_type = 'text/plain'
-    return pep_type
-
-
-def get_input_lines(inpath):
-    try:
-        infile = open(inpath)
-    except IOError, e:
-        if e.errno <> errno.ENOENT: raise
-        print >> sys.stderr, 'Error: Skipping missing PEP file:', e.filename
-        sys.stderr.flush()
-        return None, None
-    lines = infile.read().splitlines(1) # handles x-platform line endings
-    infile.close()
-    return lines
-
-
-def find_pep(pep_str):
-    """Find the .txt file indicated by a cmd line argument"""
-    if os.path.exists(pep_str):
-        return pep_str
-    num = int(pep_str)
-    return "pep-%04d.txt" % num
-
-def make_html(inpath, verbose=0):
-    input_lines = get_input_lines(inpath)
-    pep_type = get_pep_type(input_lines)
-    if pep_type is None:
-        print >> sys.stderr, 'Error: Input file %s is not a PEP.' % inpath
-        sys.stdout.flush()
-        return None
-    elif not PEP_TYPE_DISPATCH.has_key(pep_type):
-        print >> sys.stderr, ('Error: Unknown PEP type for input file %s: %s'
-                              % (inpath, pep_type))
-        sys.stdout.flush()
-        return None
-    elif PEP_TYPE_DISPATCH[pep_type] == None:
-        pep_type_error(inpath, pep_type)
-        return None
-    outpath = os.path.splitext(inpath)[0] + ".html"
-    if verbose:
-        print inpath, "(%s)" % pep_type, "->", outpath
-        sys.stdout.flush()
-    outfile = open(outpath, "w")
-    PEP_TYPE_DISPATCH[pep_type](inpath, input_lines, outfile)
-    outfile.close()
-    os.chmod(outfile.name, 0664)
-    return outpath
-
-def push_pep(htmlfiles, txtfiles, username, verbose, local=0):
-    quiet = ""
-    if local:
-        if verbose:
-            quiet = "-v"
-        target = HDIR
-        copy_cmd = "cp"
-        chmod_cmd = "chmod"
-    else:
-        if not verbose:
-            quiet = "-q"
-        if username:
-            username = username + "@"
-        target = username + HOST + ":" + HDIR
-        copy_cmd = "scp"
-        chmod_cmd = "ssh %s%s chmod" % (username, HOST)
-    files = htmlfiles[:]
-    files.extend(txtfiles)
-    files.append("style.css")
-    files.append("pep.css")
-    filelist = SPACE.join(files)
-    rc = os.system("%s %s %s %s" % (copy_cmd, quiet, filelist, target))
-    if rc:
-        sys.exit(rc)
-    rc = os.system("%s 664 %s/*" % (chmod_cmd, HDIR))
-    if rc:
-        sys.exit(rc)
-
-
-PEP_TYPE_DISPATCH = {'text/plain': fixfile,
-                     'text/x-rst': fix_rst_pep}
-PEP_TYPE_MESSAGES = {}
-
-def check_requirements():
-    # Check Python:
-    try:
-        from email.Utils import parseaddr
-    except ImportError:
-        PEP_TYPE_DISPATCH['text/plain'] = None
-        PEP_TYPE_MESSAGES['text/plain'] = (
-            'Python %s or better required for "%%(pep_type)s" PEP '
-            'processing; %s present (%%(inpath)s).'
-            % (REQUIRES['python'], sys.version.split()[0]))
-    # Check Docutils:
-    try:
-        import docutils
-    except ImportError:
-        PEP_TYPE_DISPATCH['text/x-rst'] = None
-        PEP_TYPE_MESSAGES['text/x-rst'] = (
-            'Docutils not present for "%(pep_type)s" PEP file %(inpath)s.  '
-            'See README.txt for installation.')
-    else:
-        installed = [int(part) for part in docutils.__version__.split('.')]
-        required = [int(part) for part in REQUIRES['docutils'].split('.')]
-        if installed < required:
-            PEP_TYPE_DISPATCH['text/x-rst'] = None
-            PEP_TYPE_MESSAGES['text/x-rst'] = (
-                'Docutils must be reinstalled for "%%(pep_type)s" PEP '
-                'processing (%%(inpath)s).  Version %s or better required; '
-                '%s present.  See README.txt for installation.'
-                % (REQUIRES['docutils'], docutils.__version__))
-
-def pep_type_error(inpath, pep_type):
-    print >> sys.stderr, 'Error: ' + PEP_TYPE_MESSAGES[pep_type] % locals()
-    sys.stdout.flush()
-
-
-def browse_file(pep):
-    import webbrowser
-    file = find_pep(pep)
-    if file.endswith(".txt"):
-        file = file[:-3] + "html"
-    file = os.path.abspath(file)
-    url = "file:" + file
-    webbrowser.open(url)
-
-def browse_remote(pep):
-    import webbrowser
-    file = find_pep(pep)
-    if file.endswith(".txt"):
-        file = file[:-3] + "html"
-    url = PEPDIRRUL + file
-    webbrowser.open(url)
-
-
-def main(argv=None):
-    # defaults
-    update = 0
-    local = 0
-    username = ''
-    verbose = 1
-    browse = 0
-
-    check_requirements()
-
-    if argv is None:
-        argv = sys.argv[1:]
-
-    try:
-        opts, args = getopt.getopt(
-            argv, 'bilhqu:',
-            ['browse', 'install', 'local', 'help', 'quiet', 'user='])
-    except getopt.error, msg:
-        usage(1, msg)
-
-    for opt, arg in opts:
-        if opt in ('-h', '--help'):
-            usage(0)
-        elif opt in ('-i', '--install'):
-            update = 1
-        elif opt in ('-l', '--local'):
-            update = 1
-            local = 1
-        elif opt in ('-u', '--user'):
-            username = arg
-        elif opt in ('-q', '--quiet'):
-            verbose = 0
-        elif opt in ('-b', '--browse'):
-            browse = 1
-
-    if args:
-        peptxt = []
-        html = []
-        for pep in args:
-            file = find_pep(pep)
-            peptxt.append(file)
-            newfile = make_html(file, verbose=verbose)
-            if newfile:
-                html.append(newfile)
-            if browse and not update:
-                browse_file(pep)
-    else:
-        # do them all
-        peptxt = []
-        html = []
-        files = glob.glob("pep-*.txt")
-        files.sort()
-        for file in files:
-            peptxt.append(file)
-            newfile = make_html(file, verbose=verbose)
-            if newfile:
-                html.append(newfile)
-        if browse and not update:
-            browse_file("0")
-
-    if update:
-        push_pep(html, peptxt, username, verbose, local=local)
-        if browse:
-            if args:
-                for pep in args:
-                    browse_remote(pep)
-            else:
-                browse_remote("0")
-
-
-
-if __name__ == "__main__":
-    main()
-- 
cgit v1.2.1


From aa7451441c00edc81c2dcb3389ce4a23b5f33169 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 29 Jul 2004 04:36:53 +0000
Subject: Fixed bug with config file handling.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2504 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/buildhtml.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/buildhtml.py b/tools/buildhtml.py
index d49103ea8..e9ee0d16d 100755
--- a/tools/buildhtml.py
+++ b/tools/buildhtml.py
@@ -133,13 +133,14 @@ class Builder:
         """
         for name, publisher in self.publishers.items():
             option_parser = OptionParser(
-                components=publisher.components,
+                components=publisher.components, read_config_files=1,
                 usage=usage, description=description)
             publisher.option_parser = option_parser
             publisher.setting_defaults = option_parser.get_default_values()
             frontend.make_paths_absolute(publisher.setting_defaults.__dict__,
                                          option_parser.relative_path_settings)
-        self.config_settings = option_parser.get_standard_config_settings()
+            publisher.config_settings = (
+                option_parser.get_standard_config_settings())
         self.settings_spec = self.publishers[''].option_parser.parse_args(
             values=frontend.Values())   # no defaults; just the cmdline opts
         self.initial_settings = self.get_settings('')
@@ -154,7 +155,7 @@ class Builder:
         """
         publisher = self.publishers[publisher_name]
         settings = frontend.Values(publisher.setting_defaults.__dict__)
-        settings.update(self.config_settings, publisher.option_parser)
+        settings.update(publisher.config_settings, publisher.option_parser)
         if directory:
             local_config = publisher.option_parser.get_config_file_settings(
                 os.path.join(directory, 'docutils.conf'))
-- 
cgit v1.2.1


From b96b6f32f54c14a01705b0c13c36f8e25d7a93f6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 29 Aug 2004 20:04:53 +0000
Subject: converted tabs to whitespace

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2548 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/rst2latex.py          | 2 +-
 tools/stylesheets/style.tex | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/rst2latex.py b/tools/rst2latex.py
index 62b3e46d4..5f51f34e2 100755
--- a/tools/rst2latex.py
+++ b/tools/rst2latex.py
@@ -20,6 +20,6 @@ from docutils.core import publish_cmdline, default_description
 
 
 description = ('Generates LaTeX documents from standalone reStructuredText '
-			   'sources.  ' + default_description)
+               'sources.  ' + default_description)
 
 publish_cmdline(writer_name='latex', description=description)
diff --git a/tools/stylesheets/style.tex b/tools/stylesheets/style.tex
index 23661e29a..6e041a14b 100644
--- a/tools/stylesheets/style.tex
+++ b/tools/stylesheets/style.tex
@@ -68,7 +68,7 @@
 %  \begin{titlepage}
 %    \begin{center}
 %    \textsf{TITLE \@title} \\
-%	Date: \today
+%       Date: \today
 %    \end{center}
 %  \end{titlepage}
 %}
-- 
cgit v1.2.1


From 6bb61d96a0c98bbd68135a3a79284087c9f6e9b3 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 5 Oct 2004 01:22:09 +0000
Subject: Added support for the new line_block/line structure.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2692 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 441186a43..b2e25e2ad 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -9,10 +9,13 @@ Default cascading style sheet for the HTML output of Docutils.
 */
 
 .first {
-  margin-top: 0 }
+  margin-top: 0 ! important }
 
 .last {
-  margin-bottom: 0 }
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
 
 a.toc-backref {
   text-decoration: none ;
@@ -70,6 +73,16 @@ div.figure {
 div.footer, div.header {
   font-size: smaller }
 
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
 div.sidebar {
   margin-left: 1em ;
   border: medium outset ;
-- 
cgit v1.2.1


From 3d05eaa6ec0678f844f7638f5b018737dc67d757 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 21 Oct 2004 02:17:23 +0000
Subject: reduced vertical space in compound blocks in HTML by adding
 compound-{first,middle,last} classes

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2751 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index b2e25e2ad..933a96b49 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -243,3 +243,9 @@ tt {
 
 ul.auto-toc {
   list-style-type: none }
+
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
-- 
cgit v1.2.1


From b132b83e5260804e7665324dd8558de7968d830c Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 21 Oct 2004 13:56:00 +0000
Subject: fixed order (should be more or less alphabetical)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2755 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 933a96b49..0881e3839 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -39,12 +39,18 @@ div.abstract p.topic-title {
   font-weight: bold ;
   text-align: center }
 
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning, div.admonition {
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
   margin: 2em ;
   border: medium outset ;
   padding: 1em }
 
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
 div.warning p.admonition-title {
@@ -52,11 +58,11 @@ div.warning p.admonition-title {
   font-weight: bold ;
   font-family: sans-serif }
 
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title,
-div.admonition p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
 
 div.dedication {
   margin: 2em 5em ;
@@ -243,9 +249,3 @@ tt {
 
 ul.auto-toc {
   list-style-type: none }
-
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-- 
cgit v1.2.1


From 013319295cf6b47554b7b8b43f38973297965cff Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 21 Oct 2004 14:14:36 +0000
Subject: document "! important"

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2756 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 0881e3839..4bbe34a57 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -8,6 +8,9 @@
 Default cascading style sheet for the HTML output of Docutils.
 */
 
+/* "! important" is used here to override other ``margin-top`` and
+   ``margin-bottom`` styles that are later in the stylesheet or 
+   more specific.  See . */
 .first {
   margin-top: 0 ! important }
 
-- 
cgit v1.2.1


From 708938ed7f79ac54e26e020ff44f7223c85ba5fc Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 21 Oct 2004 21:49:24 +0000
Subject: removed padding from footnote & citation tables (fixes Opera bug; fix
 by Felix Wiemann)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2757 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 4bbe34a57..df500707b 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -224,15 +224,13 @@ table {
   margin-bottom: 0.5em }
 
 table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
+  border-left: solid thin gray }
 
 table.docinfo {
   margin: 2em 4em }
 
 table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
+  border-left: solid thin black }
 
 td, th {
   padding-left: 0.5em ;
-- 
cgit v1.2.1


From b76c0637256c7c823dba009e145bffe7ca444783 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 13 Nov 2004 19:37:09 +0000
Subject: added class="docutils" to elements which need stylesheet tweaking and
 do not have their own class

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2849 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index df500707b..70f45518b 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -1,9 +1,9 @@
 /*
 :Author: David Goodger
 :Contact: goodger@users.sourceforge.net
-:date: $Date$
-:version: $Revision$
-:copyright: This stylesheet has been placed in the public domain.
+:Date: $Date$
+:Version: $Revision$
+:Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 */
@@ -27,11 +27,11 @@ a.toc-backref {
 blockquote.epigraph {
   margin: 2em 5em ; }
 
-dd {
+dl.docutils dd {
   margin-bottom: 0.5em }
 
 /* Uncomment (& remove this text!) to get bold-faced definition list terms
-dt {
+dl.docutils dt {
   font-weight: bold }
 */
 
@@ -128,7 +128,7 @@ h1.title {
 h2.subtitle {
   text-align: center }
 
-hr {
+hr.docutils {
   width: 75% }
 
 ol.simple, ul.simple {
@@ -219,20 +219,21 @@ span.pre {
 span.problematic {
   color: red }
 
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
 table.citation {
   border-left: solid thin gray }
 
 table.docinfo {
   margin: 2em 4em }
 
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
 table.footnote {
   border-left: solid thin black }
 
-td, th {
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
   vertical-align: top }
@@ -242,10 +243,11 @@ th.docinfo-name, th.field-name {
   text-align: left ;
   white-space: nowrap }
 
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
 
-tt {
+tt.docutils {
   background-color: #eeeeee }
 
 ul.auto-toc {
-- 
cgit v1.2.1


From 6a57b91088b1cddb67ece9bbdf4cf3fe3c0eec30 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 13 Nov 2004 21:02:20 +0000
Subject: changed padding of sidebars to avoid 0-top-padding

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2855 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 70f45518b..e519adbb1 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -95,7 +95,7 @@ div.line-block div.line-block {
 div.sidebar {
   margin-left: 1em ;
   border: medium outset ;
-  padding: 0em 1em ;
+  padding: 1em ;
   background-color: #ffffee ;
   width: 40% ;
   float: right ;
-- 
cgit v1.2.1


From dbd944e80a6f67bea3f3b0e332a3b0c34ee618f5 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 25 Nov 2004 11:26:34 +0000
Subject: removed no_random option; SF's Python doesn't seem to be broken
 anymore

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2868 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 6a26a1c59..d958a3844 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -14,4 +14,3 @@ footnote-references: brackets
 template: pep-html-template
 stylesheet-path: stylesheets/pep.css
 python-home: http://www.python.org
-no-random: true
-- 
cgit v1.2.1


From 219e0949ca2bdf69be1fc93495e6f35c419c2d76 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 22 Dec 2004 19:03:27 +0000
Subject: replaced "&" by "and" because the XHTML validator complains when
 inlining the stylesheet

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2886 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index e519adbb1..419e804d2 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -30,7 +30,7 @@ blockquote.epigraph {
 dl.docutils dd {
   margin-bottom: 0.5em }
 
-/* Uncomment (& remove this text!) to get bold-faced definition list terms
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
 dl.docutils dt {
   font-weight: bold }
 */
-- 
cgit v1.2.1


From 2c4714d6fa19c2bd61bc7a5ff6bc6de0441d39ab Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 22 Dec 2004 19:08:26 +0000
Subject: commented out reduced vertical space in compound paragraphs, because
 it's usually unnecessary and looks unnatural.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2887 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 419e804d2..439d226c9 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -61,11 +61,14 @@ div.warning p.admonition-title {
   font-weight: bold ;
   font-family: sans-serif }
 
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
 div.compound .compound-first, div.compound .compound-middle {
   margin-bottom: 0.5em }
 
 div.compound .compound-last, div.compound .compound-middle {
   margin-top: 0.5em }
+*/
 
 div.dedication {
   margin: 2em 5em ;
-- 
cgit v1.2.1


From 865a8284c89402d3fdc23aef59c743a44ae77256 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 11 Feb 2005 10:13:53 +0000
Subject: removed "span.option-argument"; it was unused and option arguments
 are italic anyway because they are in ...

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2958 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 439d226c9..f9bd7dbdf 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -213,9 +213,6 @@ span.interpreted {
 span.option {
   white-space: nowrap }
 
-span.option-argument {
-  font-style: italic }
-
 span.pre {
   white-space: pre }
 
-- 
cgit v1.2.1


From a71f9f6f6796297fed9f4a6af466f350fada308a Mon Sep 17 00:00:00 2001
From: blais 
Date: Thu, 3 Mar 2005 22:50:52 +0000
Subject: Updated repeat-last-character, which now does overlines.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3000 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 36 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 15cd4054e..233237e7c 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -36,42 +36,39 @@ cand replace with char: ")
 	(search-failed
 	 (message (format "%d lines replaced." found)))))))
 
-(defun repeat-last-character ()
-  ;; by Martin Blais
-  "Fills the current line up to the length of the preceding line (if not empty),
-using the last character on the current line.  If the preceding line is empty,
-or if a prefix argument is provided, fill up to the fill-column.
+(defun repeat-last-character (&optional tofill)
+  "Fills the current line up to the length of the preceding line (if not
+empty), using the last character on the current line.  If the preceding line is
+empty, we use the fill-column.
+
+If a prefix argument is provided, use the next line rather than the preceding
+line.
 
 If the current line is longer than the desired length, shave the characters off
 the current line to fit the desired length.
 
 As an added convenience, if the command is repeated immediately, the alternative
-behaviour is performed."
-
-;; TODO
-;; ----
-;; It would be useful if only these characters were repeated:
-;; =-`:.'"~^_*+#<>!$%&(),/;?@[\]{|}
-;; Especially, empty lines shouldn't be repeated.
-
+column is used (fill-column vs. end of previous/next line)."
   (interactive)
   (let* ((curcol (current-column))
-	 (curline (+ (count-lines (point-min) (point)) (if (eq curcol 0) 1 0)))
+	 (curline (+ (count-lines (point-min) (point))
+		     (if (eq curcol 0) 1 0)))
 	 (lbp (line-beginning-position 0))
-	 (prevcol (if (= curline 1)
+	 (prevcol (if (and (= curline 1) (not current-prefix-arg))
 		      fill-column
 		    (save-excursion
-		      (forward-line -1)
+		      (forward-line (if current-prefix-arg 1 -1))
 		      (end-of-line)
 		      (skip-chars-backward " \t" lbp)
 		      (let ((cc (current-column)))
 			(if (= cc 0) fill-column cc)))))
 	 (rightmost-column
-	  (cond (current-prefix-arg fill-column)
+	  (cond (tofill fill-column)
 		((equal last-command 'repeat-last-character)
 		 (if (= curcol fill-column) prevcol fill-column))
 		(t (save-excursion
-		     (if (= prevcol 0) fill-column prevcol))) )) )
+		     (if (= prevcol 0) fill-column prevcol)))
+		)) )
     (end-of-line)
     (if (> (current-column) rightmost-column)
 	;; shave characters off the end
@@ -80,7 +77,8 @@ behaviour is performed."
 		       (point))
       ;; fill with last characters
       (insert-char (preceding-char)
-		   (- rightmost-column (current-column)))) ))
+		   (- rightmost-column (current-column))))
+    ))
 
 (defun reST-title-char-p (c)
   ;; by Martin Blais
-- 
cgit v1.2.1


From 16e829f5bfb0779a1ab427385260988d6aab575c Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 8 Mar 2005 05:46:44 +0000
Subject: Added function to create alternate title boxing like Dave.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3026 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 79 ++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 233237e7c..e02f504ae 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -83,7 +83,7 @@ column is used (fill-column vs. end of previous/next line)."
 (defun reST-title-char-p (c)
   ;; by Martin Blais
   "Returns true if the given character is a valid title char."
-  (and (string-match "[-=`:\\.'\"~^_*+#<>!$%&(),/;?@\\\|]" 
+  (and (string-match "[-=`:\\.'\"~^_*+#<>!$%&(),/;?@\\\|]"
 		     (char-to-string c)) t))
 
 (defun reST-forward-title ()
@@ -97,8 +97,8 @@ column is used (fill-column vs. end of previous/next line)."
 	       (not
 		(and (re-search-forward "^[A-Za-z0-9].*[ \t]*$" nil t)
 		     (reST-title-char-p (char-after (+ (point) 1)))
-		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$" 
-					 (char-after (+ (point) 1)) 
+		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$"
+					 (char-after (+ (point) 1))
 					 (current-column))))))
 	     (beginning-of-line)
 	     (point))) )
@@ -117,8 +117,8 @@ column is used (fill-column vs. end of previous/next line)."
 		     (re-search-backward "^[A-Za-z0-9].*[ \t]*$" nil t)
 		     (or (end-of-line) t)
 		     (reST-title-char-p (char-after (+ (point) 1)))
-		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$" 
-					 (char-after (+ (point) 1)) 
+		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$"
+					 (char-after (+ (point) 1))
 					 (current-column))))))
 	     (beginning-of-line)
 	     (point))) )
@@ -145,3 +145,72 @@ This is useful for filling list item paragraphs."
   (interactive)
   (join-paragraph)
   (fill-paragraph nil))
+
+(defun line-single-char-p ()
+  "Predicate is t if the current line is composed only of a
+  single repeated non-whitespace character."
+  (save-excursion
+    (back-to-indentation)
+    (if (not (looking-at "\n"))
+	(looking-at (format "[%s]+\\s-*$" (thing-at-point 'char))))
+    ))
+
+(defun reST-box-section ()
+  "Adds hanging overline and underline title markers for the text
+on the current line.  If the text is not indented, we indent it
+by one char.
+
+The underline character chosen is the one present in the current
+underline, or '-'.
+
+In addition, this function removes any existing overline and
+underline and replaces it with the update one.  This allows you
+to edit a title and then simple update the boxing around it."
+
+  (interactive)
+  (save-excursion
+    (let (bc
+	  ec
+	  (c ?-))
+
+      ;; Fix indentation if the line does not begin with some whitespace
+      (beginning-of-line)
+      (and (not (looking-at "[\t ]")) (insert " "))
+      (back-to-indentation)
+      (setq bc (current-column))
+
+      ;; Remove whitespace at the end of the line
+      (end-of-line)
+      (delete-horizontal-space)
+      (setq ec (current-column))
+
+      ;; Remove previous line if it consists only of a single repeated character
+      (save-excursion
+	(forward-line -1)
+	(and (line-single-char-p)
+	     (kill-whole-line 1)))
+
+      ;; Remove previous line if it consists only of a single repeated character
+      (save-excursion
+	(forward-line +1)
+	(if (line-single-char-p)
+	    (progn
+	      ;; Get the previous character from the first char of the following line
+	      (back-to-indentation)
+	      (setq c (string-to-char (thing-at-point 'char)))
+	      (kill-whole-line 1))))
+
+      ;; Insert overline
+      (beginning-of-line)
+      (open-line 1)
+      (move-to-column (- bc 1) t)
+      (insert (make-string (+ (- ec bc) 2) c))
+
+      ;; Insert overline
+      (forward-line +2)
+      (open-line 1)
+      (move-to-column (- bc 1) t)
+      (insert (make-string (+ (- ec bc) 2) c))
+
+      )))
+
-- 
cgit v1.2.1


From b1f764689da23e26369a0fe5a75df7c2a918d63b Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 14 Mar 2005 18:25:20 +0000
Subject: removed unnecessary config file entry (is the default)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3042 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index d958a3844..a838c2325 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -7,7 +7,6 @@ generator: on
 [html4css1 writer]
 # These entries affect HTML output:
 stylesheet-path: stylesheets/default.css
-footnote-references: brackets
 
 [pep_html writer]
 # These entries affect reStructuredText-style PEPs:
-- 
cgit v1.2.1


From 600bec8c59c027ff01707cf43646ecb7b1774d91 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Mon, 14 Mar 2005 21:18:33 +0000
Subject: join-paragraph simplified/rewritten by Martin Blais

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3044 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index e02f504ae..3d29668fd 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -125,18 +125,11 @@ column is used (fill-column vs. end of previous/next line)."
     (if newpoint (goto-char newpoint)) ))
 
 (defun join-paragraph ()
-  ;; by David Goodger
+  ;; by David Goodger & Martin Blais
   "Join lines in current paragraph into one line, removing end-of-lines."
   (interactive)
-  (save-excursion
-    (backward-paragraph 1)
-    (forward-char 1)
-    (let ((start (point)))	; remember where we are
-      (forward-paragraph 1)	; go to the end of the paragraph
-      (beginning-of-line 0)	; go to the beginning of the previous line
-      (while (< start (point))	; as long as we haven't passed where we started
-	(delete-indentation)	; join this line to the line before
-	(beginning-of-line)))))	; and go back to the beginning of the line
+  (let ((fill-column 65000)) ; some big number
+    (call-interactively 'fill-paragraph)))
 
 (defun force-fill-paragraph ()
   ;; by David Goodger
-- 
cgit v1.2.1


From f8eb26cb427707c3f9ae8b6b03b7d55ce0fec851 Mon Sep 17 00:00:00 2001
From: cben 
Date: Tue, 15 Mar 2005 00:43:13 +0000
Subject: Make buildhtml.py aware of latin-1 encoding.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3047 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/docutils.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tools/editors/emacs/docutils.conf

(limited to 'tools')

diff --git a/tools/editors/emacs/docutils.conf b/tools/editors/emacs/docutils.conf
new file mode 100644
index 000000000..a74f08d4a
--- /dev/null
+++ b/tools/editors/emacs/docutils.conf
@@ -0,0 +1,2 @@
+[general]
+input_encoding: latin-1
-- 
cgit v1.2.1


From 41903bd35c69157b432fb2284257707b3756c03c Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 23 Mar 2005 22:21:20 +0000
Subject: added -A option to quicktest.py (as listed by quicktest.py -h)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3103 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/quicktest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/quicktest.py b/tools/quicktest.py
index 0cdff9549..fbccb1aaa 100755
--- a/tools/quicktest.py
+++ b/tools/quicktest.py
@@ -157,7 +157,7 @@ def posixGetArgs(argv):
             outputFormat = 'pretty'
         elif o in ['-t', '--test']:
             outputFormat = 'test'
-        elif o == '--attributes':
+        elif o in ['--attributes', '-A']:
             optargs['attributes'] = 1
         elif o in ['-d', '--debug']:
             optargs['debug'] = 1
-- 
cgit v1.2.1


From f0533dfcbe1711b8b7a1807ece65d14cb017e1f3 Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 29 Mar 2005 23:33:48 +0000
Subject: I restructured (pun intended) the emacs support for restructuredtext.
   Basically, I replaced the function that can create a box title (it was
 recent) by a generic function that does everything that you would want to do
 around a section title. I tried to make the ultimate underlining function on
 a single binding. (This code was started on the way back from PyCon with Mr.
 docutils himself sitting next to me driving while I was coding.)

Invocation of this function multiple times will do
more of what you like.  It's a bit hard to explain,
full details are in the LISP code, but really, the best
thing is to bind it and try it out in your documents.

This makes it much easier to create/update
section titles.  Let me know of any ideas
on how this could be improved.


;; You should bind the versatile sectioning command to some key in the text-mode
;; hook. Something like this::
;;
;;   (defun user-rst-mode-hook ()
;;     (local-set-key [(control ?=)] 'rest-adjust-section-title)
;;     )
;;   (add-hook 'text-mode-hook 'user-rst-mode-hook)
;;


Enjoy! (I think you will.)



git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3146 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 529 ++++++++++++++++++++++++++------
 1 file changed, 437 insertions(+), 92 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 3d29668fd..5fa391cc8 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -6,11 +6,26 @@
 ;; Support code for editing reStructuredText with Emacs indented-text mode.
 ;; The goal is to create an integrated reStructuredText editing mode.
 ;;
-;; Updates
-;; -------
+;; Installation instructions
+;; -------------------------
+;;
+;; You should bind the versatile sectioning command to some key in the text-mode
+;; hook. Something like this::
+;;
+;;   (defun user-rst-mode-hook ()
+;;     (local-set-key [(control ?=)] 'rest-adjust-section-title)
+;;     )
+;;   (add-hook 'text-mode-hook 'user-rst-mode-hook)
+;;
+;; Other specialized and more generic functions are also available.
+;; Note that C-= is a good binding, since it allows you to specif a negative arg
+;; easily with C-- C-= (easy to type), as well as ordinary prefix arg with
+;; C-u C-=.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Generic text functions that are more convenient than the defaults.
 ;;
-;; 2003-02-25 (blais): updated repeat-last-character function and added
-;;                     a few routines for navigating between titles.
 
 (defun replace-lines (fromchar tochar)
   ;; by David Goodger
@@ -36,6 +51,407 @@ cand replace with char: ")
 	(search-failed
 	 (message (format "%d lines replaced." found)))))))
 
+(defun join-paragraph ()
+  ;; by David Goodger
+  "Join lines in current paragraph into one line, removing end-of-lines."
+  (interactive)
+  (save-excursion
+    (backward-paragraph 1)
+    (forward-char 1)
+    (let ((start (point)))	; remember where we are
+      (forward-paragraph 1)	; go to the end of the paragraph
+      (beginning-of-line 0)	; go to the beginning of the previous line
+      (while (< start (point))	; as long as we haven't passed where we started
+	(delete-indentation)	; join this line to the line before
+	(beginning-of-line)))))	; and go back to the beginning of the line
+
+(defun force-fill-paragraph ()
+  ;; by David Goodger
+  "Fill paragraph at point, first joining the paragraph's lines into one.
+This is useful for filling list item paragraphs."
+  (interactive)
+  (join-paragraph)
+  (fill-paragraph nil))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; The following functions implement a smart automatic title sectioning feature.
+;; The idea is that with the cursor sitting on a section title, we try to get as
+;; much information from context and do the best thing. This function can be
+;; invoked many time and/or with prefix argument to rotate between the various
+;; options.
+;;
+;; There are two styles of sectioning:
+;;
+;; 1. simple-underline, e.g.      |Some Title
+;;                                |----------
+;;
+;; 2. overline-and-underline, e.g.  |------------
+;;                                  | Some Title
+;;                                  |------------
+;;
+;; Some notes:
+;;
+;; - the underlining character that is used depends on context. The file is
+;;   scanned to find other sections and an appropriate character is selected.
+;;   If the function is invoked on a section that is complete, the character
+;;   is rotated among the existing ones.
+;;
+;; - prefix argument is used to alternate the sectioning style.
+;;
+;; Examples:
+;;
+;;   |Some Title       --->    |Some Title
+;;   | 			       |----------
+;;
+;;   |Some Title       --->    |Some Title
+;;   |----- 		       |----------
+;;
+;;   |                         |------------
+;;   | Some Title      --->    | Some Title
+;;   | 			       |------------
+;;
+;; In overline-and-underline style, a variable is available to select how much
+;; space to leave before and after the title (it can be zero) when alternating
+;; the style.  Note that if the title already has some whitespace in front of
+;; it, we don't adjust it to the variable setting, we use the whitespace that is
+;; already there for adjustment.
+
+(defun rest-line-single-char-p ()
+  "Predicate return the unique char if the current line is
+  composed only of a single repeated non-whitespace
+  character. This returns the char even if there is whitespace at
+  the beginning of the line."
+  (save-excursion
+    (back-to-indentation)
+    (if (not (looking-at "\n"))
+	(let ((c (thing-at-point 'char)))
+	  (and (looking-at (format "[%s]+\\s-*$" c))
+	       (not (looking-at "::\\s-*$"))
+	       (not (looking-at "\\.\\.\\.\\s-*$"))
+	       (not (looking-at ".\\s-*$")) ;; discard one char line
+	       (string-to-char c))))
+    ))
+
+(defun rest-find-last-section-char ()
+  "Looks backward for the last section char found in the file."
+
+  (let (c)
+    (save-excursion 
+      (while (and (not c) (not (bobp)))
+	(forward-line -1)
+	(setq c (rest-line-single-char-p))
+	))
+    c))
+
+(defun rest-current-section-char (&optional point)
+  "Gets the section char around the current point."
+  (save-excursion
+    (if point (goto-char point))
+    (let ((offlist '(0 1 -2))
+	  loff
+	  rval
+	  c)
+      (while offlist
+	(forward-line (car offlist))
+	(setq c (rest-line-single-char-p))
+	(if c
+	    (progn (setq offlist nil
+			 rval c))
+	  (setq offlist (cdr offlist)))
+	)
+      rval
+      )))
+
+(defun rest-initial-sectioning-style (&optional point)
+  "Looks around point and attempts to determine the sectioning
+  style, between simple-underline and overline-and-underline.  If
+  there aren't any existing over/underlines, return nil."
+  (save-excursion
+    (if point (goto-char point))
+    (let (ou)
+      (save-excursion
+	(setq ou (mapcar
+		  (lambda (x)
+		    (forward-line x)
+		    (rest-line-single-char-p))
+		  '(-1 2))))
+      (beginning-of-line)
+      (cond
+       ((equal ou '(nil nil)) nil)
+       ((car ou) 'over-and-under) ;; we only need check the overline
+       (t 'simple)
+       )
+      )))
+
+(defun rest-all-section-chars (&optional ignore-lines)
+  "Finds all the section chars in the entire file and orders them
+  hierarchically, removing duplicates.  Basically, returns a list
+  of the section underlining characters.
+
+  Optional parameters IGNORE-AROUND can be a list of lines to
+  ignore."
+
+  (let (chars 
+	c
+	(curline 1))
+    (save-excursion
+      (beginning-of-buffer)
+      (while (< (point) (buffer-end 1))
+	(if (not (memq curline ignore-lines))
+	    (progn
+	      (setq c (rest-line-single-char-p))
+	      (if c
+		  (progn
+		    (add-to-list 'chars c t)
+		    ))) )
+	(forward-line 1) (setq curline (+ curline 1))
+	))
+    chars))
+
+(defun rest-update-section (underlinechar style &optional indent)
+  "Unconditionally updates the overline/underline of a section
+  title using the given character CHAR, with STYLE 'simple or
+  'over-and-under, in which case with title whitespace separation
+  on each side with INDENT whitespaces.  If the style is 'simple,
+  whitespace before the title is removed.
+
+  If there are existing overline and/or underline, they are
+  removed before adding the requested adornments."
+
+  (interactive)
+  (let (marker
+	len
+	ec
+	(c ?-))
+
+      (end-of-line)
+      (setq marker (point-marker))
+
+      ;; Fixup whitespace at the beginning and end of the line
+      (if (or (null indent) (eq style 'simple))
+	  (setq indent 0))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (insert (make-string indent ? ))
+
+      (end-of-line)
+      (delete-horizontal-space)
+
+      ;; Set the current column, we're at the end of the title line
+      (setq len (+ (current-column) indent))
+
+      ;; Remove previous line if it consists only of a single repeated character
+      (save-excursion
+	(forward-line -1)
+	(and (rest-line-single-char-p)
+	     (kill-whole-line 1)))
+
+      ;; Remove following line if it consists only of a single repeated character
+      (save-excursion
+	(forward-line +1)
+	(and (rest-line-single-char-p)
+	     (kill-whole-line 1))
+	;; Add a newline if we're at the end of the buffer, for the subsequence
+	;; inserting of the underline
+	(if (= (point) (buffer-end 1))
+	    (newline 1)))
+
+      ;; Insert overline
+      (if (eq style 'over-and-under)
+	  (save-excursion
+	    (beginning-of-line)
+	    (open-line 1)
+	    (insert (make-string len underlinechar))))
+
+      ;; Insert underline
+      (forward-line +1)
+      (open-line 1)
+      (insert (make-string len underlinechar))
+
+      (forward-line +1)
+      (goto-char marker)
+      ))
+
+
+(defvar rest-default-section-char ?=
+  "Default section underlining character to use when there aren't
+  any others to be used in the file.")
+
+(defvar rest-default-under-and-over-indent 2
+  "Number of characters to indent the section title when toggling
+  sectioning styles.  This is used when switching from a simple 
+  section style to a over-and-under style.")
+
+(defun rest-adjust-section-title ()
+  "Adjust/rotate the section underlining for the section around
+  point.
+
+  This function is the main entry point of this module and is a
+  bit of a swiss knife.  It is meant as the single function to
+  invoke to adjust the underlines (and possibly overlines) of a
+  section title in restructuredtext.  The next action it takes
+  depends on context around the point, and it is meant to be
+  invoked possibly more than once. Basically, this function deals
+  with:
+
+  - underlining a title if it does not have an underline;
+  - adjusting the length of the underline characters to fit a
+    modified title;
+  - rotating the underlines/overlines in the set of already
+    existing underline chars used in the file;
+  - switching between simple underline and over-and-under style
+    sectioning (or box style).
+
+  Here are the gory details:
+
+  - If the current line has no underline character around it,
+    search backwards for a previously used underlining character,
+    and underline the current line as a section title (also see
+    prefix argument below).
+
+    If no pre-existing underlining character is found in the
+    file, we use the last seen underline char or
+    rest-default-section-char if this is the first title in the
+    entire file.
+
+  - If the current line does have an underline or overline, and
+    if
+
+    - the underline do not extend to exactly the end of the
+      title line, this changes the length of the under(over)lines
+      to fit exactly the section title;
+
+    - the underline length is already adjusted to the end of the
+      title line, we search the file for the underline chars, and
+      we rotate the current title's underline character with that
+      list (going down the hierarchy that is present in the
+      file);
+
+    If there is a prefix argument, switch the style between the
+    initial sectioning style and the other sectioning style.  The
+    two styles are overline-and-underline and simple-underline.
+    
+    If however, you are on a complete section title and you
+    specify a negative argument, the effect of the prefix
+    argument is to change the direction of rotation of the
+    underline characters. Thus using a prefix argument and a
+    negative prefix argument achieves a different result in the
+    case of rotation.
+
+    Note that the initial style of underlining (simple underline
+    or box-style) depends on if there is whitespace at the start
+    of the line.  If there are already underlines/overlines,
+    those are used to select the style, otherwise if there is
+    whitespace at the front of the title overline-and-underline
+    style is chosen, and otherwise simple underline.
+
+    Also, note that this should work on the section title line as
+    well as on a complete or incomplete underline for a
+    title (first thing we check for that case and move the cursor
+    up a line if needed)."
+
+  (interactive)
+
+  ;; check if we're on an underline under a title line, and move the cursor up
+  ;; if it is so.
+  (if (and (or (rest-line-single-char-p) 
+	       (looking-at "^\\s-*$"))
+	   (save-excursion
+	     (forward-line -1)
+	     (beginning-of-line)
+	     (looking-at "^.+$")))
+      (forward-line -1))
+
+  (let (
+	;; find current sectioning character
+	(curchar (rest-current-section-char))
+	;; find current sectioning style
+	(init-style (rest-initial-sectioning-style))
+	;; find current indentation of title line
+	(curindent (save-excursion
+		     (back-to-indentation)
+		     (current-column)))
+
+	;; ending column
+	(endcol (- (line-end-position) (line-beginning-position)))
+	)
+
+    ;; if there is no current style found...
+    (if (eq init-style nil)
+	;; select based on the whitespace at the beginning of the line
+	(save-excursion
+	  (beginning-of-line)
+	  (setq init-style
+		(if (looking-at "^\\s-+") 'over-and-under 'simple))))
+
+    ;; if we're switching characters, we're going to simply change the
+    ;; sectioning style.  this branch is also taken if there is no current
+    ;; sectioning around the title.
+    (if (or (and current-prefix-arg
+		 (not (< (prefix-numeric-value current-prefix-arg) 0)))
+	    (eq curchar nil))
+
+
+
+	;; we're switching characters or there is currently no sectioning
+	(progn
+	  (setq curchar 
+		(or curchar
+		    (rest-find-last-section-char)
+		    (car (rest-all-section-chars))
+		    rest-default-section-char))
+	  
+	  (rest-update-section
+	   (or curchar rest-default-section-char)
+	   (if current-prefix-arg
+	       (if (eq init-style 'over-and-under) 'simple 'over-and-under)
+	     init-style)
+	   rest-default-under-and-over-indent)
+	  )
+
+      ;; else we're not switching characters, and there is some sectioning
+      ;; already present, so check if the current sectioning is complete and
+      ;; correct.
+      (let ((exps (concat "^" (make-string (+ endcol curindent) curchar) "$")))
+	(if (or
+	     (not (save-excursion (forward-line +1)
+				  (beginning-of-line)
+				  (looking-at exps)))
+	     (and (eq init-style 'over-and-under)
+		  (not (save-excursion (forward-line -1)
+				       (beginning-of-line)
+				       (looking-at exps)))))
+
+	    ;; the current sectioning needs to be fixed/updated!
+	    (rest-update-section curchar init-style curindent)
+
+	  ;; the current sectioning is complete, rotate characters
+	  (let* ( (curline (+ (count-lines (point-min) (point))
+			      (if (bolp) 1 0)))
+		  (allchars (rest-all-section-chars 
+			     (list (- curline 1) curline (+ curline 1))))
+		  (rotchars (append allchars (list (car allchars))))
+		  (nextchar 
+		   (or (cadr (memq curchar 
+				   (if (< (prefix-numeric-value 
+					   current-prefix-arg) 0)
+				       (reverse rotchars) rotchars)))
+		       (car allchars)) ) )
+
+	    (if nextchar
+		(rest-update-section nextchar init-style curindent))
+	    )))
+      )))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Generic character repeater function.
+;;
+;; For sections, better to use the specialized function above, but this can
+;; be useful for creating separators.
+
 (defun repeat-last-character (&optional tofill)
   "Fills the current line up to the length of the preceding line (if not
 empty), using the last character on the current line.  If the preceding line is
@@ -80,14 +496,21 @@ column is used (fill-column vs. end of previous/next line)."
 		   (- rightmost-column (current-column))))
     ))
 
-(defun reST-title-char-p (c)
-  ;; by Martin Blais
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Section movement commands.
+;;
+
+;; Note: this is not quite correct, the definition is any non alpha-numeric
+;; character.
+(defun rest-title-char-p (c)
   "Returns true if the given character is a valid title char."
   (and (string-match "[-=`:\\.'\"~^_*+#<>!$%&(),/;?@\\\|]"
 		     (char-to-string c)) t))
 
-(defun reST-forward-title ()
-  ;; by Martin Blais
+(defun rest-forward-section ()
   "Skip to the next restructured text section title."
   (interactive)
   (let* ( (newpoint
@@ -104,8 +527,7 @@ column is used (fill-column vs. end of previous/next line)."
 	     (point))) )
     (if newpoint (goto-char newpoint)) ))
 
-(defun reST-backward-title ()
-  ;; by Martin Blais
+(defun rest-backward-section ()
   "Skip to the previous restructured text section title."
   (interactive)
   (let* ( (newpoint
@@ -124,86 +546,9 @@ column is used (fill-column vs. end of previous/next line)."
 	     (point))) )
     (if newpoint (goto-char newpoint)) ))
 
-(defun join-paragraph ()
-  ;; by David Goodger & Martin Blais
-  "Join lines in current paragraph into one line, removing end-of-lines."
-  (interactive)
-  (let ((fill-column 65000)) ; some big number
-    (call-interactively 'fill-paragraph)))
-
-(defun force-fill-paragraph ()
-  ;; by David Goodger
-  "Fill paragraph at point, first joining the paragraph's lines into one.
-This is useful for filling list item paragraphs."
-  (interactive)
-  (join-paragraph)
-  (fill-paragraph nil))
-
-(defun line-single-char-p ()
-  "Predicate is t if the current line is composed only of a
-  single repeated non-whitespace character."
-  (save-excursion
-    (back-to-indentation)
-    (if (not (looking-at "\n"))
-	(looking-at (format "[%s]+\\s-*$" (thing-at-point 'char))))
-    ))
-
-(defun reST-box-section ()
-  "Adds hanging overline and underline title markers for the text
-on the current line.  If the text is not indented, we indent it
-by one char.
-
-The underline character chosen is the one present in the current
-underline, or '-'.
-
-In addition, this function removes any existing overline and
-underline and replaces it with the update one.  This allows you
-to edit a title and then simple update the boxing around it."
-
-  (interactive)
-  (save-excursion
-    (let (bc
-	  ec
-	  (c ?-))
-
-      ;; Fix indentation if the line does not begin with some whitespace
-      (beginning-of-line)
-      (and (not (looking-at "[\t ]")) (insert " "))
-      (back-to-indentation)
-      (setq bc (current-column))
-
-      ;; Remove whitespace at the end of the line
-      (end-of-line)
-      (delete-horizontal-space)
-      (setq ec (current-column))
-
-      ;; Remove previous line if it consists only of a single repeated character
-      (save-excursion
-	(forward-line -1)
-	(and (line-single-char-p)
-	     (kill-whole-line 1)))
-
-      ;; Remove previous line if it consists only of a single repeated character
-      (save-excursion
-	(forward-line +1)
-	(if (line-single-char-p)
-	    (progn
-	      ;; Get the previous character from the first char of the following line
-	      (back-to-indentation)
-	      (setq c (string-to-char (thing-at-point 'char)))
-	      (kill-whole-line 1))))
-
-      ;; Insert overline
-      (beginning-of-line)
-      (open-line 1)
-      (move-to-column (- bc 1) t)
-      (insert (make-string (+ (- ec bc) 2) c))
-
-      ;; Insert overline
-      (forward-line +2)
-      (open-line 1)
-      (move-to-column (- bc 1) t)
-      (insert (make-string (+ (- ec bc) 2) c))
-
-      )))
 
+;;------------------------------------------------------------------------------
+;; For backwards compatibility.  Remove at some point.
+(defalias 'reST-title-char-p 'rest-title-char-p)
+(defalias 'reST-forward-title 'rest-forward-section)
+(defalias 'reST-backward-title 'rest-backward-section)
-- 
cgit v1.2.1


From b54aec439d13a6db1d6bafe092a668bec6d02da7 Mon Sep 17 00:00:00 2001
From: blais 
Date: Wed, 30 Mar 2005 05:56:57 +0000
Subject: Fixed an oops with join-paragraph, prefer new version. (sorry I had
 been working on a copy on my load-path rather than on the docutils checkout).

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3147 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 5fa391cc8..f9a413cc6 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -28,7 +28,6 @@
 ;;
 
 (defun replace-lines (fromchar tochar)
-  ;; by David Goodger
   "Replace flush-left lines, consisting of multiple FROMCHAR characters,
 with equal-length lines of TOCHAR."
   (interactive "\
@@ -52,21 +51,12 @@ cand replace with char: ")
 	 (message (format "%d lines replaced." found)))))))
 
 (defun join-paragraph ()
-  ;; by David Goodger
   "Join lines in current paragraph into one line, removing end-of-lines."
   (interactive)
-  (save-excursion
-    (backward-paragraph 1)
-    (forward-char 1)
-    (let ((start (point)))	; remember where we are
-      (forward-paragraph 1)	; go to the end of the paragraph
-      (beginning-of-line 0)	; go to the beginning of the previous line
-      (while (< start (point))	; as long as we haven't passed where we started
-	(delete-indentation)	; join this line to the line before
-	(beginning-of-line)))))	; and go back to the beginning of the line
+  (let ((fill-column 65000)) ; some big number
+    (call-interactively 'fill-paragraph)))
 
 (defun force-fill-paragraph ()
-  ;; by David Goodger
   "Fill paragraph at point, first joining the paragraph's lines into one.
 This is useful for filling list item paragraphs."
   (interactive)
-- 
cgit v1.2.1


From 224708bf11f80ec4b5d7b212d53e262d1685cfe6 Mon Sep 17 00:00:00 2001
From: blais 
Date: Thu, 31 Mar 2005 15:32:12 +0000
Subject: Bugfix for emacs rest support, it was using kill-whole-line function,
 which is only in emacs-cvs. The checked in code should work in emacs-21.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3150 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index f9a413cc6..30d70c1f3 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -236,13 +236,13 @@ This is useful for filling list item paragraphs."
       (save-excursion
 	(forward-line -1)
 	(and (rest-line-single-char-p)
-	     (kill-whole-line 1)))
+	     (kill-line 1)))
 
       ;; Remove following line if it consists only of a single repeated character
       (save-excursion
 	(forward-line +1)
 	(and (rest-line-single-char-p)
-	     (kill-whole-line 1))
+	     (kill-line 1))
 	;; Add a newline if we're at the end of the buffer, for the subsequence
 	;; inserting of the underline
 	(if (= (point) (buffer-end 1))
@@ -383,8 +383,6 @@ This is useful for filling list item paragraphs."
 		 (not (< (prefix-numeric-value current-prefix-arg) 0)))
 	    (eq curchar nil))
 
-
-
 	;; we're switching characters or there is currently no sectioning
 	(progn
 	  (setq curchar 
-- 
cgit v1.2.1


From b38dfb88913114637b1b9eb793c57d001ea692b9 Mon Sep 17 00:00:00 2001
From: blais 
Date: Fri, 1 Apr 2005 01:15:46 +0000
Subject: Fixed another bug with emacs section titles, where using a regexp
 special character (e.g. +) as an underline wouldn't work.

Also, I made the default boxing title indent
to 1 space, as per bug report and dave's preference.




git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3152 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 30d70c1f3..6ab35cbcc 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -269,7 +269,7 @@ This is useful for filling list item paragraphs."
   "Default section underlining character to use when there aren't
   any others to be used in the file.")
 
-(defvar rest-default-under-and-over-indent 2
+(defvar rest-default-under-and-over-indent 1
   "Number of characters to indent the section title when toggling
   sectioning styles.  This is used when switching from a simple 
   section style to a over-and-under style.")
@@ -402,7 +402,10 @@ This is useful for filling list item paragraphs."
       ;; else we're not switching characters, and there is some sectioning
       ;; already present, so check if the current sectioning is complete and
       ;; correct.
-      (let ((exps (concat "^" (make-string (+ endcol curindent) curchar) "$")))
+      (let ((exps (concat "^" 
+			  (regexp-quote (make-string 
+					 (+ endcol curindent) curchar)) 
+			  "$")))
 	(if (or
 	     (not (save-excursion (forward-line +1)
 				  (beginning-of-line)
-- 
cgit v1.2.1


From b09be600d02510214101c030dda33f6564e244b3 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sat, 2 Apr 2005 00:45:50 +0000
Subject: Fixed some cases when the cursor is on the underline line itself, and
 the line is short. I'm trying to make this function work in all reasonable
 cases.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3153 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 6ab35cbcc..113b99cfe 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -108,20 +108,31 @@ This is useful for filling list item paragraphs."
 ;; it, we don't adjust it to the variable setting, we use the whitespace that is
 ;; already there for adjustment.
 
-(defun rest-line-single-char-p ()
+(defun rest-line-single-char-p (&optional accept-special)
   "Predicate return the unique char if the current line is
   composed only of a single repeated non-whitespace
   character. This returns the char even if there is whitespace at
-  the beginning of the line."
+  the beginning of the line.
+
+  If ACCEPT-SPECIAL is specified we do not ignore special sequences
+  which normally we would ignore when doing a search on many lines.
+  For example, normally we have cases to ignore commonly occuring
+  patterns, such as :: or ...;  with the flag do not ignore them."
   (save-excursion
     (back-to-indentation)
     (if (not (looking-at "\n"))
 	(let ((c (thing-at-point 'char)))
-	  (and (looking-at (format "[%s]+\\s-*$" c))
-	       (not (looking-at "::\\s-*$"))
-	       (not (looking-at "\\.\\.\\.\\s-*$"))
-	       (not (looking-at ".\\s-*$")) ;; discard one char line
-	       (string-to-char c))))
+	  (if (and (looking-at (format "[%s]+\\s-*$" c))
+		   (or accept-special
+		       (and
+			;; common patterns
+			(not (looking-at "::\\s-*$"))
+			(not (looking-at "\\.\\.\\.\\s-*$"))
+			;; discard one char line
+			(not (looking-at ".\\s-*$")) 
+			)))
+	      (string-to-char c))
+	  ))
     ))
 
 (defun rest-find-last-section-char ()
@@ -145,7 +156,7 @@ This is useful for filling list item paragraphs."
 	  c)
       (while offlist
 	(forward-line (car offlist))
-	(setq c (rest-line-single-char-p))
+	(setq c (rest-line-single-char-p 1))
 	(if c
 	    (progn (setq offlist nil
 			 rval c))
@@ -235,13 +246,13 @@ This is useful for filling list item paragraphs."
       ;; Remove previous line if it consists only of a single repeated character
       (save-excursion
 	(forward-line -1)
-	(and (rest-line-single-char-p)
+	(and (rest-line-single-char-p 1)
 	     (kill-line 1)))
 
       ;; Remove following line if it consists only of a single repeated character
       (save-excursion
 	(forward-line +1)
-	(and (rest-line-single-char-p)
+	(and (rest-line-single-char-p 1)
 	     (kill-line 1))
 	;; Add a newline if we're at the end of the buffer, for the subsequence
 	;; inserting of the underline
@@ -346,7 +357,7 @@ This is useful for filling list item paragraphs."
 
   ;; check if we're on an underline under a title line, and move the cursor up
   ;; if it is so.
-  (if (and (or (rest-line-single-char-p) 
+  (if (and (or (rest-line-single-char-p 1) 
 	       (looking-at "^\\s-*$"))
 	   (save-excursion
 	     (forward-line -1)
-- 
cgit v1.2.1


From e27b1c2a3a25166e5d9da85a7bb9df3821f888da Mon Sep 17 00:00:00 2001
From: blais 
Date: Sat, 2 Apr 2005 23:43:57 +0000
Subject: A simple first stab at a series of regression tests for the section
 underlining function. I still have to write many of the other tests.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3161 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           |   5 +-
 tools/editors/emacs/tests/tests-adjust-section.el | 181 ++++++++++++++++++++++
 2 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 tools/editors/emacs/tests/tests-adjust-section.el

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 113b99cfe..c7c431f05 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -1,5 +1,5 @@
-;; Authors: David Goodger ;
-;;          Martin Blais
+;; Authors: David Goodger ,
+;;          Martin Blais 
 ;; Date: $Date$
 ;; Copyright: This module has been placed in the public domain.
 ;;
@@ -447,6 +447,7 @@ This is useful for filling list item paragraphs."
 	    )))
       )))
 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Generic character repeater function.
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
new file mode 100644
index 000000000..df01b2bd5
--- /dev/null
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -0,0 +1,181 @@
+;; Authors: Martin Blais 
+;; Date: $Date: 2005/04/01 23:19:41 $
+;; Copyright: This module has been placed in the public domain.
+;;
+;; Regression tests for rest-adjust-section-title.
+;;
+
+(defvar rest-adjust-section-tests 
+  '(
+    (simple
+"
+Some Title@
+
+"
+"
+Some Title
+==========
+
+")
+
+    (simple-cursor-in-line
+"
+Some Tit@le
+
+"
+"
+Some Title
+==========
+
+")
+
+    (simple-cursor-beginning
+"
+@Some Title
+
+"
+"
+Some Title
+==========
+
+")
+
+    (simple-at-end-of-buffer
+"
+Some Title@"
+"
+Some Title
+==========
+")
+
+    (cursor-on-empty-line-under
+"
+Some Title
+@
+"
+"
+Some Title
+==========
+
+")
+
+
+
+    (partial
+"
+Some Title@
+---
+"
+"
+Some Title
+----------
+
+")
+
+    (cursor-on-underline
+"
+Some Title
+---@
+"
+"
+Some Title
+----------
+
+")
+
+    (cursor-on-underline-one-char
+"
+Some Title
+~@
+"
+"
+Some Title
+~~~~~~~~~~
+
+")
+
+    (with-previous-text
+"
+Some Title
+**********
+
+Subtitle@
+
+"
+"
+Some Title
+**********
+
+Subtitle
+********
+
+")
+
+    (with-previous-text-rotating
+"
+Some Title
+==========
+
+Subtitle
+--------
+
+Subtitle2@
+
+"
+"
+Some Title
+==========
+
+Subtitle
+--------
+
+Subtitle2
+=========
+
+"
+2)
+
+  )
+  
+  "A list of regression tests for the section update method.")
+   
+
+(defun regression-test-compare-expect-buffer (testlist fun)
+  "Run the regression tests for the section adjusting method."
+  
+  (let ((buf (get-buffer-create "restructuredtext-regression-tests"))
+	(specchar "@")
+	)
+    (dolist (curtest testlist)
+      ;; prepare a buffer with the starting text, and move the cursor where
+      ;; the special character is located
+      (switch-to-buffer buf)
+      (erase-buffer)
+      (insert (cadr curtest))
+      (search-backward specchar)
+      (delete-char 1)
+      
+      ;; run the section title update command n times
+      (dotimes (x (or (cadddr curtest) 1))
+	(funcall fun))
+      
+      ;; compare the buffer output with the expected text
+      (or (string=
+	   (buffer-string)
+	   (caddr curtest))
+	  (progn
+	    (error "Test %s failed." (car curtest))))
+      )
+    ))
+
+;; evaluate this to run the tests, either interactively or in batch
+(regression-test-compare-expect-buffer
+ rest-adjust-section-tests
+ (lambda ()
+   (call-interactively 'rest-adjust-section-title)))
+
+
+
+
+
+
-- 
cgit v1.2.1


From bc1a6ae4d6953fd1ddea43891c531049377473c9 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 5 Apr 2005 03:22:18 +0000
Subject: improve docs/ref/rst/directives.html field list rendering

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3166 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index a838c2325..ccddb0db7 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -7,6 +7,7 @@ generator: on
 [html4css1 writer]
 # These entries affect HTML output:
 stylesheet-path: stylesheets/default.css
+field-name-limit: 25
 
 [pep_html writer]
 # These entries affect reStructuredText-style PEPs:
-- 
cgit v1.2.1


From b1958c72c8cc1e3bd8c3239cac80a139cd5fb411 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 5 Apr 2005 03:23:51 +0000
Subject: 20 is enough

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3167 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index ccddb0db7..9f218d3bf 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -7,7 +7,7 @@ generator: on
 [html4css1 writer]
 # These entries affect HTML output:
 stylesheet-path: stylesheets/default.css
-field-name-limit: 25
+field-name-limit: 20
 
 [pep_html writer]
 # These entries affect reStructuredText-style PEPs:
-- 
cgit v1.2.1


From 3f71f8ea5d87643dda490266ec3723ce95a93eb3 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 17 Apr 2005 22:18:30 +0000
Subject: Two things to the underlining function for emacs:

1. when the underlining is invoked with a negative argument
   on a line that has no decoration, we should not interpret
   that as a style switch (box vs simple). This is reserved
   for a positive prefix-arg only.  This is more consistent
   with the behaviour when there already is some decoration
   present on the current title.

2. changed the default sectioning char to a list, and the
   underlining function to suggest a new underlining char
   (i.e. one that is not already present in the file),
   choosing it from the list formed by the difference between
   the preferred sectioning chars and the chars already in
   the file, when rotating the section underlines.

   This is really useful, because in practice, you often
   start a new file, and need to underline a new section
   which doesn't have other existing underlining. By using
   the list in the rest-preferred-characters variables
   you can specify your usual preferred order for sectioning
   chars and the new suggested character is automatically
   the one you're expecting. I set the default preferred
   list to something reasonable, =, then -, then ~, then
   other stuff.  Feel free to customize for your own needs.

   Note that the order that is already present in the file
   is used above the preferred chars list.  The preferred
   list is only used to suggest new characters.

This is getting pretty cool.  I feel like this is probably
the end of feature enhancements for this function.  Very
happy with it.



git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3228 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           | 56 +++++++++++++++++------
 tools/editors/emacs/tests/tests-adjust-section.el | 32 ++++++++++---
 2 files changed, 67 insertions(+), 21 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index c7c431f05..6ab001cec 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -88,6 +88,13 @@ This is useful for filling list item paragraphs."
 ;;   If the function is invoked on a section that is complete, the character
 ;;   is rotated among the existing ones.
 ;;
+;;   Note that when rotating the underlining characters, if we come to the end
+;;   of the hierarchy of characters, the variable rest-preferred-characters
+;;   is consulted to propose a new underline char, and if continued, we cycle
+;;   the underline characters all over again.  Set this variable to nil if 
+;;   you want to limit the underlining character propositions to the existing
+;;   underlines in the file.
+;;
 ;; - prefix argument is used to alternate the sectioning style.
 ;;
 ;; Examples:
@@ -211,6 +218,16 @@ This is useful for filling list item paragraphs."
 	))
     chars))
 
+(defun rest-suggest-new-char (allchars)
+  "Given the last char that has been seen, suggest a new,
+  different character, different from all that have been seen."
+  (let ((potentials (copy-sequence rest-preferred-characters)))
+    (dolist (x allchars)
+      (setq potentials (delq x potentials))
+      )
+    (car potentials)
+    ))
+
 (defun rest-update-section (underlinechar style &optional indent)
   "Unconditionally updates the overline/underline of a section
   title using the given character CHAR, with STYLE 'simple or
@@ -275,10 +292,10 @@ This is useful for filling list item paragraphs."
       (goto-char marker)
       ))
 
-
-(defvar rest-default-section-char ?=
-  "Default section underlining character to use when there aren't
-  any others to be used in the file.")
+(defvar rest-preferred-characters '(?= ?- ?~ ?+ ?` ?# ?@)
+  "Preferred ordering of underline characters.  This sequence is
+  consulted to offer a new underline character when we rotate the 
+  underlines at the end of the existing hierarchy of characters.")
 
 (defvar rest-default-under-and-over-indent 1
   "Number of characters to indent the section title when toggling
@@ -312,10 +329,10 @@ This is useful for filling list item paragraphs."
     and underline the current line as a section title (also see
     prefix argument below).
 
-    If no pre-existing underlining character is found in the
-    file, we use the last seen underline char or
-    rest-default-section-char if this is the first title in the
-    entire file.
+    If no pre-existing underlining character is found in the on
+    the line, we use the last seen underline char or consult the
+    first element of rest-preferred-characters if this is the
+    first title in the entire file.
 
   - If the current line does have an underline or overline, and
     if
@@ -393,18 +410,20 @@ This is useful for filling list item paragraphs."
     (if (or (and current-prefix-arg
 		 (not (< (prefix-numeric-value current-prefix-arg) 0)))
 	    (eq curchar nil))
-
+	
 	;; we're switching characters or there is currently no sectioning
 	(progn
 	  (setq curchar 
 		(or curchar
 		    (rest-find-last-section-char)
 		    (car (rest-all-section-chars))
-		    rest-default-section-char))
-	  
+		    (car rest-preferred-characters)
+		    ?=))
+
 	  (rest-update-section
-	   (or curchar rest-default-section-char)
-	   (if current-prefix-arg
+	   curchar
+	   (if (and current-prefix-arg
+		    (not (< (prefix-numeric-value current-prefix-arg) 0)))
 	       (if (eq init-style 'over-and-under) 'simple 'over-and-under)
 	     init-style)
 	   rest-default-under-and-over-indent)
@@ -434,7 +453,15 @@ This is useful for filling list item paragraphs."
 			      (if (bolp) 1 0)))
 		  (allchars (rest-all-section-chars 
 			     (list (- curline 1) curline (+ curline 1))))
-		  (rotchars (append allchars (list (car allchars))))
+
+		  (rotchars 
+		   (append allchars 
+			   (filter 'identity
+				   (list 
+				    ;; suggest a new char
+				    (rest-suggest-new-char allchars)
+				    ;; rotate to first char
+				    (car allchars)))))
 		  (nextchar 
 		   (or (cadr (memq curchar 
 				   (if (< (prefix-numeric-value 
@@ -442,6 +469,7 @@ This is useful for filling list item paragraphs."
 				       (reverse rotchars) rotchars)))
 		       (car allchars)) ) )
 
+
 	    (if nextchar
 		(rest-update-section nextchar init-style curindent))
 	    )))
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index df01b2bd5..a1fa9ec3d 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -111,6 +111,30 @@ Subtitle
 
 ")
 
+    (with-suggested-new-text
+"
+Some Title
+==========
+
+Subtitle
+--------
+
+Subtitle2@
+
+"
+"
+Some Title
+==========
+
+Subtitle
+--------
+
+Subtitle2
+~~~~~~~~~
+
+"
+2)
+
     (with-previous-text-rotating
 "
 Some Title
@@ -133,7 +157,7 @@ Subtitle2
 =========
 
 "
-2)
+3)
 
   )
   
@@ -173,9 +197,3 @@ Subtitle2
  rest-adjust-section-tests
  (lambda ()
    (call-interactively 'rest-adjust-section-title)))
-
-
-
-
-
-
-- 
cgit v1.2.1


From 352f98b31a39a3ccf81dbf5746e088cea3df2abd Mon Sep 17 00:00:00 2001
From: goodger 
Date: Wed, 20 Apr 2005 19:01:41 +0000
Subject: added to the instructions

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3229 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt          | 30 ++++++++++++++++++++++++++++++
 tools/editors/emacs/restructuredtext.el |  8 ++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index 560a59c75..d4359213b 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -6,6 +6,36 @@
 
 :Date: $Date$
 
+
+Directory Contents
+==================
+
+This directory contains the following Emacs lisp package files:
+
+* restructuredtext.el by Martin Blais and David Goodger
+
+  Support code for editing reStructuredText with Emacs indented-text
+  mode.
+
+* rst-mode.el by Stefan Merten
+
+  Provides support for documents marked up using the reStructuredText
+  format, including font locking as well as some convenience functions
+  for editing.
+
+* rst-html.el by Martin Blais
+
+  Provides a few functions and variables that can help in automating
+  the conversion of reST documents to HTML from within Emacs.
+
+Each file includes specific usage instructions.  To install a package,
+put a copy of the package file in a directory on your ``load-path``
+(use ``C-h v load-path`` to check).
+
+
+Character Processing Notes
+==========================
+
 Since reStructuredText punts on the issue of character processing,
 here are some useful resources for Emacs users in the Unicode world:
 
diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 6ab001cec..9fa83d057 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -9,6 +9,10 @@
 ;; Installation instructions
 ;; -------------------------
 ;;
+;; Add this line to your .emacs file::
+;;
+;;   (require 'restructuredtext)
+;;
 ;; You should bind the versatile sectioning command to some key in the text-mode
 ;; hook. Something like this::
 ;;
@@ -18,8 +22,8 @@
 ;;   (add-hook 'text-mode-hook 'user-rst-mode-hook)
 ;;
 ;; Other specialized and more generic functions are also available.
-;; Note that C-= is a good binding, since it allows you to specif a negative arg
-;; easily with C-- C-= (easy to type), as well as ordinary prefix arg with
+;; Note that C-= is a good binding, since it allows you to specify a negative
+;; arg easily with C-- C-= (easy to type), as well as ordinary prefix arg with
 ;; C-u C-=.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.1


From c4914648bbb9a351bbac1962525bbfccf88b3d71 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 25 Apr 2005 20:00:12 +0000
Subject: removed angle brackets because otherwise the validator complains
 about unknown tags when embedding the stylesheet

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3255 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index f9bd7dbdf..ec9f9cd5b 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -10,7 +10,7 @@ Default cascading style sheet for the HTML output of Docutils.
 
 /* "! important" is used here to override other ``margin-top`` and
    ``margin-bottom`` styles that are later in the stylesheet or 
-   more specific.  See . */
+   more specific.  See http://www.w3.org/TR/CSS1#the-cascade */
 .first {
   margin-top: 0 ! important }
 
-- 
cgit v1.2.1


From 0f8bc9eb02c14f9668be6ab14295ee018fbd1ca9 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 25 Apr 2005 20:24:49 +0000
Subject: made field-lists left-aligned by removing the left padding from field
 names

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3256 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index ec9f9cd5b..2cfc4c892 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -238,10 +238,11 @@ table.docinfo td, table.docinfo th {
   padding-right: 0.5em ;
   vertical-align: top }
 
-th.docinfo-name, th.field-name {
+table.docutils th.field-name, table.docinfo th.docinfo-name {
   font-weight: bold ;
   text-align: left ;
-  white-space: nowrap }
+  white-space: nowrap ;
+  padding-left: 0 }
 
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-- 
cgit v1.2.1


From 608f4cf68d51bd72da4a582b6746772d75286ab6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 26 Apr 2005 23:03:00 +0000
Subject: Added the rest of the new LaTeX writer (I accidentally committed
 newlatex.py together with nodes.py).

To test the new LaTeX writer you must (currently) specify
tools/latex.tex as a stylesheet.  You can use
test/functional/input/standalone_rst_latex.txt as input document.

Note that the writer is not yet complete; I'm checking it in to the
trunk anyway because I don't want to have to merge changes from the
trunk to a branch.  Things to do:

* Implement support for missing elements.
* Restructure.
* Add tests for a lot of special cases.
* Write documentation, esp. how to customize the behavior.


git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3260 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/rst2newlatex.py             |  27 ++
 tools/stylesheets/latex-notes.txt |  14 +
 tools/stylesheets/latex.tex       | 731 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 772 insertions(+)
 create mode 100755 tools/rst2newlatex.py
 create mode 100644 tools/stylesheets/latex-notes.txt
 create mode 100644 tools/stylesheets/latex.tex

(limited to 'tools')

diff --git a/tools/rst2newlatex.py b/tools/rst2newlatex.py
new file mode 100755
index 000000000..46524753f
--- /dev/null
+++ b/tools/rst2newlatex.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
+
+"""
+A minimal front end to the Docutils Publisher, producing LaTeX using
+the new LaTeX writer.
+"""
+
+try:
+    import locale
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
+
+from docutils.core import publish_cmdline, default_description
+
+
+description = ('Generates LaTeX documents from standalone reStructuredText '
+               'sources. This writer is EXPERIMENTAL and should not be used '
+               'in a production environment. ' + default_description)
+
+publish_cmdline(writer_name='newlatex2e', description=description)
diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
new file mode 100644
index 000000000..829ba9aa4
--- /dev/null
+++ b/tools/stylesheets/latex-notes.txt
@@ -0,0 +1,14 @@
+Try the commands mentioned in
+.
+
+Regarding UTF-8:
+
+* Read .
+
+* From ::
+
+  > The amssymb package and the postscript option were simply so that
+  > LaTeX could find the fonts and symbol definitions for the particular
+  > Unicode characters I used.
+  > However the DeclareUnicodeCharacter directive was to work around a
+  > missing or misnamed character in the UCS database.
diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
new file mode 100644
index 000000000..c7c25994a
--- /dev/null
+++ b/tools/stylesheets/latex.tex
@@ -0,0 +1,731 @@
+\providecommand{\Ddocumentclass}{scrartcl}
+\providecommand{\Ddocumentoptions}{a4paper}
+
+\documentclass[\Ddocumentoptions]{\Ddocumentclass}
+
+
+\providecommand{\DSpackages}{%
+  % All kinds of useful packages.
+  \usepackage{ifthen}
+}
+
+
+\providecommand{\DSfontencoding}{
+  % T1-emulation.  Provides most characters and features we're used
+  % from T1-encoded fonts but doesn't use bitmap fonts.
+  \usepackage{ae}
+  % Provide the characters not contained in AE from EC bitmap fonts.
+  \usepackage{aecompl}
+  % Guillemets ("<<", ">>") in AE.
+  \usepackage{aeguill}
+}
+
+
+% Taken from
+% 
+% and modified.  Used with permission.
+\makeatletter
+\providecommand{\Dprovidelength}[2]{%
+  \begingroup%
+    \escapechar\m@ne%
+    \xdef\@gtempa{{\string#1}}%
+  \endgroup%
+  \expandafter\@ifundefined\@gtempa%
+  {\newlength{#1}\setlength{#1}{#2}}%
+  {}%
+}
+\makeatother
+
+\makeatletter
+\providecommand{\Dprovidecounter}[1]{%
+  % Like \newcounter except that it doesn't crash if the counter
+  % already exists.
+  \@ifundefined{c@#1}{\newcounter{#1}}{}
+}
+\makeatother
+
+\providecommand{\DSboxcommands}{
+  \Dprovidelength{\Dboxparindent}{\parindent}
+  \providecommand{\Dmakeboxminipage}[1]{%
+    % Make minipage for use in a box created by \Dmakefbox.
+    \begin{minipage}[t]{0.9\linewidth}%
+      \setlength{\parindent}{\Dboxparindent}%
+      ##1%
+    \end{minipage}%
+  }
+  \providecommand{\Dmakefbox}[1]{%
+    % Make a centered, framed box.  Useful e.g. for admonitions.
+    \vspace{0.4\baselineskip}%
+    \begin{center}%
+      \fbox{\Dmakeboxminipage{##1}}%
+    \end{center}%
+    \vspace{0.4\baselineskip}%
+  }
+  \providecommand{\Dmakebox}[1]{%
+    % Make a centered, frameless box.  Useful e.g. for block quotes.
+    % Do not use minipages here, but create pseudo-lists to allow
+    % page-breaking.  (Don't uses KOMA-script's addmargin environment
+    % because it messes up bullet lists.)
+    \Dmakelistenvironment{}{}{%
+      \setlength{\parskip}{0pt}%
+      \setlength{\parindent}{\Dboxparindent}%
+      \item{##1}%
+    }%
+  }
+}
+
+
+\providecommand{\DSfrenchspacing}{
+  \frenchspacing
+}
+
+
+\providecommand{\DSauxiliaryspace}{
+  \providecommand{\Dblocklevelvspace}{%
+    % Space between block-level elements other than paragraphs.
+    0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
+  }
+  \providecommand{\Dauxiliaryspace}{%
+    \ifthenelse{\equal{\Dneedvspace}{yes}}{\vspace{\Dblocklevelvspace}}{}%
+    \Dpar%
+  }
+  \providecommand{\Dparagraphspace}{\Dpar}
+  \providecommand{\Dneedvspace}{yes}
+}
+
+
+\providecommand{\DSparagraphs}{
+  \providecommand{\Dnextparindent}{}
+  \providecommand{\Dnextpar}{\par}
+  %\newcommand{\Dnextpar}{\par\Dnextparindent}
+  \providecommand{\Dpar}{%
+    \Dnextpar%
+    \Dnextparindent%
+    \protect\renewcommand{\Dnextpar}{\par}%
+    \protect\renewcommand{\Dnextparindent}{}%
+  }
+  \providecommand{\Dnopar}{%
+    \protect\renewcommand{\Dnextpar}{\par}%
+    \protect\renewcommand{\Dnextparindent}{}%
+  }
+}
+
+\makeatletter
+\providecommand{\DSlinks}{
+  % Targets and references.
+  \usepackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
+
+  \providecommand{\Draisedlink}[1]{\Hy@raisedlink{##1}}
+  
+  % References.
+  % We're assuming here that the "refid" and "refuri" attributes occur
+  % only in inline context (in TextElements).
+  \providecommand{\DArefid}[5]{%
+    \ifthenelse{\equal{##4}{reference}}{%
+      \Dexplicitreference{\###3}{##5}%
+    }{%
+      % If this is not a target node (targets with refids are
+      % uninteresting and should be silently dropped).
+      \ifthenelse{\not\equal{##4}{target}}{%
+        % If this is a footnote reference, call special macro.
+        \ifthenelse{\equal{##4}{footnotereference}}{%
+          \Dimplicitfootnotereference{\###3}{##5}%
+        }{%
+          \ifthenelse{\equal{##4}{citationreference}}{%
+            \Dimplicitcitationreference{\###3}{##5}%
+          }{%
+            \Dimplicitreference{\###3}{##5}%
+          }%
+        }%
+      }{}%
+    }%
+  }
+  \providecommand{\DArefuri}[5]{%
+    % We only have explicit URI references, so one macro suffices.
+    \Durireference{##3}{##5}%
+  }
+  % Targets.
+  \Dprovidelength{\Dorgbaselineskip}{0pt}
+  \providecommand{\DAids}[5]{%
+    \ifthenelse{\equal{##4}{footnotereference}}{%
+      {%
+        \renewcommand{\HyperRaiseLinkDefault}{%
+          % Dirty hack to make backrefs to footnote references work.
+          % For some reason, \baselineskip is 0pt in fn references.
+          0.5\Dorgbaselineskip%
+        }%
+        \Draisedlink{\hypertarget{##3}{}}##5%
+      }%
+    }{%
+      \Draisedlink{\hypertarget{##3}{}}##5%
+    }%
+  }
+  % Color in references.
+  \usepackage{color}
+  \providecommand{\Dimplicitreference}[2]{%
+    % Create implicit reference to ID.  Implicit references occur
+    % e.g. in TOC-backlinks of section titles.  Parameters:
+    % 1. Target.
+    % 2. Link text.
+    {%
+      \protect\href{##1}{##2}%
+    }%
+  }
+  \providecommand{\Dimplicitfootnotereference}[2]{%
+    % Ditto, but for the special case of footnotes.
+    % We want them to be rendered like explicit references.
+    \Dexplicitreference{##1}{##2}%
+  }
+  \providecommand{\Dimplicitcitationreference}[2]{%
+    % Ditto for citation references.
+    \Dimplicitfootnotereference{##1}{##2}%
+  }
+  \providecommand{\Dexplicitreference}[2]{%
+    % Create explicit reference to ID, e.g. created with "foo_".
+    % Parameters:
+    % 1. Target.
+    % 2. Link text.
+    {%
+      \color{blue}\protect%
+      \href{##1}{##2}%
+    }%
+  }
+  \providecommand{\Durireference}[2]{%
+    % Create reference to URI.  Parameters:
+    % 1. Target.
+    % 2. Link text.
+    {%
+      \color{blue}
+      \protect\href{##1}{##2}%
+    }%
+  }
+}
+\makeatother
+
+
+\providecommand{\DAclasses}[5]{%
+  #5%
+}
+
+\makeatletter
+\providecommand{\Dattr}[5]{%
+  % Global attribute dispatcher.
+  % Parameters:
+  % 1. Attribute number.
+  % 2. Attribute name.
+  % 3. Attribute value.
+  % 4. Node name.
+  % 5. Node contents.
+  \@ifundefined{DA#2}{#5}{\csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}}%
+}
+\makeatother
+
+\providecommand{\DNparagraph}[1]{#1}
+\providecommand{\Dformatboxtitle}[1]{{\Large\textbf{#1}}}
+\providecommand{\Dformatboxsubtitle}[1]{{\large\textbf{#1}}}
+\providecommand{\Dtopictitle}[1]{%
+  \noindent\Dformatboxtitle{#1}%
+  \ifthenelse{\equal{\Dhassubtitle}{false}}{\vspace{1em}}{\vspace{0.5em}}%
+  \Dpar\noindent%
+}
+\providecommand{\Dtopicsubtitle}[1]{%
+  \noindent\Dformatboxsubtitle{#1}%
+  \vspace{1em}%
+  \Dpar\noindent%
+}
+\providecommand{\Dsidebartitle}[1]{\Dtopictitle{#1}}
+\providecommand{\Dsidebarsubtitle}[1]{\Dtopicsubtitle{#1}}
+\providecommand{\Ddocumenttitle}[1]{%
+  \begin{center}{\Huge#1}\end{center}%
+  \ifthenelse{\equal{\Dhassubtitle}{true}}{\vspace{0.1cm}}{\vspace{1cm}}%
+}
+\providecommand{\Ddocumentsubtitle}[1]{%
+  \begin{center}{\huge#1}\end{center}%
+  \vspace{1cm}%
+}
+\providecommand{\Dsectiontitle}[1]{\section*{#1}}
+\providecommand{\Dsubsectiontitle}[1]{\subsection*{#1}}
+\providecommand{\Dsubsubsectiontitle}[1]{\subsubsection*{#1}}
+\providecommand{\Dsubsubsubsectiontitle}[1]{%
+  \par\textbf{\vspace{1.5em}#1\vspace{1em}}}
+\providecommand{\Dmakesectiontitletext}[1]{%
+  % Return text suitable for use in \section*, \subsection*, etc.
+  % Parameter:  The title (as node tree).
+  \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
+  #1%
+}
+\providecommand{\Ddispatchsectiontitle}[1]{%
+  \ifthenelse{\value{Dsectionlevel}=1}{\Dsectiontitle{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}=2}{\Dsubsectiontitle{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}=3}{\Dsubsubsectiontitle{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}>3}{\Dsubsubsubsectiontitle{#1}}{}%
+}
+% Boolean variable.
+\providecommand{\Dhassubtitle}{}
+\makeatother
+\providecommand{\DNtitle}[1]{%
+  \ifthenelse{\equal{\Dparent}{topic}}{\Dtopictitle{#1}}{%
+    \ifthenelse{\equal{\Dparent}{document}}{\Ddocumenttitle{#1}}{%
+      \ifthenelse{\equal{\Dparent}{section}}{%
+        \Ddispatchsectiontitle{\Dmakesectiontitletext{#1}}%
+      }{%
+        \ifthenelse{\equal{\Dparent}{sidebar}}{\Dsidebartitle{#1}}{}%
+      }%
+    }%
+  }%
+}
+\providecommand{\DNsubtitle}[1]{%
+  \ifthenelse{\equal{\Dparent}{topic}}{\Dtopicsubtitle{#1}}{%
+    \ifthenelse{\equal{\Dparent}{document}}{\Ddocumentsubtitle{#1}}{%
+      \ifthenelse{\equal{\Dparent}{sidebar}}{\Dsidebarsubtitle{#1}}{}%
+    }%
+  }%
+}
+\newcounter{Dpdfbookmarkid}
+\setcounter{Dpdfbookmarkid}{0}
+\providecommand{\Dpdfbookmark}[1]{%
+  % Temporarily decrement Desctionlevel counter.
+  \addtocounter{Dsectionlevel}{-1}%
+  %\typeout{\arabic{Dsectionlevel}}%
+  %\typeout{#1}%
+  %\typeout{docutils\roman{Dpdfbookmarkid}}%
+  %\typeout{}%
+  \pdfbookmark[\arabic{Dsectionlevel}]{#1}{docutils\arabic{Dpdfbookmarkid}}%
+  \addtocounter{Dsectionlevel}{1}%
+  \addtocounter{Dpdfbookmarkid}{1}%
+}
+
+%\providecommand{\DNliteralblock}[1]{\begin{quote}\ttfamily\raggedright#1\end{quote}}
+\providecommand{\DNliteralblock}[1]{%
+  \Dmakelistenvironment{}{}{%
+    \raggedright\item\noindent\nohyphens{\textnhtt{#1}}%
+  }%
+}
+\providecommand{\DNdoctestblock}[1]{%
+  % Treat doctest blocks the same as literal blocks.
+  \DNliteralblock{#1}%
+}
+\usepackage{hyphenat}
+\providecommand{\DNliteral}[1]{\textnhtt{#1}}
+\providecommand{\DNemphasis}[1]{\emph{#1}}
+\providecommand{\DNstrong}[1]{\textbf{#1}}
+\providecommand{\DNdocument}[1]{\begin{document}\protect\renewcommand{\Dnextparindent}{\noindent}#1\end{document}}
+\providecommand{\DNtopic}[1]{%
+  \par%
+  \Dmakebox{%
+    %%  % Close with \par because otherwise LaTeX wouldn't notice the
+    %%  % changed \baselineskip (due to the font size change).
+    %%  {\small#1\par}%
+    #1%
+  }%
+}
+\providecommand{\Dformatrubric}[1]{{\large\textbf{#1}}}
+\providecommand{\DNrubric}[1]{\begin{center}\Dformatrubric{#1}\end{center}}
+
+\providecommand{\Dbullet}{}
+\providecommand{\Dsetbullet}[1]{\renewcommand{\Dbullet}{#1}}
+\providecommand{\DNbulletlist}[1]{\Dmakelistenvironment{\Dbullet}{}{#1}}
+
+\providecommand{\DNlistitem}[1]{\item{#1}}
+\providecommand{\DNenumeratedlist}[1]{#1}
+\newcounter{Dsectionlevel}
+\providecommand{\DNsection}[1]{\addtocounter{Dsectionlevel}{1}#1\addtocounter{Dsectionlevel}{-1}}
+
+% Using \_ will cause hyphenation after _ even in \textnhtt-typewriter
+% because the hyphenat package redefines \_.  So we use
+% \textunderscore here.
+\providecommand{\Dtextunderscore}{\textunderscore}
+
+\providecommand{\Dtextinlineliteralfirstspace}{{ }}
+\providecommand{\Dtextinlineliteralsecondspace}{{~}}
+
+\Dprovidelength{\Dlistspacing}{0.8\baselineskip}
+
+% Current hardcoded.
+\usepackage[latin1]{inputenc}
+
+\providecommand{\Dresetlistdepth}{false}
+\makeatletter
+\providecommand{\Dmakelistenvironment}[3]{%
+  % Make list environment with support for unlimited nesting and with
+  % reasonable default lengths.  Parameters:
+  % 1. Label (same as in list environment).
+  % 2. Spacing (same as in list environment).
+  % 3. List contents (contents of list environment).
+  {%
+    \renewcommand{\Dneedvspace}{no}%
+    % \parsep0.5\baselineskip
+    \renewcommand{\Dresetlistdepth}{false}%
+    \ifnum \@listdepth>5%
+    \protect\renewcommand{\Dresetlistdepth}{true}%
+    \@listdepth=5%
+    \fi%
+    \begin{list}{%
+        #1%
+      }{%
+        \setlength{\itemsep}{0pt}%
+        \setlength{\partopsep}{0pt}%
+        \setlength{\topsep}{0pt}%
+                                % List should take 90% of total width.
+        \setlength{\leftmargin}{0.05\linewidth}%
+                                % Equal margins.
+        \setlength{\rightmargin}{\leftmargin}%
+        #2%
+      }{%
+        #3%
+      }%
+    \end{list}%
+    \ifthenelse{\equal{\Dresetlistdepth}{true}}{\@listdepth=5}{}%
+  }%
+}
+\makeatother
+
+\providecommand{\Dmakeenumeratedlist}[6]{%
+  % Make enumerated list.
+  % Parameters:
+  % - prefix
+  % - type (\arabic, \roman, ...)
+  % - suffix
+  % - suggested counter name
+  % - start number - 1
+  % - list contents
+  \newcounter{#4}%
+  \Dmakelistenvironment{#1#2{#4}#3}{%
+    % Use as much space as needed for the label.
+    \setlength{\labelwidth}{10em}%
+    % Reserve enough space so that the label doesn't go beyond the
+    % left margin of preceding paragraphs.  Like that:
+    %
+    %    A paragraph.
+    %
+    %   1. First item.
+    \setlength{\leftmargin}{2.5em}%
+    % Equal margins.
+    \setlength{\rightmargin}{\leftmargin}%
+    % Use counter recommended by Python module.
+    \usecounter{#4}%
+    % Set start value.
+    \addtocounter{#4}{#5}%
+  }{%
+    % The list contents.
+    #6}%
+}
+
+
+\providecommand{\Dlanguage}{english}
+\usepackage[\Dlanguage]{babel}
+
+% Single quote in literal mode.  \textquotesingle from package
+% textcomp has wrong width when using package ae, so we use a normal
+% single curly quote here.
+\providecommand{\Dtextliteralsinglequote}{'}
+
+
+\providecommand{\Dtwocolumntable}[1]{%
+  % Create a simple borderless two-column table, the right column of
+  % which has a variable width.
+  \begin{tabularx}{\linewidth}{@{}lX@{}}#1\end{tabularx}%
+}
+
+
+\usepackage{tabularx}
+\providecommand{\Dformatfieldname}[1]{\bfseries{#1:}}
+\providecommand{\DNfieldlist}[1]{%
+  \noindent\Dtwocolumntable{#1}%
+}
+\providecommand{\DNfieldname}[1]{\Dformatfieldname{#1}{}&{}}
+\providecommand{\DNfieldbody}[1]{{#1}{}\tabularnewline}
+
+
+\providecommand{\DNdefinitionlist}[1]{%
+  \noindent\begin{description}#1\end{description}%
+}
+\providecommand{\DNdefinitionlistitem}[1]{%
+  % LaTeX expects the label in square brackets; we provide an empty
+  % label.
+  \item[]#1%
+}
+\providecommand{\DNterm}[1]{#1}
+% I'm still not sure what's the best rendering for classifiers.  The
+% colon syntax is used by reStructuredText, so it's at least WYSIWYG.
+% Use slanted text because italic would cause too much emphasis.
+\providecommand{\DNclassifier}[1]{~:~\textsl{#1}}
+\providecommand{\DNdefinition}[1]{\Dpar#1}
+
+
+\providecommand{\Dformatoptiongroup}[1]{%
+  % Format option group, e.g. "-f file, --input file".
+  \texttt{#1}%
+}
+\providecommand{\Dformatoption}[1]{%
+  % Format option, e.g. "-f file".
+  % Put into mbox to avoid line-breaking at spaces.
+  \mbox{#1}%
+}
+\providecommand{\Dformatoptionstring}[1]{%
+  % Format option string, e.g. "-f".
+  #1%
+}
+\providecommand{\Dformatoptionargument}[1]{%
+  % Format option argument, e.g. "file".
+  \textsl{#1}%
+}
+\providecommand{\Dformatoptiondescription}[1]{%
+  % Format option description, e.g.
+  % "\DNparagraph{Read input data from file.}"
+  #1%
+}
+\providecommand{\DNoptionlist}[1]{%
+  \noindent\Dtwocolumntable{#1}%
+}
+\providecommand{\Doptiongroupjoiner}{,{ }}
+\providecommand{\Disfirstoption}{%
+  % Auxiliary macro indicating if a given option is the first child
+  % of its option group (if it's not, it has to preceded by
+  % \Doptiongroupjoiner).
+  false%
+}
+\providecommand{\DNoptiongroup}[1]{%
+  \renewcommand{\Disfirstoption}{true}%
+  \Dformatoptiongroup{#1}{}&{}%
+}
+\providecommand{\DNoption}[1]{%
+  % If this is not the first option in this option group, add a
+  % joiner.
+  \ifthenelse{\equal{\Disfirstoption}{true}}{%
+    \renewcommand{\Disfirstoption}{false}%
+  }{%
+    \Doptiongroupjoiner%
+  }%
+  \Dformatoption{#1}%
+}
+\providecommand{\DNoptionstring}[1]{\Dformatoptionstring{#1}}
+\providecommand{\DNoptionargument}[1]{{ }\Dformatoptionargument{#1}}
+\providecommand{\DNdescription}[1]{%
+  \Dformatoptiondescription{#1}%
+  \tabularnewline%
+}
+
+\providecommand{\Dlineblockindentation}{2.5em}
+\providecommand{\DNlineblock}[1]{%
+  \Dmakelistenvironment{}{%
+    \ifthenelse{\equal{\Dparent}{lineblock}}{%
+      % Parent is a line block, so indent.
+      \setlength{\leftmargin}{\Dlineblockindentation}%
+    }{%
+      % At top level; don't indent.
+      \setlength{\leftmargin}{0pt}%
+    }%
+    \setlength{\parsep}{0pt}
+  }%
+  {%
+    #1%
+  }%
+}
+\providecommand{\DNline}[1]{\item#1}
+
+
+\providecommand{\DNtransition}{%
+  \Dpar\noindent{}\hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}%
+}
+
+
+\providecommand{\Dformatblockquote}[1]{%
+  % Format contents of block quote.
+  % This occurs in block-level context, so we cannot use \textsl.
+  {\slshape#1}%
+}
+\providecommand{\Dformatattribution}[1]{---\textup{#1}}
+\providecommand{\DNblockquote}[1]{%
+  \renewcommand{\Dnextparindent}{\noindent}%
+  \renewcommand{\Dnextpar}{}%
+  \Dmakebox{%
+    \Dformatblockquote{#1}
+  }%
+}
+\providecommand{\DNattribution}[1]{%
+  \Dpar%
+  \begin{flushright}\Dformatattribution{#1}\end{flushright}%
+}
+
+
+% Sidebars:
+\usepackage{picins}
+% Vertical and horizontal margins.
+\Dprovidelength{\Dsidebarvmargin}{0.5em}
+\Dprovidelength{\Dsidebarhmargin}{1em}
+% Padding (space between contents and frame).
+\Dprovidelength{\Dsidebarpadding}{1em}
+% Frame width.
+\Dprovidelength{\Dsidebarframewidth}{2\fboxrule}
+% Position ("l" or "r").
+\providecommand{\Dsidebarposition}{r}
+% Width.
+\Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
+\providecommand{\DNsidebar}[1]{\parpic[\Dsidebarposition]{%
+    \Dpar%
+    \begin{minipage}[t]{\Dsidebarwidth}
+      % Doing this with nested minipages is ugly, but I haven't found
+      % another way to place vertical space before and after the fbox.
+      \vspace{\Dsidebarvmargin}
+      {%
+        \setlength{\fboxrule}{\Dsidebarframewidth}%
+        \setlength{\fboxsep}{\Dsidebarpadding}%
+        \fbox{%
+          \begin{minipage}[t]{\linewidth}%
+            \setlength{\parindent}{\Dboxparindent}%
+            #1%
+          \end{minipage}%
+        }%
+      }%
+      \vspace{\Dsidebarvmargin}
+    \end{minipage}%
+  }%
+}
+
+
+% Citations and footnotes.
+\providecommand{\Dformatfootnote}[1]{%
+  % Format footnote.
+  {%
+    \footnotesize#1%
+    % \par is necessary for LaTeX to adjust baselineskip to the
+    % changed font size.
+    \par%
+  }%
+}
+\providecommand{\Dformatcitation}[1]{\Dformatfootnote{#1}}
+\providecommand{\DNfootnotereference}[1]{%
+  {%
+    % \baselineskip is 0pt in \textsuperscript, so we save it here.
+    \setlength{\Dorgbaselineskip}{\baselineskip}%
+    \textsuperscript{#1}%
+  }%
+}
+\providecommand{\DNcitationreference}[1]{{[}#1{]}}
+\Dprovidelength{\Dfootnotesep}{5pt}
+\providecommand{\Dfootnotespacing}{%
+  % Spacing commands executed at the beginning of footnotes.
+  \setlength{\parindent}{0pt}%
+  \hspace{1em}%
+}
+\providecommand{\DNfootnote}[1]{%
+  % See ltfloat.dtx for details.
+  {%
+    \insert\footins{%
+      \Dnopar\vspace{\Dfootnotesep}\Dfootnotespacing%
+      \Dformatfootnote{#1}%
+    }%
+  }%
+}
+\providecommand{\DNcitation}[1]{\DNfootnote{#1}}
+\providecommand{\Dformatfootnotelabel}[1]{%
+  % Keep \footnotesize in footnote labels (\textsuperscript would
+  % reduce the font size even more).
+  \textsuperscript{\footnotesize#1{ }}%
+}
+\providecommand{\Dformatcitationlabel}[1]{{[}#1{]}{ }}
+\providecommand{\Dformatmultiplebackrefs}[1]{\textsl{#1}}
+\providecommand{\Dthislabel}{}
+\providecommand{\DNlabel}[1]{%
+  \renewcommand{\Dthislabel}{#1}
+  \ifthenelse{\not\equal{\Dsinglebackref}{}}{%
+    \let\Doriginallabel=\Dthislabel%
+    \def\Dthislabel{%
+      \Dsinglefootnotebacklink{\Dsinglebackref}{\Doriginallabel}%
+    }%
+  }{}%
+  \ifthenelse{\equal{\Dparent}{footnote}}{%
+    % Footnote label.
+    \Dformatfootnotelabel{\Dthislabel}%
+  }{%
+    \ifthenelse{\equal{\Dparent}{citation}}{%
+      % Citation label.
+      \Dformatcitationlabel{\Dthislabel}%
+    }{}%
+  }%
+  % If there are multiple backrefs, add them now.
+  \Dformatmultiplebackrefs{\Dmultiplebackrefs}%
+  % Supress next paragraph change.
+  \renewcommand{\Dnextpar}{}%
+}
+\providecommand{\Dsinglefootnotebacklink}[2]{%
+  % Create normal backlink of a footnote label.  Parameters:
+  % 1. ID.
+  % 2. Link text.
+  % Treat like a footnote reference.
+  \Dimplicitfootnotereference{\##1}{#2}%
+}
+\providecommand{\Dmultifootnotebacklink}[2]{%
+  % Create generated backlink, as in (1, 2).  Parameters:
+  % 1. ID.
+  % 2. Link text.
+  % Treat like a footnote reference.
+  \Dimplicitfootnotereference{\##1}{#2}%
+}
+\providecommand{\Dsinglecitationbacklink}[2]{\Dsinglefootnotebacklink{#1}{#2}}
+\providecommand{\Dmulticitationbacklink}[2]{\Dmultifootnotebacklink{#1}{#2}}
+
+
+\usepackage{longtable}
+\providecommand{\Dmaketable}[2]{%
+  % Make table.  Parameters:
+  % 1. Table spec (like "|p|p|").
+  % 2. Table contents.
+  \begin{longtable}{#1}%
+    \hline%
+    #2%
+  \end{longtable}
+}
+\providecommand{\DNthead}[1]{%
+  #1%
+  \endhead%
+}
+\providecommand{\DNrow}[1]{%
+  #1\tabularnewline%
+  \hline%
+}
+\providecommand{\Dcolspan}[2]{%
+  % Take care of the morecols attribute (but incremented by 1).
+  &\multicolumn{#1}{l|}{#2}%
+}
+\providecommand{\Dcolspanleft}[2]{%
+  % Like \Dmorecols, but called for the leftmost entries in a table
+  % row.
+  \multicolumn{#1}{|l|}{#2}%
+}
+\providecommand{\Dsubsequententry}[1]{%
+  %
+}
+% \DNentry is not used because we set the ampersand ("&") in the
+% \DAcolspan... macros.
+\providecommand{\DAtableheaderentry}[5]{\Dformattableheaderentry{#5}}
+\providecommand{\Dformattableheaderentry}[1]{{\bfseries#1}}
+
+
+\providecommand{\DNsystemmessage}[1]{%
+  {%
+    \noindent%
+    \color{red}%
+    \bfseries%
+    #1%
+  }%
+}
+
+
+% Need to replace by language-specific stuff.
+\providecommand{\Dtextleftdblquote}{``}
+\providecommand{\Dtextrightdblquote}{''}
+
+
+%\usepackage{fixmath}
+%\usepackage{amsmath}
+
+
+\DSpackages
+\DSfontencoding
+\DSboxcommands
+\DSfrenchspacing
+\DSauxiliaryspace
+\DSparagraphs
+\DSlinks
-- 
cgit v1.2.1


From fa387fdb69c9d4aa34cbcbabae2db046b329cd25 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 27 Apr 2005 15:24:22 +0000
Subject: more sophisticated spacing; image support; node-specific attribute
 handlers

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3265 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c7c25994a..9b250d9b9 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -86,6 +86,10 @@
     0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
   }
   \providecommand{\Dauxiliaryspace}{%
+    \ifthenelse{\equal{\Dneedvspace}{yes}}{\vspace{\Dblocklevelvspace}}{}%
+    \Dpar\noindent%
+  }
+  \providecommand{\Dauxiliaryparspace}{%
     \ifthenelse{\equal{\Dneedvspace}{yes}}{\vspace{\Dblocklevelvspace}}{}%
     \Dpar%
   }
@@ -216,7 +220,11 @@
   % 3. Attribute value.
   % 4. Node name.
   % 5. Node contents.
-  \@ifundefined{DA#2}{#5}{\csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}}%
+  \@ifundefined{DN#4A#2}{%
+    \@ifundefined{DA#2}{#5}{\csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}}%
+  }{%
+    \csname DN#4A#2\endcsname{#1}{#2}{#3}{#4}{#5}%
+  }%
 }
 \makeatother
 
@@ -713,7 +721,23 @@
 }
 
 
-% Need to replace by language-specific stuff.
+\usepackage{graphicx}
+\Dprovidelength{\Dimagewidth}{0pt}
+\newsavebox{\Dimagesavebox}
+\providecommand{\DNimageAuri}[5]{%
+  % Insert image.  We treat the URI like a path here.
+%  \
+  \settowidth{\Dimagewidth}{\includegraphics{#3}}%
+  \ifthenelse{\Dimagewidth>\linewidth}{%
+    \includegraphics[width=\linewidth]{#3}%
+  }{%
+    \includegraphics{#3}%
+  }%
+}
+
+
+% Need to replace with language-specific stuff.  Maybe look at
+% csquotes.sty and ask the author for permission to use parts of it.
 \providecommand{\Dtextleftdblquote}{``}
 \providecommand{\Dtextrightdblquote}{''}
 
-- 
cgit v1.2.1


From 154ecc473fd947a0d9155873c3c7d736790eb3ee Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 29 Apr 2005 19:39:02 +0000
Subject: fixed spacing problem with hyperlinks; removed some unused commands

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3269 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 9b250d9b9..e3d50b60a 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -171,9 +171,7 @@
     % e.g. in TOC-backlinks of section titles.  Parameters:
     % 1. Target.
     % 2. Link text.
-    {%
-      \protect\href{##1}{##2}%
-    }%
+    \href{##1}{##2}%
   }
   \providecommand{\Dimplicitfootnotereference}[2]{%
     % Ditto, but for the special case of footnotes.
@@ -189,19 +187,13 @@
     % Parameters:
     % 1. Target.
     % 2. Link text.
-    {%
-      \color{blue}\protect%
-      \href{##1}{##2}%
-    }%
+    \href{##1}{{\color{blue}##2}}%
   }
   \providecommand{\Durireference}[2]{%
     % Create reference to URI.  Parameters:
     % 1. Target.
     % 2. Link text.
-    {%
-      \color{blue}
-      \protect\href{##1}{##2}%
-    }%
+    \href{##1}{{\color{blue}##2}}%
   }
 }
 \makeatother
@@ -713,7 +705,6 @@
 
 \providecommand{\DNsystemmessage}[1]{%
   {%
-    \noindent%
     \color{red}%
     \bfseries%
     #1%
@@ -723,10 +714,8 @@
 
 \usepackage{graphicx}
 \Dprovidelength{\Dimagewidth}{0pt}
-\newsavebox{\Dimagesavebox}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-%  \
   \settowidth{\Dimagewidth}{\includegraphics{#3}}%
   \ifthenelse{\Dimagewidth>\linewidth}{%
     \includegraphics[width=\linewidth]{#3}%
-- 
cgit v1.2.1


From dd2eb8aa50f8fcb4b865b90d0edc3b4de38a5cd3 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 29 Apr 2005 22:06:20 +0000
Subject: ignore hyperlink targets; fixed line-blocks in tabular environments
 (e.g. field lists)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3270 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 102 ++++++++++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 41 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index e3d50b60a..f0a7e7f1f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -86,15 +86,15 @@
     0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
   }
   \providecommand{\Dauxiliaryspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{yes}}{\vspace{\Dblocklevelvspace}}{}%
+    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
     \Dpar\noindent%
   }
   \providecommand{\Dauxiliaryparspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{yes}}{\vspace{\Dblocklevelvspace}}{}%
+    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
     \Dpar%
   }
   \providecommand{\Dparagraphspace}{\Dpar}
-  \providecommand{\Dneedvspace}{yes}
+  \providecommand{\Dneedvspace}{true}
 }
 
 
@@ -145,8 +145,13 @@
     }%
   }
   \providecommand{\DArefuri}[5]{%
-    % We only have explicit URI references, so one macro suffices.
-    \Durireference{##3}{##5}%
+    \ifthenelse{\equal{##4}{target}}{%
+      % Hyperlink targets can (and should be) ignored because they are
+      % invisible.
+    }{%
+      % We only have explicit URI references, so one macro suffices.
+      \Durireference{##3}{##5}%
+    }%
   }
   % Targets.
   \Dprovidelength{\Dorgbaselineskip}{0pt}
@@ -229,7 +234,7 @@
   \Dpar\noindent%
 }
 \providecommand{\Dtopicsubtitle}[1]{%
-  \noindent\Dformatboxsubtitle{#1}%
+  \Dformatboxsubtitle{#1}%
   \vspace{1em}%
   \Dpar\noindent%
 }
@@ -309,7 +314,12 @@
 \providecommand{\DNliteral}[1]{\textnhtt{#1}}
 \providecommand{\DNemphasis}[1]{\emph{#1}}
 \providecommand{\DNstrong}[1]{\textbf{#1}}
-\providecommand{\DNdocument}[1]{\begin{document}\protect\renewcommand{\Dnextparindent}{\noindent}#1\end{document}}
+\providecommand{\DNdocument}[1]{%
+  \begin{document}%
+    \noindent%
+    #1%
+  \end{document}%
+}
 \providecommand{\DNtopic}[1]{%
   \par%
   \Dmakebox{%
@@ -352,31 +362,37 @@
   % 1. Label (same as in list environment).
   % 2. Spacing (same as in list environment).
   % 3. List contents (contents of list environment).
-  {%
-    \renewcommand{\Dneedvspace}{no}%
-    % \parsep0.5\baselineskip
-    \renewcommand{\Dresetlistdepth}{false}%
-    \ifnum \@listdepth>5%
-    \protect\renewcommand{\Dresetlistdepth}{true}%
-    \@listdepth=5%
-    \fi%
-    \begin{list}{%
-        #1%
-      }{%
-        \setlength{\itemsep}{0pt}%
-        \setlength{\partopsep}{0pt}%
-        \setlength{\topsep}{0pt}%
-                                % List should take 90% of total width.
-        \setlength{\leftmargin}{0.05\linewidth}%
-                                % Equal margins.
-        \setlength{\rightmargin}{\leftmargin}%
-        #2%
-      }{%
-        #3%
-      }%
-    \end{list}%
-    \ifthenelse{\equal{\Dresetlistdepth}{true}}{\@listdepth=5}{}%
-  }%
+  \ifthenelse{\equal{\Dinsidetabular}{true}}{%
+    % Unfortunately, vertical spacing doesn't work correctly when
+    % using lists inside tabular environments, so we use a minipage.
+    \begin{minipage}[t]{\linewidth}%
+  }{}%
+    {%
+      \renewcommand{\Dneedvspace}{false}%
+      % \parsep0.5\baselineskip
+      \renewcommand{\Dresetlistdepth}{false}%
+      \ifnum \@listdepth>5%
+      \protect\renewcommand{\Dresetlistdepth}{true}%
+      \@listdepth=5%
+      \fi%
+      \begin{list}{%
+          #1%
+        }{%
+          \setlength{\itemsep}{0pt}%
+          \setlength{\partopsep}{0pt}%
+          \setlength{\topsep}{0pt}%
+                                  % List should take 90% of total width.
+          \setlength{\leftmargin}{0.05\linewidth}%
+                                  % Equal margins.
+          \setlength{\rightmargin}{\leftmargin}%
+          #2%
+        }{%
+          #3%
+        }%
+      \end{list}%
+      \ifthenelse{\equal{\Dresetlistdepth}{true}}{\@listdepth=5}{}%
+    }%
+  \ifthenelse{\equal{\Dinsidetabular}{true}}{\end{minipage}}{}%
 }
 \makeatother
 
@@ -421,20 +437,25 @@
 \providecommand{\Dtextliteralsinglequote}{'}
 
 
+\providecommand{\Dinsidetabular}{false}
 \providecommand{\Dtwocolumntable}[1]{%
   % Create a simple borderless two-column table, the right column of
   % which has a variable width.
-  \begin{tabularx}{\linewidth}{@{}lX@{}}#1\end{tabularx}%
+  {%
+    \protect\renewcommand{\Dinsidetabular}{true}%
+    \begin{tabularx}{\linewidth}{@{}lX@{}}%
+      #1%
+    \end{tabularx}%
+  }%
 }
 
-
 \usepackage{tabularx}
 \providecommand{\Dformatfieldname}[1]{\bfseries{#1:}}
 \providecommand{\DNfieldlist}[1]{%
-  \noindent\Dtwocolumntable{#1}%
+  \Dtwocolumntable{#1}%
 }
-\providecommand{\DNfieldname}[1]{\Dformatfieldname{#1}{}&{}}
-\providecommand{\DNfieldbody}[1]{{#1}{}\tabularnewline}
+\providecommand{\DNfieldname}[1]{\Dformatfieldname{#1}&}
+\providecommand{\DNfieldbody}[1]{#1\tabularnewline}
 
 
 \providecommand{\DNdefinitionlist}[1]{%
@@ -476,7 +497,7 @@
   #1%
 }
 \providecommand{\DNoptionlist}[1]{%
-  \noindent\Dtwocolumntable{#1}%
+  \Dtwocolumntable{#1}%
 }
 \providecommand{\Doptiongroupjoiner}{,{ }}
 \providecommand{\Disfirstoption}{%
@@ -516,9 +537,8 @@
       % At top level; don't indent.
       \setlength{\leftmargin}{0pt}%
     }%
-    \setlength{\parsep}{0pt}
-  }%
-  {%
+    \setlength{\parsep}{0pt}%
+  }{%
     #1%
   }%
 }
-- 
cgit v1.2.1


From 0d367a20ddf73937c88f48eefe81a9de83649aa9 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 29 Apr 2005 23:54:36 +0000
Subject: checking in my intermediate results, trying to fix spacing problems
 in field lists

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3273 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt |  2 ++
 tools/stylesheets/latex.tex       | 16 +++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
index 829ba9aa4..a3bd3720c 100644
--- a/tools/stylesheets/latex-notes.txt
+++ b/tools/stylesheets/latex-notes.txt
@@ -12,3 +12,5 @@ Regarding UTF-8:
   > Unicode characters I used.
   > However the DeclareUnicodeCharacter directive was to work around a
   > missing or misnamed character in the UCS database.
+
+Long field lists with ltxtable?
diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index f0a7e7f1f..80b89e471 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -1,3 +1,5 @@
+\makeatletter
+
 \providecommand{\Ddocumentclass}{scrartcl}
 \providecommand{\Ddocumentoptions}{a4paper}
 
@@ -24,7 +26,6 @@
 % Taken from
 % 
 % and modified.  Used with permission.
-\makeatletter
 \providecommand{\Dprovidelength}[2]{%
   \begingroup%
     \escapechar\m@ne%
@@ -34,15 +35,12 @@
   {\newlength{#1}\setlength{#1}{#2}}%
   {}%
 }
-\makeatother
 
-\makeatletter
 \providecommand{\Dprovidecounter}[1]{%
   % Like \newcounter except that it doesn't crash if the counter
   % already exists.
   \@ifundefined{c@#1}{\newcounter{#1}}{}
 }
-\makeatother
 
 \providecommand{\DSboxcommands}{
   \Dprovidelength{\Dboxparindent}{\parindent}
@@ -114,7 +112,6 @@
   }
 }
 
-\makeatletter
 \providecommand{\DSlinks}{
   % Targets and references.
   \usepackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
@@ -201,14 +198,12 @@
     \href{##1}{{\color{blue}##2}}%
   }
 }
-\makeatother
 
 
 \providecommand{\DAclasses}[5]{%
   #5%
 }
 
-\makeatletter
 \providecommand{\Dattr}[5]{%
   % Global attribute dispatcher.
   % Parameters:
@@ -223,7 +218,6 @@
     \csname DN#4A#2\endcsname{#1}{#2}{#3}{#4}{#5}%
   }%
 }
-\makeatother
 
 \providecommand{\DNparagraph}[1]{#1}
 \providecommand{\Dformatboxtitle}[1]{{\Large\textbf{#1}}}
@@ -267,7 +261,6 @@
 }
 % Boolean variable.
 \providecommand{\Dhassubtitle}{}
-\makeatother
 \providecommand{\DNtitle}[1]{%
   \ifthenelse{\equal{\Dparent}{topic}}{\Dtopictitle{#1}}{%
     \ifthenelse{\equal{\Dparent}{document}}{\Ddocumenttitle{#1}}{%
@@ -355,7 +348,6 @@
 \usepackage[latin1]{inputenc}
 
 \providecommand{\Dresetlistdepth}{false}
-\makeatletter
 \providecommand{\Dmakelistenvironment}[3]{%
   % Make list environment with support for unlimited nesting and with
   % reasonable default lengths.  Parameters:
@@ -394,7 +386,7 @@
     }%
   \ifthenelse{\equal{\Dinsidetabular}{true}}{\end{minipage}}{}%
 }
-\makeatother
+\providecommand{\DAlastitem}[5]{#5\@finalstrut\@arstrutbox}
 
 \providecommand{\Dmakeenumeratedlist}[6]{%
   % Make enumerated list.
@@ -762,3 +754,5 @@
 \DSauxiliaryspace
 \DSparagraphs
 \DSlinks
+
+%\makeatother
-- 
cgit v1.2.1


From a80c28dc5a92a783ab1bfec1be70da89fe158aa3 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 30 Apr 2005 00:11:35 +0000
Subject: added some indirection with \Dformat...

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3274 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 80b89e471..4e2a070b5 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -458,12 +458,15 @@
   % label.
   \item[]#1%
 }
-\providecommand{\DNterm}[1]{#1}
+\providecommand{\Dformatterm}[1]{#1}
+\providecommand{\DNterm}[1]{\Dformatterm{#1}}
 % I'm still not sure what's the best rendering for classifiers.  The
 % colon syntax is used by reStructuredText, so it's at least WYSIWYG.
 % Use slanted text because italic would cause too much emphasis.
-\providecommand{\DNclassifier}[1]{~:~\textsl{#1}}
-\providecommand{\DNdefinition}[1]{\Dpar#1}
+\providecommand{\Dformatclassifier}[1]{\textsl{#1}}
+\providecommand{\DNclassifier}[1]{~:~\Dformatclassifier{#1}}
+\providecommand{\Dformatdefinition}[1]{#1}
+\providecommand{\DNdefinition}[1]{\Dpar\Dformatdefinition{#1}}
 
 
 \providecommand{\Dformatoptiongroup}[1]{%
-- 
cgit v1.2.1


From 9d4a0714283832fade9e10836cb68032215ee36c Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 30 Apr 2005 16:54:47 +0000
Subject: make lists more deeply nestable by not adding right margin if there
 is not enough space

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3280 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 4e2a070b5..85c66cdbf 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -409,14 +409,21 @@
     %   1. First item.
     \setlength{\leftmargin}{2.5em}%
     % Equal margins.
-    \setlength{\rightmargin}{\leftmargin}%
+    \ifthenelse{\lengthtest{\linewidth>10em}}{%
+      \setlength{\rightmargin}{\leftmargin}%
+    }{%
+      % If the line is narrower than 10em, we don't remove any further
+      % space from the right.
+      \setlength{\rightmargin}{0pt}%
+    }%
     % Use counter recommended by Python module.
     \usecounter{#4}%
     % Set start value.
     \addtocounter{#4}{#5}%
   }{%
     % The list contents.
-    #6}%
+    #6%
+  }%
 }
 
 
@@ -758,4 +765,4 @@
 \DSparagraphs
 \DSlinks
 
-%\makeatother
+\makeatother
-- 
cgit v1.2.1


From b44e0f1151201dfa37ccc11753e37ab3fe342ccc Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 3 May 2005 19:19:35 +0000
Subject: do not enclose document and sections in macro calls, so that TeX does
 not run out of memory when processing large documents

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3287 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 85c66cdbf..0cc4d9ac7 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -307,12 +307,8 @@
 \providecommand{\DNliteral}[1]{\textnhtt{#1}}
 \providecommand{\DNemphasis}[1]{\emph{#1}}
 \providecommand{\DNstrong}[1]{\textbf{#1}}
-\providecommand{\DNdocument}[1]{%
-  \begin{document}%
-    \noindent%
-    #1%
-  \end{document}%
-}
+\providecommand{\Dvisitdocument}{\begin{document}\noindent}
+\providecommand{\Ddepartdocument}{\end{document}}
 \providecommand{\DNtopic}[1]{%
   \par%
   \Dmakebox{%
@@ -332,7 +328,8 @@
 \providecommand{\DNlistitem}[1]{\item{#1}}
 \providecommand{\DNenumeratedlist}[1]{#1}
 \newcounter{Dsectionlevel}
-\providecommand{\DNsection}[1]{\addtocounter{Dsectionlevel}{1}#1\addtocounter{Dsectionlevel}{-1}}
+\providecommand{\Dvisitsection}{\addtocounter{Dsectionlevel}{1}}
+\providecommand{\Ddepartsection}{\addtocounter{Dsectionlevel}{-1}}
 
 % Using \_ will cause hyphenation after _ even in \textnhtt-typewriter
 % because the hyphenat package redefines \_.  So we use
-- 
cgit v1.2.1


From 36e258db356cbc21e35145d5e261451b06d87bbf Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 3 May 2005 20:42:45 +0000
Subject: improved handling of long field names

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3288 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 0cc4d9ac7..c2a5c935d 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -450,7 +450,18 @@
 \providecommand{\DNfieldlist}[1]{%
   \Dtwocolumntable{#1}%
 }
-\providecommand{\DNfieldname}[1]{\Dformatfieldname{#1}&}
+\Dprovidelength{\Dmaxfieldnamewidth}{8em}%
+\Dprovidelength{\Dplaceholderfieldnamewidth}{2em}%
+\Dprovidelength{\Dfieldnamewidth}{0pt}%
+\providecommand{\DNfieldname}[1]{%
+  \settowidth{\Dfieldnamewidth}{\Dformatfieldname{#1}}%
+  \ifthenelse{\lengthtest{\Dfieldnamewidth>\Dmaxfieldnamewidth}}{%
+    \makebox[\Dplaceholderfieldnamewidth][l]{\Dformatfieldname{#1}}%
+    &\tabularnewline~&%
+  }{%
+    \Dformatfieldname{#1}&%
+  }%
+}
 \providecommand{\DNfieldbody}[1]{#1\tabularnewline}
 
 
-- 
cgit v1.2.1


From 2a36a20ee7e5d733809a5ef32f12e6b46586e47f Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 3 May 2005 21:34:01 +0000
Subject: made auxiliary spacing more flexible

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3291 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c2a5c935d..68daf3fef 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -83,13 +83,20 @@
     % Space between block-level elements other than paragraphs.
     0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
   }
-  \providecommand{\Dauxiliaryspace}{%
+  \providecommand{\Dnextauxiliaryspace}{%
     \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \Dpar\noindent%
+  }
+  \providecommand{\Dvspace}{%
+    \Dnextauxiliaryspace%
+    \renewcommand{\Dnextauxiliaryspace}{%
+      \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
+    }%
+  }%
+  \providecommand{\Dauxiliaryspace}{%
+    \Dvspace\Dpar\noindent%
   }
   \providecommand{\Dauxiliaryparspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \Dpar%
+    \Dvspace\Dpar%
   }
   \providecommand{\Dparagraphspace}{\Dpar}
   \providecommand{\Dneedvspace}{true}
@@ -457,7 +464,7 @@
   \settowidth{\Dfieldnamewidth}{\Dformatfieldname{#1}}%
   \ifthenelse{\lengthtest{\Dfieldnamewidth>\Dmaxfieldnamewidth}}{%
     \makebox[\Dplaceholderfieldnamewidth][l]{\Dformatfieldname{#1}}%
-    &\tabularnewline~&%
+    &\tabularnewline&%
   }{%
     \Dformatfieldname{#1}&%
   }%
-- 
cgit v1.2.1


From 2dda62ea39b5ad7ad7f063a1843f55ebb996bf07 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 3 May 2005 21:42:46 +0000
Subject: removed additional flexibility; probably not needed, on second
 thought

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3292 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 68daf3fef..44bb91251 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -83,20 +83,13 @@
     % Space between block-level elements other than paragraphs.
     0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
   }
-  \providecommand{\Dnextauxiliaryspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-  }
-  \providecommand{\Dvspace}{%
-    \Dnextauxiliaryspace%
-    \renewcommand{\Dnextauxiliaryspace}{%
-      \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    }%
-  }%
   \providecommand{\Dauxiliaryspace}{%
-    \Dvspace\Dpar\noindent%
+    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
+    \Dpar\noindent%
   }
   \providecommand{\Dauxiliaryparspace}{%
-    \Dvspace\Dpar%
+    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
+    \Dpar%
   }
   \providecommand{\Dparagraphspace}{\Dpar}
   \providecommand{\Dneedvspace}{true}
-- 
cgit v1.2.1


From 2f72811e55a880663a944f366b997a2b6267dbda Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 3 May 2005 22:09:49 +0000
Subject: changed rubric formatting

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3293 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 44bb91251..8dbf39ab0 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -318,8 +318,10 @@
     #1%
   }%
 }
-\providecommand{\Dformatrubric}[1]{{\large\textbf{#1}}}
-\providecommand{\DNrubric}[1]{\begin{center}\Dformatrubric{#1}\end{center}}
+\providecommand{\Dformatrubric}[1]{\textbf{#1}}
+\providecommand{\DNrubric}[1]{%
+  \vspace{0.3em}\Dpar\noindent\Dformatrubric{#1}\Dpar\noindent%
+}
 
 \providecommand{\Dbullet}{}
 \providecommand{\Dsetbullet}[1]{\renewcommand{\Dbullet}{#1}}
-- 
cgit v1.2.1


From b9b8decff0e4249760af913eeb1f7f6f27027fea Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 4 May 2005 12:32:29 +0000
Subject: made Dblocklevelvspace a length; need to come up with a shorter name

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3295 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 8dbf39ab0..f382f3f10 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -79,7 +79,7 @@
 
 
 \providecommand{\DSauxiliaryspace}{
-  \providecommand{\Dblocklevelvspace}{%
+  \Dprovidelength{\Dblocklevelvspace}{%
     % Space between block-level elements other than paragraphs.
     0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
   }
-- 
cgit v1.2.1


From ed9ab8fe5dd2e4561ea6bee7620a6c471871ef08 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 4 May 2005 12:33:35 +0000
Subject: added note about standard-TeX compatibility

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3296 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
index a3bd3720c..ce085024d 100644
--- a/tools/stylesheets/latex-notes.txt
+++ b/tools/stylesheets/latex-notes.txt
@@ -14,3 +14,24 @@ Regarding UTF-8:
   > missing or misnamed character in the UCS database.
 
 Long field lists with ltxtable?
+
+
+::
+
+    3.1.6. How can I make a document portable to both latex and pdflatex
+    Contributed by: Christian Kumpf
+    Check for the existence of the variable \pdfoutput:
+    \newif\ifpdf
+    \ifx\pdfoutput\undefined
+    \pdffalse % we are not running PDFLaTeX
+    \else
+    \pdfoutput=1 % we are running PDFLaTeX
+    \pdftrue
+    \fi
+    Then use your new variable \ifpdf
+    \ifpdf
+    \usepackage[pdftex]{graphicx}
+    \pdfcompresslevel=9
+    \else
+    \usepackage{graphicx}
+    \fi
-- 
cgit v1.2.1


From a32ff20498076981eecc28ea34decb06090e2f56 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 4 May 2005 12:59:45 +0000
Subject: added early and late initialization macros for usage by user
 stylesheet

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3297 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index f382f3f10..c6ea7be89 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -1,10 +1,14 @@
 \makeatletter
 
+\providecommand{\DSearly}{}
+\providecommand{\DSlate}{}
+
 \providecommand{\Ddocumentclass}{scrartcl}
 \providecommand{\Ddocumentoptions}{a4paper}
 
 \documentclass[\Ddocumentoptions]{\Ddocumentclass}
 
+\DSearly
 
 \providecommand{\DSpackages}{%
   % All kinds of useful packages.
@@ -774,5 +778,6 @@
 \DSauxiliaryspace
 \DSparagraphs
 \DSlinks
+\DSlate
 
 \makeatother
-- 
cgit v1.2.1


From 1215ece6bd5e66640245bd0dba2953207ea85845 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 4 May 2005 18:39:35 +0000
Subject: made section handling a bit more flexible; added \Dprerubricspace

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3299 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c6ea7be89..1596ae291 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -246,10 +246,10 @@
   \begin{center}{\huge#1}\end{center}%
   \vspace{1cm}%
 }
-\providecommand{\Dsectiontitle}[1]{\section*{#1}}
-\providecommand{\Dsubsectiontitle}[1]{\subsection*{#1}}
-\providecommand{\Dsubsubsectiontitle}[1]{\subsubsection*{#1}}
-\providecommand{\Dsubsubsubsectiontitle}[1]{%
+\providecommand{\Dsectiontitlei}[1]{\section*{#1}}
+\providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
+\providecommand{\Dsectiontitleiii}[1]{\subsubsection*{#1}}
+\providecommand{\Dsectiontitleiv}[1]{%
   \par\textbf{\vspace{1.5em}#1\vspace{1em}}}
 \providecommand{\Dmakesectiontitletext}[1]{%
   % Return text suitable for use in \section*, \subsection*, etc.
@@ -257,11 +257,13 @@
   \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
   #1%
 }
+% Can be overwritten by user stylesheet.
+\providecommand{\Dsectiontitle}[1]{\Ddispatchsectiontitle{#1}}
 \providecommand{\Ddispatchsectiontitle}[1]{%
-  \ifthenelse{\value{Dsectionlevel}=1}{\Dsectiontitle{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}=2}{\Dsubsectiontitle{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}=3}{\Dsubsubsectiontitle{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}>3}{\Dsubsubsubsectiontitle{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}=1}{\Dsectiontitlei{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}=2}{\Dsectiontitleii{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}=3}{\Dsectiontitleiii{#1}}{}%
+  \ifthenelse{\value{Dsectionlevel}>3}{\Dsectiontitleiv{#1}}{}%
 }
 % Boolean variable.
 \providecommand{\Dhassubtitle}{}
@@ -269,7 +271,7 @@
   \ifthenelse{\equal{\Dparent}{topic}}{\Dtopictitle{#1}}{%
     \ifthenelse{\equal{\Dparent}{document}}{\Ddocumenttitle{#1}}{%
       \ifthenelse{\equal{\Dparent}{section}}{%
-        \Ddispatchsectiontitle{\Dmakesectiontitletext{#1}}%
+        \Dsectiontitle{\Dmakesectiontitletext{#1}}%
       }{%
         \ifthenelse{\equal{\Dparent}{sidebar}}{\Dsidebartitle{#1}}{}%
       }%
@@ -323,8 +325,9 @@
   }%
 }
 \providecommand{\Dformatrubric}[1]{\textbf{#1}}
+\Dprovidelength{\Dprerubricspace}{0.3em}
 \providecommand{\DNrubric}[1]{%
-  \vspace{0.3em}\Dpar\noindent\Dformatrubric{#1}\Dpar\noindent%
+  \vspace{\Dprerubricspace}\Dpar\noindent\Dformatrubric{#1}\Dpar\noindent%
 }
 
 \providecommand{\Dbullet}{}
@@ -334,8 +337,16 @@
 \providecommand{\DNlistitem}[1]{\item{#1}}
 \providecommand{\DNenumeratedlist}[1]{#1}
 \newcounter{Dsectionlevel}
-\providecommand{\Dvisitsection}{\addtocounter{Dsectionlevel}{1}}
-\providecommand{\Ddepartsection}{\addtocounter{Dsectionlevel}{-1}}
+\providecommand{\Dvisitsectionhook}{}
+\providecommand{\Ddepartsectionhook}{}
+\providecommand{\Dvisitsection}{%
+  \addtocounter{Dsectionlevel}{1}%
+  \Dvisitsectionhook%
+}
+\providecommand{\Ddepartsection}{%
+  \Ddepartsectionhook%
+  \addtocounter{Dsectionlevel}{-1}%
+}
 
 % Using \_ will cause hyphenation after _ even in \textnhtt-typewriter
 % because the hyphenat package redefines \_.  So we use
-- 
cgit v1.2.1


From 235937dbdb0f7aa97e4705a88e03045012e8472c Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 4 May 2005 20:28:28 +0000
Subject: moved \DSearly down; moved definition lists down; rewrote
 implementation for field lists and option lists

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3300 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 152 +++++++++++++++++++++++++++-----------------
 1 file changed, 94 insertions(+), 58 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 1596ae291..b2422f6d4 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -1,15 +1,5 @@
 \makeatletter
 
-\providecommand{\DSearly}{}
-\providecommand{\DSlate}{}
-
-\providecommand{\Ddocumentclass}{scrartcl}
-\providecommand{\Ddocumentoptions}{a4paper}
-
-\documentclass[\Ddocumentoptions]{\Ddocumentclass}
-
-\DSearly
-
 \providecommand{\DSpackages}{%
   % All kinds of useful packages.
   \usepackage{ifthen}
@@ -204,6 +194,17 @@
 }
 
 
+\providecommand{\DSearly}{}
+\providecommand{\DSlate}{}
+
+\providecommand{\Ddocumentclass}{scrartcl}
+\providecommand{\Ddocumentoptions}{a4paper}
+
+\documentclass[\Ddocumentoptions]{\Ddocumentclass}
+
+\DSearly
+
+
 \providecommand{\DAclasses}[5]{%
   #5%
 }
@@ -449,57 +450,74 @@
 % single curly quote here.
 \providecommand{\Dtextliteralsinglequote}{'}
 
-
+\usepackage{tabularx}
+% "Tabular lists" are field lists and options lists (not definition
+% lists because there the term always appears on its own line).  We'll
+% use the terminology of field lists now ("field", "field name",
+% "field body"), but the same is also analogously applicable to option
+% lists.
+%
+% We want these lists to be breakable across pages.  We cannot
+% automatically get the narrowest possible size for the left column
+% (i.e. the field names or option groups) because tabularx does not
+% support multi-page tables, ltxtable needs to have the table in an
+% external file and we don't want to clutter the user's directories
+% with auxiliary files created by the filecontents environment, and
+% ltablex is not included in teTeX.
+%
+% Thus we set a fixed length for the left column and use list
+% environments.  This also has the nice side effect that breaking is
+% now possible anywhere, not just between fields.
+%
+% Note that we are creating a distinct list environment for each
+% field.  There is no macro for a whole tabular list!
+\Dprovidelength{\Dtabularlistfieldnamewidth}{6em}
+\Dprovidelength{\Dtabularlistfieldnamesep}{0.5em}
 \providecommand{\Dinsidetabular}{false}
-\providecommand{\Dtwocolumntable}[1]{%
-  % Create a simple borderless two-column table, the right column of
-  % which has a variable width.
+\providecommand{\Dsavefieldname}{}
+\providecommand{\Dsavefieldbody}{}
+\Dprovidelength{\Dusedfieldnamewidth}{0pt}
+\Dprovidelength{\Drealfieldnamewidth}{0pt}
+\providecommand{\Dtabularlistfieldname}[1]{\renewcommand{\Dsavefieldname}{#1}}
+\providecommand{\Dtabularlistfieldbody}[1]{\renewcommand{\Dsavefieldbody}{#1}}
+\providecommand{\Dtabularlistfield}[1]{%
   {%
-    \protect\renewcommand{\Dinsidetabular}{true}%
-    \begin{tabularx}{\linewidth}{@{}lX@{}}%
-      #1%
-    \end{tabularx}%
+    % This only saves field name and field body in \Dsavefieldname and
+    % \Dsavefieldbody, resp.  It does not insert any text into the
+    % document.
+    #1%
+    % Recalculate the real field name width everytime we encounter a
+    % tabular list field because it may have been changed using a
+    % "raw" node.
+    \setlength{\Drealfieldnamewidth}{\Dtabularlistfieldnamewidth}%
+    \addtolength{\Drealfieldnamewidth}{\Dtabularlistfieldnamesep}%
+    \Dmakelistenvironment{%
+      \makebox[\Drealfieldnamewidth][l]{\Dsavefieldname}%
+    }{%
+      \setlength{\labelwidth}{\Drealfieldnamewidth}%
+      \setlength{\leftmargin}{\Drealfieldnamewidth}%
+      \setlength{\rightmargin}{0pt}%
+      \setlength{\labelsep}{0pt}%
+    }{%
+      \item%
+      \settowidth{\Dusedfieldnamewidth}{\Dsavefieldname}%
+      \ifthenelse{%
+        \lengthtest{\Dusedfieldnamewidth>\Dtabularlistfieldnamewidth}%
+      }{~\newline}{}%
+      \Dsavefieldbody%
+    }%
   }%
 }
 
-\usepackage{tabularx}
 \providecommand{\Dformatfieldname}[1]{\bfseries{#1:}}
-\providecommand{\DNfieldlist}[1]{%
-  \Dtwocolumntable{#1}%
-}
-\Dprovidelength{\Dmaxfieldnamewidth}{8em}%
-\Dprovidelength{\Dplaceholderfieldnamewidth}{2em}%
-\Dprovidelength{\Dfieldnamewidth}{0pt}%
+\providecommand{\DNfieldlist}[1]{#1}
+\providecommand{\DNfield}[1]{\Dtabularlistfield{#1}}
 \providecommand{\DNfieldname}[1]{%
-  \settowidth{\Dfieldnamewidth}{\Dformatfieldname{#1}}%
-  \ifthenelse{\lengthtest{\Dfieldnamewidth>\Dmaxfieldnamewidth}}{%
-    \makebox[\Dplaceholderfieldnamewidth][l]{\Dformatfieldname{#1}}%
-    &\tabularnewline&%
-  }{%
-    \Dformatfieldname{#1}&%
+  \Dtabularlistfieldname{%
+    \Dformatfieldname{#1}%
   }%
 }
-\providecommand{\DNfieldbody}[1]{#1\tabularnewline}
-
-
-\providecommand{\DNdefinitionlist}[1]{%
-  \noindent\begin{description}#1\end{description}%
-}
-\providecommand{\DNdefinitionlistitem}[1]{%
-  % LaTeX expects the label in square brackets; we provide an empty
-  % label.
-  \item[]#1%
-}
-\providecommand{\Dformatterm}[1]{#1}
-\providecommand{\DNterm}[1]{\Dformatterm{#1}}
-% I'm still not sure what's the best rendering for classifiers.  The
-% colon syntax is used by reStructuredText, so it's at least WYSIWYG.
-% Use slanted text because italic would cause too much emphasis.
-\providecommand{\Dformatclassifier}[1]{\textsl{#1}}
-\providecommand{\DNclassifier}[1]{~:~\Dformatclassifier{#1}}
-\providecommand{\Dformatdefinition}[1]{#1}
-\providecommand{\DNdefinition}[1]{\Dpar\Dformatdefinition{#1}}
-
+\providecommand{\DNfieldbody}[1]{\Dtabularlistfieldbody{#1}}
 
 \providecommand{\Dformatoptiongroup}[1]{%
   % Format option group, e.g. "-f file, --input file".
@@ -523,9 +541,7 @@
   % "\DNparagraph{Read input data from file.}"
   #1%
 }
-\providecommand{\DNoptionlist}[1]{%
-  \Dtwocolumntable{#1}%
-}
+\providecommand{\DNoptionlist}[1]{#1}
 \providecommand{\Doptiongroupjoiner}{,{ }}
 \providecommand{\Disfirstoption}{%
   % Auxiliary macro indicating if a given option is the first child
@@ -533,9 +549,12 @@
   % \Doptiongroupjoiner).
   false%
 }
+\providecommand{\DNoptionlistitem}[1]{%
+  \Dtabularlistfield{#1}%
+}
 \providecommand{\DNoptiongroup}[1]{%
   \renewcommand{\Disfirstoption}{true}%
-  \Dformatoptiongroup{#1}{}&{}%
+  \Dtabularlistfieldname{\Dformatoptiongroup{#1}}%
 }
 \providecommand{\DNoption}[1]{%
   % If this is not the first option in this option group, add a
@@ -550,10 +569,27 @@
 \providecommand{\DNoptionstring}[1]{\Dformatoptionstring{#1}}
 \providecommand{\DNoptionargument}[1]{{ }\Dformatoptionargument{#1}}
 \providecommand{\DNdescription}[1]{%
-  \Dformatoptiondescription{#1}%
-  \tabularnewline%
+  \Dtabularlistfieldbody{\Dformatoptiondescription{#1}}%
 }
 
+\providecommand{\DNdefinitionlist}[1]{%
+  \noindent\begin{description}#1\end{description}%
+}
+\providecommand{\DNdefinitionlistitem}[1]{%
+  % LaTeX expects the label in square brackets; we provide an empty
+  % label.
+  \item[]#1%
+}
+\providecommand{\Dformatterm}[1]{#1}
+\providecommand{\DNterm}[1]{\Dformatterm{#1}}
+% I'm still not sure what's the best rendering for classifiers.  The
+% colon syntax is used by reStructuredText, so it's at least WYSIWYG.
+% Use slanted text because italic would cause too much emphasis.
+\providecommand{\Dformatclassifier}[1]{\textsl{#1}}
+\providecommand{\DNclassifier}[1]{~:~\Dformatclassifier{#1}}
+\providecommand{\Dformatdefinition}[1]{#1}
+\providecommand{\DNdefinition}[1]{\Dpar\Dformatdefinition{#1}}
+
 \providecommand{\Dlineblockindentation}{2.5em}
 \providecommand{\DNlineblock}[1]{%
   \Dmakelistenvironment{}{%
-- 
cgit v1.2.1


From f30c0c75a24de3f5b5e4e91d0127140ccb5a7957 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 15:46:28 +0000
Subject: removed tabularx

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3303 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index b2422f6d4..8d52f00f6 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -450,7 +450,7 @@
 % single curly quote here.
 \providecommand{\Dtextliteralsinglequote}{'}
 
-\usepackage{tabularx}
+
 % "Tabular lists" are field lists and options lists (not definition
 % lists because there the term always appears on its own line).  We'll
 % use the terminology of field lists now ("field", "field name",
-- 
cgit v1.2.1


From c4b5f8b669d65d53d7cb7c09867c882c84bf8c61 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 16:26:23 +0000
Subject: simplified title and subtitle dispatcher code

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3304 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 8d52f00f6..ba64b86ee 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -258,8 +258,9 @@
   \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
   #1%
 }
-% Can be overwritten by user stylesheet.
-\providecommand{\Dsectiontitle}[1]{\Ddispatchsectiontitle{#1}}
+\providecommand{\Dsectiontitle}[1]{%
+  \Ddispatchsectiontitle{\Dmakesectiontitletext{#1}}%
+}
 \providecommand{\Ddispatchsectiontitle}[1]{%
   \ifthenelse{\value{Dsectionlevel}=1}{\Dsectiontitlei{#1}}{}%
   \ifthenelse{\value{Dsectionlevel}=2}{\Dsectiontitleii{#1}}{}%
@@ -267,24 +268,12 @@
   \ifthenelse{\value{Dsectionlevel}>3}{\Dsectiontitleiv{#1}}{}%
 }
 % Boolean variable.
-\providecommand{\Dhassubtitle}{}
+\providecommand{\Dhassubtitle}{false}
 \providecommand{\DNtitle}[1]{%
-  \ifthenelse{\equal{\Dparent}{topic}}{\Dtopictitle{#1}}{%
-    \ifthenelse{\equal{\Dparent}{document}}{\Ddocumenttitle{#1}}{%
-      \ifthenelse{\equal{\Dparent}{section}}{%
-        \Dsectiontitle{\Dmakesectiontitletext{#1}}%
-      }{%
-        \ifthenelse{\equal{\Dparent}{sidebar}}{\Dsidebartitle{#1}}{}%
-      }%
-    }%
-  }%
+  \csname D\Dparent title\endcsname{#1}%
 }
 \providecommand{\DNsubtitle}[1]{%
-  \ifthenelse{\equal{\Dparent}{topic}}{\Dtopicsubtitle{#1}}{%
-    \ifthenelse{\equal{\Dparent}{document}}{\Ddocumentsubtitle{#1}}{%
-      \ifthenelse{\equal{\Dparent}{sidebar}}{\Dsidebarsubtitle{#1}}{}%
-    }%
-  }%
+  \csname D\Dparent subtitle\endcsname{#1}%
 }
 \newcounter{Dpdfbookmarkid}
 \setcounter{Dpdfbookmarkid}{0}
-- 
cgit v1.2.1


From 423f1e08c383effb9f2be54946e1343de9619c39 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 16:46:11 +0000
Subject: improved section title dispatcher

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3305 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index ba64b86ee..d0b9919d9 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -247,11 +247,6 @@
   \begin{center}{\huge#1}\end{center}%
   \vspace{1cm}%
 }
-\providecommand{\Dsectiontitlei}[1]{\section*{#1}}
-\providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
-\providecommand{\Dsectiontitleiii}[1]{\subsubsection*{#1}}
-\providecommand{\Dsectiontitleiv}[1]{%
-  \par\textbf{\vspace{1.5em}#1\vspace{1em}}}
 \providecommand{\Dmakesectiontitletext}[1]{%
   % Return text suitable for use in \section*, \subsection*, etc.
   % Parameter:  The title (as node tree).
@@ -262,10 +257,18 @@
   \Ddispatchsectiontitle{\Dmakesectiontitletext{#1}}%
 }
 \providecommand{\Ddispatchsectiontitle}[1]{%
-  \ifthenelse{\value{Dsectionlevel}=1}{\Dsectiontitlei{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}=2}{\Dsectiontitleii{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}=3}{\Dsectiontitleiii{#1}}{}%
-  \ifthenelse{\value{Dsectionlevel}>3}{\Dsectiontitleiv{#1}}{}%
+  \@ifundefined{Dsectiontitle\roman{Dsectionlevel}}{%
+    \Ddeepsectionlevel{#1}%
+  }{%
+    \csname Dsectiontitle\roman{Dsectionlevel}\endcsname{#1}%
+  }%
+}
+\providecommand{\Dsectiontitlei}[1]{\section*{#1}}
+\providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
+\providecommand{\Dsectiontitleiii}[1]{\subsubsection*{#1}}
+\providecommand{\Ddeepsectionlevel}[1]{%
+  % Unsufficiently tested.
+  \par\textbf{\vspace{1.5em}#1\vspace{1em}}%
 }
 % Boolean variable.
 \providecommand{\Dhassubtitle}{false}
-- 
cgit v1.2.1


From 464f029c73702531fc0d4ab8da98d05bd0f6e1b9 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 17:36:21 +0000
Subject: simplified definition of deep section titles

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3306 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index d0b9919d9..0f7db08f9 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -258,17 +258,19 @@
 }
 \providecommand{\Ddispatchsectiontitle}[1]{%
   \@ifundefined{Dsectiontitle\roman{Dsectionlevel}}{%
-    \Ddeepsectionlevel{#1}%
+    \Ddeepsectiontitle{#1}%
   }{%
     \csname Dsectiontitle\roman{Dsectionlevel}\endcsname{#1}%
   }%
 }
 \providecommand{\Dsectiontitlei}[1]{\section*{#1}}
 \providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
-\providecommand{\Dsectiontitleiii}[1]{\subsubsection*{#1}}
-\providecommand{\Ddeepsectionlevel}[1]{%
-  % Unsufficiently tested.
-  \par\textbf{\vspace{1.5em}#1\vspace{1em}}%
+\providecommand{\Ddeepsectiontitle}[1]{%
+  % Anything below \subsubsection (like \paragraph or \subparagraph)
+  % is useless because it uses the same font.  The only way to
+  % (visually) distinguish such deeply nested sections is to use
+  % section numbering.
+  \subsubsection*{#1}%
 }
 % Boolean variable.
 \providecommand{\Dhassubtitle}{false}
-- 
cgit v1.2.1


From dc897efc06b167ed100fd7dcf127ca903dbf071b Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 17:51:59 +0000
Subject: made section title formatting more flexible

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3307 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 0f7db08f9..07792ac7a 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -247,14 +247,16 @@
   \begin{center}{\huge#1}\end{center}%
   \vspace{1cm}%
 }
-\providecommand{\Dmakesectiontitletext}[1]{%
-  % Return text suitable for use in \section*, \subsection*, etc.
-  % Parameter:  The title (as node tree).
+% Can be overwritten by user stylesheet.
+\providecommand{\Dformatsectiontitle}[1]{#1}
+\providecommand{\Dbookmarksectiontitle}[1]{%
+  % Return text suitable for use in \section*, \subsection*, etc.,
+  % containing a PDF bookmark.  Parameter:  The title (as node tree).
   \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
   #1%
 }
 \providecommand{\Dsectiontitle}[1]{%
-  \Ddispatchsectiontitle{\Dmakesectiontitletext{#1}}%
+  \Ddispatchsectiontitle{\Dbookmarksectiontitle{\Dformatsectiontitle{#1}}}%
 }
 \providecommand{\Ddispatchsectiontitle}[1]{%
   \@ifundefined{Dsectiontitle\roman{Dsectionlevel}}{%
-- 
cgit v1.2.1


From a7f1e611f07982deab4d1e5fa0f34c3c15e9ee99 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 17:53:50 +0000
Subject: added support for section subtitles (sectionsubtitle)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3308 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 07792ac7a..d9ec9a7d8 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -249,6 +249,7 @@
 }
 % Can be overwritten by user stylesheet.
 \providecommand{\Dformatsectiontitle}[1]{#1}
+\providecommand{\Dformatsectionsubtitle}[1]{\Dformatsectiontitle{#1}}
 \providecommand{\Dbookmarksectiontitle}[1]{%
   % Return text suitable for use in \section*, \subsection*, etc.,
   % containing a PDF bookmark.  Parameter:  The title (as node tree).
@@ -274,6 +275,10 @@
   % section numbering.
   \subsubsection*{#1}%
 }
+\providecommand{\Dsectionsubtitle}[1]{%
+  % Don't create a PDF bookmark.
+  \Ddispatchsectiontitle{\scalebox{.8}{\Dformatsectionsubtitle{#1}}}%
+}
 % Boolean variable.
 \providecommand{\Dhassubtitle}{false}
 \providecommand{\DNtitle}[1]{%
-- 
cgit v1.2.1


From 8f539d8a6be8d840143a74b791ad9b6add96ad6d Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 18:00:11 +0000
Subject: reduced space between section title and subtitle (sectionsubtitle)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3309 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index d9ec9a7d8..33ca5d3f7 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -275,7 +275,10 @@
   % section numbering.
   \subsubsection*{#1}%
 }
+\Dprovidelength{\Dsectionsubtitleraisedistance}{0.7em}
 \providecommand{\Dsectionsubtitle}[1]{%
+  % Move the subtitle nearer to the title.
+  \vspace{-\Dsectionsubtitleraisedistance}%
   % Don't create a PDF bookmark.
   \Ddispatchsectiontitle{\scalebox{.8}{\Dformatsectionsubtitle{#1}}}%
 }
-- 
cgit v1.2.1


From c5721cdbbb6133a3bda4308ecce8df623ab1d2c0 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 5 May 2005 18:27:52 +0000
Subject: added sectiontitlehook and sectionsubtitlehook; added dispatcher for
 sectionsubtitle

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3310 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt |  3 +--
 tools/stylesheets/latex.tex       | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
index ce085024d..4b4874a29 100644
--- a/tools/stylesheets/latex-notes.txt
+++ b/tools/stylesheets/latex-notes.txt
@@ -1,6 +1,7 @@
 Try the commands mentioned in
 .
 
+
 Regarding UTF-8:
 
 * Read .
@@ -13,8 +14,6 @@ Regarding UTF-8:
   > However the DeclareUnicodeCharacter directive was to work around a
   > missing or misnamed character in the UCS database.
 
-Long field lists with ltxtable?
-
 
 ::
 
diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 33ca5d3f7..8cb125fee 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -256,8 +256,11 @@
   \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
   #1%
 }
+\providecommand{\Dsectiontitlehook}[1]{#1}
 \providecommand{\Dsectiontitle}[1]{%
-  \Ddispatchsectiontitle{\Dbookmarksectiontitle{\Dformatsectiontitle{#1}}}%
+  \Dsectiontitlehook{%
+    \Ddispatchsectiontitle{\Dbookmarksectiontitle{\Dformatsectiontitle{#1}}}%
+  }%
 }
 \providecommand{\Ddispatchsectiontitle}[1]{%
   \@ifundefined{Dsectiontitle\roman{Dsectionlevel}}{%
@@ -266,6 +269,9 @@
     \csname Dsectiontitle\roman{Dsectionlevel}\endcsname{#1}%
   }%
 }
+\providecommand{\Ddispatchsectionsubtitle}[1]{%
+  \Ddispatchsectiontitle{#1}%
+}
 \providecommand{\Dsectiontitlei}[1]{\section*{#1}}
 \providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
 \providecommand{\Ddeepsectiontitle}[1]{%
@@ -275,12 +281,15 @@
   % section numbering.
   \subsubsection*{#1}%
 }
+\providecommand{\Dsectionsubtitlehook}[1]{#1}
 \Dprovidelength{\Dsectionsubtitleraisedistance}{0.7em}
 \providecommand{\Dsectionsubtitle}[1]{%
-  % Move the subtitle nearer to the title.
-  \vspace{-\Dsectionsubtitleraisedistance}%
-  % Don't create a PDF bookmark.
-  \Ddispatchsectiontitle{\scalebox{.8}{\Dformatsectionsubtitle{#1}}}%
+  \Dsectionsubtitlehook{%
+    % Move the subtitle nearer to the title.
+    \vspace{-\Dsectionsubtitleraisedistance}%
+    % Don't create a PDF bookmark.
+    \Ddispatchsectionsubtitle{\scalebox{.8}{\Dformatsectionsubtitle{#1}}}%
+  }%
 }
 % Boolean variable.
 \providecommand{\Dhassubtitle}{false}
-- 
cgit v1.2.1


From 792b40f8338fc4a07aa848baa2a45fef5e52eb0a Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 19:02:47 +0000
Subject: made attribute dispatcher more powerful

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3311 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 8cb125fee..a36d84eae 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -209,6 +209,8 @@
   #5%
 }
 
+\providecommand{\Difdefined}[3]{\@ifundefined{#1}{#3}{#2}}
+
 \providecommand{\Dattr}[5]{%
   % Global attribute dispatcher.
   % Parameters:
@@ -217,10 +219,16 @@
   % 3. Attribute value.
   % 4. Node name.
   % 5. Node contents.
-  \@ifundefined{DN#4A#2}{%
-    \@ifundefined{DA#2}{#5}{\csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}}%
-  }{%
+  \Difdefined{DN#4A#2V#3}{%
+    \csname DN#4A#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
+  }\Difdefined{DN#4A#2}{%
     \csname DN#4A#2\endcsname{#1}{#2}{#3}{#4}{#5}%
+  }\Difdefined{DA#2V#3}{%
+    \csname DA#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
+  }\Difdefined{DA#2}{%
+    \csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}%
+  }{%
+    #5%
   }%
 }
 
@@ -658,7 +666,8 @@
 \providecommand{\Dsidebarposition}{r}
 % Width.
 \Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
-\providecommand{\DNsidebar}[1]{\parpic[\Dsidebarposition]{%
+\providecommand{\DNsidebar}[1]{
+  \parpic[\Dsidebarposition]{%
     \Dpar%
     \begin{minipage}[t]{\Dsidebarwidth}
       % Doing this with nested minipages is ugly, but I haven't found
-- 
cgit v1.2.1


From 80951770104595473835edfaf9ade8d0c8fb493d Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 20:02:10 +0000
Subject: fixed new attribute dispatcher

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3312 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index a36d84eae..41af4156d 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -221,15 +221,14 @@
   % 5. Node contents.
   \Difdefined{DN#4A#2V#3}{%
     \csname DN#4A#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }\Difdefined{DN#4A#2}{%
+  }{\Difdefined{DN#4A#2}{%
     \csname DN#4A#2\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }\Difdefined{DA#2V#3}{%
+  }{\Difdefined{DA#2V#3}{%
     \csname DA#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }\Difdefined{DA#2}{%
+  }{\Difdefined{DA#2}{%
     \csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }{%
-    #5%
-  }%
+  }{#5%
+  }}}}%
 }
 
 \providecommand{\DNparagraph}[1]{#1}
-- 
cgit v1.2.1


From 67b1d363d45dbf81b777d65655b85d74273cb96a Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 20:22:31 +0000
Subject: added Dimagemaxwidth command

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3313 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 41af4156d..5c048bbbe 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -817,12 +817,15 @@
 
 
 \usepackage{graphicx}
-\Dprovidelength{\Dimagewidth}{0pt}
+% Maximum width of an image.
+\providecommand{\Dimagemaxwidth}{\linewidth}
+% Auxiliary variable.
+\Dprovidelength{\Dcurrentimagewidth}{0pt}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-  \settowidth{\Dimagewidth}{\includegraphics{#3}}%
-  \ifthenelse{\Dimagewidth>\linewidth}{%
-    \includegraphics[width=\linewidth]{#3}%
+  \settowidth{\Dcurrentimagewidth}{\includegraphics{#3}}%
+  \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dimagemaxwidth}}{%
+    \includegraphics[width=\Dimagemaxwidth]{#3}%
   }{%
     \includegraphics{#3}%
   }%
-- 
cgit v1.2.1


From 81bbd2d2715c4720a038966f82fdb3053882ad5a Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 21:55:21 +0000
Subject: added support for image alignment; this currently breaks figure
 alignment -- I'll fix that later

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3316 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 5c048bbbe..fd7be48bd 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -816,11 +816,40 @@
 }
 
 
+\providecommand{\Dhalign}[2]{%
+  % Horizontally align the contents to the left or right so that the
+  % text flows around it.
+  % Parameters:
+  % 1. l or r
+  % 2. Contents.
+  \parpic[#1]{#2}%
+}
+
+
 \usepackage{graphicx}
 % Maximum width of an image.
 \providecommand{\Dimagemaxwidth}{\linewidth}
 % Auxiliary variable.
 \Dprovidelength{\Dcurrentimagewidth}{0pt}
+\providecommand{\DNimageAalign}[5]{%
+  \ifthenelse{\equal{#3}{left}}{%
+    \Dhalign{l}{#5}%
+  }{%
+    \ifthenelse{\equal{#3}{right}}{%
+      \Dhalign{r}{#5}%
+    }{%
+      \ifthenelse{\equal{#3}{center}}{%
+        % Text floating around centered figures is brain damage.
+        % Thus we use a center environment.  Note that no extra space
+        % is added by the writer, so the space added by the center
+        % environment is fine.
+        \begin{center}#5\end{center}%
+      }{%
+        #5%
+      }%
+    }%
+  }%
+}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
   \settowidth{\Dcurrentimagewidth}{\includegraphics{#3}}%
-- 
cgit v1.2.1


From 82225b476d879a8dd7a250914fde0bbf915f9e89 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 23:52:52 +0000
Subject: added \Dsimpleimage macro which can be called from user stylesheets

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3317 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index fd7be48bd..e2f524f81 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -852,11 +852,15 @@
 }
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-  \settowidth{\Dcurrentimagewidth}{\includegraphics{#3}}%
+  \Dsimpleimage{#3}%
+}
+\providecommand{\Dsimpleimage}[1]{%
+  % Insert image, without much parametrization.
+  \settowidth{\Dcurrentimagewidth}{\includegraphics{#1}}%
   \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dimagemaxwidth}}{%
-    \includegraphics[width=\Dimagemaxwidth]{#3}%
+    \includegraphics[width=\Dimagemaxwidth]{#1}%
   }{%
-    \includegraphics{#3}%
+    \includegraphics{#1}%
   }%
 }
 
-- 
cgit v1.2.1


From 301119f58a9aa133cfb1b823a2d20e6762891425 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 7 May 2005 23:59:14 +0000
Subject: added class attribute dispatcher

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3318 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index e2f524f81..0a9c33ac7 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -206,7 +206,16 @@
 
 
 \providecommand{\DAclasses}[5]{%
-  #5%
+  \Difdefined{DN#4C#3}{%
+    % Pass only contents, nothing else!
+    \csname DN#4C#3\endcsname{#5}%
+  }{%
+    \Difdefined{DC#3}{%
+      \csname DC#3\endcsname{#5}%
+    }{%
+      #5%
+    }%
+  }%
 }
 
 \providecommand{\Difdefined}[3]{\@ifundefined{#1}{#3}{#2}}
-- 
cgit v1.2.1


From 32c30721cd7ae4f85d57763630074ae4fe261314 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 9 May 2005 16:35:57 +0000
Subject: added support for :width: option of images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3323 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 0a9c33ac7..5fca53d61 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -859,9 +859,14 @@
     }%
   }%
 }
+\providecommand{\DcurrentNimageAwidth}{}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-  \Dsimpleimage{#3}%
+  \ifthenelse{\equal{\DcurrentNimageAwidth}{}}{%
+    \Dsimpleimage{#3}%
+  }{%
+    \Dpercentwidthimage{\DcurrentNimageAwidth}{#3}%
+  }%
 }
 \providecommand{\Dsimpleimage}[1]{%
   % Insert image, without much parametrization.
@@ -872,6 +877,16 @@
     \includegraphics{#1}%
   }%
 }
+% Auxiliary length.  One percent of \linewidth.
+\Dprovidelength{\Dlinewidthpercent}{0pt}
+\providecommand{\Dpercentwidthimage}[2]{%
+  % Image with specified width.
+  % Parameters:
+  % 1. Image width in percent of \linewidth (1 to 100).
+  % 2. Image path.
+  \setlength{\Dlinewidthpercent}{0.01\linewidth}%
+  \includegraphics[width=#1\Dlinewidthpercent]{#2}%
+}
 
 
 % Need to replace with language-specific stuff.  Maybe look at
-- 
cgit v1.2.1


From 235daed0cb082fc9f18d956c6965ca13db193212 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 9 May 2005 22:41:22 +0000
Subject: added support for image base path

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3328 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 5fca53d61..d04dbbe88 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -859,13 +859,17 @@
     }%
   }%
 }
-\providecommand{\DcurrentNimageAwidth}{}
+% Base path for images.
+\providecommand{\Dimagebase}{}
+% Auxiliary command.  Current image path.
+\providecommand{\Dimagepath}{}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-  \ifthenelse{\equal{\DcurrentNimageAwidth}{}}{%
-    \Dsimpleimage{#3}%
+  \renewcommand{\Dimagepath}{\Dimagebase#3}
+  \Difdefined{DcurrentNimageAwidth}{%
+    \Dpercentwidthimage{\DcurrentNimageAwidth}{\Dimagepath}%
   }{%
-    \Dpercentwidthimage{\DcurrentNimageAwidth}{#3}%
+    \Dsimpleimage{\Dimagepath}%
   }%
 }
 \providecommand{\Dsimpleimage}[1]{%
-- 
cgit v1.2.1


From 2524210ae50328a7c4383cebe78fc6a985d4148f Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 9 May 2005 23:35:09 +0000
Subject: fixed right margin of line blocks

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3329 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index d04dbbe88..fabd57631 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -625,6 +625,7 @@
     \ifthenelse{\equal{\Dparent}{lineblock}}{%
       % Parent is a line block, so indent.
       \setlength{\leftmargin}{\Dlineblockindentation}%
+      \setlength{\rightmargin}{0pt}%
     }{%
       % At top level; don't indent.
       \setlength{\leftmargin}{0pt}%
-- 
cgit v1.2.1


From 95067ca94a445d907461be04811f6c094db3ac79 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 10 May 2005 19:46:57 +0000
Subject: first solution for the broken rendering of field lists in tables

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3331 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index fabd57631..8e9ad93c7 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -534,7 +534,9 @@
         \lengthtest{\Dusedfieldnamewidth>\Dtabularlistfieldnamewidth}%
       }{~\newline}{}%
       \Dsavefieldbody%
+      \@finalstrut\@arstrutbox%
     }%
+    \par%
   }%
 }
 
@@ -786,10 +788,13 @@
   % Make table.  Parameters:
   % 1. Table spec (like "|p|p|").
   % 2. Table contents.
-  \begin{longtable}{#1}%
-    \hline%
-    #2%
-  \end{longtable}
+  {%
+    \renewcommand{\Dinsidetabular}{true}%
+    \begin{longtable}{#1}%
+      \hline%
+      #2%
+    \end{longtable}%
+  }%
 }
 \providecommand{\DNthead}[1]{%
   #1%
-- 
cgit v1.2.1


From d59a8a683fd71e491949d25c08882fb15f1e96d9 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 11 May 2005 18:47:11 +0000
Subject: re-fixed right margin of line blocks

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3332 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 8e9ad93c7..fcdc6f3fd 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -627,11 +627,11 @@
     \ifthenelse{\equal{\Dparent}{lineblock}}{%
       % Parent is a line block, so indent.
       \setlength{\leftmargin}{\Dlineblockindentation}%
-      \setlength{\rightmargin}{0pt}%
     }{%
       % At top level; don't indent.
       \setlength{\leftmargin}{0pt}%
     }%
+    \setlength{\rightmargin}{0pt}%
     \setlength{\parsep}{0pt}%
   }{%
     #1%
-- 
cgit v1.2.1


From e5439a73f5e3d4a0b1b0284fca25cecfa133c045 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 11 May 2005 19:06:11 +0000
Subject: some ugly fix for the broken definition list spacing

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3333 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index fcdc6f3fd..fc5915ee0 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -604,7 +604,13 @@
 }
 
 \providecommand{\DNdefinitionlist}[1]{%
-  \noindent\begin{description}#1\end{description}%
+  % XXX Replace with a generic list, so we don't have to hack around
+  % spacing problems with \vspace and \hspace.
+  \vspace{-2em}%
+  \begin{description}%
+    \parskip0pt%
+    #1%
+  \end{description}%
 }
 \providecommand{\DNdefinitionlistitem}[1]{%
   % LaTeX expects the label in square brackets; we provide an empty
@@ -612,7 +618,7 @@
   \item[]#1%
 }
 \providecommand{\Dformatterm}[1]{#1}
-\providecommand{\DNterm}[1]{\Dformatterm{#1}}
+\providecommand{\DNterm}[1]{\hspace{-5pt}\Dformatterm{#1}}
 % I'm still not sure what's the best rendering for classifiers.  The
 % colon syntax is used by reStructuredText, so it's at least WYSIWYG.
 % Use slanted text because italic would cause too much emphasis.
-- 
cgit v1.2.1


From 7e44db0a0e450b1e8169792192e9d14a2e3b69e7 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 11 May 2005 23:54:06 +0000
Subject: nicer vertical spacing for floating images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3334 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index fc5915ee0..c261960e4 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -837,19 +837,25 @@
 }
 
 
+\providecommand{\Dinsidehalign}{false}
 \providecommand{\Dhalign}[2]{%
   % Horizontally align the contents to the left or right so that the
   % text flows around it.
   % Parameters:
   % 1. l or r
   % 2. Contents.
+  \renewcommand{\Dinsidehalign}{true}%
+  % For some obscure reason \parpic consumes some vertical space.
+  \vspace{-3pt}%
   \parpic[#1]{#2}%
+  \renewcommand{\Dinsidehalign}{false}%
 }
 
 
 \usepackage{graphicx}
 % Maximum width of an image.
 \providecommand{\Dimagemaxwidth}{\linewidth}
+\providecommand{\Dfloatimagemaxwidth}{0.5\linewidth}
 % Auxiliary variable.
 \Dprovidelength{\Dcurrentimagewidth}{0pt}
 \providecommand{\DNimageAalign}[5]{%
@@ -877,18 +883,27 @@
 \providecommand{\Dimagepath}{}
 \providecommand{\DNimageAuri}[5]{%
   % Insert image.  We treat the URI like a path here.
-  \renewcommand{\Dimagepath}{\Dimagebase#3}
+  \renewcommand{\Dimagepath}{\Dimagebase#3}%
   \Difdefined{DcurrentNimageAwidth}{%
     \Dpercentwidthimage{\DcurrentNimageAwidth}{\Dimagepath}%
   }{%
     \Dsimpleimage{\Dimagepath}%
   }%
 }
+\providecommand{\Dcurrentimagemaxwidth}{}
 \providecommand{\Dsimpleimage}[1]{%
   % Insert image, without much parametrization.
   \settowidth{\Dcurrentimagewidth}{\includegraphics{#1}}%
-  \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dimagemaxwidth}}{%
-    \includegraphics[width=\Dimagemaxwidth]{#1}%
+  \ifthenelse{\equal{\Dinsidehalign}{true}}{%
+    \renewcommand{\Dcurrentimagemaxwidth}{\Dfloatimagemaxwidth}%
+  }{%
+    \renewcommand{\Dcurrentimagemaxwidth}{\Dimagemaxwidth}%
+  }%
+  \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dcurrentimagemaxwidth}}{%
+    \begin{minipage}{\Dcurrentimagemaxwidth}%
+      \ifthenelse{\equal{\Dinsidehalign}{true}}{\vspace{3.5pt}}{}%
+      \includegraphics[width=\linewidth]{#1}%
+    \end{minipage}%
   }{%
     \includegraphics{#1}%
   }%
-- 
cgit v1.2.1


From 4b990d4a1c5ae8b0b04eb0a138071203d2b9dc2c Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 12 May 2005 01:37:11 +0000
Subject: improved vertical spacing of floating images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3335 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c261960e4..c4511e689 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -890,6 +890,26 @@
     \Dsimpleimage{\Dimagepath}%
   }%
 }
+\Dprovidelength{\Dfloatimagevmargin}{0pt}
+\providecommand{\Dwidthimage}[2]{%
+  % Image with specified width.
+  % Parameters:
+  % 1. Image width.
+  % 2. Image path.
+  \begin{minipage}{#1}%
+    \ifthenelse{\equal{\Dinsidehalign}{true}}{
+      % Compensate for space previously added in \Dhalign, but not
+      % entirely.
+      \vspace*{2.5pt}%
+      \vspace*{\Dfloatimagevmargin}%
+    }{}%
+    \includegraphics[width=\linewidth]{#2}%
+    \ifthenelse{\equal{\Dinsidehalign}{true}}{%
+      \vspace*{1.5pt}%
+      \vspace*{\Dfloatimagevmargin}%
+    }{}%
+  \end{minipage}%
+}  
 \providecommand{\Dcurrentimagemaxwidth}{}
 \providecommand{\Dsimpleimage}[1]{%
   % Insert image, without much parametrization.
@@ -900,12 +920,9 @@
     \renewcommand{\Dcurrentimagemaxwidth}{\Dimagemaxwidth}%
   }%
   \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dcurrentimagemaxwidth}}{%
-    \begin{minipage}{\Dcurrentimagemaxwidth}%
-      \ifthenelse{\equal{\Dinsidehalign}{true}}{\vspace{3.5pt}}{}%
-      \includegraphics[width=\linewidth]{#1}%
-    \end{minipage}%
+    \Dwidthimage{\Dcurrentimagemaxwidth}{#1}%
   }{%
-    \includegraphics{#1}%
+    \Dwidthimage{\Dcurrentimagewidth}{#1}%
   }%
 }
 % Auxiliary length.  One percent of \linewidth.
@@ -916,7 +933,7 @@
   % 1. Image width in percent of \linewidth (1 to 100).
   % 2. Image path.
   \setlength{\Dlinewidthpercent}{0.01\linewidth}%
-  \includegraphics[width=#1\Dlinewidthpercent]{#2}%
+  \Dwidthimage{#1\Dlinewidthpercent}{#2}%
 }
 
 
-- 
cgit v1.2.1


From c8d3ad94ae7103823e7ab98db10b270f356a9bdd Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 12 May 2005 21:21:36 +0000
Subject: added \Ditemsep, changed nesting of section subtitle macro calls

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3337 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c4511e689..1e94f9641 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -304,7 +304,7 @@
     % Move the subtitle nearer to the title.
     \vspace{-\Dsectionsubtitleraisedistance}%
     % Don't create a PDF bookmark.
-    \Ddispatchsectionsubtitle{\scalebox{.8}{\Dformatsectionsubtitle{#1}}}%
+    \Ddispatchsectionsubtitle{\Dformatsectionsubtitle{\scalebox{.8}{#1}}}%
   }%
 }
 % Boolean variable.
@@ -432,6 +432,7 @@
 }
 \providecommand{\DAlastitem}[5]{#5\@finalstrut\@arstrutbox}
 
+\Dprovidelength{\Ditemsep}{0pt}
 \providecommand{\Dmakeenumeratedlist}[6]{%
   % Make enumerated list.
   % Parameters:
@@ -460,6 +461,7 @@
       % space from the right.
       \setlength{\rightmargin}{0pt}%
     }%
+    \setlength{\itemsep}{\Ditemsep}%
     % Use counter recommended by Python module.
     \usecounter{#4}%
     % Set start value.
-- 
cgit v1.2.1


From a66a83d891c9cd6f766071e1023ef1657919b2fa Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 14 May 2005 01:13:25 +0000
Subject: changed \Dformatfieldname to use a command rather than a declaration
 for bold-faced text; added maximum height (= height of the text on the page)
 for images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3338 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 1e94f9641..25892b94d 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -542,7 +542,7 @@
   }%
 }
 
-\providecommand{\Dformatfieldname}[1]{\bfseries{#1:}}
+\providecommand{\Dformatfieldname}[1]{\textbf{#1:}}
 \providecommand{\DNfieldlist}[1]{#1}
 \providecommand{\DNfield}[1]{\Dtabularlistfield{#1}}
 \providecommand{\DNfieldname}[1]{%
@@ -905,7 +905,7 @@
       \vspace*{2.5pt}%
       \vspace*{\Dfloatimagevmargin}%
     }{}%
-    \includegraphics[width=\linewidth]{#2}%
+    \includegraphics[width=\linewidth,height=\textheight,keepaspectratio]{#2}%
     \ifthenelse{\equal{\Dinsidehalign}{true}}{%
       \vspace*{1.5pt}%
       \vspace*{\Dfloatimagevmargin}%
-- 
cgit v1.2.1


From 358358c1c586216307713c3be3d8cc20a436dd0c Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 14 May 2005 01:32:39 +0000
Subject: added note about image :width:

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3339 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
index 4b4874a29..87e65abd2 100644
--- a/tools/stylesheets/latex-notes.txt
+++ b/tools/stylesheets/latex-notes.txt
@@ -34,3 +34,7 @@ Regarding UTF-8:
     \else
     \usepackage{graphicx}
     \fi
+
+Width of images needs cleanup, in the framework.  Integers aren't
+sufficient (virtually unusable in typeset documents).  Need to discuss
+on Docutils-develop and come up with a set of standard units.
-- 
cgit v1.2.1


From 44343594a7b40dc30c9d2626eb05ce9c34f93703 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 16 May 2005 01:47:13 +0000
Subject: added \Dsetlistrightmargin macro; bottom-align images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3343 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 25892b94d..c76171e1f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -391,6 +391,16 @@
 % Current hardcoded.
 \usepackage[latin1]{inputenc}
 
+\providecommand{\Dsetlistrightmargin}{%
+  \ifthenelse{\lengthtest{\linewidth>10em}}{%
+    % Equal margins.
+    \setlength{\rightmargin}{\leftmargin}%
+  }{%
+    % If the line is narrower than 10em, we don't remove any further
+    % space from the right.
+    \setlength{\rightmargin}{0pt}%
+  }%
+}
 \providecommand{\Dresetlistdepth}{false}
 \providecommand{\Dmakelistenvironment}[3]{%
   % Make list environment with support for unlimited nesting and with
@@ -419,8 +429,7 @@
           \setlength{\topsep}{0pt}%
                                   % List should take 90% of total width.
           \setlength{\leftmargin}{0.05\linewidth}%
-                                  % Equal margins.
-          \setlength{\rightmargin}{\leftmargin}%
+          \Dsetlistrightmargin%
           #2%
         }{%
           #3%
@@ -453,14 +462,7 @@
     %
     %   1. First item.
     \setlength{\leftmargin}{2.5em}%
-    % Equal margins.
-    \ifthenelse{\lengthtest{\linewidth>10em}}{%
-      \setlength{\rightmargin}{\leftmargin}%
-    }{%
-      % If the line is narrower than 10em, we don't remove any further
-      % space from the right.
-      \setlength{\rightmargin}{0pt}%
-    }%
+    \Dsetlistrightmargin%
     \setlength{\itemsep}{\Ditemsep}%
     % Use counter recommended by Python module.
     \usecounter{#4}%
@@ -898,7 +900,9 @@
   % Parameters:
   % 1. Image width.
   % 2. Image path.
-  \begin{minipage}{#1}%
+  % Need to make bottom-alignment dependent on align attribute (add
+  % functional test first).
+  \begin{minipage}[b]{#1}%
     \ifthenelse{\equal{\Dinsidehalign}{true}}{
       % Compensate for space previously added in \Dhalign, but not
       % entirely.
-- 
cgit v1.2.1


From eacd0882f7e2aa5de5710ce6c403e4bcb5ee52f9 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 16 May 2005 02:21:15 +0000
Subject: added \Dfloatimagetopmargin and \Dfloatimagebottommargin

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3344 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index c76171e1f..d94be959d 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -895,6 +895,8 @@
   }%
 }
 \Dprovidelength{\Dfloatimagevmargin}{0pt}
+\providecommand{\Dfloatimagetopmargin}{\Dfloatimagevmargin}
+\providecommand{\Dfloatimagebottommargin}{\Dfloatimagevmargin}
 \providecommand{\Dwidthimage}[2]{%
   % Image with specified width.
   % Parameters:
@@ -907,12 +909,12 @@
       % Compensate for space previously added in \Dhalign, but not
       % entirely.
       \vspace*{2.5pt}%
-      \vspace*{\Dfloatimagevmargin}%
+      \vspace*{\Dfloatimagetopmargin}%
     }{}%
     \includegraphics[width=\linewidth,height=\textheight,keepaspectratio]{#2}%
     \ifthenelse{\equal{\Dinsidehalign}{true}}{%
       \vspace*{1.5pt}%
-      \vspace*{\Dfloatimagevmargin}%
+      \vspace*{\Dfloatimagebottommargin}%
     }{}%
   \end{minipage}%
 }  
-- 
cgit v1.2.1


From 71fd953aa28e39e38378c024839c7a8516f0868e Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 17 May 2005 13:04:56 +0000
Subject: Minor fix to underlining function, added more tests.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3345 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           |  6 ++-
 tools/editors/emacs/tests/tests-adjust-section.el | 55 ++++++++++++++++++++---
 2 files changed, 53 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 9fa83d057..1bac6ebbe 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -424,13 +424,17 @@ This is useful for filling list item paragraphs."
 		    (car rest-preferred-characters)
 		    ?=))
 
+	  ;; if there is a current indent, reuse it, otherwise use default
+	  (if (= curindent 0)
+	      (setq curindent rest-default-under-and-over-indent))
+
 	  (rest-update-section
 	   curchar
 	   (if (and current-prefix-arg
 		    (not (< (prefix-numeric-value current-prefix-arg) 0)))
 	       (if (eq init-style 'over-and-under) 'simple 'over-and-under)
 	     init-style)
-	   rest-default-under-and-over-indent)
+	   curindent)
 	  )
 
       ;; else we're not switching characters, and there is some sectioning
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index a1fa9ec3d..43215fb98 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -5,7 +5,7 @@
 ;; Regression tests for rest-adjust-section-title.
 ;;
 
-(defvar rest-adjust-section-tests 
+(setq rest-adjust-section-tests 
   '(
     (simple
 "
@@ -133,7 +133,7 @@ Subtitle2
 ~~~~~~~~~
 
 "
-2)
+(nil nil))
 
     (with-previous-text-rotating
 "
@@ -157,12 +157,49 @@ Subtitle2
 =========
 
 "
-3)
+(nil nil nil))
 
-  )
+      (start-indented
+"
+   Some Title@
+
+"
+"
+================
+   Some Title
+================
+
+")
+
+      (switch-from-nothing
+"
+Some Title@
+
+"
+"
+============
+ Some Title
+============
+
+" (t))
+
+      (switch-from-over-and-under
+"
+============
+ Some Title@
+============
+"
+"
+Some Title
+==========
+
+" (t))
+
+))
   
   "A list of regression tests for the section update method.")
-   
+
+
 
 (defun regression-test-compare-expect-buffer (testlist fun)
   "Run the regression tests for the section adjusting method."
@@ -171,6 +208,9 @@ Subtitle2
 	(specchar "@")
 	)
     (dolist (curtest testlist)
+      ;; print current text
+      (message (format "========= %s" (prin1-to-string (car curtest))))
+
       ;; prepare a buffer with the starting text, and move the cursor where
       ;; the special character is located
       (switch-to-buffer buf)
@@ -180,8 +220,9 @@ Subtitle2
       (delete-char 1)
       
       ;; run the section title update command n times
-      (dotimes (x (or (cadddr curtest) 1))
-	(funcall fun))
+      (dolist (x (or (cadddr curtest) (list nil)))
+	(let ((current-prefix-arg x))
+	  (funcall fun)))
       
       ;; compare the buffer output with the expected text
       (or (string=
-- 
cgit v1.2.1


From 12184e807cb2b7c1e3bf2631f51c4bac838b0ad2 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 18 May 2005 20:36:16 +0000
Subject: added support for "border" class

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3349 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index d94be959d..d9fc58348 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -945,6 +945,9 @@
 }
 
 
+\providecommand{\DCborder}[1]{\fbox{#1}}
+
+
 % Need to replace with language-specific stuff.  Maybe look at
 % csquotes.sty and ask the author for permission to use parts of it.
 \providecommand{\Dtextleftdblquote}{``}
-- 
cgit v1.2.1


From 45c6b5e8d79755d798d4385f52029cad1f1c80cd Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 21 May 2005 00:27:12 +0000
Subject: added "(provide 'restructuredtext)"

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3359 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 1bac6ebbe..fe39265b2 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -591,3 +591,6 @@ column is used (fill-column vs. end of previous/next line)."
 (defalias 'reST-title-char-p 'rest-title-char-p)
 (defalias 'reST-forward-title 'rest-forward-section)
 (defalias 'reST-backward-title 'rest-backward-section)
+
+
+(provide 'restructuredtext)
-- 
cgit v1.2.1


From 051dda33ce2b163d5595485c191af6c879b3b890 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 21 May 2005 00:31:39 +0000
Subject: added provide command for rst-mode as well

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3360 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst-mode.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst-mode.el b/tools/editors/emacs/rst-mode.el
index cb3c20148..8fc14e4a5 100644
--- a/tools/editors/emacs/rst-mode.el
+++ b/tools/editors/emacs/rst-mode.el
@@ -695,4 +695,6 @@ entered.")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(provide 'rst-mode)
+
 ;;; rst-mode.el ends here
-- 
cgit v1.2.1


From 2c3a254f2a8e5e6a66fee2426b626fa8a853491b Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 26 May 2005 00:44:13 +0000
Subject: added support and test for section subtitles

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3367 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 2cfc4c892..cec78e53b 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -14,7 +14,7 @@ Default cascading style sheet for the HTML output of Docutils.
 .first {
   margin-top: 0 ! important }
 
-.last {
+.last, .with-subtitle {
   margin-bottom: 0 ! important }
 
 .hidden {
@@ -125,6 +125,10 @@ div.system-message p.system-message-title {
 div.topic {
   margin: 2em }
 
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
 h1.title {
   text-align: center }
 
@@ -219,6 +223,9 @@ span.pre {
 span.problematic {
   color: red }
 
+span.section-subtitle {
+  font-size: 80% }
+
 table.citation {
   border-left: solid thin gray }
 
-- 
cgit v1.2.1


From c47a6a229e99e9ac7044eb477ff26cda7c64fbac Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 26 May 2005 10:51:39 +0000
Subject: added explanatory comment about span.section-subtitle

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3368 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index cec78e53b..608aad487 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -224,6 +224,7 @@ span.problematic {
   color: red }
 
 span.section-subtitle {
+  /* font-size relative to parent ( element) */
   font-size: 80% }
 
 table.citation {
-- 
cgit v1.2.1


From 4cdf5b9a94efda7e196720509ac9d16b50b70a4f Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 27 May 2005 22:50:24 +0000
Subject: added borderless class for images; removed angle brackets which cause
 problems when embedding the style sheet

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3391 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 608aad487..c79647380 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -138,6 +138,9 @@ h2.subtitle {
 hr.docutils {
   width: 75% }
 
+img.borderless {
+  border: 0 }
+
 ol.simple, ul.simple {
   margin-bottom: 1em }
 
@@ -224,7 +227,7 @@ span.problematic {
   color: red }
 
 span.section-subtitle {
-  /* font-size relative to parent ( element) */
+  /* font-size relative to parent (h1..h6 element) */
   font-size: 80% }
 
 table.citation {
-- 
cgit v1.2.1


From 684ed18e5cd24430f5b444f016689d9e8ed34dd3 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 5 Jun 2005 19:05:33 +0000
Subject: added clear properties for footer div and aligned images

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3434 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index c79647380..73cc7bcd0 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -83,6 +83,7 @@ div.figure {
   margin-left: 2em }
 
 div.footer, div.header {
+  clear: both;
   font-size: smaller }
 
 div.line-block {
@@ -138,6 +139,9 @@ h2.subtitle {
 hr.docutils {
   width: 75% }
 
+img[align] {
+  clear: both }
+
 img.borderless {
   border: 0 }
 
-- 
cgit v1.2.1


From 59d18be8f7244e4440b846cb5fe45e226d594f1a Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 01:21:23 +0000
Subject: new LaTeX writer: added TOC support

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3440 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 94 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 85 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index d9fc58348..aa14e7801 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -56,7 +56,7 @@
   \providecommand{\Dmakebox}[1]{%
     % Make a centered, frameless box.  Useful e.g. for block quotes.
     % Do not use minipages here, but create pseudo-lists to allow
-    % page-breaking.  (Don't uses KOMA-script's addmargin environment
+    % page-breaking.  (Don't use KOMA-script's addmargin environment
     % because it messes up bullet lists.)
     \Dmakelistenvironment{}{}{%
       \setlength{\parskip}{0pt}%
@@ -147,6 +147,7 @@
   % Targets.
   \Dprovidelength{\Dorgbaselineskip}{0pt}
   \providecommand{\DAids}[5]{%
+    \label{##3}%
     \ifthenelse{\equal{##4}{footnotereference}}{%
       {%
         \renewcommand{\HyperRaiseLinkDefault}{%
@@ -346,12 +347,16 @@
 \providecommand{\Dvisitdocument}{\begin{document}\noindent}
 \providecommand{\Ddepartdocument}{\end{document}}
 \providecommand{\DNtopic}[1]{%
-  \par%
-  \Dmakebox{%
-    %%  % Close with \par because otherwise LaTeX wouldn't notice the
-    %%  % changed \baselineskip (due to the font size change).
-    %%  {\small#1\par}%
+  \ifthenelse{\equal{\DcurrentNtopicAcontents}{1}}{%
+    \addtocounter{Dtoclevel}{1}%
+    \vspace{1em}%
+    \par\noindent%
     #1%
+    \addtocounter{Dtoclevel}{-1}%
+    \renewcommand{\Dnextparindent}{\noindent}%
+  }{%
+    \par\noindent%
+    \Dmakebox{#1}%
   }%
 }
 \providecommand{\Dformatrubric}[1]{\textbf{#1}}
@@ -362,9 +367,45 @@
 
 \providecommand{\Dbullet}{}
 \providecommand{\Dsetbullet}[1]{\renewcommand{\Dbullet}{#1}}
-\providecommand{\DNbulletlist}[1]{\Dmakelistenvironment{\Dbullet}{}{#1}}
-
-\providecommand{\DNlistitem}[1]{\item{#1}}
+\providecommand{\DNbulletlist}[1]{%
+  \Difinsidetoc{%
+    \addtocounter{Dtoclevel}{1}%
+    \addtolength{\Dtocindent}{\Dtocsectnumwidth}%
+    \addtolength{\Dtocsectnumwidth}{\Dtocadditionalsectnumwidth}%
+    #1%
+    \addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}%
+    \addtolength{\Dtocindent}{-\Dtocsectnumwidth}%
+    \addtocounter{Dtoclevel}{-1}%
+  }{%
+    \Dmakelistenvironment{\Dbullet}{}{#1}%
+  }%
+}
+\renewcommand{\@pnumwidth}{2.2em}
+\providecommand{\DNlistitem}[1]{%
+  \Difinsidetoc{%
+    \ifthenelse{\equal{\theDtoclevel}{1}\and\equal{\Dlocaltoc}{false}}{%
+      \par\addvspace{1em}%
+      % Group taken from scrartcl.cls and modified:
+      \begingroup%
+        \parindent0pt%
+        \rightskip\@pnumwidth%
+        \parfillskip-\@pnumwidth%
+        \leavevmode\sectfont%
+        \advance\leftskip\@tempdima%
+        \hskip-\leftskip%
+        {#1}\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss%
+          \pageref{\DcurrentNlistitemAtocrefid}%
+        }\par%
+      \endgroup%
+    }{%
+      \@dottedtocline{0}{\Dtocindent}{0em}{#1}{%
+        \pageref{\DcurrentNlistitemAtocrefid}%
+      }%
+    }%
+  }{%
+    \item{#1}%
+  }%
+}
 \providecommand{\DNenumeratedlist}[1]{#1}
 \newcounter{Dsectionlevel}
 \providecommand{\Dvisitsectionhook}{}
@@ -953,6 +994,41 @@
 \providecommand{\Dtextleftdblquote}{``}
 \providecommand{\Dtextrightdblquote}{''}
 
+% Table of contents:
+\Dprovidelength{\Dtocininitialsectnumwidth}{2.4em}
+\Dprovidelength{\Dtocadditionalsectnumwidth}{0.7em}
+% Level inside a table of contents.  While this is at -1, we are not
+% inside a TOC.
+\Dprovidecounter{Dtoclevel}%
+\setcounter{Dtoclevel}{-1}
+\providecommand{\Dlocaltoc}{false}%
+\providecommand{\DNtopicClocal}[1]{%
+  \renewcommand{\Dlocaltoc}{true}%
+  \addtolength{\Dtocsectnumwidth}{2\Dtocadditionalsectnumwidth}%
+  \addtolength{\Dtocindent}{-2\Dtocadditionalsectnumwidth}%
+  #1%
+  \addtolength{\Dtocindent}{2\Dtocadditionalsectnumwidth}%
+  \addtolength{\Dtocsectnumwidth}{-2\Dtocadditionalsectnumwidth}%
+  \renewcommand{\Dlocaltoc}{false}%
+}
+\Dprovidelength{\Dtocindent}{0pt}%
+\Dprovidelength{\Dtocsectnumwidth}{\Dtocininitialsectnumwidth}
+% Compensate for one additional TOC indentation space so that the
+% top-level is unindented.
+\addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}
+\addtolength{\Dtocindent}{-\Dtocsectnumwidth}
+\providecommand{\Difinsidetoc}[2]{%
+  \ifthenelse{\not\equal{\theDtoclevel}{-1}}{#1}{#2}%
+}
+\providecommand{\DNgeneratedCsectnum}[1]{%
+  \Difinsidetoc{%
+    % Section number inside TOC.
+    \makebox[\Dtocsectnumwidth][l]{#1}%
+  }{%
+    % Section number inside section title.
+    #1\quad%
+  }%
+}
 
 %\usepackage{fixmath}
 %\usepackage{amsmath}
-- 
cgit v1.2.1


From bee3ce552cfb22f986282b9a1f4a625496f4bbfd Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 13:09:07 +0000
Subject: improved stylesheet; made it compatible to IE

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3442 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index 73cc7bcd0..abfcbce7a 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -139,8 +139,11 @@ h2.subtitle {
 hr.docutils {
   width: 75% }
 
-img[align] {
-  clear: both }
+img.align-left {
+  clear: left }
+
+img.align-right {
+  clear: right }
 
 img.borderless {
   border: 0 }
-- 
cgit v1.2.1


From 0de11999bef7fde228766a0e501a6141d32d28a6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 22:42:28 +0000
Subject: replaced code copied from KOMA-script by self-written code

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3444 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index aa14e7801..f01ed437c 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -384,19 +384,11 @@
 \providecommand{\DNlistitem}[1]{%
   \Difinsidetoc{%
     \ifthenelse{\equal{\theDtoclevel}{1}\and\equal{\Dlocaltoc}{false}}{%
-      \par\addvspace{1em}%
-      % Group taken from scrartcl.cls and modified:
-      \begingroup%
-        \parindent0pt%
-        \rightskip\@pnumwidth%
-        \parfillskip-\@pnumwidth%
-        \leavevmode\sectfont%
-        \advance\leftskip\@tempdima%
-        \hskip-\leftskip%
-        {#1}\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss%
-          \pageref{\DcurrentNlistitemAtocrefid}%
-        }\par%
-      \endgroup%
+      {%
+        \par\addvspace{1em}\noindent%
+        \sectfont%
+        #1\hfill\pageref{\DcurrentNlistitemAtocrefid}%
+      }%
     }{%
       \@dottedtocline{0}{\Dtocindent}{0em}{#1}{%
         \pageref{\DcurrentNlistitemAtocrefid}%
-- 
cgit v1.2.1


From 8f54a134c2eb666aa932353dc46b66aa9fa961c2 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 23:27:42 +0000
Subject: fixed some spacing problems

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3445 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index f01ed437c..6a74b7b0f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -369,13 +369,7 @@
 \providecommand{\Dsetbullet}[1]{\renewcommand{\Dbullet}{#1}}
 \providecommand{\DNbulletlist}[1]{%
   \Difinsidetoc{%
-    \addtocounter{Dtoclevel}{1}%
-    \addtolength{\Dtocindent}{\Dtocsectnumwidth}%
-    \addtolength{\Dtocsectnumwidth}{\Dtocadditionalsectnumwidth}%
-    #1%
-    \addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}%
-    \addtolength{\Dtocindent}{-\Dtocsectnumwidth}%
-    \addtocounter{Dtoclevel}{-1}%
+    \Dtocbulletlist{#1}%
   }{%
     \Dmakelistenvironment{\Dbullet}{}{#1}%
   }%
@@ -435,6 +429,7 @@
   }%
 }
 \providecommand{\Dresetlistdepth}{false}
+\Dprovidelength{\Doriginallabelsep}{\labelsep}
 \providecommand{\Dmakelistenvironment}[3]{%
   % Make list environment with support for unlimited nesting and with
   % reasonable default lengths.  Parameters:
@@ -462,6 +457,7 @@
           \setlength{\topsep}{0pt}%
                                   % List should take 90% of total width.
           \setlength{\leftmargin}{0.05\linewidth}%
+          \setlength{\labelsep}{\Doriginallabelsep}%
           \Dsetlistrightmargin%
           #2%
         }{%
@@ -546,6 +542,7 @@
 \Dprovidelength{\Drealfieldnamewidth}{0pt}
 \providecommand{\Dtabularlistfieldname}[1]{\renewcommand{\Dsavefieldname}{#1}}
 \providecommand{\Dtabularlistfieldbody}[1]{\renewcommand{\Dsavefieldbody}{#1}}
+\Dprovidelength{\Dparskiptemp}{0pt}
 \providecommand{\Dtabularlistfield}[1]{%
   {%
     % This only saves field name and field body in \Dsavefieldname and
@@ -567,11 +564,17 @@
     }{%
       \item%
       \settowidth{\Dusedfieldnamewidth}{\Dsavefieldname}%
+      \setlength{\Dparskiptemp}{\parskip}%
       \ifthenelse{%
         \lengthtest{\Dusedfieldnamewidth>\Dtabularlistfieldnamewidth}%
-      }{~\newline}{}%
+      }{%
+        \mbox{}\par%
+        \setlength{\parskip}{0pt}%
+      }{}%
       \Dsavefieldbody%
-      \@finalstrut\@arstrutbox%
+      \setlength{\parskip}{\Dparskiptemp}%
+      %XXX Why did we need this?
+      %\@finalstrut\@arstrutbox%
     }%
     \par%
   }%
@@ -641,9 +644,6 @@
 }
 
 \providecommand{\DNdefinitionlist}[1]{%
-  % XXX Replace with a generic list, so we don't have to hack around
-  % spacing problems with \vspace and \hspace.
-  \vspace{-2em}%
   \begin{description}%
     \parskip0pt%
     #1%
@@ -1021,6 +1021,15 @@
     #1\quad%
   }%
 }
+\providecommand{\Dtocbulletlist}[1]{%
+  \addtocounter{Dtoclevel}{1}%
+  \addtolength{\Dtocindent}{\Dtocsectnumwidth}%
+  \addtolength{\Dtocsectnumwidth}{\Dtocadditionalsectnumwidth}%
+  #1%
+  \addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}%
+  \addtolength{\Dtocindent}{-\Dtocsectnumwidth}%
+  \addtocounter{Dtoclevel}{-1}%
+}
 
 %\usepackage{fixmath}
 %\usepackage{amsmath}
-- 
cgit v1.2.1


From 7181a95e2bae1fbbf5e5b0f78c5abedfbb1908c1 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 23:39:25 +0000
Subject: fixed more spacing problems

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3446 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 6a74b7b0f..a5e5692f3 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -457,6 +457,9 @@
           \setlength{\topsep}{0pt}%
                                   % List should take 90% of total width.
           \setlength{\leftmargin}{0.05\linewidth}%
+          \ifthenelse{\lengthtest{\leftmargin<1.8em}}{%
+            \setlength{\leftmargin}{1.8em}%
+          }{}%
           \setlength{\labelsep}{\Doriginallabelsep}%
           \Dsetlistrightmargin%
           #2%
@@ -468,7 +471,8 @@
     }%
   \ifthenelse{\equal{\Dinsidetabular}{true}}{\end{minipage}}{}%
 }
-\providecommand{\DAlastitem}[5]{#5\@finalstrut\@arstrutbox}
+\providecommand{\Dfinalstrut}{\@finalstrut\@arstrutbox}
+\providecommand{\DAlastitem}[5]{#5\Dfinalstrut}
 
 \Dprovidelength{\Ditemsep}{0pt}
 \providecommand{\Dmakeenumeratedlist}[6]{%
-- 
cgit v1.2.1


From a2da7dc08f353e141dd3a58387c5a8f35bdc9cbf Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 6 Jun 2005 23:46:40 +0000
Subject: do not indent literal blocks inside a table

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3447 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index a5e5692f3..2a5689cf3 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -332,7 +332,12 @@
 
 %\providecommand{\DNliteralblock}[1]{\begin{quote}\ttfamily\raggedright#1\end{quote}}
 \providecommand{\DNliteralblock}[1]{%
-  \Dmakelistenvironment{}{}{%
+  \Dmakelistenvironment{}{%
+    \ifthenelse{\equal{\Dinsidetabular}{true}}{%
+      \setlength{\leftmargin}{0pt}%
+    }{}%
+    \setlength{\rightmargin}{0pt}%
+  }{%
     \raggedright\item\noindent\nohyphens{\textnhtt{#1}}%
   }%
 }
-- 
cgit v1.2.1


From 93f2fe0cba6b389dc708a9032117c96491de5e35 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 7 Jun 2005 00:57:43 +0000
Subject: moved \Dfinalstrut into the stylesheet where it belongs

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3448 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 2a5689cf3..64d56ac59 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -338,7 +338,7 @@
     }{}%
     \setlength{\rightmargin}{0pt}%
   }{%
-    \raggedright\item\noindent\nohyphens{\textnhtt{#1}}%
+    \raggedright\item\noindent\nohyphens{\textnhtt{#1\Dfinalstrut}}%
   }%
 }
 \providecommand{\DNdoctestblock}[1]{%
-- 
cgit v1.2.1


From 0183754c655e85b1fb02527b358b6f419fbad01e Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 10 Jun 2005 21:23:23 +0000
Subject: Updated URL; David Carlisle says this one is newer, and it contains a
 copyright notice.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3458 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/unicode2rstsubs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/unicode2rstsubs.py b/tools/unicode2rstsubs.py
index d5e259863..20f88153d 100755
--- a/tools/unicode2rstsubs.py
+++ b/tools/unicode2rstsubs.py
@@ -19,7 +19,7 @@ wide-Unicode characters in the set.
 
 The input file, unicode.xml, is maintained as part of the MathML 2
 Recommentation XML source, and is available at
- (as of 2003-06-22).
+.
 """
 
 import sys
-- 
cgit v1.2.1


From cab1e343e4d2c78b1772aefcda352deb37514dbe Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 10 Jun 2005 21:47:32 +0000
Subject: updated new latex writer to use unicode_latex map; this should have
 been the log message to r3460...

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3463 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 64d56ac59..f7991e875 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -420,7 +420,7 @@
 
 \Dprovidelength{\Dlistspacing}{0.8\baselineskip}
 
-% Current hardcoded.
+% Currently hardcoded.
 \usepackage[latin1]{inputenc}
 
 \providecommand{\Dsetlistrightmargin}{%
-- 
cgit v1.2.1


From 5afbd171b3f913573b2353db912127c37af47694 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 10 Jun 2005 22:14:49 +0000
Subject: removed input encoding from LaTeX stylesheet

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3465 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index f7991e875..7f176af7c 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -420,9 +420,6 @@
 
 \Dprovidelength{\Dlistspacing}{0.8\baselineskip}
 
-% Currently hardcoded.
-\usepackage[latin1]{inputenc}
-
 \providecommand{\Dsetlistrightmargin}{%
   \ifthenelse{\lengthtest{\linewidth>10em}}{%
     % Equal margins.
-- 
cgit v1.2.1


From 101c0cc376ffc7cf455b60b77ccf902f5dd35214 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 11 Jun 2005 03:18:08 +0000
Subject: added header comments

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3467 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/unicode2rstsubs.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/unicode2rstsubs.py b/tools/unicode2rstsubs.py
index 20f88153d..bc86fe014 100755
--- a/tools/unicode2rstsubs.py
+++ b/tools/unicode2rstsubs.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 # Author: David Goodger
-# Contact: goodger@users.sourceforge.net
+# Contact: goodger@python.org
 # Revision: $Revision$
 # Date: $Date$
 # Copyright: This program has been placed in the public domain.
@@ -68,6 +68,14 @@ class CharacterEntitySetExtractor:
     unwanted_entity_sets = ['stix',     # unknown, buggy set
                             'predefined']
 
+    header = """\
+.. This data file has been placed in the public domain.
+.. Derived from the Unicode character mappings available at
+   .
+   Processed by unicode2rstsubs.py
+   (part of Docutils, http://docutils.sourceforge.net).
+"""
+
     def __init__(self, infile):
         self.infile = infile
         """Input unicode.xml file."""
@@ -165,6 +173,7 @@ class CharacterEntitySetExtractor:
             outname = set_name + '.txt'
         outfile = open(outname, 'w')
         print 'writing file "%s"' % outname
+        print >>outfile, self.header
         set = self.sets[set_name]
         entities = [(e.lower(), e) for e in set.keys()]
         entities.sort()
-- 
cgit v1.2.1


From fef6420bfc5dd5707c417cf68e6404f316833bd2 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 11 Jun 2005 23:03:19 +0000
Subject: moved \vspace out of image implementation so that when adding borders
 around images the \vspace is outside the border

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3468 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 7f176af7c..973414291 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -881,6 +881,8 @@
 
 
 \providecommand{\Dinsidehalign}{false}
+\newsavebox{\Dalignedimagebox}
+\Dprovidelength{\Dalignedimagewidth}{0pt}
 \providecommand{\Dhalign}[2]{%
   % Horizontally align the contents to the left or right so that the
   % text flows around it.
@@ -890,7 +892,22 @@
   \renewcommand{\Dinsidehalign}{true}%
   % For some obscure reason \parpic consumes some vertical space.
   \vspace{-3pt}%
-  \parpic[#1]{#2}%
+  % Now we do something *really* ugly, but this enables us to wrap the
+  % image in a minipage while still allowing tight frames when
+  % class=border (see \DNimageCborder).
+  \sbox{\Dalignedimagebox}{#2}%
+  \settowidth{\Dalignedimagewidth}{\usebox{\Dalignedimagebox}}%
+  % Now we do something *really* ugly.
+  \parpic[#1]{%
+    \begin{minipage}[b]{\Dalignedimagewidth}%
+    % Compensate for previously added space, but not entirely.
+    \vspace*{2.0pt}%
+    \vspace*{\Dfloatimagetopmargin}%
+    \usebox{\Dalignedimagebox}%
+    \vspace*{1.5pt}%
+    \vspace*{\Dfloatimagebottommargin}%
+    \end{minipage}%
+  }%
   \renewcommand{\Dinsidehalign}{false}%
 }
 
@@ -944,16 +961,8 @@
   % Need to make bottom-alignment dependent on align attribute (add
   % functional test first).
   \begin{minipage}[b]{#1}%
-    \ifthenelse{\equal{\Dinsidehalign}{true}}{
-      % Compensate for space previously added in \Dhalign, but not
-      % entirely.
-      \vspace*{2.5pt}%
-      \vspace*{\Dfloatimagetopmargin}%
-    }{}%
     \includegraphics[width=\linewidth,height=\textheight,keepaspectratio]{#2}%
     \ifthenelse{\equal{\Dinsidehalign}{true}}{%
-      \vspace*{1.5pt}%
-      \vspace*{\Dfloatimagebottommargin}%
     }{}%
   \end{minipage}%
 }  
@@ -985,6 +994,8 @@
 
 
 \providecommand{\DCborder}[1]{\fbox{#1}}
+% No padding between image and border.
+\providecommand{\DNimageCborder}[1]{\frame{#1}}
 
 
 % Need to replace with language-specific stuff.  Maybe look at
-- 
cgit v1.2.1


From 138d15373cef34d6390f8f5a3b419088e09776cd Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 12 Jun 2005 04:20:35 +0000
Subject: tweaked

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3470 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/unicode2rstsubs.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/unicode2rstsubs.py b/tools/unicode2rstsubs.py
index bc86fe014..abc85e48b 100755
--- a/tools/unicode2rstsubs.py
+++ b/tools/unicode2rstsubs.py
@@ -8,7 +8,7 @@
 
 """
 unicode2subfiles.py -- produce character entity files (reSructuredText
-substitutions) from the MathML master unicode.xml file.
+substitutions) from the W3C master unicode.xml file.
 
 This program extracts character entity and entity set information from a
 unicode.xml file and produces multiple reStructuredText files (in the current
@@ -18,8 +18,8 @@ entity set; a second file with a "-wide.txt" suffix is produced if there are
 wide-Unicode characters in the set.
 
 The input file, unicode.xml, is maintained as part of the MathML 2
-Recommentation XML source, and is available at
-.
+Recommentation XML source, and is available from
+.
 """
 
 import sys
@@ -70,10 +70,10 @@ class CharacterEntitySetExtractor:
 
     header = """\
 .. This data file has been placed in the public domain.
-.. Derived from the Unicode character mappings available at
-   .
-   Processed by unicode2rstsubs.py
-   (part of Docutils, http://docutils.sourceforge.net).
+.. Derived from the Unicode character mappings available from
+   .
+   Processed by unicode2rstsubs.py, part of Docutils:
+   .
 """
 
     def __init__(self, infile):
-- 
cgit v1.2.1


From 3f6ae9297e9fc97dca334d88e3efef68cc1b5a80 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 15 Jun 2005 23:27:09 +0000
Subject: added proper euro symbol; added temporary figure support

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3484 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 54 +++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 16 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 973414291..88b6a8499 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -17,6 +17,14 @@
 }
 
 
+\providecommand{\DSsymbols}{%
+  % The Euro symbol in Computer Modern looks, um, funny.  Let's get a
+  % proper Euro symbol.
+  \usepackage{eurosym}%
+  \renewcommand{\texteuro}{\euro}%
+}
+
+
 % Taken from
 % 
 % and modified.  Used with permission.
@@ -897,15 +905,14 @@
   % class=border (see \DNimageCborder).
   \sbox{\Dalignedimagebox}{#2}%
   \settowidth{\Dalignedimagewidth}{\usebox{\Dalignedimagebox}}%
-  % Now we do something *really* ugly.
   \parpic[#1]{%
     \begin{minipage}[b]{\Dalignedimagewidth}%
-    % Compensate for previously added space, but not entirely.
-    \vspace*{2.0pt}%
-    \vspace*{\Dfloatimagetopmargin}%
-    \usebox{\Dalignedimagebox}%
-    \vspace*{1.5pt}%
-    \vspace*{\Dfloatimagebottommargin}%
+      % Compensate for previously added space, but not entirely.
+      \vspace*{2.0pt}%
+      \vspace*{\Dfloatimagetopmargin}%
+      \usebox{\Dalignedimagebox}%
+      \vspace*{1.5pt}%
+      \vspace*{\Dfloatimagebottommargin}%
     \end{minipage}%
   }%
   \renewcommand{\Dinsidehalign}{false}%
@@ -926,9 +933,9 @@
       \Dhalign{r}{#5}%
     }{%
       \ifthenelse{\equal{#3}{center}}{%
-        % Text floating around centered figures is brain damage.
-        % Thus we use a center environment.  Note that no extra space
-        % is added by the writer, so the space added by the center
+        % Text floating around centered figures is a bad idea.  Thus
+        % we use a center environment.  Note that no extra space is
+        % added by the writer, so the space added by the center
         % environment is fine.
         \begin{center}#5\end{center}%
       }{%
@@ -959,12 +966,10 @@
   % 1. Image width.
   % 2. Image path.
   % Need to make bottom-alignment dependent on align attribute (add
-  % functional test first).
-  \begin{minipage}[b]{#1}%
-    \includegraphics[width=\linewidth,height=\textheight,keepaspectratio]{#2}%
-    \ifthenelse{\equal{\Dinsidehalign}{true}}{%
-    }{}%
-  \end{minipage}%
+  % functional test first).  Need to observe height attribute.
+  %\begin{minipage}[b]{#1}%
+    \includegraphics[width=#1,height=\textheight,keepaspectratio]{#2}%
+  %\end{minipage}%
 }  
 \providecommand{\Dcurrentimagemaxwidth}{}
 \providecommand{\Dsimpleimage}[1]{%
@@ -992,6 +997,19 @@
   \Dwidthimage{#1\Dlinewidthpercent}{#2}%
 }
 
+% Figures.
+\providecommand{\DNfigureAalign}[5]{%
+  % Hack to make it work Right Now.
+  %\def\DcurrentNimageAwidth{\DcurrentNfigureAwidth}%
+  %
+    %\def\DcurrentNimageAwidth{\linewidth}%
+    \DNimageAalign{#1}{#2}{#3}{#4}{%
+      \begin{minipage}[b]{0.4\linewidth}#5\end{minipage}}%
+    %\let\DcurrentNimageAwidth=\relax%
+  %
+  %\let\DcurrentNimageAwidth=\relax%
+}
+\providecommand{\DNcaption}[1]{\par\noindent{\slshape#1}}
 
 \providecommand{\DCborder}[1]{\fbox{#1}}
 % No padding between image and border.
@@ -1048,6 +1066,9 @@
   \addtocounter{Dtoclevel}{-1}%
 }
 
+
+
+
 %\usepackage{fixmath}
 %\usepackage{amsmath}
 
@@ -1059,6 +1080,7 @@
 \DSauxiliaryspace
 \DSparagraphs
 \DSlinks
+\DSsymbols
 \DSlate
 
 \makeatother
-- 
cgit v1.2.1


From 51dc4c46044bf4bbc46465cbd8536521cb9128ac Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 15 Jun 2005 23:54:52 +0000
Subject: moved profiledocutils and testcoverage into main tree

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3488 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/dev/README.txt |  1 +
 tools/dev/profile.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 tools/dev/README.txt
 create mode 100755 tools/dev/profile.sh

(limited to 'tools')

diff --git a/tools/dev/README.txt b/tools/dev/README.txt
new file mode 100644
index 000000000..ca9e99ee8
--- /dev/null
+++ b/tools/dev/README.txt
@@ -0,0 +1 @@
+Tools for developers.
diff --git a/tools/dev/profile.sh b/tools/dev/profile.sh
new file mode 100755
index 000000000..1f79c655e
--- /dev/null
+++ b/tools/dev/profile.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/python -i
+
+# Author: Felix Wiemann
+# Contact: Felix_Wiemann@ososo.de
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This script has been placed in the public domain.
+
+import os.path
+import docutils.core
+import hotshot.stats
+
+print 'Profiler started.'
+
+os.chdir(os.path.join(os.path.dirname(docutils.__file__), '..'))
+
+print 'Profiling...'
+
+prof = hotshot.Profile('docutils.prof')
+prof.runcall(docutils.core.publish_file, source_path='HISTORY.txt',
+             destination_path='prof.HISTORY.html', writer_name='html')
+prof.close()
+
+print 'Loading statistics...'
+
+print """
+stats = hotshot.stats.load('docutils.prof')
+stats.strip_dirs()
+stats.sort_stats('time')  # 'cumulative'; 'calls'
+stats.print_stats(40)
+"""
+
+stats = hotshot.stats.load('docutils.prof')
+stats.strip_dirs()
+stats.sort_stats('time')
+stats.print_stats(40)
+
+try:
+    execfile(os.environ['PYTHONSTARTUP'])
+except:
+    pass
-- 
cgit v1.2.1


From 5cb3b0ed53caac06299dae0f567cec2aef86717a Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 15 Jun 2005 23:59:49 +0000
Subject: fixed name  *sigh*

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3490 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/dev/profile.sh          | 41 -----------------------------------------
 tools/dev/profile_docutils.py | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100755 tools/dev/profile.sh
 create mode 100755 tools/dev/profile_docutils.py

(limited to 'tools')

diff --git a/tools/dev/profile.sh b/tools/dev/profile.sh
deleted file mode 100755
index 1f79c655e..000000000
--- a/tools/dev/profile.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python -i
-
-# Author: Felix Wiemann
-# Contact: Felix_Wiemann@ososo.de
-# Revision: $Revision$
-# Date: $Date$
-# Copyright: This script has been placed in the public domain.
-
-import os.path
-import docutils.core
-import hotshot.stats
-
-print 'Profiler started.'
-
-os.chdir(os.path.join(os.path.dirname(docutils.__file__), '..'))
-
-print 'Profiling...'
-
-prof = hotshot.Profile('docutils.prof')
-prof.runcall(docutils.core.publish_file, source_path='HISTORY.txt',
-             destination_path='prof.HISTORY.html', writer_name='html')
-prof.close()
-
-print 'Loading statistics...'
-
-print """
-stats = hotshot.stats.load('docutils.prof')
-stats.strip_dirs()
-stats.sort_stats('time')  # 'cumulative'; 'calls'
-stats.print_stats(40)
-"""
-
-stats = hotshot.stats.load('docutils.prof')
-stats.strip_dirs()
-stats.sort_stats('time')
-stats.print_stats(40)
-
-try:
-    execfile(os.environ['PYTHONSTARTUP'])
-except:
-    pass
diff --git a/tools/dev/profile_docutils.py b/tools/dev/profile_docutils.py
new file mode 100755
index 000000000..1f79c655e
--- /dev/null
+++ b/tools/dev/profile_docutils.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python -i
+
+# Author: Felix Wiemann
+# Contact: Felix_Wiemann@ososo.de
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This script has been placed in the public domain.
+
+import os.path
+import docutils.core
+import hotshot.stats
+
+print 'Profiler started.'
+
+os.chdir(os.path.join(os.path.dirname(docutils.__file__), '..'))
+
+print 'Profiling...'
+
+prof = hotshot.Profile('docutils.prof')
+prof.runcall(docutils.core.publish_file, source_path='HISTORY.txt',
+             destination_path='prof.HISTORY.html', writer_name='html')
+prof.close()
+
+print 'Loading statistics...'
+
+print """
+stats = hotshot.stats.load('docutils.prof')
+stats.strip_dirs()
+stats.sort_stats('time')  # 'cumulative'; 'calls'
+stats.print_stats(40)
+"""
+
+stats = hotshot.stats.load('docutils.prof')
+stats.strip_dirs()
+stats.sort_stats('time')
+stats.print_stats(40)
+
+try:
+    execfile(os.environ['PYTHONSTARTUP'])
+except:
+    pass
-- 
cgit v1.2.1


From 6e7fbd8d90a9a62a8f5219080e2c4660d0f7732f Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 16 Jun 2005 00:58:44 +0000
Subject: applied patch to fix problems when wide characters appear in section
 title; thanks to "gentoo" user; closing
 https://sourceforge.net/tracker/?func=detail&atid=422032&aid=1220126&group_id=38414

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3494 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index fe39265b2..3c670a224 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -397,7 +397,12 @@ This is useful for filling list item paragraphs."
 		     (current-column)))
 
 	;; ending column
-	(endcol (- (line-end-position) (line-beginning-position)))
+	(endcol (- (save-excursion
+		     (end-of-line)
+		     (current-column))
+                   (save-excursion
+		     (back-to-indentation)
+                     (current-column))))
 	)
 
     ;; if there is no current style found...
-- 
cgit v1.2.1


From 9d4e4e72dcc057f707bf393570714fac91ec6d01 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 20 Jun 2005 17:42:33 +0000
Subject: changed default PEP python home to http://www.python.org

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3526 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf     | 1 -
 tools/pep-html-template | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 9f218d3bf..8d09a65a5 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -13,4 +13,3 @@ field-name-limit: 20
 # These entries affect reStructuredText-style PEPs:
 template: pep-html-template
 stylesheet-path: stylesheets/pep.css
-python-home: http://www.python.org
diff --git a/tools/pep-html-template b/tools/pep-html-template
index 94ecafb70..bbaeb64b2 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -20,7 +20,7 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
  border="0" width="150" height="35" />
    		
 
 [Python Home]
-[PEP Index]
+[PEP Index]
 [PEP Source]
 
    
 %(body)s
-- 
cgit v1.2.1


From 2ce6724de5ff00aed429bcef45f1899661bee563 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Mon, 20 Jun 2005 18:59:29 +0000
Subject: tool for developers; moved

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3532 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/dev/unicode2rstsubs.py | 204 +++++++++++++++++++++++++++++++++++++++++++
 tools/unicode2rstsubs.py     | 204 -------------------------------------------
 2 files changed, 204 insertions(+), 204 deletions(-)
 create mode 100755 tools/dev/unicode2rstsubs.py
 delete mode 100755 tools/unicode2rstsubs.py

(limited to 'tools')

diff --git a/tools/dev/unicode2rstsubs.py b/tools/dev/unicode2rstsubs.py
new file mode 100755
index 000000000..abc85e48b
--- /dev/null
+++ b/tools/dev/unicode2rstsubs.py
@@ -0,0 +1,204 @@
+#! /usr/bin/env python
+
+# Author: David Goodger
+# Contact: goodger@python.org
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This program has been placed in the public domain.
+
+"""
+unicode2subfiles.py -- produce character entity files (reSructuredText
+substitutions) from the W3C master unicode.xml file.
+
+This program extracts character entity and entity set information from a
+unicode.xml file and produces multiple reStructuredText files (in the current
+directory) containing substitutions.  Entity sets are from ISO 8879 & ISO
+9573-13 (combined), MathML, and HTML4.  One or two files are produced for each
+entity set; a second file with a "-wide.txt" suffix is produced if there are
+wide-Unicode characters in the set.
+
+The input file, unicode.xml, is maintained as part of the MathML 2
+Recommentation XML source, and is available from
+.
+"""
+
+import sys
+import os
+import optparse
+import re
+from xml.parsers.expat import ParserCreate
+
+
+usage_msg = """Usage: %s [unicode.xml]"""
+
+def usage(prog, status=0, msg=None):
+    print >>sys.stderr, usage_msg % prog
+    if msg:
+        print >>sys.stderr, msg
+    sys.exit(status)
+
+def main(argv=None):
+    if argv is None:
+        argv = sys.argv
+    if len(argv) == 2:
+        inpath = argv[1]
+    elif len(argv) > 2:
+        usage(argv[0], 2,
+              'Too many arguments (%s): only 1 expected.' % (len(argv) - 1))
+    else:
+        inpath = 'unicode.xml'
+    if not os.path.isfile(inpath):
+        usage(argv[0], 1, 'No such file: "%s".' % inpath)
+    infile = open(inpath)
+    process(infile)
+
+def process(infile):
+    grouper = CharacterEntitySetExtractor(infile)
+    grouper.group()
+    grouper.write_sets()
+
+
+class CharacterEntitySetExtractor:
+
+    """
+    Extracts character entity information from unicode.xml file, groups it by
+    entity set, and writes out reStructuredText substitution files.
+    """
+
+    unwanted_entity_sets = ['stix',     # unknown, buggy set
+                            'predefined']
+
+    header = """\
+.. This data file has been placed in the public domain.
+.. Derived from the Unicode character mappings available from
+   .
+   Processed by unicode2rstsubs.py, part of Docutils:
+   .
+"""
+
+    def __init__(self, infile):
+        self.infile = infile
+        """Input unicode.xml file."""
+
+        self.parser = self.setup_parser()
+        """XML parser."""
+
+        self.elements = []
+        """Stack of element names.  Last is current element."""
+
+        self.sets = {}
+        """Mapping of charent set name to set dict."""
+
+        self.charid = None
+        """Current character's "id" attribute value."""
+
+        self.descriptions = {}
+        """Mapping of character ID to description."""
+
+    def setup_parser(self):
+        parser = ParserCreate()
+        parser.StartElementHandler = self.StartElementHandler
+        parser.EndElementHandler = self.EndElementHandler
+        parser.CharacterDataHandler = self.CharacterDataHandler
+        return parser
+
+    def group(self):
+        self.parser.ParseFile(self.infile)
+
+    def StartElementHandler(self, name, attributes):
+        self.elements.append(name)
+        handler = name + '_start'
+        if hasattr(self, handler):
+            getattr(self, handler)(name, attributes)
+
+    def EndElementHandler(self, name):
+        assert self.elements[-1] == name, \
+               'unknown end-tag %r (%r)' % (name, self.element)
+        self.elements.pop()
+        handler = name + '_end'
+        if hasattr(self, handler):
+            getattr(self, handler)(name)
+
+    def CharacterDataHandler(self, data):
+        handler = self.elements[-1] + '_data'
+        if hasattr(self, handler):
+            getattr(self, handler)(data)
+
+    def character_start(self, name, attributes):
+        self.charid = attributes['id']
+
+    def entity_start(self, name, attributes):
+        set = self.entity_set_name(attributes['set'])
+        if not set:
+            return
+        if not self.sets.has_key(set):
+            print 'bad set: %r' % set
+            return
+        entity = attributes['id']
+        assert (not self.sets[set].has_key(entity)
+                or self.sets[set][entity] == self.charid), \
+                ('sets[%r][%r] == %r (!= %r)'
+                 % (set, entity, self.sets[set][entity], self.charid))
+        self.sets[set][entity] = self.charid
+
+    def description_data(self, data):
+        self.descriptions.setdefault(self.charid, '')
+        self.descriptions[self.charid] += data
+
+    entity_set_name_pat = re.compile(r'[0-9-]*(.+)$')
+    """Pattern to strip ISO numbers off the beginning of set names."""
+
+    def entity_set_name(self, name):
+        """
+        Return lowcased and standard-number-free entity set name.
+        Return ``None`` for unwanted entity sets.
+        """
+        match = self.entity_set_name_pat.match(name)
+        name = match.group(1).lower()
+        if name in self.unwanted_entity_sets:
+            return None
+        self.sets.setdefault(name, {})
+        return name
+
+    def write_sets(self):
+        sets = self.sets.keys()
+        sets.sort()
+        for set_name in sets:
+            self.write_set(set_name)
+
+    def write_set(self, set_name, wide=None):
+        if wide:
+            outname = set_name + '-wide.txt'
+        else:
+            outname = set_name + '.txt'
+        outfile = open(outname, 'w')
+        print 'writing file "%s"' % outname
+        print >>outfile, self.header
+        set = self.sets[set_name]
+        entities = [(e.lower(), e) for e in set.keys()]
+        entities.sort()
+        longest = 0
+        for _, entity_name in entities:
+            longest = max(longest, len(entity_name))
+        has_wide = None
+        for _, entity_name in entities:
+            has_wide = self.write_entity(
+                set, set_name, entity_name, outfile, longest, wide) or has_wide
+        if has_wide and not wide:
+            self.write_set(set_name, 1)
+
+    def write_entity(self, set, set_name, entity_name, outfile, longest,
+                     wide=None):
+        charid = set[entity_name]
+        if not wide:
+            for code in charid[1:].split('-'):
+                if int(code, 16) > 0xFFFF:
+                    return 1            # wide-Unicode character
+        codes = ' '.join(['U+%s' % code for code in charid[1:].split('-')])
+        print >>outfile, ('.. %-*s unicode:: %s .. %s'
+                          % (longest + 2, '|' + entity_name + '|',
+                             codes, self.descriptions[charid]))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/tools/unicode2rstsubs.py b/tools/unicode2rstsubs.py
deleted file mode 100755
index abc85e48b..000000000
--- a/tools/unicode2rstsubs.py
+++ /dev/null
@@ -1,204 +0,0 @@
-#! /usr/bin/env python
-
-# Author: David Goodger
-# Contact: goodger@python.org
-# Revision: $Revision$
-# Date: $Date$
-# Copyright: This program has been placed in the public domain.
-
-"""
-unicode2subfiles.py -- produce character entity files (reSructuredText
-substitutions) from the W3C master unicode.xml file.
-
-This program extracts character entity and entity set information from a
-unicode.xml file and produces multiple reStructuredText files (in the current
-directory) containing substitutions.  Entity sets are from ISO 8879 & ISO
-9573-13 (combined), MathML, and HTML4.  One or two files are produced for each
-entity set; a second file with a "-wide.txt" suffix is produced if there are
-wide-Unicode characters in the set.
-
-The input file, unicode.xml, is maintained as part of the MathML 2
-Recommentation XML source, and is available from
-.
-"""
-
-import sys
-import os
-import optparse
-import re
-from xml.parsers.expat import ParserCreate
-
-
-usage_msg = """Usage: %s [unicode.xml]"""
-
-def usage(prog, status=0, msg=None):
-    print >>sys.stderr, usage_msg % prog
-    if msg:
-        print >>sys.stderr, msg
-    sys.exit(status)
-
-def main(argv=None):
-    if argv is None:
-        argv = sys.argv
-    if len(argv) == 2:
-        inpath = argv[1]
-    elif len(argv) > 2:
-        usage(argv[0], 2,
-              'Too many arguments (%s): only 1 expected.' % (len(argv) - 1))
-    else:
-        inpath = 'unicode.xml'
-    if not os.path.isfile(inpath):
-        usage(argv[0], 1, 'No such file: "%s".' % inpath)
-    infile = open(inpath)
-    process(infile)
-
-def process(infile):
-    grouper = CharacterEntitySetExtractor(infile)
-    grouper.group()
-    grouper.write_sets()
-
-
-class CharacterEntitySetExtractor:
-
-    """
-    Extracts character entity information from unicode.xml file, groups it by
-    entity set, and writes out reStructuredText substitution files.
-    """
-
-    unwanted_entity_sets = ['stix',     # unknown, buggy set
-                            'predefined']
-
-    header = """\
-.. This data file has been placed in the public domain.
-.. Derived from the Unicode character mappings available from
-   .
-   Processed by unicode2rstsubs.py, part of Docutils:
-   .
-"""
-
-    def __init__(self, infile):
-        self.infile = infile
-        """Input unicode.xml file."""
-
-        self.parser = self.setup_parser()
-        """XML parser."""
-
-        self.elements = []
-        """Stack of element names.  Last is current element."""
-
-        self.sets = {}
-        """Mapping of charent set name to set dict."""
-
-        self.charid = None
-        """Current character's "id" attribute value."""
-
-        self.descriptions = {}
-        """Mapping of character ID to description."""
-
-    def setup_parser(self):
-        parser = ParserCreate()
-        parser.StartElementHandler = self.StartElementHandler
-        parser.EndElementHandler = self.EndElementHandler
-        parser.CharacterDataHandler = self.CharacterDataHandler
-        return parser
-
-    def group(self):
-        self.parser.ParseFile(self.infile)
-
-    def StartElementHandler(self, name, attributes):
-        self.elements.append(name)
-        handler = name + '_start'
-        if hasattr(self, handler):
-            getattr(self, handler)(name, attributes)
-
-    def EndElementHandler(self, name):
-        assert self.elements[-1] == name, \
-               'unknown end-tag %r (%r)' % (name, self.element)
-        self.elements.pop()
-        handler = name + '_end'
-        if hasattr(self, handler):
-            getattr(self, handler)(name)
-
-    def CharacterDataHandler(self, data):
-        handler = self.elements[-1] + '_data'
-        if hasattr(self, handler):
-            getattr(self, handler)(data)
-
-    def character_start(self, name, attributes):
-        self.charid = attributes['id']
-
-    def entity_start(self, name, attributes):
-        set = self.entity_set_name(attributes['set'])
-        if not set:
-            return
-        if not self.sets.has_key(set):
-            print 'bad set: %r' % set
-            return
-        entity = attributes['id']
-        assert (not self.sets[set].has_key(entity)
-                or self.sets[set][entity] == self.charid), \
-                ('sets[%r][%r] == %r (!= %r)'
-                 % (set, entity, self.sets[set][entity], self.charid))
-        self.sets[set][entity] = self.charid
-
-    def description_data(self, data):
-        self.descriptions.setdefault(self.charid, '')
-        self.descriptions[self.charid] += data
-
-    entity_set_name_pat = re.compile(r'[0-9-]*(.+)$')
-    """Pattern to strip ISO numbers off the beginning of set names."""
-
-    def entity_set_name(self, name):
-        """
-        Return lowcased and standard-number-free entity set name.
-        Return ``None`` for unwanted entity sets.
-        """
-        match = self.entity_set_name_pat.match(name)
-        name = match.group(1).lower()
-        if name in self.unwanted_entity_sets:
-            return None
-        self.sets.setdefault(name, {})
-        return name
-
-    def write_sets(self):
-        sets = self.sets.keys()
-        sets.sort()
-        for set_name in sets:
-            self.write_set(set_name)
-
-    def write_set(self, set_name, wide=None):
-        if wide:
-            outname = set_name + '-wide.txt'
-        else:
-            outname = set_name + '.txt'
-        outfile = open(outname, 'w')
-        print 'writing file "%s"' % outname
-        print >>outfile, self.header
-        set = self.sets[set_name]
-        entities = [(e.lower(), e) for e in set.keys()]
-        entities.sort()
-        longest = 0
-        for _, entity_name in entities:
-            longest = max(longest, len(entity_name))
-        has_wide = None
-        for _, entity_name in entities:
-            has_wide = self.write_entity(
-                set, set_name, entity_name, outfile, longest, wide) or has_wide
-        if has_wide and not wide:
-            self.write_set(set_name, 1)
-
-    def write_entity(self, set, set_name, entity_name, outfile, longest,
-                     wide=None):
-        charid = set[entity_name]
-        if not wide:
-            for code in charid[1:].split('-'):
-                if int(code, 16) > 0xFFFF:
-                    return 1            # wide-Unicode character
-        codes = ' '.join(['U+%s' % code for code in charid[1:].split('-')])
-        print >>outfile, ('.. %-*s unicode:: %s .. %s'
-                          % (longest + 2, '|' + entity_name + '|',
-                             codes, self.descriptions[charid]))
-
-
-if __name__ == '__main__':
-    sys.exit(main())
-- 
cgit v1.2.1


From fbc14fc4439455bc8726051604c4148ed14e29ee Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 20 Jun 2005 19:12:33 +0000
Subject: renamed tools/pep.py to rstpep2html.py

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3533 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep.py         | 27 ---------------------------
 tools/rstpep2html.py | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100755 tools/pep.py
 create mode 100755 tools/rstpep2html.py

(limited to 'tools')

diff --git a/tools/pep.py b/tools/pep.py
deleted file mode 100755
index 5aa4b8afc..000000000
--- a/tools/pep.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-
-# Author: David Goodger
-# Contact: goodger@users.sourceforge.net
-# Revision: $Revision$
-# Date: $Date$
-# Copyright: This module has been placed in the public domain.
-
-"""
-A minimal front end to the Docutils Publisher, producing HTML from PEP
-(Python Enhancement Proposal) documents.
-"""
-
-try:
-    import locale
-    locale.setlocale(locale.LC_ALL, '')
-except:
-    pass
-
-from docutils.core import publish_cmdline, default_description
-
-
-description = ('Generates (X)HTML from reStructuredText-format PEP files.  '
-               + default_description)
-
-publish_cmdline(reader_name='pep', writer_name='pep_html',
-                description=description)
diff --git a/tools/rstpep2html.py b/tools/rstpep2html.py
new file mode 100755
index 000000000..5aa4b8afc
--- /dev/null
+++ b/tools/rstpep2html.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+# Author: David Goodger
+# Contact: goodger@users.sourceforge.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
+
+"""
+A minimal front end to the Docutils Publisher, producing HTML from PEP
+(Python Enhancement Proposal) documents.
+"""
+
+try:
+    import locale
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
+
+from docutils.core import publish_cmdline, default_description
+
+
+description = ('Generates (X)HTML from reStructuredText-format PEP files.  '
+               + default_description)
+
+publish_cmdline(reader_name='pep', writer_name='pep_html',
+                description=description)
-- 
cgit v1.2.1


From 71c59a6b9569fc2aafc4d4e41c21cca04b29cd65 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 20 Jun 2005 19:20:00 +0000
Subject: moved create_unimap.py to tools/dev/

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3534 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/dev/create_unimap.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100755 tools/dev/create_unimap.py

(limited to 'tools')

diff --git a/tools/dev/create_unimap.py b/tools/dev/create_unimap.py
new file mode 100755
index 000000000..260913ed3
--- /dev/null
+++ b/tools/dev/create_unimap.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+
+# Author: Felix Wiemann
+# Contact: Felix_Wiemann@ososo.de
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This file has been placed in the public domain.
+
+# Call: create_unimap.py < unicode.xml > unicode_latex.py
+#
+# Get unicode.xml from
+# .
+
+from xml.dom import minidom
+import sys
+import pprint
+
+def w(s):
+    if isinstance(s, unicode):
+        s = s.encode('utf8')
+    sys.stdout.write(s)
+
+text_map = {}
+math_map = {}
+
+class Visitor:
+    
+    """Node visitor for contents of unicode.xml."""
+
+    def visit_character(self, node):
+        for n in node.childNodes:
+            if n.nodeName == 'latex':
+                code = node.attributes['dec'].value
+                if '-' in code:
+                    # I don't know what this means, but we probably
+                    # don't need it....
+                    continue
+                if int(code) < 128:
+                    # Wrong (maps "-" to "$-$", which is too wide) and
+                    # unnecessary (maps "a" to "{a}").
+                    continue
+                latex_code = n.childNodes[0].nodeValue.encode('ascii').strip()
+                if node.attributes['mode'].value == 'math':
+                    math_map[unichr(int(code))] = '$%s$' % latex_code
+                else:
+                    text_map[unichr(int(code))] = '{%s}' % latex_code
+
+def call_visitor(node, visitor=Visitor()):
+    if isinstance(node, minidom.Text):
+        name = 'Text'
+    else:
+        name = node.nodeName.replace('#', '_')
+    if hasattr(visitor, 'visit_' + name):
+        getattr(visitor, 'visit_' + name)(node)
+    for child in node.childNodes:
+        call_visitor(child)
+    if hasattr(visitor, 'depart_' + name):
+        getattr(visitor, 'depart_' + name)(node)
+
+document = minidom.parse(sys.stdin)
+call_visitor(document)
+
+unicode_map = math_map
+unicode_map.update(text_map)
+# Now unicode_map contains the text entries plus dollar-enclosed math
+# entries for those chars for which no text entry exists.
+
+print '# Author: Felix Wiemann'
+print '# Contact: Felix_Wiemann@ososo.de'
+print '# Revision: $%s$' % 'Revision'
+print '# Date: $%s$' % 'Date'
+print '# Copyright: This file has been placed in the public domain.'
+print '#'
+print '# This is a mapping of Unicode characters to LaTeX'
+print '# equivalents.  The information has been extracted from'
+print '# .'
+print '# The extraction has been done by the "create_unimap.py"'
+print '# script written by Felix Wiemann.'
+print
+print 'unicode_map = %s' % pprint.pformat(unicode_map, indent=0)
-- 
cgit v1.2.1


From d3a60d28fa5ef090e66b3db54069811efc05afe6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 20 Jun 2005 19:29:02 +0000
Subject: changed comment at the top of unicode_latex.py

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3535 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/dev/create_unimap.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/dev/create_unimap.py b/tools/dev/create_unimap.py
index 260913ed3..1d1a2f8a0 100755
--- a/tools/dev/create_unimap.py
+++ b/tools/dev/create_unimap.py
@@ -70,11 +70,13 @@ print '# Contact: Felix_Wiemann@ososo.de'
 print '# Revision: $%s$' % 'Revision'
 print '# Date: $%s$' % 'Date'
 print '# Copyright: This file has been placed in the public domain.'
+print
+print '# This is a mapping of Unicode characters to LaTeX equivalents.'
+print '# The information has been extracted from'
+print '# , written by'
+print '# David Carlisle and Sebastian Rahtz.'
 print '#'
-print '# This is a mapping of Unicode characters to LaTeX'
-print '# equivalents.  The information has been extracted from'
-print '# .'
-print '# The extraction has been done by the "create_unimap.py"'
-print '# script written by Felix Wiemann.'
+print '# The extraction has been done by the "create_unimap.py" script'
+print '# located at .'
 print
 print 'unicode_map = %s' % pprint.pformat(unicode_map, indent=0)
-- 
cgit v1.2.1


From 146697013053462711c6b70a1b4e2a67b0f79231 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 21 Jun 2005 11:37:50 +0000
Subject: deactivated embed_stylesheet for documentation

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3551 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 8d09a65a5..92392c2ed 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -3,6 +3,7 @@
 source-link: yes
 datestamp: %Y-%m-%d %H:%M UTC
 generator: on
+embed-stylesheet: no
 
 [html4css1 writer]
 # These entries affect HTML output:
-- 
cgit v1.2.1


From dd317a449cc8c710a408da740ca4859f7c6d3cdb Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 22 Jun 2005 22:07:06 +0000
Subject: removed and added to-do list entries for latex writer

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3558 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
index 87e65abd2..92da02491 100644
--- a/tools/stylesheets/latex-notes.txt
+++ b/tools/stylesheets/latex-notes.txt
@@ -35,6 +35,5 @@ Regarding UTF-8:
     \usepackage{graphicx}
     \fi
 
-Width of images needs cleanup, in the framework.  Integers aren't
-sufficient (virtually unusable in typeset documents).  Need to discuss
-on Docutils-develop and come up with a set of standard units.
+
+Need to handle paragraph indenting manually (in the writer).
-- 
cgit v1.2.1


From 835cd6732507e8e4c76b0ef437bcc74177a9d174 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 26 Jun 2005 22:20:27 +0000
Subject: merge trunk/docutils@3525
 branches/blais_interrupt_render/docutils@HEAD trunk/docutils

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3581 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst-html.el | 62 +++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst-html.el b/tools/editors/emacs/rst-html.el
index c9ebf33ef..57e4d0b55 100644
--- a/tools/editors/emacs/rst-html.el
+++ b/tools/editors/emacs/rst-html.el
@@ -1,32 +1,26 @@
 ;;; rst-mode.el --- Goodies to automate converting reST documents to HTML.
-
-;; Copyright 2003 Martin Blais 
-;; 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2 of the License, or
-;; (at your option) any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+;;;
+;;; Author: Martin Blais
+;;; Contact: blais@furius.ca
+;;; Revision: $Revision$
+;;; Date: $Date$
+;;; Copyright: This module has been placed in the public domain.
+;;;
+;;; This package provides a few functions and variables that can help in
+;;; automating converting reST documents to HTML from within Emacs.  You could
+;;; use a makefile to do this, of use the compile command that this package
+;;; provides.
+;;;
+;;; You can also bind a command to automate converting to HTML::
+;;;
+;;;   (defun user-rst-mode-hook ()
+;;;     (local-set-key [(control c)(?9)] 'rst-html-compile))
+;;;   (add-hook 'rst-mode-hook 'user-rst-mode-hook)
+;;;
 ;;; Commentary:
-
-;; This package provides a few functions and variables that can help in
-;; automating converting reST documents to HTML from within emacs.  You could
-;; use a makefile to do this, of use the compile command that this package
-;; provides.
-
-;; You can also bind a command to automate converting to HTML:
-;; (defun user-rst-mode-hook ()
-;;   (local-set-key [(control c)(?9)] 'rst-html-compile))
-;; (add-hook 'rst-mode-hook 'user-rst-mode-hook)
+;;;
+;;; History:
+;;; 
 
 ;;; Code:
 
@@ -35,7 +29,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defgroup rst-html nil 
+(defgroup rst-html nil
   "Settings for conversion to HTML available by \\[rst-html-compile]. Use of
 this functionality is discouraged. Get a proper `Makefile' instead."
   :group 'rst
@@ -47,7 +41,7 @@ this functionality is discouraged. Get a proper `Makefile' instead."
   :type '(string))
 
 (defcustom rst-html-stylesheet ""
-  "Stylesheet for reST to HTML conversion. Empty for no special stylesheet."
+  "Stylesheet for reST to HTML conversion.  Empty for no special stylesheet."
   :group 'rst-html
   :type '(string))
 
@@ -86,8 +80,8 @@ Stylesheets are set by an own option."
     ))
 
 (defun rst-html-compile-with-conf ()
-  "Compile command to convert reST document into HTML. Attempts to find
-configuration file, if it can, overrides the options."
+  "Compile command to convert reST document into HTML.
+Attempts to find configuration file, if it can, overrides the options."
   (interactive)
   (let ((conffile (rst-html-find-conf)))
     (if conffile
@@ -118,7 +112,7 @@ configuration file, if it can, overrides the options."
       (while (and (or (not (string= "/" dir)) (setq dir nil) nil)
 		  (not (file-exists-p (concat dir file-name))))
 	;; Move up to the parent dir and try again.
-	(setq dir (expand-file-name (file-name-directory 
+	(setq dir (expand-file-name (file-name-directory
 				     (directory-file-name
 				     (file-name-directory dir))))) )
       (or (and dir (concat dir file-name)) nil)
@@ -126,4 +120,6 @@ configuration file, if it can, overrides the options."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; rst-mode.el ends here
+(provide 'rst-html)
+
+;;; rst-html.el ends here
-- 
cgit v1.2.1


From 3266e3acfa404e8967106e13c0b48168f3ab2fe4 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 28 Jun 2005 13:11:20 +0000
Subject: added JED mode link

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3616 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/README.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools')

diff --git a/tools/editors/README.txt b/tools/editors/README.txt
index f3786ef2e..517c0558a 100644
--- a/tools/editors/README.txt
+++ b/tools/editors/README.txt
@@ -14,6 +14,10 @@ External links:
 * `reStructuredText syntax highlighting mode for vim
   `__
 
+* `rst mode `__ for the `JED`_
+  programmers editor
+
 Additions are welcome.
 
 .. _reStructuredText: http://docutils.sf.net/rst.html
+.. _JED: http://www.jedsoft.org/jed/
-- 
cgit v1.2.1


From 77f04a55cc598dbfeb97703d5f115048daa01822 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 29 Jun 2005 20:01:19 +0000
Subject: implemented units for image widths; implemented language-support
 (e.g. for hyphenation)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3635 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 88b6a8499..8937fe1ac 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -203,6 +203,16 @@
 }
 
 
+\providecommand{\DSlanguage}{%
+  % Set up babel.
+  \ifthenelse{\equal{\Dlanguagebabel}{}}{}{%
+    \usepackage[\Dlanguagebabel]{babel}%
+  }
+}
+  
+
+
+
 \providecommand{\DSearly}{}
 \providecommand{\DSlate}{}
 
@@ -518,9 +528,6 @@
 }
 
 
-\providecommand{\Dlanguage}{english}
-\usepackage[\Dlanguage]{babel}
-
 % Single quote in literal mode.  \textquotesingle from package
 % textcomp has wrong width when using package ae, so we use a normal
 % single curly quote here.
@@ -952,7 +959,7 @@
   % Insert image.  We treat the URI like a path here.
   \renewcommand{\Dimagepath}{\Dimagebase#3}%
   \Difdefined{DcurrentNimageAwidth}{%
-    \Dpercentwidthimage{\DcurrentNimageAwidth}{\Dimagepath}%
+    \Dwidthimage{\DcurrentNimageAwidth}{\Dimagepath}%
   }{%
     \Dsimpleimage{\Dimagepath}%
   }%
@@ -986,15 +993,12 @@
     \Dwidthimage{\Dcurrentimagewidth}{#1}%
   }%
 }
-% Auxiliary length.  One percent of \linewidth.
-\Dprovidelength{\Dlinewidthpercent}{0pt}
-\providecommand{\Dpercentwidthimage}[2]{%
+\providecommand{\Dwidthimage}[2]{%
   % Image with specified width.
   % Parameters:
-  % 1. Image width in percent of \linewidth (1 to 100).
+  % 1. Image width.
   % 2. Image path.
-  \setlength{\Dlinewidthpercent}{0.01\linewidth}%
-  \Dwidthimage{#1\Dlinewidthpercent}{#2}%
+  \Dwidthimage{#1}{#2}%
 }
 
 % Figures.
@@ -1010,6 +1014,7 @@
   %\let\DcurrentNimageAwidth=\relax%
 }
 \providecommand{\DNcaption}[1]{\par\noindent{\slshape#1}}
+\providecommand{\DNlegend}[1]{\Dauxiliaryspace#1}
 
 \providecommand{\DCborder}[1]{\fbox{#1}}
 % No padding between image and border.
@@ -1067,6 +1072,11 @@
 }
 
 
+% For \Dpixelunit, the length value is pre-multiplied with 0.75, so by
+% specifying "pt" we get the same notion of "pixel" as graphicx.
+\providecommand{\Dpixelunit}{pt}
+% Normally lengths are relative to the current linewidth.
+\providecommand{\Drelativeunit}{\linewidth}
 
 
 %\usepackage{fixmath}
-- 
cgit v1.2.1


From 6a66e3e696c26896f3d5ffac5376beddd13a6f20 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 29 Jun 2005 22:34:44 +0000
Subject: removed document.internal_targets and document.external_targets;
 fixed bug (not sure yet if the code is clean -- needs refactoring)

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3637 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 8937fe1ac..a73d78822 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -205,11 +205,11 @@
 
 \providecommand{\DSlanguage}{%
   % Set up babel.
-  \ifthenelse{\equal{\Dlanguagebabel}{}}{}{%
-    \usepackage[\Dlanguagebabel]{babel}%
+  \ifthenelse{\equal{\Dlanguagebabel}{}}{}{
+    \usepackage[\Dlanguagebabel]{babel}
   }
 }
-  
+
 
 
 
-- 
cgit v1.2.1


From db5f6bea2e5a9cdb64d77f8bea90f04e6f98c121 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 15 Jul 2005 16:41:36 +0000
Subject: removed latex-notes.txt; moved to wiki:
 http://docutils.python-hosting.com/wiki/NewLatex

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3757 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex-notes.txt | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 tools/stylesheets/latex-notes.txt

(limited to 'tools')

diff --git a/tools/stylesheets/latex-notes.txt b/tools/stylesheets/latex-notes.txt
deleted file mode 100644
index 92da02491..000000000
--- a/tools/stylesheets/latex-notes.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Try the commands mentioned in
-.
-
-
-Regarding UTF-8:
-
-* Read .
-
-* From ::
-
-  > The amssymb package and the postscript option were simply so that
-  > LaTeX could find the fonts and symbol definitions for the particular
-  > Unicode characters I used.
-  > However the DeclareUnicodeCharacter directive was to work around a
-  > missing or misnamed character in the UCS database.
-
-
-::
-
-    3.1.6. How can I make a document portable to both latex and pdflatex
-    Contributed by: Christian Kumpf
-    Check for the existence of the variable \pdfoutput:
-    \newif\ifpdf
-    \ifx\pdfoutput\undefined
-    \pdffalse % we are not running PDFLaTeX
-    \else
-    \pdfoutput=1 % we are running PDFLaTeX
-    \pdftrue
-    \fi
-    Then use your new variable \ifpdf
-    \ifpdf
-    \usepackage[pdftex]{graphicx}
-    \pdfcompresslevel=9
-    \else
-    \usepackage{graphicx}
-    \fi
-
-
-Need to handle paragraph indenting manually (in the writer).
-- 
cgit v1.2.1


From 625b851763602bdb417647a4eac9cf2fb0365a2f Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 17 Jul 2005 21:29:51 +0000
Subject: removed a lot of paragraph-handling code; some was unnecessary, some
 will be replaced by custom paragraph-indentation logic in the Python module;
 always add space around transitions

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3762 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 56 ++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index a73d78822..dbbcddb3a 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -87,33 +87,17 @@
   }
   \providecommand{\Dauxiliaryspace}{%
     \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \Dpar\noindent%
+    \par\noindent%
   }
   \providecommand{\Dauxiliaryparspace}{%
     \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \Dpar%
+    \par%
   }
-  \providecommand{\Dparagraphspace}{\Dpar}
+  \providecommand{\Dparagraphspace}{\par}
   \providecommand{\Dneedvspace}{true}
 }
 
 
-\providecommand{\DSparagraphs}{
-  \providecommand{\Dnextparindent}{}
-  \providecommand{\Dnextpar}{\par}
-  %\newcommand{\Dnextpar}{\par\Dnextparindent}
-  \providecommand{\Dpar}{%
-    \Dnextpar%
-    \Dnextparindent%
-    \protect\renewcommand{\Dnextpar}{\par}%
-    \protect\renewcommand{\Dnextparindent}{}%
-  }
-  \providecommand{\Dnopar}{%
-    \protect\renewcommand{\Dnextpar}{\par}%
-    \protect\renewcommand{\Dnextparindent}{}%
-  }
-}
-
 \providecommand{\DSlinks}{
   % Targets and references.
   \usepackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
@@ -265,12 +249,12 @@
 \providecommand{\Dtopictitle}[1]{%
   \noindent\Dformatboxtitle{#1}%
   \ifthenelse{\equal{\Dhassubtitle}{false}}{\vspace{1em}}{\vspace{0.5em}}%
-  \Dpar\noindent%
+  \par%
 }
 \providecommand{\Dtopicsubtitle}[1]{%
-  \Dformatboxsubtitle{#1}%
+  \noindent\Dformatboxsubtitle{#1}%
   \vspace{1em}%
-  \Dpar\noindent%
+  \par%
 }
 \providecommand{\Dsidebartitle}[1]{\Dtopictitle{#1}}
 \providecommand{\Dsidebarsubtitle}[1]{\Dtopicsubtitle{#1}}
@@ -376,7 +360,6 @@
     \par\noindent%
     #1%
     \addtocounter{Dtoclevel}{-1}%
-    \renewcommand{\Dnextparindent}{\noindent}%
   }{%
     \par\noindent%
     \Dmakebox{#1}%
@@ -385,7 +368,7 @@
 \providecommand{\Dformatrubric}[1]{\textbf{#1}}
 \Dprovidelength{\Dprerubricspace}{0.3em}
 \providecommand{\DNrubric}[1]{%
-  \vspace{\Dprerubricspace}\Dpar\noindent\Dformatrubric{#1}\Dpar\noindent%
+  \vspace{\Dprerubricspace}\par\noindent\Dformatrubric{#1}\par%
 }
 
 \providecommand{\Dbullet}{}
@@ -683,7 +666,7 @@
 \providecommand{\Dformatclassifier}[1]{\textsl{#1}}
 \providecommand{\DNclassifier}[1]{~:~\Dformatclassifier{#1}}
 \providecommand{\Dformatdefinition}[1]{#1}
-\providecommand{\DNdefinition}[1]{\Dpar\Dformatdefinition{#1}}
+\providecommand{\DNdefinition}[1]{\par\Dformatdefinition{#1}}
 
 \providecommand{\Dlineblockindentation}{2.5em}
 \providecommand{\DNlineblock}[1]{%
@@ -705,7 +688,7 @@
 
 
 \providecommand{\DNtransition}{%
-  \Dpar\noindent{}\hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}%
+  \hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}%
 }
 
 
@@ -716,14 +699,12 @@
 }
 \providecommand{\Dformatattribution}[1]{---\textup{#1}}
 \providecommand{\DNblockquote}[1]{%
-  \renewcommand{\Dnextparindent}{\noindent}%
-  \renewcommand{\Dnextpar}{}%
   \Dmakebox{%
     \Dformatblockquote{#1}
   }%
 }
 \providecommand{\DNattribution}[1]{%
-  \Dpar%
+  \par%
   \begin{flushright}\Dformatattribution{#1}\end{flushright}%
 }
 
@@ -743,11 +724,10 @@
 \Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
 \providecommand{\DNsidebar}[1]{
   \parpic[\Dsidebarposition]{%
-    \Dpar%
-    \begin{minipage}[t]{\Dsidebarwidth}
+    \begin{minipage}[t]{\Dsidebarwidth}%
       % Doing this with nested minipages is ugly, but I haven't found
       % another way to place vertical space before and after the fbox.
-      \vspace{\Dsidebarvmargin}
+      \vspace{\Dsidebarvmargin}%
       {%
         \setlength{\fboxrule}{\Dsidebarframewidth}%
         \setlength{\fboxsep}{\Dsidebarpadding}%
@@ -758,7 +738,7 @@
           \end{minipage}%
         }%
       }%
-      \vspace{\Dsidebarvmargin}
+      \vspace{\Dsidebarvmargin}%
     \end{minipage}%
   }%
 }
@@ -783,8 +763,8 @@
   }%
 }
 \providecommand{\DNcitationreference}[1]{{[}#1{]}}
-\Dprovidelength{\Dfootnotesep}{5pt}
-\providecommand{\Dfootnotespacing}{%
+\Dprovidelength{\Dfootnotesep}{3.5pt}
+\providecommand{\Dsetfootnotespacing}{%
   % Spacing commands executed at the beginning of footnotes.
   \setlength{\parindent}{0pt}%
   \hspace{1em}%
@@ -793,7 +773,8 @@
   % See ltfloat.dtx for details.
   {%
     \insert\footins{%
-      \Dnopar\vspace{\Dfootnotesep}\Dfootnotespacing%
+      \vspace{\Dfootnotesep}%
+      \Dsetfootnotespacing%
       \Dformatfootnote{#1}%
     }%
   }%
@@ -826,8 +807,6 @@
   }%
   % If there are multiple backrefs, add them now.
   \Dformatmultiplebackrefs{\Dmultiplebackrefs}%
-  % Supress next paragraph change.
-  \renewcommand{\Dnextpar}{}%
 }
 \providecommand{\Dsinglefootnotebacklink}[2]{%
   % Create normal backlink of a footnote label.  Parameters:
@@ -1088,7 +1067,6 @@
 \DSboxcommands
 \DSfrenchspacing
 \DSauxiliaryspace
-\DSparagraphs
 \DSlinks
 \DSsymbols
 \DSlate
-- 
cgit v1.2.1


From bd5d3204ec71f70e01164372d96230af029fd1c6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 18 Jul 2005 23:10:42 +0000
Subject: Make use of \Dlanguagebabel. Added \Dprinting for output primarily
 for printing, not online viewing. Some clean-up in the LaTeX stylesheet.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3766 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 182 +++++++++++++++++++++++---------------------
 1 file changed, 95 insertions(+), 87 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index dbbcddb3a..aee91b56f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -1,14 +1,27 @@
 \makeatletter
 
-\providecommand{\DSpackages}{%
-  % All kinds of useful packages.
-  \usepackage{ifthen}
-}
+% Development notes at
+% http://docutils.python-hosting.com/wiki/NewLatex
+
+
+\providecommand{\Dprinting}{false}
+
+
+\providecommand{\DSearly}{}
+\providecommand{\DSlate}{}
+
+\providecommand{\Ddocumentclass}{scrartcl}
+\providecommand{\Ddocumentoptions}{a4paper}
+
+\documentclass[\Ddocumentoptions]{\Ddocumentclass}
+
+\DSearly
 
 
 \providecommand{\DSfontencoding}{
-  % T1-emulation.  Provides most characters and features we're used
-  % from T1-encoded fonts but doesn't use bitmap fonts.
+  % Set up font encoding.
+  % AE is a T1-emulation.  It provides most characters and features
+  % as T1-encoded fonts but doesn't use ugly bitmap fonts.
   \usepackage{ae}
   % Provide the characters not contained in AE from EC bitmap fonts.
   \usepackage{aecompl}
@@ -18,9 +31,10 @@
 
 
 \providecommand{\DSsymbols}{%
+  % Fix up symbols.
   % The Euro symbol in Computer Modern looks, um, funny.  Let's get a
   % proper Euro symbol.
-  \usepackage{eurosym}%
+  \RequirePackage{eurosym}%
   \renewcommand{\texteuro}{\euro}%
 }
 
@@ -44,63 +58,59 @@
   \@ifundefined{c@#1}{\newcounter{#1}}{}
 }
 
-\providecommand{\DSboxcommands}{
-  \Dprovidelength{\Dboxparindent}{\parindent}
-  \providecommand{\Dmakeboxminipage}[1]{%
-    % Make minipage for use in a box created by \Dmakefbox.
-    \begin{minipage}[t]{0.9\linewidth}%
-      \setlength{\parindent}{\Dboxparindent}%
-      ##1%
-    \end{minipage}%
-  }
-  \providecommand{\Dmakefbox}[1]{%
-    % Make a centered, framed box.  Useful e.g. for admonitions.
-    \vspace{0.4\baselineskip}%
-    \begin{center}%
-      \fbox{\Dmakeboxminipage{##1}}%
-    \end{center}%
-    \vspace{0.4\baselineskip}%
-  }
-  \providecommand{\Dmakebox}[1]{%
-    % Make a centered, frameless box.  Useful e.g. for block quotes.
-    % Do not use minipages here, but create pseudo-lists to allow
-    % page-breaking.  (Don't use KOMA-script's addmargin environment
-    % because it messes up bullet lists.)
-    \Dmakelistenvironment{}{}{%
-      \setlength{\parskip}{0pt}%
-      \setlength{\parindent}{\Dboxparindent}%
-      \item{##1}%
-    }%
-  }
+\Dprovidelength{\Dboxparindent}{\parindent}
+\providecommand{\Dmakeboxminipage}[1]{%
+  % Make minipage for use in a box created by \Dmakefbox.
+  \begin{minipage}[t]{0.9\linewidth}%
+    \setlength{\parindent}{\Dboxparindent}%
+    #1%
+  \end{minipage}%
+}
+\providecommand{\Dmakefbox}[1]{%
+  % Make a centered, framed box.  Useful e.g. for admonitions.
+  \vspace{0.4\baselineskip}%
+  \begin{center}%
+    \fbox{\Dmakeboxminipage{#1}}%
+  \end{center}%
+  \vspace{0.4\baselineskip}%
+}
+\providecommand{\Dmakebox}[1]{%
+  % Make a centered, frameless box.  Useful e.g. for block quotes.
+  % Do not use minipages here, but create pseudo-lists to allow
+  % page-breaking.  (Don't use KOMA-script's addmargin environment
+  % because it messes up bullet lists.)
+  \Dmakelistenvironment{}{}{%
+    \setlength{\parskip}{0pt}%
+    \setlength{\parindent}{\Dboxparindent}%
+    \item{#1}%
+  }%
 }
 
 
-\providecommand{\DSfrenchspacing}{
-  \frenchspacing
-}
+\RequirePackage{ifthen}
+\providecommand{\Dfrenchspacing}{true}
+\ifthenelse{\equal{\Dfrenchspacing}{true}}{\frenchspacing}{}
 
 
-\providecommand{\DSauxiliaryspace}{
-  \Dprovidelength{\Dblocklevelvspace}{%
-    % Space between block-level elements other than paragraphs.
-    0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
-  }
-  \providecommand{\Dauxiliaryspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \par\noindent%
-  }
-  \providecommand{\Dauxiliaryparspace}{%
-    \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-    \par%
-  }
-  \providecommand{\Dparagraphspace}{\par}
-  \providecommand{\Dneedvspace}{true}
+\Dprovidelength{\Dblocklevelvspace}{%
+  % Space between block-level elements other than paragraphs.
+  0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
+}
+\providecommand{\Dauxiliaryspace}{%
+  \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
+  \par\noindent%
 }
+\providecommand{\Dauxiliaryparspace}{%
+  \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
+  \par%
+}
+\providecommand{\Dparagraphspace}{\par}
+\providecommand{\Dneedvspace}{true}
 
 
 \providecommand{\DSlinks}{
   % Targets and references.
-  \usepackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
+  \RequirePackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
 
   \providecommand{\Draisedlink}[1]{\Hy@raisedlink{##1}}
   
@@ -137,7 +147,6 @@
     }%
   }
   % Targets.
-  \Dprovidelength{\Dorgbaselineskip}{0pt}
   \providecommand{\DAids}[5]{%
     \label{##3}%
     \ifthenelse{\equal{##4}{footnotereference}}{%
@@ -145,7 +154,7 @@
         \renewcommand{\HyperRaiseLinkDefault}{%
           % Dirty hack to make backrefs to footnote references work.
           % For some reason, \baselineskip is 0pt in fn references.
-          0.5\Dorgbaselineskip%
+          0.5\Doriginalbaselineskip%
         }%
         \Draisedlink{\hypertarget{##3}{}}##5%
       }%
@@ -154,7 +163,7 @@
     }%
   }
   % Color in references.
-  \usepackage{color}
+  \RequirePackage{color}
   \providecommand{\Dimplicitreference}[2]{%
     % Create implicit reference to ID.  Implicit references occur
     % e.g. in TOC-backlinks of section titles.  Parameters:
@@ -171,18 +180,24 @@
     % Ditto for citation references.
     \Dimplicitfootnotereference{##1}{##2}%
   }
+  \ifthenelse{\equal{\Dprinting}{true}}{
+    \providecommand{\Dexplicitreferencecolor}{black}
+  }{
+    \providecommand{\Dexplicitreferencecolor}{blue}
+  }
   \providecommand{\Dexplicitreference}[2]{%
     % Create explicit reference to ID, e.g. created with "foo_".
     % Parameters:
     % 1. Target.
     % 2. Link text.
-    \href{##1}{{\color{blue}##2}}%
+    \href{##1}{{\color{\Dexplicitreferencecolor}##2}}%
   }
+  \providecommand{\Durireferencecolor}{\Dexplicitreferencecolor}
   \providecommand{\Durireference}[2]{%
     % Create reference to URI.  Parameters:
     % 1. Target.
     % 2. Link text.
-    \href{##1}{{\color{blue}##2}}%
+    \href{##1}{{\color{\Durireferencecolor}##2}}%
   }
 }
 
@@ -190,24 +205,13 @@
 \providecommand{\DSlanguage}{%
   % Set up babel.
   \ifthenelse{\equal{\Dlanguagebabel}{}}{}{
-    \usepackage[\Dlanguagebabel]{babel}
+    \RequirePackage[\Dlanguagebabel]{babel}
   }
 }
 
 
 
 
-\providecommand{\DSearly}{}
-\providecommand{\DSlate}{}
-
-\providecommand{\Ddocumentclass}{scrartcl}
-\providecommand{\Ddocumentoptions}{a4paper}
-
-\documentclass[\Ddocumentoptions]{\Ddocumentclass}
-
-\DSearly
-
-
 \providecommand{\DAclasses}[5]{%
   \Difdefined{DN#4C#3}{%
     % Pass only contents, nothing else!
@@ -247,6 +251,7 @@
 \providecommand{\Dformatboxtitle}[1]{{\Large\textbf{#1}}}
 \providecommand{\Dformatboxsubtitle}[1]{{\large\textbf{#1}}}
 \providecommand{\Dtopictitle}[1]{%
+  \Difinsidetoc{\vspace{1em}\par}{}%
   \noindent\Dformatboxtitle{#1}%
   \ifthenelse{\equal{\Dhassubtitle}{false}}{\vspace{1em}}{\vspace{0.5em}}%
   \par%
@@ -302,12 +307,15 @@
 }
 \providecommand{\Dsectionsubtitlehook}[1]{#1}
 \Dprovidelength{\Dsectionsubtitleraisedistance}{0.7em}
+\providecommand{\Dsectionsubtitlescaling}{0.85}
 \providecommand{\Dsectionsubtitle}[1]{%
   \Dsectionsubtitlehook{%
     % Move the subtitle nearer to the title.
     \vspace{-\Dsectionsubtitleraisedistance}%
     % Don't create a PDF bookmark.
-    \Ddispatchsectionsubtitle{\Dformatsectionsubtitle{\scalebox{.8}{#1}}}%
+    \Ddispatchsectionsubtitle{%
+      \Dformatsectionsubtitle{\scalebox{\Dsectionsubtitlescaling}{#1}}%
+    }%
   }%
 }
 % Boolean variable.
@@ -347,7 +355,7 @@
   % Treat doctest blocks the same as literal blocks.
   \DNliteralblock{#1}%
 }
-\usepackage{hyphenat}
+\RequirePackage{hyphenat}
 \providecommand{\DNliteral}[1]{\textnhtt{#1}}
 \providecommand{\DNemphasis}[1]{\emph{#1}}
 \providecommand{\DNstrong}[1]{\textbf{#1}}
@@ -356,7 +364,6 @@
 \providecommand{\DNtopic}[1]{%
   \ifthenelse{\equal{\DcurrentNtopicAcontents}{1}}{%
     \addtocounter{Dtoclevel}{1}%
-    \vspace{1em}%
     \par\noindent%
     #1%
     \addtocounter{Dtoclevel}{-1}%
@@ -688,7 +695,7 @@
 
 
 \providecommand{\DNtransition}{%
-  \hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}%
+  \raisebox{0.25em}{\parbox{\linewidth}{\hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}}}%
 }
 
 
@@ -710,7 +717,7 @@
 
 
 % Sidebars:
-\usepackage{picins}
+\RequirePackage{picins}
 % Vertical and horizontal margins.
 \Dprovidelength{\Dsidebarvmargin}{0.5em}
 \Dprovidelength{\Dsidebarhmargin}{1em}
@@ -755,10 +762,11 @@
   }%
 }
 \providecommand{\Dformatcitation}[1]{\Dformatfootnote{#1}}
+\Dprovidelength{\Doriginalbaselineskip}{0pt}
 \providecommand{\DNfootnotereference}[1]{%
   {%
     % \baselineskip is 0pt in \textsuperscript, so we save it here.
-    \setlength{\Dorgbaselineskip}{\baselineskip}%
+    \setlength{\Doriginalbaselineskip}{\baselineskip}%
     \textsuperscript{#1}%
   }%
 }
@@ -786,7 +794,10 @@
   \textsuperscript{\footnotesize#1{ }}%
 }
 \providecommand{\Dformatcitationlabel}[1]{{[}#1{]}{ }}
-\providecommand{\Dformatmultiplebackrefs}[1]{\textsl{#1}}
+\providecommand{\Dformatmultiplebackrefs}[1]{%
+  % If in printing mode, do not write out multiple backrefs.
+  \ifthenelse{\equal{\Dprinting}{true}}{}{\textsl{#1}}%
+}
 \providecommand{\Dthislabel}{}
 \providecommand{\DNlabel}[1]{%
   \renewcommand{\Dthislabel}{#1}
@@ -826,7 +837,7 @@
 \providecommand{\Dmulticitationbacklink}[2]{\Dmultifootnotebacklink{#1}{#2}}
 
 
-\usepackage{longtable}
+\RequirePackage{longtable}
 \providecommand{\Dmaketable}[2]{%
   % Make table.  Parameters:
   % 1. Table spec (like "|p|p|").
@@ -867,7 +878,7 @@
 
 \providecommand{\DNsystemmessage}[1]{%
   {%
-    \color{red}%
+    \ifthenelse{\equal{\Dprinting}{false}}{\color{red}}{}%
     \bfseries%
     #1%
   }%
@@ -905,7 +916,7 @@
 }
 
 
-\usepackage{graphicx}
+\RequirePackage{graphicx}
 % Maximum width of an image.
 \providecommand{\Dimagemaxwidth}{\linewidth}
 \providecommand{\Dfloatimagemaxwidth}{0.5\linewidth}
@@ -1058,15 +1069,12 @@
 \providecommand{\Drelativeunit}{\linewidth}
 
 
-%\usepackage{fixmath}
-%\usepackage{amsmath}
+%\RequirePackage{fixmath}
+%\RequirePackage{amsmath}
 
 
-\DSpackages
 \DSfontencoding
-\DSboxcommands
-\DSfrenchspacing
-\DSauxiliaryspace
+\DSlanguage
 \DSlinks
 \DSsymbols
 \DSlate
-- 
cgit v1.2.1


From 45eb6921c60524610114b518a6f6bb5d72b42e00 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 7 Aug 2005 07:44:03 +0000
Subject: Added missing generic filter function.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3787 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 3c670a224..64444f3a8 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -26,6 +26,20 @@
 ;; arg easily with C-- C-= (easy to type), as well as ordinary prefix arg with
 ;; C-u C-=.
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Generic Filter function.
+
+(if (not (fboundp 'filter))
+    (defun filter (pred list)
+      "Returns a list of all the elements fulfilling the pred requirement (that
+is for which (pred elem) is true)"
+      (if list
+          (let ((head (car list))
+                (tail (filter pred (cdr list))))
+            (if (funcall pred head)
+                (cons head tail)
+              tail)))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Generic text functions that are more convenient than the defaults.
-- 
cgit v1.2.1


From 995a73c5bf8b437660c2504491a1b82ec8d16297 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 7 Aug 2005 08:27:19 +0000
Subject: Added a fix to the underlining function that makes it less disturbing
 when you position the cursor on the underline.

Also, fixed the tests.





git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3788 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           | 52 +++++++++++++----------
 tools/editors/emacs/tests/tests-adjust-section.el |  4 +-
 2 files changed, 31 insertions(+), 25 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 64444f3a8..b5f08a641 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -390,34 +390,36 @@ This is useful for filling list item paragraphs."
 
   (interactive)
 
-  ;; check if we're on an underline under a title line, and move the cursor up
-  ;; if it is so.
-  (if (and (or (rest-line-single-char-p 1) 
-	       (looking-at "^\\s-*$"))
-	   (save-excursion
-	     (forward-line -1)
-	     (beginning-of-line)
-	     (looking-at "^.+$")))
-      (forward-line -1))
-
-  (let (
-	;; find current sectioning character
-	(curchar (rest-current-section-char))
-	;; find current sectioning style
-	(init-style (rest-initial-sectioning-style))
-	;; find current indentation of title line
-	(curindent (save-excursion
-		     (back-to-indentation)
-		     (current-column)))
-
-	;; ending column
+  (let* (
+	 ;; check if we're on an underline under a title line, and move the
+	 ;; cursor up if it is so.
+	 (moved
+	  (if (and (or (rest-line-single-char-p 1) 
+		       (looking-at "^\\s-*$"))
+		   (save-excursion
+		     (forward-line -1)
+		     (beginning-of-line)
+		     (looking-at "^.+$")))
+	      (progn (forward-line -1) t)
+	    ))
+
+	 ;; find current sectioning character
+	 (curchar (rest-current-section-char))
+	 ;; find current sectioning style
+	 (init-style (rest-initial-sectioning-style))
+	 ;; find current indentation of title line
+	 (curindent (save-excursion
+		      (back-to-indentation)
+		      (current-column)))
+
+	 ;; ending column
 	(endcol (- (save-excursion
 		     (end-of-line)
 		     (current-column))
                    (save-excursion
 		     (back-to-indentation)
                      (current-column))))
-	)
+	 )
 
     ;; if there is no current style found...
     (if (eq init-style nil)
@@ -500,7 +502,11 @@ This is useful for filling list item paragraphs."
 	    (if nextchar
 		(rest-update-section nextchar init-style curindent))
 	    )))
-      )))
+      )
+
+    (if moved 
+	(progn (forward-line 1) (end-of-line)))
+    ))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index 43215fb98..5af65d56a 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -196,8 +196,8 @@ Some Title
 " (t))
 
 ))
-  
-  "A list of regression tests for the section update method.")
+
+;; "A list of regression tests for the section update method."
 
 
 
-- 
cgit v1.2.1


From 6f10c58e06e1c25ff6582280bb641f51213dc956 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 12 Aug 2005 22:20:39 +0000
Subject: updated from Docutils default.css

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3791 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/pep.css | 139 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 124 insertions(+), 15 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
index a82045bc9..a687ee8c8 100644
--- a/tools/stylesheets/pep.css
+++ b/tools/stylesheets/pep.css
@@ -8,11 +8,17 @@
 Default cascading style sheet for the PEP HTML output of Docutils.
 */
 
+/* "! important" is used here to override other ``margin-top`` and
+   ``margin-bottom`` styles that are later in the stylesheet or 
+   more specific.  See http://www.w3.org/TR/CSS1#the-cascade */
 .first {
-  margin-top: 0 }
+  margin-top: 0 ! important }
 
-.last {
-  margin-bottom: 0 }
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
 
 .navigation {
   width: 100% ;
@@ -53,12 +59,15 @@ a.toc-backref {
   text-decoration: none ;
   color: black }
 
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
 body {
   margin: 0px ;
   margin-bottom: 1em ;
   padding: 0px }
 
-dd {
+dl.docutils dd {
   margin-bottom: 0.5em }
 
 div.section {
@@ -78,12 +87,18 @@ div.abstract p.topic-title {
   font-weight: bold ;
   text-align: center }
 
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
   margin: 2em ;
   border: medium outset ;
   padding: 1em }
 
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
 div.attention p.admonition-title, div.caution p.admonition-title,
 div.danger p.admonition-title, div.error p.admonition-title,
 div.warning p.admonition-title {
@@ -91,21 +106,58 @@ div.warning p.admonition-title {
   font-weight: bold ;
   font-family: sans-serif }
 
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
   font-weight: bold ;
-  font-family: sans-serif }
+  font-style: normal }
 
 div.figure {
   margin-left: 2em }
 
 div.footer, div.header {
+  clear: both;
   font-size: smaller }
 
 div.footer {
   margin-left: 1em ;
   margin-right: 1em }
 
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin-left: 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
 div.system-messages {
   margin: 5em }
 
@@ -123,6 +175,10 @@ div.system-message p.system-message-title {
 div.topic {
   margin: 2em }
 
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
 h1 {
   font-family: sans-serif ;
   font-size: large }
@@ -149,9 +205,18 @@ h6 {
   font-style: italic ;
   font-size: x-small }
 
-.section hr {
+hr.docutils {
   width: 75% }
 
+img.align-left {
+  clear: left }
+
+img.align-right {
+  clear: right }
+
+img.borderless {
+  border: 0 }
+
 ol.simple, ul.simple {
   margin-bottom: 1em }
 
@@ -170,6 +235,10 @@ ol.lowerroman {
 ol.upperroman {
   list-style: upper-roman }
 
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
 p.caption {
   font-style: italic }
 
@@ -180,10 +249,31 @@ p.credits {
 p.label {
   white-space: nowrap }
 
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
 p.topic-title {
   font-family: sans-serif ;
   font-weight: bold }
 
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font-family: serif ;
+  font-size: 100% }
+
 pre.line-block {
   font-family: serif ;
   font-size: 100% }
@@ -204,6 +294,9 @@ span.classifier-delimiter {
 span.interpreted {
   font-family: sans-serif }
 
+span.option {
+  white-space: nowrap }
+
 span.option-argument {
   font-style: italic }
 
@@ -213,11 +306,25 @@ span.pre {
 span.problematic {
   color: red }
 
-table {
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid thin gray }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
   margin-top: 0.5em ;
   margin-bottom: 0.5em }
 
-td, th {
+table.footnote {
+  border-left: solid thin black }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
   padding-left: 0.5em ;
   padding-right: 0.5em ;
   vertical-align: top }
@@ -228,12 +335,14 @@ td.num {
 th.field-name {
   font-weight: bold ;
   text-align: left ;
-  white-space: nowrap }
+  white-space: nowrap ;
+  padding-left: 0 }
 
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
   font-size: 100% }
 
-tt {
+tt.docutils {
   background-color: #eeeeee }
 
 ul.auto-toc {
-- 
cgit v1.2.1


From 5c90ddc006b36818e727b4a42196a708b2a78a25 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Wed, 24 Aug 2005 21:33:21 +0000
Subject: made _stylesheet_required setting default to 0, activating it in the
 rst2html.py front-end tool

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3830 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/rst2html.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/rst2html.py b/tools/rst2html.py
index 35e5558aa..7fa3aebc4 100755
--- a/tools/rst2html.py
+++ b/tools/rst2html.py
@@ -22,4 +22,5 @@ from docutils.core import publish_cmdline, default_description
 description = ('Generates (X)HTML documents from standalone reStructuredText '
                'sources.  ' + default_description)
 
-publish_cmdline(writer_name='html', description=description)
+publish_cmdline(writer_name='html', description=description,
+                settings_overrides={'_stylesheet_required': 1})
-- 
cgit v1.2.1


From 7f6fa5828f837c9fc241ca94536937ee3578b3ed Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Fri, 26 Aug 2005 16:15:37 +0000
Subject: minor improvements

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3838 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/default.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
index abfcbce7a..a418a7a00 100644
--- a/tools/stylesheets/default.css
+++ b/tools/stylesheets/default.css
@@ -2,10 +2,13 @@
 :Author: David Goodger
 :Contact: goodger@users.sourceforge.net
 :Date: $Date$
-:Version: $Revision$
+:Revision: $Revision$
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
 */
 
 /* "! important" is used here to override other ``margin-top`` and
-- 
cgit v1.2.1


From 1f4936a3415c16d38c76e3d39fc285c0428ffed8 Mon Sep 17 00:00:00 2001
From: blais 
Date: Fri, 9 Sep 2005 15:17:31 +0000
Subject: New support for section title underlining in Emacs.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3860 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           | 1454 ++++++++++++++-------
 tools/editors/emacs/tests/Makefile                |    4 +
 tools/editors/emacs/tests/README                  |   27 +
 tools/editors/emacs/tests/tests-adjust-section.el |  774 +++++++++--
 tools/editors/emacs/tests/tests-basic.el          |  762 +++++++++++
 tools/editors/emacs/tests/tests-runner.el         |  122 ++
 6 files changed, 2553 insertions(+), 590 deletions(-)
 create mode 100644 tools/editors/emacs/tests/Makefile
 create mode 100644 tools/editors/emacs/tests/README
 create mode 100644 tools/editors/emacs/tests/tests-basic.el
 create mode 100644 tools/editors/emacs/tests/tests-runner.el

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index b5f08a641..0c13a82a2 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -9,22 +9,34 @@
 ;; Installation instructions
 ;; -------------------------
 ;;
-;; Add this line to your .emacs file::
+;; Add this line to your .emacs file and bind the versatile sectioning commands
+;; in text mode, like this::
 ;;
 ;;   (require 'restructuredtext)
+;;   (add-hook 'text-mode-hook 'rest-text-mode-hook)
 ;;
-;; You should bind the versatile sectioning command to some key in the text-mode
-;; hook. Something like this::
+;; The keys it defines are:
 ;;
-;;   (defun user-rst-mode-hook ()
-;;     (local-set-key [(control ?=)] 'rest-adjust-section-title)
-;;     )
-;;   (add-hook 'text-mode-hook 'user-rst-mode-hook)
+;;    C-= : updates or rotates the section title around point or
+;;          promotes/demotes the decorations within the region (see full details
+;;          below).
+;;
+;;          Note that C-= is a good binding, since it allows you to specify a
+;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
+;;          prefix arg with C-u C-=.
+;;
+;;    C-x C-= : displays the hierarchy of title decorations from this file.
+;;
+;;    C-M-{, C-M-} : navigate between section titles.
+;;
+;; Other specialized and more generic functions are also available (see source
+;; code).  The most important function provided by this file for section title
+;; adjustments is rest-adjust.
+;;
+;; TODO: 
+;; - Add an option to forego using the file structure in order to make
+;;   suggestion, and to always use the preferred decorations to do that.
 ;;
-;; Other specialized and more generic functions are also available.
-;; Note that C-= is a good binding, since it allows you to specify a negative
-;; arg easily with C-- C-= (easy to type), as well as ordinary prefix arg with
-;; C-u C-=.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Generic Filter function.
@@ -40,100 +52,113 @@ is for which (pred elem) is true)"
                 (cons head tail)
               tail)))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Generic text functions that are more convenient than the defaults.
-;;
-
-(defun replace-lines (fromchar tochar)
-  "Replace flush-left lines, consisting of multiple FROMCHAR characters,
-with equal-length lines of TOCHAR."
-  (interactive "\
-cSearch for flush-left lines of char:
-cand replace with char: ")
-  (save-excursion
-    (let* ((fromstr (string fromchar))
-	   (searchre (concat "^" (regexp-quote fromstr) "+ *$"))
-	   (found 0))
-      (condition-case err
-	  (while t
-	    (search-forward-regexp searchre)
-	    (setq found (1+ found))
-	    (search-backward fromstr)  ;; point will be *before* last char
-	    (setq p (1+ (point)))
-	    (beginning-of-line)
-	    (setq l (- p (point)))
-	    (kill-line)
-	    (insert-char tochar l))
-	(search-failed
-	 (message (format "%d lines replaced." found)))))))
-
-(defun join-paragraph ()
-  "Join lines in current paragraph into one line, removing end-of-lines."
-  (interactive)
-  (let ((fill-column 65000)) ; some big number
-    (call-interactively 'fill-paragraph)))
-
-(defun force-fill-paragraph ()
-  "Fill paragraph at point, first joining the paragraph's lines into one.
-This is useful for filling list item paragraphs."
-  (interactive)
-  (join-paragraph)
-  (fill-paragraph nil))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The following functions implement a smart automatic title sectioning feature.
 ;; The idea is that with the cursor sitting on a section title, we try to get as
-;; much information from context and do the best thing. This function can be
-;; invoked many time and/or with prefix argument to rotate between the various
-;; options.
+;; much information from context and try to do the best thing automatically.
+;; This function can be invoked many times and/or with prefix argument to rotate
+;; between the various sectioning decorations.
 ;;
-;; There are two styles of sectioning:
+;; Definitions: the two forms of sectioning define semantically separate section
+;; levels.  A sectioning DECORATION consists in:
 ;;
-;; 1. simple-underline, e.g.      |Some Title
-;;                                |----------
+;;   - a CHARACTER
 ;;
-;; 2. overline-and-underline, e.g.  |------------
-;;                                  | Some Title
-;;                                  |------------
+;;   - a STYLE which can be either of 'simple' or 'over-and-under'.
+;;
+;;   - an INDENT (meaningful for the over-and-under style only) which determines
+;;     how many characters and over-and-under style is hanging outside of the
+;;     title at the beginning and ending.
+;;
+;; Here are two examples of decorations (| represents the window border, column
+;; 0):
+;;
+;;                                  |
+;; 1. char: '-'   e                 |Some Title
+;;    style: simple                 |----------
+;;                                  |
+;; 2. char: '='                     |==============
+;;    style: over-and-under         |  Some Title
+;;    indent: 2                     |==============
+;;                                  |
 ;;
 ;; Some notes:
 ;;
-;; - the underlining character that is used depends on context. The file is
+;; - The underlining character that is used depends on context. The file is
 ;;   scanned to find other sections and an appropriate character is selected.
-;;   If the function is invoked on a section that is complete, the character
-;;   is rotated among the existing ones.
+;;   If the function is invoked on a section that is complete, the character is
+;;   rotated among the existing section decorations.
+;;
+;;   Note that when rotating the characters, if we come to the end of the
+;;   hierarchy of decorations, the variable rest-preferred-decorations is
+;;   consulted to propose a new underline decoration, and if continued, we cycle
+;;   the decorations all over again.  Set this variable to nil if you want to
+;;   limit the underlining character propositions to the existing decorations in
+;;   the file.
 ;;
-;;   Note that when rotating the underlining characters, if we come to the end
-;;   of the hierarchy of characters, the variable rest-preferred-characters
-;;   is consulted to propose a new underline char, and if continued, we cycle
-;;   the underline characters all over again.  Set this variable to nil if 
-;;   you want to limit the underlining character propositions to the existing
-;;   underlines in the file.
+;; - A prefix argument can be used to alternate the style.
 ;;
-;; - prefix argument is used to alternate the sectioning style.
+;; - An underline/overline that is not extended to the column at which it should
+;;   be hanging is dubbed INCOMPLETE.  For example::
 ;;
-;; Examples:
+;;      |Some Title
+;;      |-------
+;;
+;; Examples of default invocation:
 ;;
 ;;   |Some Title       --->    |Some Title
-;;   | 			       |----------
+;;   |                         |----------
 ;;
 ;;   |Some Title       --->    |Some Title
-;;   |----- 		       |----------
+;;   |-----                    |----------
 ;;
 ;;   |                         |------------
 ;;   | Some Title      --->    | Some Title
-;;   | 			       |------------
+;;   |                         |------------
 ;;
-;; In overline-and-underline style, a variable is available to select how much
-;; space to leave before and after the title (it can be zero) when alternating
-;; the style.  Note that if the title already has some whitespace in front of
-;; it, we don't adjust it to the variable setting, we use the whitespace that is
-;; already there for adjustment.
+;; In over-and-under style, when alternating the style, a variable is available
+;; to select how much default indent to use (it can be zero).  Note that if the
+;; current section decoration already has an indent, we don't adjust it to the
+;; default, we rather use the current indent that is already there for
+;; adjustment (unless we cycle, in which case we use the indent that has been
+;; found previously).
+
+(defun rest-text-mode-hook ()
+  "Default text mode hook for rest."
+  (local-set-key [(control ?=)] 'rest-adjust)
+  (local-set-key [(control x)(control ?=)] 'rest-display-sections-hierarchy)
+  (local-set-key [(control meta ?{)] 'rest-backward-section)
+  (local-set-key [(control meta ?})] 'rest-forward-section)
+  )
+
+(defcustom rest-preferred-decorations '( (?= over-and-under 1)
+					 (?= simple 0)
+					 (?- simple 0)
+					 (?~ simple 0)
+					 (?+ simple 0)
+					 (?` simple 0)
+					 (?# simple 0)
+					 (?@ simple 0) )
+  "Preferred ordering of section title decorations.  This
+  sequence is consulted to offer a new decoration suggestion when
+  we rotate the underlines at the end of the existing hierarchy
+  of characters, or when there is no existing section title in
+  the file.")
+
+
+(defcustom rest-default-indent 1
+  "Number of characters to indent the section title when toggling
+  decoration styles.  This is used when switching from a simple
+  decoration style to a over-and-under decoration style.")
+
 
-(defun rest-line-single-char-p (&optional accept-special)
+(defcustom rest-section-text-regexp "^[ \t]*\\S-*[a-zA-Z0-9]\\S-*"
+  "Regular expression for valid section title text.")
+
+
+(defun rest-line-homogeneous-p (&optional accept-special)
   "Predicate return the unique char if the current line is
   composed only of a single repeated non-whitespace
   character. This returns the char even if there is whitespace at
@@ -146,128 +171,95 @@ This is useful for filling list item paragraphs."
   (save-excursion
     (back-to-indentation)
     (if (not (looking-at "\n"))
-	(let ((c (thing-at-point 'char)))
-	  (if (and (looking-at (format "[%s]+\\s-*$" c))
-		   (or accept-special
-		       (and
-			;; common patterns
-			(not (looking-at "::\\s-*$"))
-			(not (looking-at "\\.\\.\\.\\s-*$"))
-			;; discard one char line
-			(not (looking-at ".\\s-*$")) 
-			)))
-	      (string-to-char c))
-	  ))
+        (let ((c (thing-at-point 'char)))
+          (if (and (looking-at (format "[%s]+[ \t]*$" c))
+                   (or accept-special
+                       (and
+                        ;; Common patterns.
+                        (not (looking-at "::[ \t]*$"))
+                        (not (looking-at "\\.\\.\\.[ \t]*$"))
+                        ;; Discard one char line
+                        (not (looking-at ".[ \t]*$"))
+                        )))
+              (string-to-char c))
+          ))
     ))
 
-(defun rest-find-last-section-char ()
-  "Looks backward for the last section char found in the file."
 
-  (let (c)
-    (save-excursion 
-      (while (and (not c) (not (bobp)))
-	(forward-line -1)
-	(setq c (rest-line-single-char-p))
-	))
-    c))
+(defun rest-compare-decorations (deco1 deco2)
+  "Compare decorations.  Returns true if both are equal,
+according to restructured text semantics (only the character and
+the style are compared, the indentation does not matter."
+  (and (eq (car deco1) (car deco2))
+       (eq (cadr deco1) (cadr deco2))))
+
+
+(defun rest-get-decoration-match (hier deco)
+  "Returns the index (level) of the decoration in the given hierarchy.
+This basically just searches for the item using the appropriate
+comparison and returns the index.  We return nil if the item is
+not found."
+  (let ((cur hier))
+    (while (and cur (not (rest-compare-decorations (car cur) deco)))
+      (setq cur (cdr cur)))
+    cur))
 
-(defun rest-current-section-char (&optional point)
-  "Gets the section char around the current point."
-  (save-excursion
-    (if point (goto-char point))
-    (let ((offlist '(0 1 -2))
-	  loff
-	  rval
-	  c)
-      (while offlist
-	(forward-line (car offlist))
-	(setq c (rest-line-single-char-p 1))
-	(if c
-	    (progn (setq offlist nil
-			 rval c))
-	  (setq offlist (cdr offlist)))
-	)
-      rval
-      )))
-
-(defun rest-initial-sectioning-style (&optional point)
-  "Looks around point and attempts to determine the sectioning
-  style, between simple-underline and overline-and-underline.  If
-  there aren't any existing over/underlines, return nil."
-  (save-excursion
-    (if point (goto-char point))
-    (let (ou)
-      (save-excursion
-	(setq ou (mapcar
-		  (lambda (x)
-		    (forward-line x)
-		    (rest-line-single-char-p))
-		  '(-1 2))))
-      (beginning-of-line)
-      (cond
-       ((equal ou '(nil nil)) nil)
-       ((car ou) 'over-and-under) ;; we only need check the overline
-       (t 'simple)
-       )
-      )))
-
-(defun rest-all-section-chars (&optional ignore-lines)
-  "Finds all the section chars in the entire file and orders them
-  hierarchically, removing duplicates.  Basically, returns a list
-  of the section underlining characters.
-
-  Optional parameters IGNORE-AROUND can be a list of lines to
-  ignore."
-
-  (let (chars 
-	c
-	(curline 1))
-    (save-excursion
-      (beginning-of-buffer)
-      (while (< (point) (buffer-end 1))
-	(if (not (memq curline ignore-lines))
-	    (progn
-	      (setq c (rest-line-single-char-p))
-	      (if c
-		  (progn
-		    (add-to-list 'chars c t)
-		    ))) )
-	(forward-line 1) (setq curline (+ curline 1))
-	))
-    chars))
-
-(defun rest-suggest-new-char (allchars)
-  "Given the last char that has been seen, suggest a new,
-  different character, different from all that have been seen."
-  (let ((potentials (copy-sequence rest-preferred-characters)))
-    (dolist (x allchars)
-      (setq potentials (delq x potentials))
-      )
-    (car potentials)
-    ))
 
-(defun rest-update-section (underlinechar style &optional indent)
-  "Unconditionally updates the overline/underline of a section
-  title using the given character CHAR, with STYLE 'simple or
-  'over-and-under, in which case with title whitespace separation
-  on each side with INDENT whitespaces.  If the style is 'simple,
-  whitespace before the title is removed.
+(defun rest-suggest-new-decoration (alldecos &optional prev)
+  "Suggest a new, different decoration, different from all that
+have been seen.
 
-  If there are existing overline and/or underline, they are
-  removed before adding the requested adornments."
+  ALLDECOS is the set of all decorations, including the line
+  numbers.  PREV is the optional previous decoration, in order to
+  suggest a better match."
+
+  ;; For all the preferred decorations...
+  (let* (
+	 ;; If 'prev' is given, reorder the list to start searching after the match.
+	 (fplist
+	  (cdr (rest-get-decoration-match rest-preferred-decorations prev)))
+
+	 ;; List of candidates to search.
+	 (curpotential (append fplist rest-preferred-decorations)))
+    (while
+	;; For all the decorations...
+	(let ((cur alldecos)
+	      found)
+	  (while (and cur (not found))
+	    (if (rest-compare-decorations (car cur) (car curpotential))
+		;; Found it!
+		(setq found (car curpotential))
+	      (setq cur (cdr cur))))
+	  found)
+
+      (setq curpotential (cdr curpotential)))
+
+    (copy-list (car curpotential)) ))
+
+
+(defun rest-update-section (char style &optional indent)
+  "Unconditionally updates the style of a section decoration
+  using the given character CHAR, with STYLE 'simple or
+  'over-and-under, and with indent INDENT.  If the STYLE is
+  'simple, whitespace before the title is removed (indent is
+  always assume to be 0).
+
+  If there are existing overline and/or underline from the
+  existing decoration, they are removed before adding the
+  requested decoration."
 
   (interactive)
   (let (marker
-	len
-	ec
-	(c ?-))
+        len
+        ec
+        (c ?-))
 
       (end-of-line)
       (setq marker (point-marker))
 
       ;; Fixup whitespace at the beginning and end of the line
       (if (or (null indent) (eq style 'simple))
-	  (setq indent 0))
+          (setq indent 0))
       (beginning-of-line)
       (delete-horizontal-space)
       (insert (make-string indent ? ))
@@ -280,234 +272,807 @@ This is useful for filling list item paragraphs."
 
       ;; Remove previous line if it consists only of a single repeated character
       (save-excursion
-	(forward-line -1)
-	(and (rest-line-single-char-p 1)
-	     (kill-line 1)))
-
-      ;; Remove following line if it consists only of a single repeated character
+        (forward-line -1)
+	(and (rest-line-homogeneous-p 1)
+	     ;; Avoid removing the underline of a title right above us.
+	     (save-excursion (forward-line -1)
+			     (not (looking-at rest-section-text-regexp)))
+             (kill-line 1)))
+
+      ;; Remove following line if it consists only of a single repeated
+      ;; character
       (save-excursion
-	(forward-line +1)
-	(and (rest-line-single-char-p 1)
-	     (kill-line 1))
-	;; Add a newline if we're at the end of the buffer, for the subsequence
-	;; inserting of the underline
-	(if (= (point) (buffer-end 1))
-	    (newline 1)))
+        (forward-line +1)
+        (and (rest-line-homogeneous-p 1)
+             (kill-line 1))
+        ;; Add a newline if we're at the end of the buffer, for the subsequence
+        ;; inserting of the underline
+        (if (= (point) (buffer-end 1))
+            (newline 1)))
 
       ;; Insert overline
       (if (eq style 'over-and-under)
-	  (save-excursion
-	    (beginning-of-line)
-	    (open-line 1)
-	    (insert (make-string len underlinechar))))
+          (save-excursion
+            (beginning-of-line)
+            (open-line 1)
+            (insert (make-string len char))))
 
       ;; Insert underline
       (forward-line +1)
       (open-line 1)
-      (insert (make-string len underlinechar))
+      (insert (make-string len char))
 
       (forward-line +1)
       (goto-char marker)
       ))
 
-(defvar rest-preferred-characters '(?= ?- ?~ ?+ ?` ?# ?@)
-  "Preferred ordering of underline characters.  This sequence is
-  consulted to offer a new underline character when we rotate the 
-  underlines at the end of the existing hierarchy of characters.")
 
-(defvar rest-default-under-and-over-indent 1
-  "Number of characters to indent the section title when toggling
-  sectioning styles.  This is used when switching from a simple 
-  section style to a over-and-under style.")
-
-(defun rest-adjust-section-title ()
-  "Adjust/rotate the section underlining for the section around
-  point.
-
-  This function is the main entry point of this module and is a
-  bit of a swiss knife.  It is meant as the single function to
-  invoke to adjust the underlines (and possibly overlines) of a
-  section title in restructuredtext.  The next action it takes
-  depends on context around the point, and it is meant to be
-  invoked possibly more than once. Basically, this function deals
-  with:
-
-  - underlining a title if it does not have an underline;
-  - adjusting the length of the underline characters to fit a
-    modified title;
-  - rotating the underlines/overlines in the set of already
-    existing underline chars used in the file;
-  - switching between simple underline and over-and-under style
-    sectioning (or box style).
-
-  Here are the gory details:
-
-  - If the current line has no underline character around it,
-    search backwards for a previously used underlining character,
-    and underline the current line as a section title (also see
-    prefix argument below).
-
-    If no pre-existing underlining character is found in the on
-    the line, we use the last seen underline char or consult the
-    first element of rest-preferred-characters if this is the
-    first title in the entire file.
-
-  - If the current line does have an underline or overline, and
-    if
-
-    - the underline do not extend to exactly the end of the
-      title line, this changes the length of the under(over)lines
-      to fit exactly the section title;
-
-    - the underline length is already adjusted to the end of the
-      title line, we search the file for the underline chars, and
-      we rotate the current title's underline character with that
-      list (going down the hierarchy that is present in the
-      file);
-
-    If there is a prefix argument, switch the style between the
-    initial sectioning style and the other sectioning style.  The
-    two styles are overline-and-underline and simple-underline.
+(defun rest-normalize-cursor-position ()
+  "If the cursor is on a decoration line or an empty line , place
+  it on the section title line (at the end).  Returns the line
+  offset by which the cursor was moved. This works both over or
+  under a line."
+  (if (save-excursion (beginning-of-line)
+                      (or (rest-line-homogeneous-p 1)
+                          (looking-at "^[ \t]*$")))
+      (progn
+        (beginning-of-line)
+        (cond
+         ((save-excursion (forward-line -1)
+                          (beginning-of-line)
+                          (and (looking-at rest-section-text-regexp)
+                               (not (rest-line-homogeneous-p 1))))
+          (progn (forward-line -1) -1))
+         ((save-excursion (forward-line +1)
+                          (beginning-of-line)
+                          (and (looking-at rest-section-text-regexp)
+                               (not (rest-line-homogeneous-p 1))))
+          (progn (forward-line +1) +1))
+         (t 0)))
+    0 ))
+
+
+(defun rest-find-all-decorations ()
+  "Finds all the decorations in the file, and returns a list of
+  (line, decoration) pairs.  Each decoration consists in a (char,
+  style, indent) triple.
+
+  This function does not detect the hierarchy of decorations, it
+  just finds all of them in a file.  You can then invoke another
+  function to remove redundancies and inconsistencies."
+
+  (let (positions
+        (curline 1))
+    ;; Iterate over all the section titles/decorations in the file.
+    (save-excursion
+      (beginning-of-buffer)
+      (while (< (point) (buffer-end 1))
+        (if (rest-line-homogeneous-p)
+            (progn
+              (setq curline (+ curline (rest-normalize-cursor-position)))
+
+              ;; Here we have found a potential site for a decoration,
+              ;; characterize it.
+              (let ((deco (rest-get-decoration)))
+                (if (cadr deco) ;; Style is existing.
+                    ;; Found a real decoration site.
+                    (progn
+                      (push (cons curline deco) positions)
+                      ;; Push beyond the underline.
+                      (forward-line 1)
+                      (setq curline (+ curline 1))
+                      )))
+              ))
+        (forward-line 1)
+        (setq curline (+ curline 1))
+        ))
+    (reverse positions)))
+
+
+(defun rest-infer-hierarchy (decorations)
+  "Build a hierarchy of decorations using the list of given decorations.
+
+  This function expects a list of (char, style, indent)
+  decoration specifications, in order that they appear in a file,
+  and will infer a hierarchy of section levels by removing
+  decorations that have already been seen in a forward traversal of the
+  decorations, comparing just the character and style.
+
+  Similarly returns a list of (char, style, indent), where each
+  list element should be unique."
+
+  (let ((hierarchy-alist (list)))
+    (dolist (x decorations)
+      (let ((char (car x))
+            (style (cadr x))
+            (indent (caddr x)))
+        (if (not (assoc (cons char style) hierarchy-alist))
+            (progn
+              (setq hierarchy-alist
+                    (append hierarchy-alist
+                            (list (cons (cons char style) x))))
+              ))
+        ))
+    (mapcar 'cdr hierarchy-alist)
+    ))
+
+
+(defun rest-get-hierarchy (&optional alldecos ignore)
+  "Returns a list of decorations that represents the hierarchy of
+  section titles in the file.
+
+  If the line number in IGNORE is specified, the decoration found
+  on that line (if there is one) is not taken into account when
+  building the hierarchy."
+  (let ((all (or alldecos (rest-find-all-decorations))))
+    (setq all (assq-delete-all ignore all))
+    (rest-infer-hierarchy (mapcar 'cdr all))))
+
+
+(defun rest-get-decoration (&optional point)
+  "Looks around point and finds the characteristics of the
+  decoration that is found there.  We assume that the cursor is
+  already placed on the title line (and not on the overline or
+  underline).
+
+  This function returns a (char, style, indent) triple.  If the
+  characters of overline and underline are different, we return
+  the underline character.  The indent is always calculated.  A
+  decoration can be said to exist if the style is not nil.
+
+  A point can be specified to go to the given location before
+  extracting the decoration."
+
+  (let (char style indent)
+    (save-excursion
+      (if point (goto-char point))
+      (beginning-of-line)
+      (if (looking-at rest-section-text-regexp)
+          (let* ((over (save-excursion
+			 (forward-line -1)
+			 (rest-line-homogeneous-p)))
+
+		(under (save-excursion
+			 (forward-line +1)
+			 (rest-line-homogeneous-p)))
+	        )
+
+	    ;; Check that the line above the overline is not part of a title
+	    ;; above it.
+	    (if (and over
+		     (save-excursion
+		       (and (equal (forward-line -2) 0)
+			    (looking-at rest-section-text-regexp))))
+		(setq over nil))
+
+            (cond
+             ;; No decoration found, leave all return values nil.
+             ((and (eq over nil) (eq under nil)))
+
+             ;; Overline only, leave all return values nil.
+             ;;
+             ;; Note: we don't return the overline character, but it could perhaps
+             ;; in some cases be used to do something.
+             ((and over (eq under nil)))
+
+             ;; Underline only.
+             ((and under (eq over nil))
+              (setq char under
+                    style 'simple))
+
+             ;; Both overline and underline.
+             (t
+              (setq char under
+                    style 'over-and-under))
+             )
+            )
+        )
+      ;; Find indentation.
+      (setq indent (save-excursion (back-to-indentation) (current-column)))
+      )
+    ;; Return values.
+    (list char style indent)))
+
+
+(defun rest-get-decorations-around (&optional alldecos)
+  "Given the list of all decorations (with positions),
+find the decorations before and after the given point.
+A list of the previous and next decorations is returned."
+  (let* ((all (or alldecos (rest-find-all-decorations)))
+	 (curline (line-number-at-pos))
+	 prev next
+	 (cur all))
+
+    ;; Search for the decorations around the current line.
+    (while (and cur (< (caar cur) curline))
+      (setq prev cur
+	    cur (cdr cur)))
+    ;; 'cur' is the following decoration.
+
+    (if (and cur (caar cur))
+	(setq next (if (= curline (caar cur)) (cdr cur) cur)))
+
+    (mapcar 'cdar (list prev next))
+    ))
+
+
+(defun rest-decoration-complete-p (deco &optional point)
+  "Return true if the decoration DECO around POINT is complete."
+  ;; Note: we assume that the detection of the overline as being the underline
+  ;; of a preceding title has already been detected, and has been eliminated
+  ;; from the decoration that is given to us.
+
+  ;; There is some sectioning already present, so check if the current
+  ;; sectioning is complete and correct.
+  (let* ((char (car deco))
+         (style (cadr deco))
+         (indent (caddr deco))
+         (endcol (save-excursion (end-of-line) (current-column)))
+         )
+    (if char
+        (let ((exps (concat "^"
+                            (regexp-quote (make-string (+ endcol indent) char))
+                            "$")))
+          (and
+           (save-excursion (forward-line +1)
+                           (beginning-of-line)
+                           (looking-at exps))
+           (or (not (eq style 'over-and-under))
+               (save-excursion (forward-line -1)
+                               (beginning-of-line)
+                               (looking-at exps))))
+          ))
+    ))
+
+
+(defun rest-get-next-decoration 
+  (curdeco hier &optional suggestion reverse-direction)
+  "Get the next decoration for CURDECO, in given hierarchy HIER,
+and suggesting for new decoration SUGGESTION."
+
+  (let* (
+	 (char (car curdeco))
+	 (style (cadr curdeco))
+
+	 ;; Build a new list of decorations for the rotation.
+	 (rotdecos
+	  (append hier
+		  ;; Suggest a new decoration.
+		  (list suggestion
+			;; If nothing to suggest, use first decoration.
+			(car hier)))) )
+    (or
+     ;; Search for next decoration.
+     (cadr
+      (let ((cur (if reverse-direction rotdecos
+		   (reverse rotdecos)))
+	    found)
+	(while (and cur
+		    (not (and (eq char (caar cur))
+			      (eq style (cadar cur)))))
+	  (setq cur (cdr cur)))
+	cur))
+		    
+     ;; If not found, take the first of all decorations.
+     suggestion
+     )))
+
+
+(defun rest-adjust ()
+  "Adjust/rotate the section decoration for the section title
+around point or promote/demote the decorations inside the region,
+depending on if the region is active.  This function is meant to
+be invoked possibly multiple times, and can vary its behaviour
+with a positive prefix argument (toggle style), or with a
+negative prefix argument (alternate behaviour).
+
+This function is the main focus of this module and is a bit of a
+swiss knife.  It is meant as the single most essential function
+to be bound to invoke to adjust the decorations of a section
+title in restructuredtext.  It tries to deal with all the
+possible cases gracefully and to do `the right thing' in all
+cases.
+
+See the documentations of rest-adjust-decoration and
+rest-promote-region for full details.
+
+Prefix Arguments
+================
+
+The method can take either (but not both) of
+
+a. a (non-negative) prefix argument, which means to toggle the
+   decoration style.  Invoke with C-u prefix for example;
+
+b. a negative numerical argument, which generally inverts the
+   direction of search in the file or hierarchy.  Invoke with C--
+   prefix for example.
+
+"
+  (interactive)
+
+  (let* ( ;; Parse the positive and negative prefix arguments.
+	 (reverse-direction
+	  (and current-prefix-arg
+	       (< (prefix-numeric-value current-prefix-arg) 0)))
+	 (toggle-style
+	  (and current-prefix-arg (not reverse-direction))))
+
+    (if mark-active
+	;; Adjust decorations within region.
+	(rest-promote-region current-prefix-arg)
+      ;; Adjust decoration around point.
+      (rest-adjust-decoration toggle-style reverse-direction))
+    ))
+
+
+(defun rest-adjust-decoration (&optional toggle-style reverse-direction)
+"Adjust/rotate the section decoration for the section title around point.
+
+This function is meant to be invoked possibly multiple times, and
+can vary its behaviour with a true TOGGLE-STYLE argument, or with
+a REVERSE-DIRECTION argument.
+
+General Behaviour
+=================
+
+The next action it takes depends on context around the point, and
+it is meant to be invoked possibly more than once to rotate among
+the various possibilities. Basically, this function deals with:
+
+- adding a decoration if the title does not have one;
+
+- adjusting the length of the underline characters to fit a
+  modified title;
+
+- rotating the decoration in the set of already existing
+  sectioning decorations used in the file;
+
+- switching between simple and over-and-under styles.
+
+You should normally not have to read all the following, just
+invoke the method and it will do the most obvious thing that you
+would expect.
+
+
+Decoration Definitions
+======================
+
+The decorations consist in
+
+1. a CHARACTER
+
+2. a STYLE which can be either of 'simple' or 'over-and-under'.
+
+3. an INDENT (meaningful for the over-and-under style only)
+   which determines how many characters and over-and-under
+   style is hanging outside of the title at the beginning and
+   ending.
+
+See source code for mode details.
+
+
+Detailed Behaviour Description
+==============================
+
+Here are the gory details of the algorithm (it seems quite
+complicated, but really, it does the most obvious thing in all
+the particular cases):
+
+Before applying the decoration change, the cursor is placed on
+the closest line that could contain a section title.
+
+Case 1: No Decoration
+---------------------
+
+If the current line has no decoration around it,
+
+- search backwards for the last previous decoration, and apply
+  the decoration one level lower to the current line.  If there
+  is no defined level below this previous decoration, we suggest
+  the most appropriate of the rest-preferred-decorations.
+
+  If REVERSE-DIRECTION is true, we simply use the previous
+  decoration found directly.
+
+- if there is no decoration found in the given direction, we use
+  the first of rest-preferred-decorations.
+
+The prefix argument forces a toggle of the prescribed decoration
+style.
+
+Case 2: Incomplete Decoration
+-----------------------------
+
+If the current line does have an existing decoration, but the
+decoration is incomplete, that is, the underline/overline does
+not extend to exactly the end of the title line (it is either too
+short or too long), we simply extend the length of the
+underlines/overlines to fit exactly the section title.
+
+If the prefix argument is given, we toggle the style of the
+decoration as well.
+
+REVERSE-DIRECTION has no effect in this case.
+
+Case 3: Complete Existing Decoration
+------------------------------------
+
+If the decoration is complete (i.e. the underline (overline)
+length is already adjusted to the end of the title line), we
+search/parse the file to establish the hierarchy of all the
+decorations (making sure not to include the decoration around
+point), and we rotate the current title's decoration from within
+that list (by default, going *down* the hierarchy that is present
+in the file, i.e. to a lower section level).  This is meant to be
+used potentially multiple times, until the desired decoration is
+found around the title.
+
+If we hit the boundary of the hierarchy, exactly one choice from
+the list of preferred decorations is suggested/chosen, the first
+of those decoration that has not been seen in the file yet (and
+not including the decoration around point), and the next
+invocation rolls over to the other end of the hierarchy (i.e. it
+cycles).  This allows you to avoid having to set which character
+to use by always using the
+
+If REVERSE-DIRECTION is true, the effect is to change the
+direction of rotation in the hierarchy of decorations, thus
+instead going *up* the hierarchy.
+
+However, if there is a non-negative prefix argument, we do not
+rotate the decoration, but instead simply toggle the style of the
+current decoration (this should be the most common way to toggle
+the style of an existing complete decoration).
+
+
+Point Location
+==============
+
+The invocation of this function can be carried out anywhere
+within the section title line, on an existing underline or
+overline, as well as on an empty line following a section title.
+This is meant to be as convenient as possible.
+
+
+Indented Sections
+=================
+
+Indented section titles such as ::
+
+   My Title
+   --------
+
+are illegal in restructuredtext and thus not recognized by the
+parser.  This code will thus not work in a way that would support
+indented sections (it would be ambiguous anyway).
+
+
+Joint Sections
+==============
+
+Section titles that are right next to each other may not be
+treated well.  More work might be needed to support those, and
+special conditions on the completeness of existing decorations
+might be required to make it non-ambiguous.
+
+For now we assume that the decorations are disjoint, that is,
+there is at least a single line between the titles/decoration
+lines.
+
+
+Suggested Binding
+=================
+
+We suggest that you bind this function on C-=.  It is close to
+C-- so a negative argument can be easily specified with a flick
+of the right hand fingers and the binding is unused in text-mode."
+  (interactive)
+
+  ;; If we were invoked directly, parse the prefix arguments into the
+  ;; arguments of the function.
+  (if current-prefix-arg
+      (setq reverse-direction
+	    (and current-prefix-arg
+		 (< (prefix-numeric-value current-prefix-arg) 0))
+
+	    toggle-style
+	    (and current-prefix-arg (not reverse-direction))))
+
+  (let* (;; Check if we're on an underline around a section title, and move the
+         ;; cursor to the title if this is the case.
+         (moved (rest-normalize-cursor-position))
+
+         ;; Find the decoration and completeness around point.
+         (curdeco (rest-get-decoration))
+         (char (car curdeco))
+         (style (cadr curdeco))
+         (indent (caddr curdeco))
+
+	 ;; New values to be computed.
+	 char-new style-new indent-new
+         )
+
+    ;; We've moved the cursor... if we're not looking at some text, we have
+    ;; nothing to do.
+    (if (save-excursion (beginning-of-line)
+                        (looking-at rest-section-text-regexp))
+	(progn
+	  (cond
+	   ;;---------------------------------------------------------------------
+	   ;; Case 1: No Decoration
+	   ((and (eq char nil) (eq style nil))
+
+	    (let* ((alldecos (rest-find-all-decorations))
+
+		   (around (rest-get-decorations-around alldecos))
+		   (prev (car around))
+		   cur
+
+		   (hier (rest-get-hierarchy alldecos))
+		   )
+
+	      ;; Advance one level down.
+	      (setq cur
+		    (if prev
+			(if (not reverse-direction)
+			    (or (cadr (rest-get-decoration-match hier prev))
+				(rest-suggest-new-decoration hier prev))
+			  prev)
+		      (copy-list (car rest-preferred-decorations))
+		      ))
+
+	      ;; Invert the style if requested.
+	      (if toggle-style
+		  (setcar (cdr cur) (if (eq (cadr cur) 'simple)
+					'over-and-under 'simple)) )
+
+	      (setq char-new (car cur)
+		    style-new (cadr cur)
+		    indent-new (caddr cur))
+	      ))
+
+	   ;;---------------------------------------------------------------------
+	   ;; Case 2: Incomplete Decoration
+	   ((not (rest-decoration-complete-p curdeco))
+
+	    ;; Invert the style if requested.
+	    (if toggle-style
+		(setq style (if (eq style 'simple) 'over-and-under 'simple)))
+
+            (setq char-new char
+		  style-new style
+		  indent-new indent))
+
+	   ;;---------------------------------------------------------------------
+	   ;; Case 3: Complete Existing Decoration
+	   (t
+	    (if toggle-style
+
+		;; Simply switch the style of the current decoration.
+		(setq char-new char
+		      style-new (if (eq style 'simple) 'over-and-under 'simple)
+		      indent-new rest-default-indent)
+
+	      ;; Else, we rotate, ignoring the decoration around the current
+	      ;; line...
+	      (let* ((alldecos (rest-find-all-decorations))
+
+		     (hier (rest-get-hierarchy alldecos (line-number-at-pos)))
+
+		     ;; Suggestion, in case we need to come up with something
+		     ;; new
+		     (suggestion (rest-suggest-new-decoration
+				  hier
+				  (car (rest-get-decorations-around alldecos))))
+
+		     (nextdeco (rest-get-next-decoration 
+				curdeco hier suggestion reverse-direction))
+
+		     )
+
+		;; Indent, if present, always overrides the prescribed indent.
+		(setq char-new (car nextdeco)
+		      style-new (cadr nextdeco)
+		      indent-new (caddr nextdeco))
+
+		)))
+	   )
+
+	  ;; Override indent with present indent!
+	  (setq indent-new (if (> indent 0) indent indent-new))
+
+	  (if (and char-new style-new)
+	      (rest-update-section char-new style-new indent-new))
+	  ))
+
+
+    ;; Correct the position of the cursor to more accurately reflect where it
+    ;; was located when the function was invoked.
+    (if (not (= moved 0))
+        (progn (forward-line (- moved))
+               (end-of-line)))
+
+    ))
+
+;; Maintain an alias for compatibility.
+(defalias 'rest-adjust-section-title 'rest-adjust)
+
+
+(defun rest-promote-region (&optional demote)
+  "Promote the section titles within the region.
+
+With argument DEMOTE or a prefix argument, demote the
+section titles instead.  The algorithm used at the boundaries of
+the hierarchy is similar to that used by rest-adjust-decoration."
+  (interactive)
+
+  (let* ((demote (or current-prefix-arg demote))
+	 (alldecos (rest-find-all-decorations))
+	 (cur alldecos)
+	 
+	 (hier (rest-get-hierarchy alldecos))
+	 (suggestion (rest-suggest-new-decoration hier))
+
+	 (region-begin-line (line-number-at-pos (region-beginning)))
+	 (region-end-line (line-number-at-pos (region-end)))
+
+	 marker-list
+	 )
+
+    ;; Skip the markers that come before the region beginning
+    (while (and cur (< (caar cur) region-begin-line))
+      (setq cur (cdr cur)))
     
-    If however, you are on a complete section title and you
-    specify a negative argument, the effect of the prefix
-    argument is to change the direction of rotation of the
-    underline characters. Thus using a prefix argument and a
-    negative prefix argument achieves a different result in the
-    case of rotation.
-
-    Note that the initial style of underlining (simple underline
-    or box-style) depends on if there is whitespace at the start
-    of the line.  If there are already underlines/overlines,
-    those are used to select the style, otherwise if there is
-    whitespace at the front of the title overline-and-underline
-    style is chosen, and otherwise simple underline.
-
-    Also, note that this should work on the section title line as
-    well as on a complete or incomplete underline for a
-    title (first thing we check for that case and move the cursor
-    up a line if needed)."
+    ;; Create a list of markers for all the decorations which are found within
+    ;; the region.
+    (save-excursion
+      (let (m line)
+	(while (and cur (< (setq line (caar cur)) region-end-line))
+	  (setq m (make-marker))
+	  (goto-line line)
+	  (push (list (set-marker m (point)) (cdar cur)) marker-list)
+	  (setq cur (cdr cur)) ))
+
+      ;; Apply modifications.
+      (let (nextdeco)
+	(dolist (p marker-list)
+	  ;; Go to the decoration to promote.
+	  (goto-char (car p))
+	  
+	  ;; Rotate the next decoration.
+	  (setq nextdeco (rest-get-next-decoration 
+			  (cadr p) hier suggestion demote))
+	  
+	  ;; Update the decoration.
+	  (apply 'rest-update-section nextdeco)
+	  
+	  ;; Clear marker to avoid slowing down the editing after we're done.
+	  (set-marker (car p) nil)
+	  ))
+      (setq deactivate-mark nil) 
+    )))
+
 
+
+(defun rest-display-sections-hierarchy (&optional decorations)
+  "Display the current file's section title decorations hierarchy.
+  This function expects a list of (char, style, indent) triples."
   (interactive)
 
-  (let* (
-	 ;; check if we're on an underline under a title line, and move the
-	 ;; cursor up if it is so.
-	 (moved
-	  (if (and (or (rest-line-single-char-p 1) 
-		       (looking-at "^\\s-*$"))
-		   (save-excursion
-		     (forward-line -1)
-		     (beginning-of-line)
-		     (looking-at "^.+$")))
-	      (progn (forward-line -1) t)
-	    ))
-
-	 ;; find current sectioning character
-	 (curchar (rest-current-section-char))
-	 ;; find current sectioning style
-	 (init-style (rest-initial-sectioning-style))
-	 ;; find current indentation of title line
-	 (curindent (save-excursion
-		      (back-to-indentation)
-		      (current-column)))
-
-	 ;; ending column
-	(endcol (- (save-excursion
-		     (end-of-line)
-		     (current-column))
-                   (save-excursion
-		     (back-to-indentation)
-                     (current-column))))
+  (if (not decorations)
+      (setq decorations (rest-get-hierarchy)))
+  (with-output-to-temp-buffer "*rest section hierarchy*"
+    (let ((level 1))
+      (with-current-buffer standard-output
+        (dolist (x decorations)
+          (insert (format "\nSection Level %d" level))
+          (apply 'rest-update-section x)
+          (end-of-buffer)
+          (insert "\n")
+          (incf level)
+          ))
+    )))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Section movement commands.
+;;
+
+(defun rest-forward-section (&optional offset)
+  "Skip to the next restructured text section title.
+  OFFSET specifies how many titles to skip.  Use a negative OFFSET to move
+  backwards in the file (default is to use 1)."
+  (interactive)
+  (let* (;; Default value for offset.
+	 (offset (or offset 1))
+
+	 ;; Get all the decorations in the file, with their line numbers.
+	 (alldecos (rest-find-all-decorations))
+
+	 ;; Get the current line.
+	 (curline (line-number-at-pos))
+
+	 (cur alldecos)
+	 (idx 0)
+	 line
 	 )
 
-    ;; if there is no current style found...
-    (if (eq init-style nil)
-	;; select based on the whitespace at the beginning of the line
-	(save-excursion
-	  (beginning-of-line)
-	  (setq init-style
-		(if (looking-at "^\\s-+") 'over-and-under 'simple))))
-
-    ;; if we're switching characters, we're going to simply change the
-    ;; sectioning style.  this branch is also taken if there is no current
-    ;; sectioning around the title.
-    (if (or (and current-prefix-arg
-		 (not (< (prefix-numeric-value current-prefix-arg) 0)))
-	    (eq curchar nil))
-	
-	;; we're switching characters or there is currently no sectioning
-	(progn
-	  (setq curchar 
-		(or curchar
-		    (rest-find-last-section-char)
-		    (car (rest-all-section-chars))
-		    (car rest-preferred-characters)
-		    ?=))
-
-	  ;; if there is a current indent, reuse it, otherwise use default
-	  (if (= curindent 0)
-	      (setq curindent rest-default-under-and-over-indent))
-
-	  (rest-update-section
-	   curchar
-	   (if (and current-prefix-arg
-		    (not (< (prefix-numeric-value current-prefix-arg) 0)))
-	       (if (eq init-style 'over-and-under) 'simple 'over-and-under)
-	     init-style)
-	   curindent)
-	  )
-
-      ;; else we're not switching characters, and there is some sectioning
-      ;; already present, so check if the current sectioning is complete and
-      ;; correct.
-      (let ((exps (concat "^" 
-			  (regexp-quote (make-string 
-					 (+ endcol curindent) curchar)) 
-			  "$")))
-	(if (or
-	     (not (save-excursion (forward-line +1)
-				  (beginning-of-line)
-				  (looking-at exps)))
-	     (and (eq init-style 'over-and-under)
-		  (not (save-excursion (forward-line -1)
-				       (beginning-of-line)
-				       (looking-at exps)))))
-
-	    ;; the current sectioning needs to be fixed/updated!
-	    (rest-update-section curchar init-style curindent)
-
-	  ;; the current sectioning is complete, rotate characters
-	  (let* ( (curline (+ (count-lines (point-min) (point))
-			      (if (bolp) 1 0)))
-		  (allchars (rest-all-section-chars 
-			     (list (- curline 1) curline (+ curline 1))))
-
-		  (rotchars 
-		   (append allchars 
-			   (filter 'identity
-				   (list 
-				    ;; suggest a new char
-				    (rest-suggest-new-char allchars)
-				    ;; rotate to first char
-				    (car allchars)))))
-		  (nextchar 
-		   (or (cadr (memq curchar 
-				   (if (< (prefix-numeric-value 
-					   current-prefix-arg) 0)
-				       (reverse rotchars) rotchars)))
-		       (car allchars)) ) )
-
-
-	    (if nextchar
-		(rest-update-section nextchar init-style curindent))
-	    )))
-      )
+    ;; Find the index of the "next" decoration w.r.t. to the current line.
+    (while (and cur (< (caar cur) curline))
+      (setq cur (cdr cur))
+      (incf idx))
+    ;; 'cur' is the decoration on or following the current line.
+
+    (if (and (> offset 0) cur (= (caar cur) curline))
+  	(incf idx))
 
-    (if moved 
-	(progn (forward-line 1) (end-of-line)))
+    ;; Find the final index.
+    (setq idx (+ idx (if (> offset 0) (- offset 1) offset)))
+    (setq cur (nth idx alldecos))
+
+    ;; If the index is positive, goto the line, otherwise go to the buffer
+    ;; boundaries.
+    (if (and cur (>= idx 0))
+	(goto-line (car cur))
+      (if (> offset 0) (end-of-buffer) (beginning-of-buffer)))
     ))
 
+(defun rest-backward-section ()
+  "Like rest-forward-section, except move back one title."
+  (interactive)
+  (rest-forward-section -1))
+
+
+
+
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Generic text functions that are more convenient than the defaults.
+;;
+
+(defun replace-lines (fromchar tochar)
+  "Replace flush-left lines, consisting of multiple FROMCHAR characters,
+with equal-length lines of TOCHAR."
+  (interactive "\
+cSearch for flush-left lines of char:
+cand replace with char: ")
+  (save-excursion
+    (let* ((fromstr (string fromchar))
+           (searchre (concat "^" (regexp-quote fromstr) "+ *$"))
+           (found 0))
+      (condition-case err
+          (while t
+            (search-forward-regexp searchre)
+            (setq found (1+ found))
+            (search-backward fromstr)  ;; point will be *before* last char
+            (setq p (1+ (point)))
+            (beginning-of-line)
+            (setq l (- p (point)))
+            (kill-line)
+            (insert-char tochar l))
+        (search-failed
+         (message (format "%d lines replaced." found)))))))
+
+(defun join-paragraph ()
+  "Join lines in current paragraph into one line, removing end-of-lines."
+  (interactive)
+  (let ((fill-column 65000)) ; some big number
+    (call-interactively 'fill-paragraph)))
+
+(defun force-fill-paragraph ()
+  "Fill paragraph at point, first joining the paragraph's lines into one.
+This is useful for filling list item paragraphs."
+  (interactive)
+  (join-paragraph)
+  (fill-paragraph nil))
+
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -531,91 +1096,34 @@ As an added convenience, if the command is repeated immediately, the alternative
 column is used (fill-column vs. end of previous/next line)."
   (interactive)
   (let* ((curcol (current-column))
-	 (curline (+ (count-lines (point-min) (point))
-		     (if (eq curcol 0) 1 0)))
-	 (lbp (line-beginning-position 0))
-	 (prevcol (if (and (= curline 1) (not current-prefix-arg))
-		      fill-column
-		    (save-excursion
-		      (forward-line (if current-prefix-arg 1 -1))
-		      (end-of-line)
-		      (skip-chars-backward " \t" lbp)
-		      (let ((cc (current-column)))
-			(if (= cc 0) fill-column cc)))))
-	 (rightmost-column
-	  (cond (tofill fill-column)
-		((equal last-command 'repeat-last-character)
-		 (if (= curcol fill-column) prevcol fill-column))
-		(t (save-excursion
-		     (if (= prevcol 0) fill-column prevcol)))
-		)) )
+         (curline (+ (count-lines (point-min) (point))
+                     (if (eq curcol 0) 1 0)))
+         (lbp (line-beginning-position 0))
+         (prevcol (if (and (= curline 1) (not current-prefix-arg))
+                      fill-column
+                    (save-excursion
+                      (forward-line (if current-prefix-arg 1 -1))
+                      (end-of-line)
+                      (skip-chars-backward " \t" lbp)
+                      (let ((cc (current-column)))
+                        (if (= cc 0) fill-column cc)))))
+         (rightmost-column
+          (cond (tofill fill-column)
+                ((equal last-command 'repeat-last-character)
+                 (if (= curcol fill-column) prevcol fill-column))
+                (t (save-excursion
+                     (if (= prevcol 0) fill-column prevcol)))
+                )) )
     (end-of-line)
     (if (> (current-column) rightmost-column)
-	;; shave characters off the end
-	(delete-region (- (point)
-			  (- (current-column) rightmost-column))
-		       (point))
+        ;; shave characters off the end
+        (delete-region (- (point)
+                          (- (current-column) rightmost-column))
+                       (point))
       ;; fill with last characters
       (insert-char (preceding-char)
-		   (- rightmost-column (current-column))))
+                   (- rightmost-column (current-column))))
     ))
 
 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Section movement commands.
-;;
-
-;; Note: this is not quite correct, the definition is any non alpha-numeric
-;; character.
-(defun rest-title-char-p (c)
-  "Returns true if the given character is a valid title char."
-  (and (string-match "[-=`:\\.'\"~^_*+#<>!$%&(),/;?@\\\|]"
-		     (char-to-string c)) t))
-
-(defun rest-forward-section ()
-  "Skip to the next restructured text section title."
-  (interactive)
-  (let* ( (newpoint
-	   (save-excursion
-	     (forward-char) ;; in case we're right on a title
-	     (while
-	       (not
-		(and (re-search-forward "^[A-Za-z0-9].*[ \t]*$" nil t)
-		     (reST-title-char-p (char-after (+ (point) 1)))
-		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$"
-					 (char-after (+ (point) 1))
-					 (current-column))))))
-	     (beginning-of-line)
-	     (point))) )
-    (if newpoint (goto-char newpoint)) ))
-
-(defun rest-backward-section ()
-  "Skip to the previous restructured text section title."
-  (interactive)
-  (let* ( (newpoint
-	   (save-excursion
-	     ;;(forward-char) ;; in case we're right on a title
-	     (while
-	       (not
-		(and (or (backward-char) t)
-		     (re-search-backward "^[A-Za-z0-9].*[ \t]*$" nil t)
-		     (or (end-of-line) t)
-		     (reST-title-char-p (char-after (+ (point) 1)))
-		     (looking-at (format "\n%c\\{%d,\\}[ \t]*$"
-					 (char-after (+ (point) 1))
-					 (current-column))))))
-	     (beginning-of-line)
-	     (point))) )
-    (if newpoint (goto-char newpoint)) ))
-
-
-;;------------------------------------------------------------------------------
-;; For backwards compatibility.  Remove at some point.
-(defalias 'reST-title-char-p 'rest-title-char-p)
-(defalias 'reST-forward-title 'rest-forward-section)
-(defalias 'reST-backward-title 'rest-backward-section)
-
-
 (provide 'restructuredtext)
diff --git a/tools/editors/emacs/tests/Makefile b/tools/editors/emacs/tests/Makefile
new file mode 100644
index 000000000..02fd22712
--- /dev/null
+++ b/tools/editors/emacs/tests/Makefile
@@ -0,0 +1,4 @@
+
+runtests:
+	emacs --script tests-basic.el
+	emacs --script tests-adjust-section.el
diff --git a/tools/editors/emacs/tests/README b/tools/editors/emacs/tests/README
new file mode 100644
index 000000000..a1f4b0e4a
--- /dev/null
+++ b/tools/editors/emacs/tests/README
@@ -0,0 +1,27 @@
+==========================================
+  Tests for automatic section adjustment
+==========================================
+
+:Author: Martin Blais 
+:Date: 2005-09-03
+
+
+Running the tests
+=================
+
+To run the test suite, you can either evaluate the relevant progn from within
+emacs, or you can run them from the command-line like this, e.g.::
+
+   emacs --script tests-basic.el
+
+See the Makefile for more details.
+
+Status
+======
+
+We are planning to write many more tests and eventually to rewrite the
+interactive section adjustment because it contains a few bugs (it nonetheless
+pretty much works well otherwise).  Some of those bugs have been added and are
+currently failing if you run the tests.
+
+(See the FIXME statements for where to continue.)
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index 5af65d56a..d544fda98 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -3,238 +3,778 @@
 ;; Copyright: This module has been placed in the public domain.
 ;;
 ;; Regression tests for rest-adjust-section-title.
+;; 
+;; Run this with::
+;;
+;;    emacs --script tests-adjust-section.el
 ;;
 
-(setq rest-adjust-section-tests 
+;; Define tests.
+(setq rest-adjust-decoration-tests
   '(
-    (simple
+;;------------------------------------------------------------------------------
+(nodec-first-simple-1
 "
 Some Title@
 
 "
 "
+============
+ Some Title
+============
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(nodec-first-simple-2
+"
 Some Title
-==========
+@
+"
+"
+============
+ Some Title
+============
 
-")
+"
+)
 
-    (simple-cursor-in-line
+;;------------------------------------------------------------------------------
+(nodec-first-simple-3
 "
 Some Tit@le
 
 "
 "
-Some Title
-==========
+============
+ Some Title
+============
 
-")
+"
+)
 
-    (simple-cursor-beginning
+;;------------------------------------------------------------------------------
+(nodec-first-simple-4
 "
 @Some Title
 
 "
 "
-Some Title
-==========
+============
+ Some Title
+============
 
 ")
 
-    (simple-at-end-of-buffer
+
+;;------------------------------------------------------------------------------
+(nodec-first-simple-others
+"
+Some Title@
+
+Other Title
+-----------
+
+Other Title2
+~~~~~~~~~~~~
+
+"
+"
+============
+ Some Title
+============
+
+Other Title
+-----------
+
+Other Title2
+~~~~~~~~~~~~
+
+"
+)
+
+
+;;------------------------------------------------------------------------------
+(nodec-first-toggle
+"
+Some Title@
+
 "
-Some Title@"
 "
 Some Title
 ==========
-")
 
-    (cursor-on-empty-line-under
 "
-Some Title
-@
+(t))
+
+;;------------------------------------------------------------------------------
+(nodec-first-forced
+"
+   Some Title@
+
+"
+"
+================
+   Some Title
+================
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(nodec-first-forced-2
+"
+   Some Title@
+
 "
 "
 Some Title
 ==========
 
-")
+"
+(t))
 
+;;------------------------------------------------------------------------------
+(nodec-simple
+"
+Previous Title
+--------------
+
+Some Title@
+
+"
+"
+Previous Title
+--------------
 
+Some Title
+~~~~~~~~~~
+
+"
+)
 
-    (partial
+;;------------------------------------------------------------------------------
+(nodec-simple-neg
 "
+Previous Title
+--------------
+
 Some Title@
----
+
+Next Title
+~~~~~~~~~~
+
 "
 "
+Previous Title
+--------------
+
 Some Title
-----------
+~~~~~~~~~~
 
-")
+Next Title
+~~~~~~~~~~
 
-    (cursor-on-underline
 "
-Some Title
----@
+)
+
+;;------------------------------------------------------------------------------
+(nodec-simple-toggle
+"
+Previous Title
+--------------
+
+Some Title@
+
 "
 "
+Previous Title
+--------------
+
+~~~~~~~~~~
 Some Title
-----------
+~~~~~~~~~~
 
-")
+"
+(t))
 
-    (cursor-on-underline-one-char
+;;------------------------------------------------------------------------------
+(nodec-simple-force-toggle
 "
-Some Title
-~@
+Previous Title
+--------------
+
+  Some Title@
+
 "
 "
+Previous Title
+--------------
+
+~~~~~~~~~~~~~~
+  Some Title
+~~~~~~~~~~~~~~
+
+"
+(t))
+
+
+;;------------------------------------------------------------------------------
+(nodec-simple-forced
+"
+Previous Title
+--------------
+
+   Some Title@
+
+"
+"
+Previous Title
+--------------
+
 Some Title
 ~~~~~~~~~~
 
-")
+"
+)
 
-    (with-previous-text
+;;------------------------------------------------------------------------------
+(nodec-neg
 "
-Some Title
-**********
+Previous Title
+--------------
 
-Subtitle@
+Some Title@
 
+Next Title
+~~~~~~~~~~
 "
 "
+Previous Title
+--------------
+
 Some Title
-**********
+----------
 
-Subtitle
-********
+Next Title
+~~~~~~~~~~
+"
+(-1))
 
-")
+;;------------------------------------------------------------------------------
+(incomplete-simple-1
+"
+Previous Title@
+----------
+"
+"
+Previous Title
+--------------
 
-    (with-suggested-new-text
 "
-Some Title
-==========
+)
 
-Subtitle
+;;------------------------------------------------------------------------------
+(incomplete-simple-2
+"
+Previous Title
+----------@
+"
+"
+Previous Title
+--------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-3
+"
+Previous Title
+-@
+"
+"
+================
+ Previous Title
+================
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-too-long
+"
+Previous Title
+------------------@
+"
+"
+Previous Title
+--------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-uo
+"
+----------------
+ Previous Title
+----------@
+"
+"
+----------------
+ Previous Title
+----------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-partial-overline
+"
+----------@
+ Previous Title
+----------------
+"
+"
+----------------
+ Previous Title
+----------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-both
+"
+----------
+ Previous Title@
+-----
+"
+"
+----------------
+ Previous Title
+----------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-toggle
+"
+Previous Title
+----------@
+"
+"
+--------------
+Previous Title
+--------------
+
+"
+(t))
+
+;;------------------------------------------------------------------------------
+(incomplete-toggle-2
+"
+----------------
+ Previous Title@
+--------
+"
+"
+Previous Title
+--------------
+
+"
+(t))
+
+;;------------------------------------------------------------------------------
+(incomplete-toggle-overline
+"
+--------@
+ Previous Title
+----------------
+"
+"
+Previous Title
+--------------
+
+"
+(t))
+
+;;------------------------------------------------------------------------------
+(incomplete-top
+"--------@
+ Previous Title
+----------------
+"
+"----------------
+ Previous Title
+----------------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(incomplete-top-2
+"=======
+Document Title@
+==============
+"
+"==============
+Document Title
+==============
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(complete-simple
+"
+================
+ Document Title
+================
+
+SubTitle
+--------
+
+My Title@
 --------
 
-Subtitle2@
+After Title
+~~~~~~~~~~~
 
 "
 "
-Some Title
+================
+ Document Title
+================
+
+SubTitle
+--------
+
+==========
+ My Title
 ==========
 
-Subtitle
+After Title
+~~~~~~~~~~~
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(complete-simple-neg
+"
+================
+ Document Title
+================
+
+SubTitle
+--------
+
+My Title@
+--------
+
+After Title
+~~~~~~~~~~~
+
+"
+"
+================
+ Document Title
+================
+
+SubTitle
 --------
 
-Subtitle2
-~~~~~~~~~
+My Title
+~~~~~~~~
+
+After Title
+~~~~~~~~~~~
 
 "
-(nil nil))
+(-1))
 
-    (with-previous-text-rotating
+;;------------------------------------------------------------------------------
+(complete-simple-suggestion-down
 "
-Some Title
-==========
+================
+ Document Title
+================
 
-Subtitle
+SubTitle
+========
+
+My Title@
+========
+
+"
+"
+================
+ Document Title
+================
+
+SubTitle
+========
+
+My Title
+--------
+
+"
+(-1))
+
+;;------------------------------------------------------------------------------
+(complete-simple-boundary-down
+"
+================
+ Document Title
+================
+
+SubTitle
+========
+
+My Title@
 --------
 
-Subtitle2@
+"
+"
+================
+ Document Title
+================
+
+SubTitle
+========
+
+==========
+ My Title
+==========
 
 "
+(-1))
+
+;;------------------------------------------------------------------------------
+(complete-simple-suggestion-up
 "
-Some Title
+================
+ Document Title
+================
+
+SubTitle
+========
+
+==========
+ My Title@
 ==========
 
-Subtitle
+"
+"
+================
+ Document Title
+================
+
+SubTitle
+========
+
+My Title
 --------
 
-Subtitle2
-=========
+"
+)
 
+;;------------------------------------------------------------------------------
+(complete-simple-boundary-up ;; Note: boundary-up does not exist.
 "
-(nil nil nil))
+================
+ Document Title
+================
+
+SubTitle
+========
 
-      (start-indented
+My Title@
+--------
 "
-   Some Title@
+"
+================
+ Document Title
+================
+
+SubTitle
+========
+
+My Title
+========
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(complete-toggle-1
+"
+SubTitle@
+~~~~~~~~
+
+"
+"
+~~~~~~~~~~
+ SubTitle
+~~~~~~~~~~
+
+"
+(t))
+
+;;------------------------------------------------------------------------------
+(complete-toggle-2
+"
+~~~~~~~~~~
+ SubTitle@
+~~~~~~~~~~
+
+"
+"
+SubTitle
+~~~~~~~~
+
+"
+(t))
+
+;;------------------------------------------------------------------------------
+(at-file-beginning
+"
+Document Title@
 
 "
 "
 ================
-   Some Title
+ Document Title@
 ================
 
-")
+"
+)
+
 
-      (switch-from-nothing
+;;------------------------------------------------------------------------------
+(at-file-ending
 "
-Some Title@
 
+Document Title@
 "
 "
-============
- Some Title
-============
 
-" (t))
+================
+ Document Title@
+================
 
-      (switch-from-over-and-under
 "
-============
- Some Title@
-============
+)
+
+;;------------------------------------------------------------------------------
+(at-file-ending-2
 "
+
+Document Title@"
 "
-Some Title
-==========
 
-" (t))
+================
+ Document Title@
+================
+"
+)
+
+;;------------------------------------------------------------------------------
+(conjoint
+"
+Document Title
+==============
+Subtitle@
+
+"
+"
+Document Title
+==============
+Subtitle@
+--------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(same-conjoint-2
+"==============
+Document Title@
+==============
+Subtitle
+========
+
+"
+"Document Title@
+==============
+Subtitle
+========
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(same-conjoint-2b
+"
+==============
+Document Title@
+==============
+Subtitle
+========
+
+"
+"
+Document Title@
+==============
+Subtitle
+========
+
+"
+)
+
+
+;;------------------------------------------------------------------------------
+(same-conjoint-2
+"
+==============
+Document Title
+==============
+===============
+Document Title2@
+===============
+
+"
+"
+==============
+Document Title
+==============
+Document Title2
+===============
+
+"
+)
 
 ))
 
-;; "A list of regression tests for the section update method."
-
-
-
-(defun regression-test-compare-expect-buffer (testlist fun)
-  "Run the regression tests for the section adjusting method."
-  
-  (let ((buf (get-buffer-create "restructuredtext-regression-tests"))
-	(specchar "@")
-	)
-    (dolist (curtest testlist)
-      ;; print current text
-      (message (format "========= %s" (prin1-to-string (car curtest))))
-
-      ;; prepare a buffer with the starting text, and move the cursor where
-      ;; the special character is located
-      (switch-to-buffer buf)
-      (erase-buffer)
-      (insert (cadr curtest))
-      (search-backward specchar)
-      (delete-char 1)
-      
-      ;; run the section title update command n times
-      (dolist (x (or (cadddr curtest) (list nil)))
-	(let ((current-prefix-arg x))
-	  (funcall fun)))
-      
-      ;; compare the buffer output with the expected text
-      (or (string=
-	   (buffer-string)
-	   (caddr curtest))
-	  (progn
-	    (error "Test %s failed." (car curtest))))
-      )
-    ))
-
-;; evaluate this to run the tests, either interactively or in batch
-(regression-test-compare-expect-buffer
- rest-adjust-section-tests
- (lambda ()
-   (call-interactively 'rest-adjust-section-title)))
+
+;; Main program.  Evaluate this to run the tests.
+;; (setq debug-on-error t)
+
+;; Import the module from the file in the parent directory directly.
+(add-to-list 'load-path ".")
+(load "tests-runner.el")
+(add-to-list 'load-path "..")
+(load "restructuredtext.el")
+
+(progn
+  (regression-test-compare-expect-buffer
+   "Test interactive adjustment of sections."
+   rest-adjust-decoration-tests
+   (lambda ()
+     (call-interactively 'rest-adjust))
+   nil))
+
diff --git a/tools/editors/emacs/tests/tests-basic.el b/tools/editors/emacs/tests/tests-basic.el
new file mode 100644
index 000000000..73054742f
--- /dev/null
+++ b/tools/editors/emacs/tests/tests-basic.el
@@ -0,0 +1,762 @@
+;; Authors: Martin Blais 
+;; Date: $Date: 2005/04/01 23:19:41 $
+;; Copyright: This module has been placed in the public domain.
+;;
+;; Regression tests for rest-adjust-section-title.
+;;
+;; Run this with::
+;;
+;;    emacs --script tests-adjust-section.el
+;;
+
+;; Import the module from the file in the parent directory directly.
+(add-to-list 'load-path ".")
+(load "tests-runner.el")
+(add-to-list 'load-path "..")
+(load "restructuredtext.el")
+
+;; (setq debug-on-error t)
+
+
+(setq rest-line-homogeneous-p-tests
+  '(
+;;------------------------------------------------------------------------------
+(simple "Blablabla bla@" nil)
+(true "-----------@" ?-)
+(indented "   -----------@" ?-)
+(letter "   aaaa@aaa" ?a)
+(true2 "uuuuuuuuuuuuuuuuu@" ?u)
+(misleading "--=---------@" nil)
+(notstrip " uuuuuuuuuuuuuuuuu@" ?u)
+(notstrip2 " uuuuuuuuuuuuuuuuu @" ?u)
+(position "-------@----" ?-)
+(one-char "-@" nil)
+))
+
+(progn
+  (regression-test-compare-expect-values
+   "Tests for predicate for one char line."
+   rest-line-homogeneous-p-tests 'rest-line-homogeneous-p nil))
+
+
+
+
+(setq rest-normalize-cursor-position-tests
+      '(
+;;------------------------------------------------------------------------------
+(under
+"
+
+Du bon vin tous les jours.
+@
+"
+"
+
+@Du bon vin tous les jours.
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(over
+"
+@
+Du bon vin tous les jours.
+
+"
+"
+
+@Du bon vin tous les jours.
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(underline
+"
+
+Du bon vin tous les jours.
+------@-----
+"
+"
+
+@Du bon vin tous les jours.
+-----------
+"
+)
+
+;;------------------------------------------------------------------------------
+(overline
+"
+------@-----
+Du bon vin tous les jours.
+
+"
+"
+-----------
+@Du bon vin tous les jours.
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(both
+"
+@-----------
+Du bon vin tous les jours.
+-----------
+
+"
+"
+-----------
+@Du bon vin tous les jours.
+-----------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(joint
+"
+Du bon vin tous les jours.
+@-----------
+Du bon vin tous les jours.
+-----------
+
+"
+"
+@Du bon vin tous les jours.
+-----------
+Du bon vin tous les jours.
+-----------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(separator
+"
+
+@-----------
+
+"
+"
+
+@-----------
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(between
+"
+Line 1
+@
+Line 2
+
+"
+"
+@Line 1
+
+Line 2
+
+"
+)
+
+;;------------------------------------------------------------------------------
+(between-2
+"
+=====================================
+   Project Idea: Panorama Stitcher
+====================================
+
+:Author: Martin Blais 
+@
+Another Title
+=============
+"
+"
+=====================================
+   Project Idea: Panorama Stitcher
+====================================
+
+@:Author: Martin Blais 
+
+Another Title
+=============
+"
+)
+
+))
+
+
+(progn
+  (regression-test-compare-expect-buffer
+   "Test preparation of cursor position."
+   rest-normalize-cursor-position-tests 'rest-normalize-cursor-position nil))
+
+
+
+
+
+
+
+(setq rest-get-decoration-tests
+      '(
+;;------------------------------------------------------------------------------
+(nodec-1
+"
+
+@Du bon vin tous les jours
+
+"
+(nil nil 0))
+
+;;------------------------------------------------------------------------------
+(nodec-2
+"
+
+@
+Du bon vin tous les jours
+
+"
+(nil nil 0))
+
+;;------------------------------------------------------------------------------
+(nodec-indent
+"
+
+@  Du bon vin tous les jours
+
+"
+(nil nil 2))
+
+;;------------------------------------------------------------------------------
+(underline
+"
+
+@Du bon vin tous les jours
+=========================
+
+"
+(?= simple 0))
+
+;;------------------------------------------------------------------------------
+(underline-incomplete
+"
+
+@Du bon vin tous les jours
+====================
+
+"
+(?= simple 0))
+
+;;------------------------------------------------------------------------------
+(underline-indent
+"
+
+@     Du bon vin tous les jours
+====================
+
+"
+(?= simple 5))
+
+;;------------------------------------------------------------------------------
+(underline-one-char
+"
+
+@Du bon vin tous les jours
+-
+"
+(nil nil 0))
+
+;;------------------------------------------------------------------------------
+(underline-two-char
+"
+
+@Du bon vin tous les jours
+--
+"
+(?- simple 0))
+
+;;------------------------------------------------------------------------------
+(over-and-under
+"
+~~~~~~~~~~~~~~~~~~~~~~~~~
+@Du bon vin tous les jours
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"
+(?~ over-and-under 0))
+
+;;------------------------------------------------------------------------------
+(over-and-under-top
+"~~~~~~~~~~~~~~~~~~~~~~~~~
+@Du bon vin tous les jours
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"
+(?~ over-and-under 0))
+
+;;------------------------------------------------------------------------------
+(over-and-under-indent
+"
+~~~~~~~~~~~~~~~~~~~~~~~~~
+@   Du bon vin tous les jours
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"
+(?~ over-and-under 3))
+
+;;------------------------------------------------------------------------------
+(over-and-under-incomplete
+"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@Du bon vin tous les jours
+~~~~~~~~~~~~~~~~~~~
+
+"
+(?~ over-and-under 0))
+
+;;------------------------------------------------------------------------------
+(over-and-under-different-chars
+"
+---------------------------
+@Du bon vin tous les jours
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"
+(?~ over-and-under 0))
+
+
+;;------------------------------------------------------------------------------
+(not-beginning
+"
+
+Du bon vin to@us les jours
+=========================
+
+"
+(?= simple 0))
+
+;;------------------------------------------------------------------------------
+(over-over-and-under
+"
+@
+=========================
+Du bon vin tous les jours
+=========================
+"
+(nil nil 0))
+
+;;------------------------------------------------------------------------------
+(joint-1
+"
+=========================
+Du bon vin tous les jours
+=========================
+Du bon vin@
+
+"
+(nil nil 0))
+
+;;------------------------------------------------------------------------------
+(joint-2
+"
+=========================
+Du bon vin tous les jours
+=========================
+Du bon vin@
+----------
+
+"
+(45 simple 0))
+
+;;------------------------------------------------------------------------------
+(joint-3
+"
+=========================
+Du bon vin tous les jours
+=========================
+----------
+Du bon vin@
+----------
+
+"
+(45 over-and-under 0))
+
+;;------------------------------------------------------------------------------
+(joint-4
+"
+=========================
+Du bon vin tous les jours
+=========================
+--------------
+  Du bon vin@
+--------------
+
+"
+(45 over-and-under 2))
+
+))
+
+
+(progn
+  (regression-test-compare-expect-values
+   "Test getting the decoration."
+   rest-get-decoration-tests 'rest-get-decoration nil))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+(setq text-1
+"===============================
+   Project Idea: My Document
+===============================
+
+:Author: Martin Blais
+
+Introduction
+============
+
+This is the introduction.
+
+Notes
+-----
+
+Some notes.
+
+Main Points
+===========
+
+Yep.
+
+Super Point
+-----------
+
+~~~~~~~~~~~
+@ Sub Point
+~~~~~~~~~~~
+
+Isn't this fabulous?
+
+Conclusion
+==========
+
+That's it, really.
+
+")
+
+
+(setq text-2
+"
+
+Previous
+--------
+
+Current@
+~~~~~~~
+
+Next
+++++
+
+")
+
+;; ~~~~~~~~~~~~~~~~~~
+;;  Buggy Decoration
+;; ~~~~~~
+;;
+;; ~~~~~~~~~~~~
+;;  Decoration
+;;
+;;
+;; ==========
+
+(setq rest-find-all-decorations-tests
+      `(
+ ;;------------------------------------------------------------------------------
+	(basic-1 ,text-1
+		 ((2 61 over-and-under 3)
+		  (7 61 simple 0)
+		  (12 45 simple 0)
+		  (17 61 simple 0)
+		  (22 45 simple 0)
+		  (26 126 over-and-under 1)
+		  (31 61 simple 0))
+		 )
+
+	(basic-2 ,text-2
+		 ((3 45 simple 0)
+		  (6 126 simple 0)
+		  (9 43 simple 0))
+		 )
+
+	))
+
+
+(progn
+  (regression-test-compare-expect-values
+   "Test finding all the decorations in a file."
+   rest-find-all-decorations-tests 'rest-find-all-decorations nil))
+
+
+
+
+(setq rest-get-hierarchy-tests
+      `(
+ ;;------------------------------------------------------------------------------
+	(basic-1 ,text-1
+		 ((61 over-and-under 3)
+		  (61 simple 0)
+		  (45 simple 0)
+		  (126 over-and-under 1))
+		 )
+	))
+
+(progn
+  (regression-test-compare-expect-values
+   "Test finding the hierarchy of sections in a file."
+   rest-get-hierarchy-tests 'rest-get-hierarchy nil))
+
+
+
+
+(setq rest-get-hierarchy-ignore-tests
+      `(
+ ;;------------------------------------------------------------------------------
+	(basic-1 ,text-1
+		 ((61 over-and-under 3)
+		  (61 simple 0)
+		  (45 simple 0))
+		 )
+	))
+
+(progn
+  (regression-test-compare-expect-values
+   "Test finding the hierarchy of sections in a file, ignoring lines."
+   rest-get-hierarchy-ignore-tests
+   (lambda () (rest-get-hierarchy nil (line-number-at-pos))) nil))
+
+
+
+
+
+
+
+(setq rest-decoration-complete-p-tests
+  '(
+;;------------------------------------------------------------------------------
+(nodec
+"
+
+@Vaudou
+
+" nil ((?= simple 0)))
+
+;;------------------------------------------------------------------------------
+(complete-simple
+"
+@Vaudou
+======
+" t ((?= simple 0)))
+
+;;------------------------------------------------------------------------------
+(complete-over-and-under
+"
+======
+@Vaudou
+======
+" t ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(complete-over-and-under-indent
+"
+==========
+@  Vaudou
+==========
+" t ((?= over-and-under 2)))
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-short
+"
+@Vaudou
+=====
+" nil ((?= simple 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-long
+"
+@Vaudou
+=======
+" nil ((?= simple 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-simple-mixed
+"
+@Vaudou
+===-==
+" nil ((?= simple 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-1
+"
+======
+@Vaudou
+=====
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-2
+"
+=====
+@Vaudou
+======
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-mixed-1
+"
+======
+@Vaudou
+===-==
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-mixed-2
+"
+===-==
+@Vaudou
+======
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-only
+"
+======
+@Vaudou
+
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-mixed
+"
+======
+@Vaudou
+------
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-1
+"
+==========
+  @Vaudou
+=========
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-2
+"
+=========
+  @Vaudou
+==========
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-mixed-1
+"
+==========
+  @Vaudou
+===-======
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-and-under-mixed-2
+"
+===-======
+  @Vaudou
+==========
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-over-only
+"
+==========
+  @Vaudou
+
+" nil ((?= over-and-under 0)))
+
+;;------------------------------------------------------------------------------
+(incomplete-mixed-2
+"
+==========
+  @Vaudou
+----------
+" nil ((?= over-and-under 0)))
+
+))
+
+(progn
+  (regression-test-compare-expect-values
+   "Tests for completeness predicate."
+   rest-decoration-complete-p-tests 'rest-decoration-complete-p nil))
+
+
+
+
+
+
+
+
+
+
+
+
+
+(setq rest-get-decorations-around-tests
+  '(
+;;------------------------------------------------------------------------------
+(simple
+"
+
+Previous
+--------
+
+@Current
+
+Next
+++++
+
+" ((?- simple 0) (?+ simple 0)))
+
+;;------------------------------------------------------------------------------
+(simple-2
+"
+
+Previous
+--------
+
+Current@
+~~~~~~~
+
+Next
+++++
+
+" ((?- simple 0) (?+ simple 0)))
+
+))
+
+(progn
+  (regression-test-compare-expect-values
+   "Tests getting the decorations around a point."
+   rest-get-decorations-around-tests 'rest-get-decorations-around nil))
+
diff --git a/tools/editors/emacs/tests/tests-runner.el b/tools/editors/emacs/tests/tests-runner.el
new file mode 100644
index 000000000..2304ae54a
--- /dev/null
+++ b/tools/editors/emacs/tests/tests-runner.el
@@ -0,0 +1,122 @@
+;; Authors: Martin Blais 
+;; Date: $Date: 2005/04/01 23:19:41 $
+;; Copyright: This module has been placed in the public domain.
+;;
+;; Simple generic test runner for test scripts.
+;;
+;; Run this with::
+;;
+;;    emacs --script .el
+;;
+
+(require 'cl)
+
+(defvar regression-point-char "@"
+  "Special character used to mark the position of point in input
+  text and expected text.")
+
+(defun regression-test-loop (suitename testfun testlist fun &optional continue)
+  "Loop over a series of tests in a buffer and run the 'testfun'
+function."
+
+  (message (format "\n\n   Test Suite: %s\n\n" suitename))
+
+  (let ((buf (get-buffer-create "regression-tests"))
+	errtxt
+	)
+    (dolist (curtest testlist)
+
+      ;; Print current text.
+      (message (format "========= %s" (prin1-to-string (car curtest))))
+
+      ;; Prepare a buffer with the starting text, and move the cursor where
+      ;; the special character is located.
+      (switch-to-buffer buf)
+      (erase-buffer)
+      (insert (cadr curtest))
+
+      (if (not (search-backward regression-point-char nil t))
+	  (error (concat "Error: Badly formed test input, missing "
+			 "the cursor position marker.")))
+
+      (delete-char 1)
+
+      (setq errtxt (funcall testfun
+			    (car curtest)
+			    (caddr curtest)
+			    (cadddr curtest)))
+
+      (if errtxt
+	  (if continue
+	      (progn (message errtxt)
+		     (message "(Continuing...)"))
+	    (error errtxt)))
+    ))
+  (message "Done."))
+
+
+(defun regression-compare-buffers (testname expected testargs)
+  "Compare the buffer and expected text and return actual
+contents if they do not match."
+  
+  ;; Run the section title update command n times.
+  (dolist (x (or testargs (list nil)))
+    (let ((current-prefix-arg x))
+      (funcall fun)))
+
+  ;; Compare the buffer output with the expected text.
+  (let* (;; Get the actual buffer contents.
+	 (actual (buffer-string))
+	 ;; Get the expected location of point
+	 (exppoint (string-match regression-point-char expected))
+	 
+	 (expected-clean (if exppoint
+			     (concat (substring expected 0 exppoint)
+				     (substring expected (+ 1 exppoint)))
+			   expected))
+
+	 ;; Adjust position of point vs. string index.
+	 (exppoint (and exppoint (+ exppoint 1)))
+
+	 )
+
+    (if (not (string= expected-clean actual))
+	;; Error! Test failed.
+	(format "Error: Test %s failed: \nexpected\n%s\ngot\n%s"
+		testname 
+		(prin1-to-string expected-clean) 
+		(prin1-to-string actual))
+      (if (and exppoint (not (equal exppoint (point))))
+	  ;; Error! Test failed, final position of cursor is not the same.
+	  (format "Error: Test %s failed: cursor badly placed." testname))
+    )))
+
+(defun regression-test-compare-expect-buffer 
+  (suitename testlist fun &optional continue)
+  "Run the regression tests for the expected buffer contents."
+  (regression-test-loop 
+   suitename 'regression-compare-buffers testlist fun continue))
+
+
+(defun regression-compare-values (testname expected testargs)
+  "Compare the buffer and expected text and return actual
+contents if they do not match."
+
+  (let (actual)
+    ;; Run the section title update command n times.
+    (setq actual (apply fun testargs))
+    
+    ;; Compare the buffer output with the expected text.
+    (if (not (equal actual expected))
+	;; Error! Test failed.
+	(format "Error: Test %s failed: expected '%s' got '%s'."
+		testname
+		(prin1-to-string expected)
+		(prin1-to-string actual))
+    )))
+
+(defun regression-test-compare-expect-values 
+  (suitename testlist fun &optional continue)
+  "Run the regression tests for expected values comparison."
+  (regression-test-loop 
+   suitename 'regression-compare-values testlist fun continue))
-- 
cgit v1.2.1


From 7f6a756ab8409fd086904e9941eb3c52a5d27e88 Mon Sep 17 00:00:00 2001
From: blais 
Date: Fri, 9 Sep 2005 15:29:59 +0000
Subject: Backported to emacs-21.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3861 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 22 +++++++++++++++++++++-
 tools/editors/emacs/tests/Makefile      |  5 +++++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 0c13a82a2..6f88fcc44 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -33,6 +33,11 @@
 ;; code).  The most important function provided by this file for section title
 ;; adjustments is rest-adjust.
 ;;
+;; You should consider customizing the following variables:
+;;
+;; - rest-default-indent
+;; - rest-preferred-decorations
+;;
 ;; TODO: 
 ;; - Add an option to forego using the file structure in order to make
 ;;   suggestion, and to always use the preferred decorations to do that.
@@ -53,6 +58,21 @@ is for which (pred elem) is true)"
               tail)))))
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; From emacs-22
+
+(if (not (fboundp 'line-number-at-pos))
+    (defun line-number-at-pos (&optional pos)
+      "Return (narrowed) buffer line number at position POS.
+    If POS is nil, use current buffer location."
+      (let ((opoint (or pos (point))) start)
+        (save-excursion
+          (goto-char (point-min))
+          (setq start (point))
+          (goto-char opoint)
+          (forward-line 0)
+          (1+ (count-lines start (point)))))) )
+    
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The following functions implement a smart automatic title sectioning feature.
@@ -154,7 +174,7 @@ is for which (pred elem) is true)"
   decoration style to a over-and-under decoration style.")
 
 
-(defcustom rest-section-text-regexp "^[ \t]*\\S-*[a-zA-Z0-9]\\S-*"
+(defvar rest-section-text-regexp "^[ \t]*\\S-*[a-zA-Z0-9]\\S-*"
   "Regular expression for valid section title text.")
 
 
diff --git a/tools/editors/emacs/tests/Makefile b/tools/editors/emacs/tests/Makefile
index 02fd22712..ea024e3fd 100644
--- a/tools/editors/emacs/tests/Makefile
+++ b/tools/editors/emacs/tests/Makefile
@@ -1,4 +1,9 @@
 
 runtests:
+	emacs-21 --batch -l tests-basic.el
+	emacs-21 --batch -l tests-adjust-section.el
+
+runtests-emacs-cvs:
 	emacs --script tests-basic.el
 	emacs --script tests-adjust-section.el
+
-- 
cgit v1.2.1


From b38f1ece385244850516545ef17072b1d99c7372 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sat, 10 Sep 2005 19:03:32 +0000
Subject: give Martin top billing; almost all of the code is his

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3864 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 6f88fcc44..9d43734ef 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -1,5 +1,5 @@
-;; Authors: David Goodger ,
-;;          Martin Blais 
+;; Authors: Martin Blais ,
+;;          David Goodger 
 ;; Date: $Date$
 ;; Copyright: This module has been placed in the public domain.
 ;;
-- 
cgit v1.2.1


From 25decd0059501f1581c3079896a21626fcdb8174 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 11 Sep 2005 22:26:19 +0000
Subject: updated docs: history and tranform list

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3873 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index aee91b56f..da8af083f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -100,7 +100,7 @@
   \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
   \par\noindent%
 }
-\providecommand{\Dauxiliaryparspace}{%
+\providecommand{\Dauxiliaryparspace}{%  XXX REMOVEME
   \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
   \par%
 }
@@ -247,7 +247,10 @@
   }}}}%
 }
 
-\providecommand{\DNparagraph}[1]{#1}
+\providecommand{\DNparagraph}[1]{%
+  \ifthenelse{\equal{\Dparagraphindented}{true}}{\indent}{\noindent}%
+  #1%
+}
 \providecommand{\Dformatboxtitle}[1]{{\Large\textbf{#1}}}
 \providecommand{\Dformatboxsubtitle}[1]{{\large\textbf{#1}}}
 \providecommand{\Dtopictitle}[1]{%
-- 
cgit v1.2.1


From 0fd701f2bbb030913b466c209733dccc733a1aa8 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 11 Sep 2005 22:32:23 +0000
Subject: polished new LaTeX writer; sorry, the last check-in accidentally
 contained the two newlatex files

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3874 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index da8af083f..515c34099 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -100,10 +100,6 @@
   \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
   \par\noindent%
 }
-\providecommand{\Dauxiliaryparspace}{%  XXX REMOVEME
-  \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-  \par%
-}
 \providecommand{\Dparagraphspace}{\par}
 \providecommand{\Dneedvspace}{true}
 
-- 
cgit v1.2.1


From b07ac8b595e3217c26ee6eb04ff648511a99dc0e Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 12 Sep 2005 21:22:07 +0000
Subject: more tests, more handling for edge cases, some polishing

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3875 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 50 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index 515c34099..eb19ddb8e 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -428,7 +428,7 @@
 \Dprovidelength{\Dlistspacing}{0.8\baselineskip}
 
 \providecommand{\Dsetlistrightmargin}{%
-  \ifthenelse{\lengthtest{\linewidth>10em}}{%
+  \ifthenelse{\lengthtest{\linewidth>12em}}{%
     % Equal margins.
     \setlength{\rightmargin}{\leftmargin}%
   }{%
@@ -842,11 +842,23 @@
   % 1. Table spec (like "|p|p|").
   % 2. Table contents.
   {%
-    \renewcommand{\Dinsidetabular}{true}%
-    \begin{longtable}{#1}%
-      \hline%
-      #2%
-    \end{longtable}%
+    \ifthenelse{\equal{\Dinsidetabular}{true}}{%
+      % Inside longtable; we cannot have nested longtables.
+      % The following \vspace *adds* vertical space.  I have no idea
+      % how to do this in a cleaner way.
+      %\mbox{}\par\vspace{-0.5em}%
+      \begin{tabular}{#1}%
+        \hline%
+        #2%
+      \end{tabular}%
+      %\par\noindent\vspace{-0.5em}%
+    }{%
+      \renewcommand{\Dinsidetabular}{true}%
+      \begin{longtable}{#1}%
+        \hline%
+        #2%
+      \end{longtable}%
+    }%
   }%
 }
 \providecommand{\DNthead}[1]{%
@@ -857,20 +869,38 @@
   #1\tabularnewline%
   \hline%
 }
+\providecommand{\Dinsidemulticolumn}{false}
+\providecommand{\Dcompensatingmulticol}[3]{%
+  \multicolumn{#1}{#2}{%
+    {%
+      \renewcommand{\Dinsidemulticolumn}{true}%
+      % Compensate for weird missing vertical space at top of paragraph.
+      \raisebox{-2.5pt}{#3}%
+    }%
+  }%
+}
 \providecommand{\Dcolspan}[2]{%
   % Take care of the morecols attribute (but incremented by 1).
-  &\multicolumn{#1}{l|}{#2}%
+  &%
+  \Dcompensatingmulticol{#1}{l|}{#2}%
 }
 \providecommand{\Dcolspanleft}[2]{%
   % Like \Dmorecols, but called for the leftmost entries in a table
   % row.
-  \multicolumn{#1}{|l|}{#2}%
+  \Dcompensatingmulticol{#1}{|l|}{#2}%
 }
 \providecommand{\Dsubsequententry}[1]{%
   %
 }
-% \DNentry is not used because we set the ampersand ("&") in the
-% \DAcolspan... macros.
+\providecommand{\DNentry}[1]{%
+  % The following sequence adds minimal vertical space above the top
+  % lines of the first cell paragraph, so that vertical space is
+  % balanced at the top and bottom of table cells.
+  \ifthenelse{\equal{\Dinsidemulticolumn}{false}}{%
+    \vspace{-1em}\vspace{-\parskip}\par%
+  }{}%
+  #1%
+}
 \providecommand{\DAtableheaderentry}[5]{\Dformattableheaderentry{#5}}
 \providecommand{\Dformattableheaderentry}[1]{{\bfseries#1}}
 
-- 
cgit v1.2.1


From 9a747c5991eb8ec2919238d767f3bd1893df5d4d Mon Sep 17 00:00:00 2001
From: blais 
Date: Thu, 15 Sep 2005 17:06:26 +0000
Subject: Fixed minor bug with indented section titles being discovered when
 they should not.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3881 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el  | 14 +++++++--
 tools/editors/emacs/tests/tests-basic.el | 51 +++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 9d43734ef..86f7806fe 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -205,6 +205,14 @@ is for which (pred elem) is true)"
           ))
     ))
 
+(defun rest-line-homogeneous-nodent-p (&optional accept-special)
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at "^[ \t]+")
+	nil
+      (rest-line-homogeneous-p accept-special)
+      )))
+
 
 (defun rest-compare-decorations (deco1 deco2)
   "Compare decorations.  Returns true if both are equal,
@@ -367,7 +375,7 @@ have been seen.
     (save-excursion
       (beginning-of-buffer)
       (while (< (point) (buffer-end 1))
-        (if (rest-line-homogeneous-p)
+        (if (rest-line-homogeneous-nodent-p)
             (progn
               (setq curline (+ curline (rest-normalize-cursor-position)))
 
@@ -450,11 +458,11 @@ have been seen.
       (if (looking-at rest-section-text-regexp)
           (let* ((over (save-excursion
 			 (forward-line -1)
-			 (rest-line-homogeneous-p)))
+			 (rest-line-homogeneous-nodent-p)))
 
 		(under (save-excursion
 			 (forward-line +1)
-			 (rest-line-homogeneous-p)))
+			 (rest-line-homogeneous-nodent-p)))
 	        )
 
 	    ;; Check that the line above the overline is not part of a title
diff --git a/tools/editors/emacs/tests/tests-basic.el b/tools/editors/emacs/tests/tests-basic.el
index 73054742f..847effd52 100644
--- a/tools/editors/emacs/tests/tests-basic.el
+++ b/tools/editors/emacs/tests/tests-basic.el
@@ -24,7 +24,7 @@
 (simple "Blablabla bla@" nil)
 (true "-----------@" ?-)
 (indented "   -----------@" ?-)
-(letter "   aaaa@aaa" ?a)
+(letter "aaaa@aaa" ?a)
 (true2 "uuuuuuuuuuuuuuuuu@" ?u)
 (misleading "--=---------@" nil)
 (notstrip " uuuuuuuuuuuuuuuuu@" ?u)
@@ -38,6 +38,26 @@
    "Tests for predicate for one char line."
    rest-line-homogeneous-p-tests 'rest-line-homogeneous-p nil))
 
+(setq rest-line-homogeneous-nodent-p-tests
+  '(
+;;------------------------------------------------------------------------------
+(simple "Blablabla bla@" nil)
+(true "-----------@" ?-)
+(indented "   -----------@" nil)
+(letter "aaaa@aaa" ?a)
+(true2 "uuuuuuuuuuuuuuuuu@" ?u)
+(misleading "--=---------@" nil)
+(notstrip " uuuuuuuuuuuuuuuuu@" nil)
+(notstrip2 " uuuuuuuuuuuuuuuuu @" nil)
+(position "-------@----" ?-)
+(one-char "-@" nil)
+))
+
+(progn
+  (regression-test-compare-expect-values
+   "Tests for predicate for one char line."
+   rest-line-homogeneous-nodent-p-tests 'rest-line-homogeneous-nodent-p nil))
+
 
 
 
@@ -398,6 +418,16 @@ Du bon vin tous les jours
 "
 (45 over-and-under 2))
 
+;;------------------------------------------------------------------------------
+(indented-1
+"
+
+  Du bon vin tous les jours@
+  =========================
+
+"
+(nil nil 2))
+
 ))
 
 
@@ -472,6 +502,20 @@ Next
 
 ")
 
+(setq text-3
+"
+
+Previous
+--------
+
+Current@
+~~~~~~~
+
+  Next
+  ++++
+
+")
+
 ;; ~~~~~~~~~~~~~~~~~~
 ;;  Buggy Decoration
 ;; ~~~~~~
@@ -501,6 +545,11 @@ Next
 		  (9 43 simple 0))
 		 )
 
+	(basic-3 ,text-3
+		 ((3 45 simple 0)
+		  (6 126 simple 0))
+		 )
+
 	))
 
 
-- 
cgit v1.2.1


From 2585824cf71cac6cea7eda21640e968b54c13cd6 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 17 Sep 2005 19:29:40 +0000
Subject: cleanup

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3882 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/stylesheets/latex.tex | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
index eb19ddb8e..231f3911f 100644
--- a/tools/stylesheets/latex.tex
+++ b/tools/stylesheets/latex.tex
@@ -844,14 +844,10 @@
   {%
     \ifthenelse{\equal{\Dinsidetabular}{true}}{%
       % Inside longtable; we cannot have nested longtables.
-      % The following \vspace *adds* vertical space.  I have no idea
-      % how to do this in a cleaner way.
-      %\mbox{}\par\vspace{-0.5em}%
       \begin{tabular}{#1}%
         \hline%
         #2%
       \end{tabular}%
-      %\par\noindent\vspace{-0.5em}%
     }{%
       \renewcommand{\Dinsidetabular}{true}%
       \begin{longtable}{#1}%
@@ -900,6 +896,7 @@
     \vspace{-1em}\vspace{-\parskip}\par%
   }{}%
   #1%
+  % No need to add an ampersand ("&"); that's done by \Dsubsequententry.
 }
 \providecommand{\DAtableheaderentry}[5]{\Dformattableheaderentry{#5}}
 \providecommand{\Dformattableheaderentry}[1]{{\bfseries#1}}
-- 
cgit v1.2.1


From 50026aa92c1147e0786874ee793017dd46539f55 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 18 Sep 2005 16:08:13 +0000
Subject: added 
     to make PEP writer output valid XHTML

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3888 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/pep-html-template | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/pep-html-template b/tools/pep-html-template
index bbaeb64b2..6f96977e8 100644
--- a/tools/pep-html-template
+++ b/tools/pep-html-template
@@ -23,5 +23,6 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
 [PEP Index]
 [PEP Source]
 
    
+
    
 %(body)s
 %(body_suffix)s
-- 
cgit v1.2.1


From 385e2baff5f65bec97bba47106282d9e8363db0b Mon Sep 17 00:00:00 2001
From: blais 
Date: Wed, 21 Sep 2005 14:14:19 +0000
Subject: Minor fixes to emacs hook and documentation additions.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3894 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           |  6 +++
 tools/editors/emacs/tests/tests-adjust-section.el |  2 +
 tools/editors/emacs/tests/tests-basic.el          |  2 +
 tools/editors/emacs/tests/tests-runner.el         | 45 +++++++++++++++++++++++
 4 files changed, 55 insertions(+)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 86f7806fe..390210228 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -43,6 +43,9 @@
 ;;   suggestion, and to always use the preferred decorations to do that.
 ;;
 
+
+(require 'cl)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Generic Filter function.
 
@@ -92,6 +95,9 @@ is for which (pred elem) is true)"
 ;;     how many characters and over-and-under style is hanging outside of the
 ;;     title at the beginning and ending.
 ;;
+;; Important note: an existing decoration must be formed by at least two
+;; characters to be recognized.
+;;
 ;; Here are two examples of decorations (| represents the window border, column
 ;; 0):
 ;;
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index d544fda98..be27dc8e3 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -8,6 +8,8 @@
 ;;
 ;;    emacs --script tests-adjust-section.el
 ;;
+;; See test-runner.el for documentation on how the format of tests.
+
 
 ;; Define tests.
 (setq rest-adjust-decoration-tests
diff --git a/tools/editors/emacs/tests/tests-basic.el b/tools/editors/emacs/tests/tests-basic.el
index 847effd52..b5c5d7948 100644
--- a/tools/editors/emacs/tests/tests-basic.el
+++ b/tools/editors/emacs/tests/tests-basic.el
@@ -8,6 +8,8 @@
 ;;
 ;;    emacs --script tests-adjust-section.el
 ;;
+;; See test-runner.el for documentation on how the format of tests.
+
 
 ;; Import the module from the file in the parent directory directly.
 (add-to-list 'load-path ".")
diff --git a/tools/editors/emacs/tests/tests-runner.el b/tools/editors/emacs/tests/tests-runner.el
index 2304ae54a..014093e6d 100644
--- a/tools/editors/emacs/tests/tests-runner.el
+++ b/tools/editors/emacs/tests/tests-runner.el
@@ -8,6 +8,51 @@
 ;;
 ;;    emacs --script .el
 ;;
+;;
+;; There are mainly two useful functions from this pacakge:
+;;
+;; 1. regression-test-compare-expect-values : used to compare expected output
+;;    values from running a function;
+;;
+;; 2. regression-test-compare-expect-buffer : used to compare expected output
+;;    buffer contents after running the function.
+;;
+;; regression-test-compare-expect-values test format
+;; -------------------------------------------------
+;;
+;; The tests are a list of tuples, with the following entries:
+;;
+;; - a SYMBOL that uniquely identifies the test.
+;;
+;; - the input buffer CONTENTS to prepare and run the test on.  If char @ is
+;;   present in the buffer, it is removed and the cursor is placed at that
+;;   position before running the tested function.
+;;
+;; - the expected OUTPUT value that the function should return.  If the actual
+;;   output is different from this, the test will fail.
+;;
+;; - an optional list of INPUT ARGUMENTS that the test function is called with
+;;   for this test.
+;; 
+;; regression-test-compare-expect-buffer test format
+;; -------------------------------------------------
+;;
+;; - a SYMBOL that uniquely identifies the test.
+;;
+;; - the input buffer CONTENTS to prepare and run the test on.  Here too, char @
+;;   is present in the buffer, it is removed and the cursor is placed at that
+;;   position before running the tested function.
+;;
+;; - the EXPECTED buffer contents after the function has been run.
+;;   Additionally, if char @ is present, it is checked that the cursor is
+;;   located at that position in the buffer after the function is run (this is
+;;   optional).
+;;
+;; - an optional list of PREFIX ARGUMENTS, which indicates to the test program
+;;   to set those prefix arguments before running the given function.  If there
+;;   are multiple prefix args, the function is invoked many times.
+;;
+
 
 (require 'cl)
 
-- 
cgit v1.2.1


From 1128d21e8937874a2c5cefa018187ad8c8e23799 Mon Sep 17 00:00:00 2001
From: blais 
Date: Wed, 21 Sep 2005 14:22:33 +0000
Subject: Fixed bug with transient mark mode.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3895 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 390210228..e0c0a1c0f 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -632,7 +632,7 @@ b. a negative numerical argument, which generally inverts the
 	 (toggle-style
 	  (and current-prefix-arg (not reverse-direction))))
 
-    (if mark-active
+    (if (and transient-mark-mode mark-active)
 	;; Adjust decorations within region.
 	(rest-promote-region current-prefix-arg)
       ;; Adjust decoration around point.
-- 
cgit v1.2.1


From 1b0c89fafde2292c03a0a21822ba083dca903bb1 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 25 Sep 2005 15:49:54 +0000
Subject: added docutils/writers/support/ directory and removed
 tools/stylesheets/; updated defaults; removed docutils/transforms/html.py (no
 longer needed); removed ``_stylesheet_required`` internal setting; updated
 setup.py

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3901 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf           |    6 -
 tools/pep-html-template       |   28 --
 tools/rst2html.py             |    3 +-
 tools/stylesheets/default.css |  276 ----------
 tools/stylesheets/latex.tex   | 1108 -----------------------------------------
 tools/stylesheets/pep.css     |  349 -------------
 tools/stylesheets/style.tex   |   74 ---
 7 files changed, 1 insertion(+), 1843 deletions(-)
 delete mode 100644 tools/pep-html-template
 delete mode 100644 tools/stylesheets/default.css
 delete mode 100644 tools/stylesheets/latex.tex
 delete mode 100644 tools/stylesheets/pep.css
 delete mode 100644 tools/stylesheets/style.tex

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 92392c2ed..f696f0013 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -7,10 +7,4 @@ embed-stylesheet: no
 
 [html4css1 writer]
 # These entries affect HTML output:
-stylesheet-path: stylesheets/default.css
 field-name-limit: 20
-
-[pep_html writer]
-# These entries affect reStructuredText-style PEPs:
-template: pep-html-template
-stylesheet-path: stylesheets/pep.css
diff --git a/tools/pep-html-template b/tools/pep-html-template
deleted file mode 100644
index 6f96977e8..000000000
--- a/tools/pep-html-template
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-  
-  
-  PEP %(pep)s -- %(title)s
-  %(stylesheet)s
-
-
-
-
    
-
-[Python]
-[Python Home]
-[PEP Index]
-[PEP Source]
-
    
-
    
-%(body)s
-%(body_suffix)s
diff --git a/tools/rst2html.py b/tools/rst2html.py
index 7fa3aebc4..35e5558aa 100755
--- a/tools/rst2html.py
+++ b/tools/rst2html.py
@@ -22,5 +22,4 @@ from docutils.core import publish_cmdline, default_description
 description = ('Generates (X)HTML documents from standalone reStructuredText '
                'sources.  ' + default_description)
 
-publish_cmdline(writer_name='html', description=description,
-                settings_overrides={'_stylesheet_required': 1})
+publish_cmdline(writer_name='html', description=description)
diff --git a/tools/stylesheets/default.css b/tools/stylesheets/default.css
deleted file mode 100644
index a418a7a00..000000000
--- a/tools/stylesheets/default.css
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:Date: $Date$
-:Revision: $Revision$
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* "! important" is used here to override other ``margin-top`` and
-   ``margin-bottom`` styles that are later in the stylesheet or 
-   more specific.  See http://www.w3.org/TR/CSS1#the-cascade */
-.first {
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin-left: 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left {
-  clear: left }
-
-img.align-right {
-  clear: right }
-
-img.borderless {
-  border: 0 }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid thin gray }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid thin black }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-tt.docutils {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
diff --git a/tools/stylesheets/latex.tex b/tools/stylesheets/latex.tex
deleted file mode 100644
index 231f3911f..000000000
--- a/tools/stylesheets/latex.tex
+++ /dev/null
@@ -1,1108 +0,0 @@
-\makeatletter
-
-% Development notes at
-% http://docutils.python-hosting.com/wiki/NewLatex
-
-
-\providecommand{\Dprinting}{false}
-
-
-\providecommand{\DSearly}{}
-\providecommand{\DSlate}{}
-
-\providecommand{\Ddocumentclass}{scrartcl}
-\providecommand{\Ddocumentoptions}{a4paper}
-
-\documentclass[\Ddocumentoptions]{\Ddocumentclass}
-
-\DSearly
-
-
-\providecommand{\DSfontencoding}{
-  % Set up font encoding.
-  % AE is a T1-emulation.  It provides most characters and features
-  % as T1-encoded fonts but doesn't use ugly bitmap fonts.
-  \usepackage{ae}
-  % Provide the characters not contained in AE from EC bitmap fonts.
-  \usepackage{aecompl}
-  % Guillemets ("<<", ">>") in AE.
-  \usepackage{aeguill}
-}
-
-
-\providecommand{\DSsymbols}{%
-  % Fix up symbols.
-  % The Euro symbol in Computer Modern looks, um, funny.  Let's get a
-  % proper Euro symbol.
-  \RequirePackage{eurosym}%
-  \renewcommand{\texteuro}{\euro}%
-}
-
-
-% Taken from
-% 
-% and modified.  Used with permission.
-\providecommand{\Dprovidelength}[2]{%
-  \begingroup%
-    \escapechar\m@ne%
-    \xdef\@gtempa{{\string#1}}%
-  \endgroup%
-  \expandafter\@ifundefined\@gtempa%
-  {\newlength{#1}\setlength{#1}{#2}}%
-  {}%
-}
-
-\providecommand{\Dprovidecounter}[1]{%
-  % Like \newcounter except that it doesn't crash if the counter
-  % already exists.
-  \@ifundefined{c@#1}{\newcounter{#1}}{}
-}
-
-\Dprovidelength{\Dboxparindent}{\parindent}
-\providecommand{\Dmakeboxminipage}[1]{%
-  % Make minipage for use in a box created by \Dmakefbox.
-  \begin{minipage}[t]{0.9\linewidth}%
-    \setlength{\parindent}{\Dboxparindent}%
-    #1%
-  \end{minipage}%
-}
-\providecommand{\Dmakefbox}[1]{%
-  % Make a centered, framed box.  Useful e.g. for admonitions.
-  \vspace{0.4\baselineskip}%
-  \begin{center}%
-    \fbox{\Dmakeboxminipage{#1}}%
-  \end{center}%
-  \vspace{0.4\baselineskip}%
-}
-\providecommand{\Dmakebox}[1]{%
-  % Make a centered, frameless box.  Useful e.g. for block quotes.
-  % Do not use minipages here, but create pseudo-lists to allow
-  % page-breaking.  (Don't use KOMA-script's addmargin environment
-  % because it messes up bullet lists.)
-  \Dmakelistenvironment{}{}{%
-    \setlength{\parskip}{0pt}%
-    \setlength{\parindent}{\Dboxparindent}%
-    \item{#1}%
-  }%
-}
-
-
-\RequirePackage{ifthen}
-\providecommand{\Dfrenchspacing}{true}
-\ifthenelse{\equal{\Dfrenchspacing}{true}}{\frenchspacing}{}
-
-
-\Dprovidelength{\Dblocklevelvspace}{%
-  % Space between block-level elements other than paragraphs.
-  0.7\baselineskip plus 0.3\baselineskip minus 0.2\baselineskip%
-}
-\providecommand{\Dauxiliaryspace}{%
-  \ifthenelse{\equal{\Dneedvspace}{true}}{\vspace{\Dblocklevelvspace}}{}%
-  \par\noindent%
-}
-\providecommand{\Dparagraphspace}{\par}
-\providecommand{\Dneedvspace}{true}
-
-
-\providecommand{\DSlinks}{
-  % Targets and references.
-  \RequirePackage[colorlinks=false,pdfborder={0 0 0}]{hyperref}
-
-  \providecommand{\Draisedlink}[1]{\Hy@raisedlink{##1}}
-  
-  % References.
-  % We're assuming here that the "refid" and "refuri" attributes occur
-  % only in inline context (in TextElements).
-  \providecommand{\DArefid}[5]{%
-    \ifthenelse{\equal{##4}{reference}}{%
-      \Dexplicitreference{\###3}{##5}%
-    }{%
-      % If this is not a target node (targets with refids are
-      % uninteresting and should be silently dropped).
-      \ifthenelse{\not\equal{##4}{target}}{%
-        % If this is a footnote reference, call special macro.
-        \ifthenelse{\equal{##4}{footnotereference}}{%
-          \Dimplicitfootnotereference{\###3}{##5}%
-        }{%
-          \ifthenelse{\equal{##4}{citationreference}}{%
-            \Dimplicitcitationreference{\###3}{##5}%
-          }{%
-            \Dimplicitreference{\###3}{##5}%
-          }%
-        }%
-      }{}%
-    }%
-  }
-  \providecommand{\DArefuri}[5]{%
-    \ifthenelse{\equal{##4}{target}}{%
-      % Hyperlink targets can (and should be) ignored because they are
-      % invisible.
-    }{%
-      % We only have explicit URI references, so one macro suffices.
-      \Durireference{##3}{##5}%
-    }%
-  }
-  % Targets.
-  \providecommand{\DAids}[5]{%
-    \label{##3}%
-    \ifthenelse{\equal{##4}{footnotereference}}{%
-      {%
-        \renewcommand{\HyperRaiseLinkDefault}{%
-          % Dirty hack to make backrefs to footnote references work.
-          % For some reason, \baselineskip is 0pt in fn references.
-          0.5\Doriginalbaselineskip%
-        }%
-        \Draisedlink{\hypertarget{##3}{}}##5%
-      }%
-    }{%
-      \Draisedlink{\hypertarget{##3}{}}##5%
-    }%
-  }
-  % Color in references.
-  \RequirePackage{color}
-  \providecommand{\Dimplicitreference}[2]{%
-    % Create implicit reference to ID.  Implicit references occur
-    % e.g. in TOC-backlinks of section titles.  Parameters:
-    % 1. Target.
-    % 2. Link text.
-    \href{##1}{##2}%
-  }
-  \providecommand{\Dimplicitfootnotereference}[2]{%
-    % Ditto, but for the special case of footnotes.
-    % We want them to be rendered like explicit references.
-    \Dexplicitreference{##1}{##2}%
-  }
-  \providecommand{\Dimplicitcitationreference}[2]{%
-    % Ditto for citation references.
-    \Dimplicitfootnotereference{##1}{##2}%
-  }
-  \ifthenelse{\equal{\Dprinting}{true}}{
-    \providecommand{\Dexplicitreferencecolor}{black}
-  }{
-    \providecommand{\Dexplicitreferencecolor}{blue}
-  }
-  \providecommand{\Dexplicitreference}[2]{%
-    % Create explicit reference to ID, e.g. created with "foo_".
-    % Parameters:
-    % 1. Target.
-    % 2. Link text.
-    \href{##1}{{\color{\Dexplicitreferencecolor}##2}}%
-  }
-  \providecommand{\Durireferencecolor}{\Dexplicitreferencecolor}
-  \providecommand{\Durireference}[2]{%
-    % Create reference to URI.  Parameters:
-    % 1. Target.
-    % 2. Link text.
-    \href{##1}{{\color{\Durireferencecolor}##2}}%
-  }
-}
-
-
-\providecommand{\DSlanguage}{%
-  % Set up babel.
-  \ifthenelse{\equal{\Dlanguagebabel}{}}{}{
-    \RequirePackage[\Dlanguagebabel]{babel}
-  }
-}
-
-
-
-
-\providecommand{\DAclasses}[5]{%
-  \Difdefined{DN#4C#3}{%
-    % Pass only contents, nothing else!
-    \csname DN#4C#3\endcsname{#5}%
-  }{%
-    \Difdefined{DC#3}{%
-      \csname DC#3\endcsname{#5}%
-    }{%
-      #5%
-    }%
-  }%
-}
-
-\providecommand{\Difdefined}[3]{\@ifundefined{#1}{#3}{#2}}
-
-\providecommand{\Dattr}[5]{%
-  % Global attribute dispatcher.
-  % Parameters:
-  % 1. Attribute number.
-  % 2. Attribute name.
-  % 3. Attribute value.
-  % 4. Node name.
-  % 5. Node contents.
-  \Difdefined{DN#4A#2V#3}{%
-    \csname DN#4A#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }{\Difdefined{DN#4A#2}{%
-    \csname DN#4A#2\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }{\Difdefined{DA#2V#3}{%
-    \csname DA#2V#3\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }{\Difdefined{DA#2}{%
-    \csname DA#2\endcsname{#1}{#2}{#3}{#4}{#5}%
-  }{#5%
-  }}}}%
-}
-
-\providecommand{\DNparagraph}[1]{%
-  \ifthenelse{\equal{\Dparagraphindented}{true}}{\indent}{\noindent}%
-  #1%
-}
-\providecommand{\Dformatboxtitle}[1]{{\Large\textbf{#1}}}
-\providecommand{\Dformatboxsubtitle}[1]{{\large\textbf{#1}}}
-\providecommand{\Dtopictitle}[1]{%
-  \Difinsidetoc{\vspace{1em}\par}{}%
-  \noindent\Dformatboxtitle{#1}%
-  \ifthenelse{\equal{\Dhassubtitle}{false}}{\vspace{1em}}{\vspace{0.5em}}%
-  \par%
-}
-\providecommand{\Dtopicsubtitle}[1]{%
-  \noindent\Dformatboxsubtitle{#1}%
-  \vspace{1em}%
-  \par%
-}
-\providecommand{\Dsidebartitle}[1]{\Dtopictitle{#1}}
-\providecommand{\Dsidebarsubtitle}[1]{\Dtopicsubtitle{#1}}
-\providecommand{\Ddocumenttitle}[1]{%
-  \begin{center}{\Huge#1}\end{center}%
-  \ifthenelse{\equal{\Dhassubtitle}{true}}{\vspace{0.1cm}}{\vspace{1cm}}%
-}
-\providecommand{\Ddocumentsubtitle}[1]{%
-  \begin{center}{\huge#1}\end{center}%
-  \vspace{1cm}%
-}
-% Can be overwritten by user stylesheet.
-\providecommand{\Dformatsectiontitle}[1]{#1}
-\providecommand{\Dformatsectionsubtitle}[1]{\Dformatsectiontitle{#1}}
-\providecommand{\Dbookmarksectiontitle}[1]{%
-  % Return text suitable for use in \section*, \subsection*, etc.,
-  % containing a PDF bookmark.  Parameter:  The title (as node tree).
-  \Draisedlink{\Dpdfbookmark{\Dtitleastext}}%
-  #1%
-}
-\providecommand{\Dsectiontitlehook}[1]{#1}
-\providecommand{\Dsectiontitle}[1]{%
-  \Dsectiontitlehook{%
-    \Ddispatchsectiontitle{\Dbookmarksectiontitle{\Dformatsectiontitle{#1}}}%
-  }%
-}
-\providecommand{\Ddispatchsectiontitle}[1]{%
-  \@ifundefined{Dsectiontitle\roman{Dsectionlevel}}{%
-    \Ddeepsectiontitle{#1}%
-  }{%
-    \csname Dsectiontitle\roman{Dsectionlevel}\endcsname{#1}%
-  }%
-}
-\providecommand{\Ddispatchsectionsubtitle}[1]{%
-  \Ddispatchsectiontitle{#1}%
-}
-\providecommand{\Dsectiontitlei}[1]{\section*{#1}}
-\providecommand{\Dsectiontitleii}[1]{\subsection*{#1}}
-\providecommand{\Ddeepsectiontitle}[1]{%
-  % Anything below \subsubsection (like \paragraph or \subparagraph)
-  % is useless because it uses the same font.  The only way to
-  % (visually) distinguish such deeply nested sections is to use
-  % section numbering.
-  \subsubsection*{#1}%
-}
-\providecommand{\Dsectionsubtitlehook}[1]{#1}
-\Dprovidelength{\Dsectionsubtitleraisedistance}{0.7em}
-\providecommand{\Dsectionsubtitlescaling}{0.85}
-\providecommand{\Dsectionsubtitle}[1]{%
-  \Dsectionsubtitlehook{%
-    % Move the subtitle nearer to the title.
-    \vspace{-\Dsectionsubtitleraisedistance}%
-    % Don't create a PDF bookmark.
-    \Ddispatchsectionsubtitle{%
-      \Dformatsectionsubtitle{\scalebox{\Dsectionsubtitlescaling}{#1}}%
-    }%
-  }%
-}
-% Boolean variable.
-\providecommand{\Dhassubtitle}{false}
-\providecommand{\DNtitle}[1]{%
-  \csname D\Dparent title\endcsname{#1}%
-}
-\providecommand{\DNsubtitle}[1]{%
-  \csname D\Dparent subtitle\endcsname{#1}%
-}
-\newcounter{Dpdfbookmarkid}
-\setcounter{Dpdfbookmarkid}{0}
-\providecommand{\Dpdfbookmark}[1]{%
-  % Temporarily decrement Desctionlevel counter.
-  \addtocounter{Dsectionlevel}{-1}%
-  %\typeout{\arabic{Dsectionlevel}}%
-  %\typeout{#1}%
-  %\typeout{docutils\roman{Dpdfbookmarkid}}%
-  %\typeout{}%
-  \pdfbookmark[\arabic{Dsectionlevel}]{#1}{docutils\arabic{Dpdfbookmarkid}}%
-  \addtocounter{Dsectionlevel}{1}%
-  \addtocounter{Dpdfbookmarkid}{1}%
-}
-
-%\providecommand{\DNliteralblock}[1]{\begin{quote}\ttfamily\raggedright#1\end{quote}}
-\providecommand{\DNliteralblock}[1]{%
-  \Dmakelistenvironment{}{%
-    \ifthenelse{\equal{\Dinsidetabular}{true}}{%
-      \setlength{\leftmargin}{0pt}%
-    }{}%
-    \setlength{\rightmargin}{0pt}%
-  }{%
-    \raggedright\item\noindent\nohyphens{\textnhtt{#1\Dfinalstrut}}%
-  }%
-}
-\providecommand{\DNdoctestblock}[1]{%
-  % Treat doctest blocks the same as literal blocks.
-  \DNliteralblock{#1}%
-}
-\RequirePackage{hyphenat}
-\providecommand{\DNliteral}[1]{\textnhtt{#1}}
-\providecommand{\DNemphasis}[1]{\emph{#1}}
-\providecommand{\DNstrong}[1]{\textbf{#1}}
-\providecommand{\Dvisitdocument}{\begin{document}\noindent}
-\providecommand{\Ddepartdocument}{\end{document}}
-\providecommand{\DNtopic}[1]{%
-  \ifthenelse{\equal{\DcurrentNtopicAcontents}{1}}{%
-    \addtocounter{Dtoclevel}{1}%
-    \par\noindent%
-    #1%
-    \addtocounter{Dtoclevel}{-1}%
-  }{%
-    \par\noindent%
-    \Dmakebox{#1}%
-  }%
-}
-\providecommand{\Dformatrubric}[1]{\textbf{#1}}
-\Dprovidelength{\Dprerubricspace}{0.3em}
-\providecommand{\DNrubric}[1]{%
-  \vspace{\Dprerubricspace}\par\noindent\Dformatrubric{#1}\par%
-}
-
-\providecommand{\Dbullet}{}
-\providecommand{\Dsetbullet}[1]{\renewcommand{\Dbullet}{#1}}
-\providecommand{\DNbulletlist}[1]{%
-  \Difinsidetoc{%
-    \Dtocbulletlist{#1}%
-  }{%
-    \Dmakelistenvironment{\Dbullet}{}{#1}%
-  }%
-}
-\renewcommand{\@pnumwidth}{2.2em}
-\providecommand{\DNlistitem}[1]{%
-  \Difinsidetoc{%
-    \ifthenelse{\equal{\theDtoclevel}{1}\and\equal{\Dlocaltoc}{false}}{%
-      {%
-        \par\addvspace{1em}\noindent%
-        \sectfont%
-        #1\hfill\pageref{\DcurrentNlistitemAtocrefid}%
-      }%
-    }{%
-      \@dottedtocline{0}{\Dtocindent}{0em}{#1}{%
-        \pageref{\DcurrentNlistitemAtocrefid}%
-      }%
-    }%
-  }{%
-    \item{#1}%
-  }%
-}
-\providecommand{\DNenumeratedlist}[1]{#1}
-\newcounter{Dsectionlevel}
-\providecommand{\Dvisitsectionhook}{}
-\providecommand{\Ddepartsectionhook}{}
-\providecommand{\Dvisitsection}{%
-  \addtocounter{Dsectionlevel}{1}%
-  \Dvisitsectionhook%
-}
-\providecommand{\Ddepartsection}{%
-  \Ddepartsectionhook%
-  \addtocounter{Dsectionlevel}{-1}%
-}
-
-% Using \_ will cause hyphenation after _ even in \textnhtt-typewriter
-% because the hyphenat package redefines \_.  So we use
-% \textunderscore here.
-\providecommand{\Dtextunderscore}{\textunderscore}
-
-\providecommand{\Dtextinlineliteralfirstspace}{{ }}
-\providecommand{\Dtextinlineliteralsecondspace}{{~}}
-
-\Dprovidelength{\Dlistspacing}{0.8\baselineskip}
-
-\providecommand{\Dsetlistrightmargin}{%
-  \ifthenelse{\lengthtest{\linewidth>12em}}{%
-    % Equal margins.
-    \setlength{\rightmargin}{\leftmargin}%
-  }{%
-    % If the line is narrower than 10em, we don't remove any further
-    % space from the right.
-    \setlength{\rightmargin}{0pt}%
-  }%
-}
-\providecommand{\Dresetlistdepth}{false}
-\Dprovidelength{\Doriginallabelsep}{\labelsep}
-\providecommand{\Dmakelistenvironment}[3]{%
-  % Make list environment with support for unlimited nesting and with
-  % reasonable default lengths.  Parameters:
-  % 1. Label (same as in list environment).
-  % 2. Spacing (same as in list environment).
-  % 3. List contents (contents of list environment).
-  \ifthenelse{\equal{\Dinsidetabular}{true}}{%
-    % Unfortunately, vertical spacing doesn't work correctly when
-    % using lists inside tabular environments, so we use a minipage.
-    \begin{minipage}[t]{\linewidth}%
-  }{}%
-    {%
-      \renewcommand{\Dneedvspace}{false}%
-      % \parsep0.5\baselineskip
-      \renewcommand{\Dresetlistdepth}{false}%
-      \ifnum \@listdepth>5%
-      \protect\renewcommand{\Dresetlistdepth}{true}%
-      \@listdepth=5%
-      \fi%
-      \begin{list}{%
-          #1%
-        }{%
-          \setlength{\itemsep}{0pt}%
-          \setlength{\partopsep}{0pt}%
-          \setlength{\topsep}{0pt}%
-                                  % List should take 90% of total width.
-          \setlength{\leftmargin}{0.05\linewidth}%
-          \ifthenelse{\lengthtest{\leftmargin<1.8em}}{%
-            \setlength{\leftmargin}{1.8em}%
-          }{}%
-          \setlength{\labelsep}{\Doriginallabelsep}%
-          \Dsetlistrightmargin%
-          #2%
-        }{%
-          #3%
-        }%
-      \end{list}%
-      \ifthenelse{\equal{\Dresetlistdepth}{true}}{\@listdepth=5}{}%
-    }%
-  \ifthenelse{\equal{\Dinsidetabular}{true}}{\end{minipage}}{}%
-}
-\providecommand{\Dfinalstrut}{\@finalstrut\@arstrutbox}
-\providecommand{\DAlastitem}[5]{#5\Dfinalstrut}
-
-\Dprovidelength{\Ditemsep}{0pt}
-\providecommand{\Dmakeenumeratedlist}[6]{%
-  % Make enumerated list.
-  % Parameters:
-  % - prefix
-  % - type (\arabic, \roman, ...)
-  % - suffix
-  % - suggested counter name
-  % - start number - 1
-  % - list contents
-  \newcounter{#4}%
-  \Dmakelistenvironment{#1#2{#4}#3}{%
-    % Use as much space as needed for the label.
-    \setlength{\labelwidth}{10em}%
-    % Reserve enough space so that the label doesn't go beyond the
-    % left margin of preceding paragraphs.  Like that:
-    %
-    %    A paragraph.
-    %
-    %   1. First item.
-    \setlength{\leftmargin}{2.5em}%
-    \Dsetlistrightmargin%
-    \setlength{\itemsep}{\Ditemsep}%
-    % Use counter recommended by Python module.
-    \usecounter{#4}%
-    % Set start value.
-    \addtocounter{#4}{#5}%
-  }{%
-    % The list contents.
-    #6%
-  }%
-}
-
-
-% Single quote in literal mode.  \textquotesingle from package
-% textcomp has wrong width when using package ae, so we use a normal
-% single curly quote here.
-\providecommand{\Dtextliteralsinglequote}{'}
-
-
-% "Tabular lists" are field lists and options lists (not definition
-% lists because there the term always appears on its own line).  We'll
-% use the terminology of field lists now ("field", "field name",
-% "field body"), but the same is also analogously applicable to option
-% lists.
-%
-% We want these lists to be breakable across pages.  We cannot
-% automatically get the narrowest possible size for the left column
-% (i.e. the field names or option groups) because tabularx does not
-% support multi-page tables, ltxtable needs to have the table in an
-% external file and we don't want to clutter the user's directories
-% with auxiliary files created by the filecontents environment, and
-% ltablex is not included in teTeX.
-%
-% Thus we set a fixed length for the left column and use list
-% environments.  This also has the nice side effect that breaking is
-% now possible anywhere, not just between fields.
-%
-% Note that we are creating a distinct list environment for each
-% field.  There is no macro for a whole tabular list!
-\Dprovidelength{\Dtabularlistfieldnamewidth}{6em}
-\Dprovidelength{\Dtabularlistfieldnamesep}{0.5em}
-\providecommand{\Dinsidetabular}{false}
-\providecommand{\Dsavefieldname}{}
-\providecommand{\Dsavefieldbody}{}
-\Dprovidelength{\Dusedfieldnamewidth}{0pt}
-\Dprovidelength{\Drealfieldnamewidth}{0pt}
-\providecommand{\Dtabularlistfieldname}[1]{\renewcommand{\Dsavefieldname}{#1}}
-\providecommand{\Dtabularlistfieldbody}[1]{\renewcommand{\Dsavefieldbody}{#1}}
-\Dprovidelength{\Dparskiptemp}{0pt}
-\providecommand{\Dtabularlistfield}[1]{%
-  {%
-    % This only saves field name and field body in \Dsavefieldname and
-    % \Dsavefieldbody, resp.  It does not insert any text into the
-    % document.
-    #1%
-    % Recalculate the real field name width everytime we encounter a
-    % tabular list field because it may have been changed using a
-    % "raw" node.
-    \setlength{\Drealfieldnamewidth}{\Dtabularlistfieldnamewidth}%
-    \addtolength{\Drealfieldnamewidth}{\Dtabularlistfieldnamesep}%
-    \Dmakelistenvironment{%
-      \makebox[\Drealfieldnamewidth][l]{\Dsavefieldname}%
-    }{%
-      \setlength{\labelwidth}{\Drealfieldnamewidth}%
-      \setlength{\leftmargin}{\Drealfieldnamewidth}%
-      \setlength{\rightmargin}{0pt}%
-      \setlength{\labelsep}{0pt}%
-    }{%
-      \item%
-      \settowidth{\Dusedfieldnamewidth}{\Dsavefieldname}%
-      \setlength{\Dparskiptemp}{\parskip}%
-      \ifthenelse{%
-        \lengthtest{\Dusedfieldnamewidth>\Dtabularlistfieldnamewidth}%
-      }{%
-        \mbox{}\par%
-        \setlength{\parskip}{0pt}%
-      }{}%
-      \Dsavefieldbody%
-      \setlength{\parskip}{\Dparskiptemp}%
-      %XXX Why did we need this?
-      %\@finalstrut\@arstrutbox%
-    }%
-    \par%
-  }%
-}
-
-\providecommand{\Dformatfieldname}[1]{\textbf{#1:}}
-\providecommand{\DNfieldlist}[1]{#1}
-\providecommand{\DNfield}[1]{\Dtabularlistfield{#1}}
-\providecommand{\DNfieldname}[1]{%
-  \Dtabularlistfieldname{%
-    \Dformatfieldname{#1}%
-  }%
-}
-\providecommand{\DNfieldbody}[1]{\Dtabularlistfieldbody{#1}}
-
-\providecommand{\Dformatoptiongroup}[1]{%
-  % Format option group, e.g. "-f file, --input file".
-  \texttt{#1}%
-}
-\providecommand{\Dformatoption}[1]{%
-  % Format option, e.g. "-f file".
-  % Put into mbox to avoid line-breaking at spaces.
-  \mbox{#1}%
-}
-\providecommand{\Dformatoptionstring}[1]{%
-  % Format option string, e.g. "-f".
-  #1%
-}
-\providecommand{\Dformatoptionargument}[1]{%
-  % Format option argument, e.g. "file".
-  \textsl{#1}%
-}
-\providecommand{\Dformatoptiondescription}[1]{%
-  % Format option description, e.g.
-  % "\DNparagraph{Read input data from file.}"
-  #1%
-}
-\providecommand{\DNoptionlist}[1]{#1}
-\providecommand{\Doptiongroupjoiner}{,{ }}
-\providecommand{\Disfirstoption}{%
-  % Auxiliary macro indicating if a given option is the first child
-  % of its option group (if it's not, it has to preceded by
-  % \Doptiongroupjoiner).
-  false%
-}
-\providecommand{\DNoptionlistitem}[1]{%
-  \Dtabularlistfield{#1}%
-}
-\providecommand{\DNoptiongroup}[1]{%
-  \renewcommand{\Disfirstoption}{true}%
-  \Dtabularlistfieldname{\Dformatoptiongroup{#1}}%
-}
-\providecommand{\DNoption}[1]{%
-  % If this is not the first option in this option group, add a
-  % joiner.
-  \ifthenelse{\equal{\Disfirstoption}{true}}{%
-    \renewcommand{\Disfirstoption}{false}%
-  }{%
-    \Doptiongroupjoiner%
-  }%
-  \Dformatoption{#1}%
-}
-\providecommand{\DNoptionstring}[1]{\Dformatoptionstring{#1}}
-\providecommand{\DNoptionargument}[1]{{ }\Dformatoptionargument{#1}}
-\providecommand{\DNdescription}[1]{%
-  \Dtabularlistfieldbody{\Dformatoptiondescription{#1}}%
-}
-
-\providecommand{\DNdefinitionlist}[1]{%
-  \begin{description}%
-    \parskip0pt%
-    #1%
-  \end{description}%
-}
-\providecommand{\DNdefinitionlistitem}[1]{%
-  % LaTeX expects the label in square brackets; we provide an empty
-  % label.
-  \item[]#1%
-}
-\providecommand{\Dformatterm}[1]{#1}
-\providecommand{\DNterm}[1]{\hspace{-5pt}\Dformatterm{#1}}
-% I'm still not sure what's the best rendering for classifiers.  The
-% colon syntax is used by reStructuredText, so it's at least WYSIWYG.
-% Use slanted text because italic would cause too much emphasis.
-\providecommand{\Dformatclassifier}[1]{\textsl{#1}}
-\providecommand{\DNclassifier}[1]{~:~\Dformatclassifier{#1}}
-\providecommand{\Dformatdefinition}[1]{#1}
-\providecommand{\DNdefinition}[1]{\par\Dformatdefinition{#1}}
-
-\providecommand{\Dlineblockindentation}{2.5em}
-\providecommand{\DNlineblock}[1]{%
-  \Dmakelistenvironment{}{%
-    \ifthenelse{\equal{\Dparent}{lineblock}}{%
-      % Parent is a line block, so indent.
-      \setlength{\leftmargin}{\Dlineblockindentation}%
-    }{%
-      % At top level; don't indent.
-      \setlength{\leftmargin}{0pt}%
-    }%
-    \setlength{\rightmargin}{0pt}%
-    \setlength{\parsep}{0pt}%
-  }{%
-    #1%
-  }%
-}
-\providecommand{\DNline}[1]{\item#1}
-
-
-\providecommand{\DNtransition}{%
-  \raisebox{0.25em}{\parbox{\linewidth}{\hspace*{\fill}\hrulefill\hrulefill\hspace*{\fill}}}%
-}
-
-
-\providecommand{\Dformatblockquote}[1]{%
-  % Format contents of block quote.
-  % This occurs in block-level context, so we cannot use \textsl.
-  {\slshape#1}%
-}
-\providecommand{\Dformatattribution}[1]{---\textup{#1}}
-\providecommand{\DNblockquote}[1]{%
-  \Dmakebox{%
-    \Dformatblockquote{#1}
-  }%
-}
-\providecommand{\DNattribution}[1]{%
-  \par%
-  \begin{flushright}\Dformatattribution{#1}\end{flushright}%
-}
-
-
-% Sidebars:
-\RequirePackage{picins}
-% Vertical and horizontal margins.
-\Dprovidelength{\Dsidebarvmargin}{0.5em}
-\Dprovidelength{\Dsidebarhmargin}{1em}
-% Padding (space between contents and frame).
-\Dprovidelength{\Dsidebarpadding}{1em}
-% Frame width.
-\Dprovidelength{\Dsidebarframewidth}{2\fboxrule}
-% Position ("l" or "r").
-\providecommand{\Dsidebarposition}{r}
-% Width.
-\Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
-\providecommand{\DNsidebar}[1]{
-  \parpic[\Dsidebarposition]{%
-    \begin{minipage}[t]{\Dsidebarwidth}%
-      % Doing this with nested minipages is ugly, but I haven't found
-      % another way to place vertical space before and after the fbox.
-      \vspace{\Dsidebarvmargin}%
-      {%
-        \setlength{\fboxrule}{\Dsidebarframewidth}%
-        \setlength{\fboxsep}{\Dsidebarpadding}%
-        \fbox{%
-          \begin{minipage}[t]{\linewidth}%
-            \setlength{\parindent}{\Dboxparindent}%
-            #1%
-          \end{minipage}%
-        }%
-      }%
-      \vspace{\Dsidebarvmargin}%
-    \end{minipage}%
-  }%
-}
-
-
-% Citations and footnotes.
-\providecommand{\Dformatfootnote}[1]{%
-  % Format footnote.
-  {%
-    \footnotesize#1%
-    % \par is necessary for LaTeX to adjust baselineskip to the
-    % changed font size.
-    \par%
-  }%
-}
-\providecommand{\Dformatcitation}[1]{\Dformatfootnote{#1}}
-\Dprovidelength{\Doriginalbaselineskip}{0pt}
-\providecommand{\DNfootnotereference}[1]{%
-  {%
-    % \baselineskip is 0pt in \textsuperscript, so we save it here.
-    \setlength{\Doriginalbaselineskip}{\baselineskip}%
-    \textsuperscript{#1}%
-  }%
-}
-\providecommand{\DNcitationreference}[1]{{[}#1{]}}
-\Dprovidelength{\Dfootnotesep}{3.5pt}
-\providecommand{\Dsetfootnotespacing}{%
-  % Spacing commands executed at the beginning of footnotes.
-  \setlength{\parindent}{0pt}%
-  \hspace{1em}%
-}
-\providecommand{\DNfootnote}[1]{%
-  % See ltfloat.dtx for details.
-  {%
-    \insert\footins{%
-      \vspace{\Dfootnotesep}%
-      \Dsetfootnotespacing%
-      \Dformatfootnote{#1}%
-    }%
-  }%
-}
-\providecommand{\DNcitation}[1]{\DNfootnote{#1}}
-\providecommand{\Dformatfootnotelabel}[1]{%
-  % Keep \footnotesize in footnote labels (\textsuperscript would
-  % reduce the font size even more).
-  \textsuperscript{\footnotesize#1{ }}%
-}
-\providecommand{\Dformatcitationlabel}[1]{{[}#1{]}{ }}
-\providecommand{\Dformatmultiplebackrefs}[1]{%
-  % If in printing mode, do not write out multiple backrefs.
-  \ifthenelse{\equal{\Dprinting}{true}}{}{\textsl{#1}}%
-}
-\providecommand{\Dthislabel}{}
-\providecommand{\DNlabel}[1]{%
-  \renewcommand{\Dthislabel}{#1}
-  \ifthenelse{\not\equal{\Dsinglebackref}{}}{%
-    \let\Doriginallabel=\Dthislabel%
-    \def\Dthislabel{%
-      \Dsinglefootnotebacklink{\Dsinglebackref}{\Doriginallabel}%
-    }%
-  }{}%
-  \ifthenelse{\equal{\Dparent}{footnote}}{%
-    % Footnote label.
-    \Dformatfootnotelabel{\Dthislabel}%
-  }{%
-    \ifthenelse{\equal{\Dparent}{citation}}{%
-      % Citation label.
-      \Dformatcitationlabel{\Dthislabel}%
-    }{}%
-  }%
-  % If there are multiple backrefs, add them now.
-  \Dformatmultiplebackrefs{\Dmultiplebackrefs}%
-}
-\providecommand{\Dsinglefootnotebacklink}[2]{%
-  % Create normal backlink of a footnote label.  Parameters:
-  % 1. ID.
-  % 2. Link text.
-  % Treat like a footnote reference.
-  \Dimplicitfootnotereference{\##1}{#2}%
-}
-\providecommand{\Dmultifootnotebacklink}[2]{%
-  % Create generated backlink, as in (1, 2).  Parameters:
-  % 1. ID.
-  % 2. Link text.
-  % Treat like a footnote reference.
-  \Dimplicitfootnotereference{\##1}{#2}%
-}
-\providecommand{\Dsinglecitationbacklink}[2]{\Dsinglefootnotebacklink{#1}{#2}}
-\providecommand{\Dmulticitationbacklink}[2]{\Dmultifootnotebacklink{#1}{#2}}
-
-
-\RequirePackage{longtable}
-\providecommand{\Dmaketable}[2]{%
-  % Make table.  Parameters:
-  % 1. Table spec (like "|p|p|").
-  % 2. Table contents.
-  {%
-    \ifthenelse{\equal{\Dinsidetabular}{true}}{%
-      % Inside longtable; we cannot have nested longtables.
-      \begin{tabular}{#1}%
-        \hline%
-        #2%
-      \end{tabular}%
-    }{%
-      \renewcommand{\Dinsidetabular}{true}%
-      \begin{longtable}{#1}%
-        \hline%
-        #2%
-      \end{longtable}%
-    }%
-  }%
-}
-\providecommand{\DNthead}[1]{%
-  #1%
-  \endhead%
-}
-\providecommand{\DNrow}[1]{%
-  #1\tabularnewline%
-  \hline%
-}
-\providecommand{\Dinsidemulticolumn}{false}
-\providecommand{\Dcompensatingmulticol}[3]{%
-  \multicolumn{#1}{#2}{%
-    {%
-      \renewcommand{\Dinsidemulticolumn}{true}%
-      % Compensate for weird missing vertical space at top of paragraph.
-      \raisebox{-2.5pt}{#3}%
-    }%
-  }%
-}
-\providecommand{\Dcolspan}[2]{%
-  % Take care of the morecols attribute (but incremented by 1).
-  &%
-  \Dcompensatingmulticol{#1}{l|}{#2}%
-}
-\providecommand{\Dcolspanleft}[2]{%
-  % Like \Dmorecols, but called for the leftmost entries in a table
-  % row.
-  \Dcompensatingmulticol{#1}{|l|}{#2}%
-}
-\providecommand{\Dsubsequententry}[1]{%
-  %
-}
-\providecommand{\DNentry}[1]{%
-  % The following sequence adds minimal vertical space above the top
-  % lines of the first cell paragraph, so that vertical space is
-  % balanced at the top and bottom of table cells.
-  \ifthenelse{\equal{\Dinsidemulticolumn}{false}}{%
-    \vspace{-1em}\vspace{-\parskip}\par%
-  }{}%
-  #1%
-  % No need to add an ampersand ("&"); that's done by \Dsubsequententry.
-}
-\providecommand{\DAtableheaderentry}[5]{\Dformattableheaderentry{#5}}
-\providecommand{\Dformattableheaderentry}[1]{{\bfseries#1}}
-
-
-\providecommand{\DNsystemmessage}[1]{%
-  {%
-    \ifthenelse{\equal{\Dprinting}{false}}{\color{red}}{}%
-    \bfseries%
-    #1%
-  }%
-}
-
-
-\providecommand{\Dinsidehalign}{false}
-\newsavebox{\Dalignedimagebox}
-\Dprovidelength{\Dalignedimagewidth}{0pt}
-\providecommand{\Dhalign}[2]{%
-  % Horizontally align the contents to the left or right so that the
-  % text flows around it.
-  % Parameters:
-  % 1. l or r
-  % 2. Contents.
-  \renewcommand{\Dinsidehalign}{true}%
-  % For some obscure reason \parpic consumes some vertical space.
-  \vspace{-3pt}%
-  % Now we do something *really* ugly, but this enables us to wrap the
-  % image in a minipage while still allowing tight frames when
-  % class=border (see \DNimageCborder).
-  \sbox{\Dalignedimagebox}{#2}%
-  \settowidth{\Dalignedimagewidth}{\usebox{\Dalignedimagebox}}%
-  \parpic[#1]{%
-    \begin{minipage}[b]{\Dalignedimagewidth}%
-      % Compensate for previously added space, but not entirely.
-      \vspace*{2.0pt}%
-      \vspace*{\Dfloatimagetopmargin}%
-      \usebox{\Dalignedimagebox}%
-      \vspace*{1.5pt}%
-      \vspace*{\Dfloatimagebottommargin}%
-    \end{minipage}%
-  }%
-  \renewcommand{\Dinsidehalign}{false}%
-}
-
-
-\RequirePackage{graphicx}
-% Maximum width of an image.
-\providecommand{\Dimagemaxwidth}{\linewidth}
-\providecommand{\Dfloatimagemaxwidth}{0.5\linewidth}
-% Auxiliary variable.
-\Dprovidelength{\Dcurrentimagewidth}{0pt}
-\providecommand{\DNimageAalign}[5]{%
-  \ifthenelse{\equal{#3}{left}}{%
-    \Dhalign{l}{#5}%
-  }{%
-    \ifthenelse{\equal{#3}{right}}{%
-      \Dhalign{r}{#5}%
-    }{%
-      \ifthenelse{\equal{#3}{center}}{%
-        % Text floating around centered figures is a bad idea.  Thus
-        % we use a center environment.  Note that no extra space is
-        % added by the writer, so the space added by the center
-        % environment is fine.
-        \begin{center}#5\end{center}%
-      }{%
-        #5%
-      }%
-    }%
-  }%
-}
-% Base path for images.
-\providecommand{\Dimagebase}{}
-% Auxiliary command.  Current image path.
-\providecommand{\Dimagepath}{}
-\providecommand{\DNimageAuri}[5]{%
-  % Insert image.  We treat the URI like a path here.
-  \renewcommand{\Dimagepath}{\Dimagebase#3}%
-  \Difdefined{DcurrentNimageAwidth}{%
-    \Dwidthimage{\DcurrentNimageAwidth}{\Dimagepath}%
-  }{%
-    \Dsimpleimage{\Dimagepath}%
-  }%
-}
-\Dprovidelength{\Dfloatimagevmargin}{0pt}
-\providecommand{\Dfloatimagetopmargin}{\Dfloatimagevmargin}
-\providecommand{\Dfloatimagebottommargin}{\Dfloatimagevmargin}
-\providecommand{\Dwidthimage}[2]{%
-  % Image with specified width.
-  % Parameters:
-  % 1. Image width.
-  % 2. Image path.
-  % Need to make bottom-alignment dependent on align attribute (add
-  % functional test first).  Need to observe height attribute.
-  %\begin{minipage}[b]{#1}%
-    \includegraphics[width=#1,height=\textheight,keepaspectratio]{#2}%
-  %\end{minipage}%
-}  
-\providecommand{\Dcurrentimagemaxwidth}{}
-\providecommand{\Dsimpleimage}[1]{%
-  % Insert image, without much parametrization.
-  \settowidth{\Dcurrentimagewidth}{\includegraphics{#1}}%
-  \ifthenelse{\equal{\Dinsidehalign}{true}}{%
-    \renewcommand{\Dcurrentimagemaxwidth}{\Dfloatimagemaxwidth}%
-  }{%
-    \renewcommand{\Dcurrentimagemaxwidth}{\Dimagemaxwidth}%
-  }%
-  \ifthenelse{\lengthtest{\Dcurrentimagewidth>\Dcurrentimagemaxwidth}}{%
-    \Dwidthimage{\Dcurrentimagemaxwidth}{#1}%
-  }{%
-    \Dwidthimage{\Dcurrentimagewidth}{#1}%
-  }%
-}
-\providecommand{\Dwidthimage}[2]{%
-  % Image with specified width.
-  % Parameters:
-  % 1. Image width.
-  % 2. Image path.
-  \Dwidthimage{#1}{#2}%
-}
-
-% Figures.
-\providecommand{\DNfigureAalign}[5]{%
-  % Hack to make it work Right Now.
-  %\def\DcurrentNimageAwidth{\DcurrentNfigureAwidth}%
-  %
-    %\def\DcurrentNimageAwidth{\linewidth}%
-    \DNimageAalign{#1}{#2}{#3}{#4}{%
-      \begin{minipage}[b]{0.4\linewidth}#5\end{minipage}}%
-    %\let\DcurrentNimageAwidth=\relax%
-  %
-  %\let\DcurrentNimageAwidth=\relax%
-}
-\providecommand{\DNcaption}[1]{\par\noindent{\slshape#1}}
-\providecommand{\DNlegend}[1]{\Dauxiliaryspace#1}
-
-\providecommand{\DCborder}[1]{\fbox{#1}}
-% No padding between image and border.
-\providecommand{\DNimageCborder}[1]{\frame{#1}}
-
-
-% Need to replace with language-specific stuff.  Maybe look at
-% csquotes.sty and ask the author for permission to use parts of it.
-\providecommand{\Dtextleftdblquote}{``}
-\providecommand{\Dtextrightdblquote}{''}
-
-% Table of contents:
-\Dprovidelength{\Dtocininitialsectnumwidth}{2.4em}
-\Dprovidelength{\Dtocadditionalsectnumwidth}{0.7em}
-% Level inside a table of contents.  While this is at -1, we are not
-% inside a TOC.
-\Dprovidecounter{Dtoclevel}%
-\setcounter{Dtoclevel}{-1}
-\providecommand{\Dlocaltoc}{false}%
-\providecommand{\DNtopicClocal}[1]{%
-  \renewcommand{\Dlocaltoc}{true}%
-  \addtolength{\Dtocsectnumwidth}{2\Dtocadditionalsectnumwidth}%
-  \addtolength{\Dtocindent}{-2\Dtocadditionalsectnumwidth}%
-  #1%
-  \addtolength{\Dtocindent}{2\Dtocadditionalsectnumwidth}%
-  \addtolength{\Dtocsectnumwidth}{-2\Dtocadditionalsectnumwidth}%
-  \renewcommand{\Dlocaltoc}{false}%
-}
-\Dprovidelength{\Dtocindent}{0pt}%
-\Dprovidelength{\Dtocsectnumwidth}{\Dtocininitialsectnumwidth}
-% Compensate for one additional TOC indentation space so that the
-% top-level is unindented.
-\addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}
-\addtolength{\Dtocindent}{-\Dtocsectnumwidth}
-\providecommand{\Difinsidetoc}[2]{%
-  \ifthenelse{\not\equal{\theDtoclevel}{-1}}{#1}{#2}%
-}
-\providecommand{\DNgeneratedCsectnum}[1]{%
-  \Difinsidetoc{%
-    % Section number inside TOC.
-    \makebox[\Dtocsectnumwidth][l]{#1}%
-  }{%
-    % Section number inside section title.
-    #1\quad%
-  }%
-}
-\providecommand{\Dtocbulletlist}[1]{%
-  \addtocounter{Dtoclevel}{1}%
-  \addtolength{\Dtocindent}{\Dtocsectnumwidth}%
-  \addtolength{\Dtocsectnumwidth}{\Dtocadditionalsectnumwidth}%
-  #1%
-  \addtolength{\Dtocsectnumwidth}{-\Dtocadditionalsectnumwidth}%
-  \addtolength{\Dtocindent}{-\Dtocsectnumwidth}%
-  \addtocounter{Dtoclevel}{-1}%
-}
-
-
-% For \Dpixelunit, the length value is pre-multiplied with 0.75, so by
-% specifying "pt" we get the same notion of "pixel" as graphicx.
-\providecommand{\Dpixelunit}{pt}
-% Normally lengths are relative to the current linewidth.
-\providecommand{\Drelativeunit}{\linewidth}
-
-
-%\RequirePackage{fixmath}
-%\RequirePackage{amsmath}
-
-
-\DSfontencoding
-\DSlanguage
-\DSlinks
-\DSsymbols
-\DSlate
-
-\makeatother
diff --git a/tools/stylesheets/pep.css b/tools/stylesheets/pep.css
deleted file mode 100644
index a687ee8c8..000000000
--- a/tools/stylesheets/pep.css
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:date: $Date$
-:version: $Revision$
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the PEP HTML output of Docutils.
-*/
-
-/* "! important" is used here to override other ``margin-top`` and
-   ``margin-bottom`` styles that are later in the stylesheet or 
-   more specific.  See http://www.w3.org/TR/CSS1#the-cascade */
-.first {
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.navigation {
-  width: 100% ;
-  background: #99ccff ;
-  margin-top: 0px ;
-  margin-bottom: 0px }
-
-.navigation .navicon {
-  width: 150px ;
-  height: 35px }
-
-.navigation .textlinks {
-  padding-left: 1em ;
-  text-align: left }
-
-.navigation td, .navigation th {
-  padding-left: 0em ;
-  padding-right: 0em ;
-  vertical-align: middle }
-
-.rfc2822 {
-  margin-top: 0.5em ;
-  margin-left: 0.5em ;
-  margin-right: 0.5em ;
-  margin-bottom: 0em }
-
-.rfc2822 td {
-  text-align: left }
-
-.rfc2822 th.field-name {
-  text-align: right ;
-  font-family: sans-serif ;
-  padding-right: 0.5em ;
-  font-weight: bold ;
-  margin-bottom: 0em }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-body {
-  margin: 0px ;
-  margin-bottom: 1em ;
-  padding: 0px }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-div.section {
-  margin-left: 1em ;
-  margin-right: 1em ;
-  margin-bottom: 1.5em }
-
-div.section div.section {
-  margin-left: 0em ;
-  margin-right: 0em ;
-  margin-top: 1.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.footer {
-  margin-left: 1em ;
-  margin-right: 1em }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin-left: 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1 {
-  font-family: sans-serif ;
-  font-size: large }
-
-h2 {
-  font-family: sans-serif ;
-  font-size: medium }
-
-h3 {
-  font-family: sans-serif ;
-  font-size: small }
-
-h4 {
-  font-family: sans-serif ;
-  font-style: italic ;
-  font-size: small }
-
-h5 {
-  font-family: sans-serif;
-  font-size: x-small }
-
-h6 {
-  font-family: sans-serif;
-  font-style: italic ;
-  font-size: x-small }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left {
-  clear: left }
-
-img.align-right {
-  clear: right }
-
-img.borderless {
-  border: 0 }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid thin gray }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid thin black }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-td.num {
-  text-align: right }
-
-th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-tt.docutils {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
diff --git a/tools/stylesheets/style.tex b/tools/stylesheets/style.tex
deleted file mode 100644
index 6e041a14b..000000000
--- a/tools/stylesheets/style.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-% latex include file for docutils latex writer
-% --------------------------------------------
-%
-% CVS: $Id$
-%
-% This is included at the end of the latex header in the generated file,
-% to allow overwriting defaults, although this could get hairy.
-% Generated files should process well standalone too, LaTeX might give a
-% message about a missing file.
-
-% donot indent first line of paragraph.
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{5pt plus 2pt minus 1pt}
-
-% sloppy
-% ------
-% Less strict (opposite to default fussy) space size between words. Therefore
-% less hyphenation.
-\sloppy
-
-% fonts
-% -----
-% times for pdf generation, gives smaller pdf files.
-%
-% But in standard postscript fonts: courier and times/helvetica do not fit.
-% Maybe use pslatex.
-\usepackage{times}
-
-% pagestyle
-% ---------
-% headings might put section titles in the page heading, but not if
-% the table of contents is done by docutils.
-% If pagestyle{headings} is used, \geometry{headheight=10pt,headsep=1pt}
-% should be set too.
-%\pagestyle{plain}
-%
-% or use fancyhdr (untested !)
-%\usepackage{fancyhdr}
-%\pagestyle{fancy}
-%\addtolength{\headheight}{\\baselineskip}
-%\renewcommand{\sectionmark}[1]{\markboth{#1}{}}
-%\renewcommand{\subsectionmark}[1]{\markright{#1}}
-%\fancyhf{}
-%\fancyhead[LE,RO]{\\bfseries\\textsf{\Large\\thepage}}
-%\fancyhead[LO]{\\textsf{\\footnotesize\\rightmark}}
-%\fancyhead[RE]{\\textsc{\\textsf{\\footnotesize\leftmark}}}
-%\\fancyfoot[LE,RO]{\\bfseries\\textsf{\scriptsize Docutils}}
-%\fancyfoot[RE,LO]{\\textsf{\scriptsize\\today}}
-
-% geometry 
-% --------
-% = papersizes and margins
-%\geometry{a4paper,twoside,tmargin=1.5cm,
-%          headheight=1cm,headsep=0.75cm}
-
-% Do section number display
-% -------------------------
-%\makeatletter
-%\def\@seccntformat#1{}
-%\makeatother
-% no numbers in toc
-%\renewcommand{\numberline}[1]{}
-
-
-% change maketitle
-% ----------------
-%\renewcommand{\maketitle}{
-%  \begin{titlepage}
-%    \begin{center}
-%    \textsf{TITLE \@title} \\
-%       Date: \today
-%    \end{center}
-%  \end{titlepage}
-%}
-- 
cgit v1.2.1


From c67b0abf918397b79b68cae23a1d3a9d3e7c9339 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Mon, 26 Sep 2005 17:59:51 +0000
Subject: added stylesheet-path entry to docutils.conf because otherwise we get
 absolute stylesheet links like this on the Docutils website:
 /home/groups/docutils/htdocs/aux/lib/python/docutils/docutils/writers/support/html4css1.css

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3905 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index f696f0013..dbe42e14a 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -3,8 +3,9 @@
 source-link: yes
 datestamp: %Y-%m-%d %H:%M UTC
 generator: on
-embed-stylesheet: no
 
 [html4css1 writer]
 # These entries affect HTML output:
+stylesheet-path: ../docutils/writers/support/html4css1.css
+embed-stylesheet: no
 field-name-limit: 20
-- 
cgit v1.2.1


From 5fdf1c828e5736b03feb375654f2735bfd8b395a Mon Sep 17 00:00:00 2001
From: blais 
Date: Wed, 5 Oct 2005 16:00:44 +0000
Subject: Changed emacs support to avoid touching the kill-ring.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3926 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index e0c0a1c0f..b03e7cbf8 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -249,7 +249,8 @@ have been seen.
 
   ;; For all the preferred decorations...
   (let* (
-	 ;; If 'prev' is given, reorder the list to start searching after the match.
+	 ;; If 'prev' is given, reorder the list to start searching after the
+	 ;; match.
 	 (fplist
 	  (cdr (rest-get-decoration-match rest-preferred-decorations prev)))
 
@@ -270,6 +271,9 @@ have been seen.
 
     (copy-list (car curpotential)) ))
 
+(defun rest-delete-line ()
+  "A version of kill-line that does not use the kill-ring."
+  (delete-region (line-beginning-position) (+ 1 (line-end-position))))
 
 (defun rest-update-section (char style &optional indent)
   "Unconditionally updates the style of a section decoration
@@ -311,14 +315,14 @@ have been seen.
 	     ;; Avoid removing the underline of a title right above us.
 	     (save-excursion (forward-line -1)
 			     (not (looking-at rest-section-text-regexp)))
-             (kill-line 1)))
+             (rest-delete-line)))
 
       ;; Remove following line if it consists only of a single repeated
       ;; character
       (save-excursion
         (forward-line +1)
         (and (rest-line-homogeneous-p 1)
-             (kill-line 1))
+             (rest-delete-line))
         ;; Add a newline if we're at the end of the buffer, for the subsequence
         ;; inserting of the underline
         (if (= (point) (buffer-end 1))
@@ -1088,7 +1092,7 @@ cand replace with char: ")
             (setq p (1+ (point)))
             (beginning-of-line)
             (setq l (- p (point)))
-            (kill-line)
+            (rest-delete-line)
             (insert-char tochar l))
         (search-failed
          (message (format "%d lines replaced." found)))))))
-- 
cgit v1.2.1


From ad01b501da1019d3953f0956d65dae3b72a4a1c8 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Tue, 11 Oct 2005 13:14:06 +0000
Subject: added OS X clipboard note

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3931 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index d4359213b..366a826da 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -79,13 +79,18 @@ here are some useful resources for Emacs users in the Unicode world:
 
         (set-frame-font "fontset-monaco")
 
+  - To enable cooperation between the system clipboard and the Emacs
+    kill ring, add this line::
+
+        (set-clipboard-coding-system 'mac-roman)
+
   Other useful resources are in `Andrew Choi's Emacs 21 for Mac OS X
   FAQ `__.
 
 No matter what platform (or editor) you're using, I recommend the
 ProFont__ programmer's font.  It's monospaced, small but readable,
-similar characters are visually distinctive (like "1lI|", "0O", "ao",
-and ".,"), and free.
+similar characters are visually distinctive (like "I1l|", "0O", "ao",
+and ".,:;"), and free.
 
 __ http://www.tobias-jung.de/seekingprofont/
 .. _reStructuredText: http://docutils.sf.net/rst.html
-- 
cgit v1.2.1


From 86b4342590996eca287f427aa5b88b370d81d227 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sat, 22 Oct 2005 17:57:34 +0000
Subject: - Added new funtion and binding to display the Table of Contents  
 and jump to any section title from it (press return);

- Renamed a rest-display-secitons-hierarchy to
  rest-display-decorations-hierarchy which is more accurate.

- Replaced C-x C-= binding by the new more useful TOC display
  feature.  The display hierarchy feature is still available
  by calling this with a prefix-argument.



git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3946 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 185 +++++++++++++++++++++++++++++---
 1 file changed, 169 insertions(+), 16 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index b03e7cbf8..b656af2ca 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -20,12 +20,15 @@
 ;;    C-= : updates or rotates the section title around point or
 ;;          promotes/demotes the decorations within the region (see full details
 ;;          below).
-;;
+;;	        
 ;;          Note that C-= is a good binding, since it allows you to specify a
 ;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
 ;;          prefix arg with C-u C-=.
 ;;
-;;    C-x C-= : displays the hierarchy of title decorations from this file.
+;;    C-x C-= : displays the hierarchical table-of-contents of the document and
+;;              allows you to jump to any section from it.
+;;
+;;    C-u C-x C-= : displays the title decorations from this file.
 ;;
 ;;    C-M-{, C-M-} : navigate between section titles.
 ;;
@@ -38,7 +41,7 @@
 ;; - rest-default-indent
 ;; - rest-preferred-decorations
 ;;
-;; TODO: 
+;; TODO:
 ;; - Add an option to forego using the file structure in order to make
 ;;   suggestion, and to always use the preferred decorations to do that.
 ;;
@@ -75,7 +78,7 @@ is for which (pred elem) is true)"
           (goto-char opoint)
           (forward-line 0)
           (1+ (count-lines start (point)))))) )
-    
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The following functions implement a smart automatic title sectioning feature.
@@ -151,10 +154,17 @@ is for which (pred elem) is true)"
 ;; adjustment (unless we cycle, in which case we use the indent that has been
 ;; found previously).
 
+(defun rest-toc-or-hierarchy ()
+  "Binding for either TOC or decorations hierarchy."
+  (interactive)
+  (if (not current-prefix-arg)
+      (rest-toc)
+    (rest-display-decorations-hierarchy)))
+
 (defun rest-text-mode-hook ()
   "Default text mode hook for rest."
   (local-set-key [(control ?=)] 'rest-adjust)
-  (local-set-key [(control x)(control ?=)] 'rest-display-sections-hierarchy)
+  (local-set-key [(control x)(control ?=)] 'rest-toc-or-hierarchy)
   (local-set-key [(control meta ?{)] 'rest-backward-section)
   (local-set-key [(control meta ?})] 'rest-forward-section)
   )
@@ -563,7 +573,7 @@ A list of the previous and next decorations is returned."
     ))
 
 
-(defun rest-get-next-decoration 
+(defun rest-get-next-decoration
   (curdeco hier &optional suggestion reverse-direction)
   "Get the next decoration for CURDECO, in given hierarchy HIER,
 and suggesting for new decoration SUGGESTION."
@@ -590,7 +600,7 @@ and suggesting for new decoration SUGGESTION."
 			      (eq style (cadar cur)))))
 	  (setq cur (cdr cur)))
 	cur))
-		    
+
      ;; If not found, take the first of all decorations.
      suggestion
      )))
@@ -904,7 +914,7 @@ of the right hand fingers and the binding is unused in text-mode."
 				  hier
 				  (car (rest-get-decorations-around alldecos))))
 
-		     (nextdeco (rest-get-next-decoration 
+		     (nextdeco (rest-get-next-decoration
 				curdeco hier suggestion reverse-direction))
 
 		     )
@@ -948,7 +958,7 @@ the hierarchy is similar to that used by rest-adjust-decoration."
   (let* ((demote (or current-prefix-arg demote))
 	 (alldecos (rest-find-all-decorations))
 	 (cur alldecos)
-	 
+
 	 (hier (rest-get-hierarchy alldecos))
 	 (suggestion (rest-suggest-new-decoration hier))
 
@@ -961,7 +971,7 @@ the hierarchy is similar to that used by rest-adjust-decoration."
     ;; Skip the markers that come before the region beginning
     (while (and cur (< (caar cur) region-begin-line))
       (setq cur (cdr cur)))
-    
+
     ;; Create a list of markers for all the decorations which are found within
     ;; the region.
     (save-excursion
@@ -977,23 +987,23 @@ the hierarchy is similar to that used by rest-adjust-decoration."
 	(dolist (p marker-list)
 	  ;; Go to the decoration to promote.
 	  (goto-char (car p))
-	  
+
 	  ;; Rotate the next decoration.
-	  (setq nextdeco (rest-get-next-decoration 
+	  (setq nextdeco (rest-get-next-decoration
 			  (cadr p) hier suggestion demote))
-	  
+
 	  ;; Update the decoration.
 	  (apply 'rest-update-section nextdeco)
-	  
+
 	  ;; Clear marker to avoid slowing down the editing after we're done.
 	  (set-marker (car p) nil)
 	  ))
-      (setq deactivate-mark nil) 
+      (setq deactivate-mark nil)
     )))
 
 
 
-(defun rest-display-sections-hierarchy (&optional decorations)
+(defun rest-display-decorations-hierarchy (&optional decorations)
   "Display the current file's section title decorations hierarchy.
   This function expects a list of (char, style, indent) triples."
   (interactive)
@@ -1013,6 +1023,149 @@ the hierarchy is similar to that used by rest-adjust-decoration."
     )))
 
 
+(defun rest-get-stripped-line ()
+  "Returns the line at cursor, stripped from whitespace."
+  (re-search-forward "\\S-.*\\S-" (line-end-position))
+  (buffer-substring-no-properties (match-beginning 0)
+				  (match-end 0)) )
+
+
+(defvar rest-toc-indent 4
+  "Indentation for table-of-contents display.")
+
+(defun rest-toc ()
+  "Finds all the section titles and their decorations in the
+  file, and displays a hierarchically-organized list of the
+  titles, which is essentially a table-of-contents of the
+  document.
+
+  The emacs buffer can be navigated, and selecting a section
+  brings the cursor in that section."
+  (interactive)
+  (let* ((curpoint (point))
+	 foundline
+	  (alldecos (rest-find-all-decorations))
+	 (hier (rest-get-hierarchy alldecos))
+	 (levels (make-hash-table :test 'equal :size 10))
+	 (buf (get-buffer-create rest-toc-buffer-name))
+	 lines)
+    (let ((lev 0))
+      (dolist (deco hier)
+	(puthash deco lev levels)
+	(incf lev)))
+
+    (let ((curline 1))
+      (save-excursion
+	(setq lines
+	      (mapcar (lambda (deco)
+			(goto-line (car deco))
+			(if (and (not foundline) (> (point) curpoint))
+			    (setq foundline curline))
+			(incf curline)
+			(list (rest-get-stripped-line)
+			      (gethash (cdr deco) levels)
+			      (let ((m (make-marker)))
+				(beginning-of-line 1)
+				(set-marker m (point)))
+			      ))
+		      alldecos))))
+
+    (with-current-buffer buf
+      (let ((inhibit-read-only t))
+	(rest-toc-mode)
+	(delete-region (point-min) (point-max))
+	(insert (format "Table of Contents: %s\n" (caar lines)))
+	(put-text-property (point-min) (point) 
+			   'face (list '(background-color . "lightgray")))
+	(dolist (x lines)
+	  (let* (
+		 ;; Compute line text to be inserted.
+		 (ins (concat (make-string (* rest-toc-indent (cadr x)) ? )
+			      (car x)))
+
+		 ;; Compute boundaries of this text.
+		 (beg (point))
+		 (end (+ beg (length ins)))
+		 )
+	    ;; Insert line.
+	    (insert ins "\n")
+
+	    ;; Highlight lines.
+	    (put-text-property beg end 'mouse-face 'highlight)
+
+	    ;; Add link on lines.
+	    (put-text-property beg end 'rest-toc-target (caddr x))
+	    ))
+	))
+    (display-buffer buf)
+    (pop-to-buffer buf)
+    (goto-line foundline)
+    ))
+
+
+(defun rest-toc-mode-find-section ()
+  (let ((pos (get-text-property (point) 'rest-toc-target)))
+    (unless pos
+      (error "No section on this line"))
+    (unless (buffer-live-p (marker-buffer pos))
+      (error "Buffer for this section was killed"))
+    pos))
+
+(defvar rest-toc-buffer-name "*Table of Contents*"
+  "Name of the Table of Contents buffer.")
+
+(defun rest-toc-mode-goto-section ()
+  "Go to the section the current line describes."
+  (interactive)
+  (let ((pos (rest-toc-mode-find-section)))
+    (kill-buffer (get-buffer rest-toc-buffer-name))
+    (pop-to-buffer (marker-buffer pos))
+    (goto-char pos)
+    (recenter 5)))
+
+(defun rest-toc-mode-mouse-goto (event)
+  "In Rest-Toc mode, go to the occurrence whose line you click on."
+  (interactive "e")
+  (let (pos)
+    (save-excursion
+      (set-buffer (window-buffer (posn-window (event-end event))))
+      (save-excursion
+	(goto-char (posn-point (event-end event)))
+	(setq pos (rest-toc-mode-find-section))))
+    (pop-to-buffer (marker-buffer pos))
+    (goto-char pos)))
+
+(defun rest-toc-mode-mouse-goto-kill (event)
+  (interactive "e")
+  (call-interactively 'rest-toc-mode-mouse-goto event)
+  (kill-buffer (get-buffer rest-toc-buffer-name)))
+    
+(defvar rest-toc-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [mouse-1] 'rest-toc-mode-mouse-goto-kill)
+    (define-key map [mouse-2] 'rest-toc-mode-mouse-goto)
+    (define-key map "\C-m" 'rest-toc-mode-goto-section)
+    (define-key map "f" 'rest-toc-mode-goto-section)
+    (define-key map "q" 'quit-window)
+    (define-key map "z" 'kill-this-buffer)
+    map)
+  "Keymap for `rest-toc-mode'.")
+
+(put 'rest-toc-mode 'mode-class 'special)
+(defun rest-toc-mode ()
+  "Major mode for output from \\[rest-toc]."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map rest-toc-mode-map)
+  (setq major-mode 'rest-toc-mode)
+  (setq mode-name "Rest-TOC")
+  (setq buffer-read-only t)
+  )
+
+;; Note: use occur-mode (replace.el) as a good example to complete missing
+;; features.
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Section movement commands.
-- 
cgit v1.2.1


From d8d6331e6b37db000ab572e9b71a00aa6bd001fa Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 25 Oct 2005 23:32:20 +0000
Subject: Fixed minor bug with TOC feature when the cursor is in the last
 section of the file.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3948 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el           |  5 ++-
 tools/editors/emacs/tests/tests-adjust-section.el | 47 +++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index b656af2ca..a8ecdf15f 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -1068,7 +1068,10 @@ the hierarchy is similar to that used by rest-adjust-decoration."
 				(beginning-of-line 1)
 				(set-marker m (point)))
 			      ))
-		      alldecos))))
+		      alldecos)))
+      (if (not foundline)
+	  (setq foundline curline))
+      )
 
     (with-current-buffer buf
       (let ((inhibit-read-only t))
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index be27dc8e3..850f9e76f 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -760,6 +760,53 @@ Document Title2
 "
 )
 
+;;------------------------------------------------------------------------------
+(cycle-previous-only
+"
+==================
+  Document Title
+==================
+
+Document Title2
+===============
+
+=======
+  Bli@
+=======
+
+Document Title2
+===============
+
+Document Title3
+---------------
+
+Document Title4
+~~~~~~~~~~~~~~~
+
+"
+"
+==================
+  Document Title
+==================
+
+Document Title2
+===============
+
+Bli@
+---
+
+Document Title2
+===============
+
+Document Title3
+---------------
+
+Document Title4
+~~~~~~~~~~~~~~~
+
+"
+)
+
 ))
 
 
-- 
cgit v1.2.1


From fbe523c302d2ad6bbc669bd7edcbb95665567cac Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 25 Oct 2005 23:33:40 +0000
Subject: Rollback new test that does not pass yet.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3949 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/tests/tests-adjust-section.el | 93 ++++++++++++-----------
 1 file changed, 47 insertions(+), 46 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index 850f9e76f..84a8d4ea3 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -760,52 +760,53 @@ Document Title2
 "
 )
 
-;;------------------------------------------------------------------------------
-(cycle-previous-only
-"
-==================
-  Document Title
-==================
-
-Document Title2
-===============
-
-=======
-  Bli@
-=======
-
-Document Title2
-===============
-
-Document Title3
----------------
-
-Document Title4
-~~~~~~~~~~~~~~~
-
-"
-"
-==================
-  Document Title
-==================
-
-Document Title2
-===============
-
-Bli@
----
-
-Document Title2
-===============
-
-Document Title3
----------------
-
-Document Title4
-~~~~~~~~~~~~~~~
-
-"
-)
+;; FIXME: todo
+;; ;;------------------------------------------------------------------------------
+;; (cycle-previous-only
+;; "
+;; ==================
+;;   Document Title
+;; ==================
+;; 
+;; Document Title2
+;; ===============
+;; 
+;; =======
+;;   Bli@
+;; =======
+;; 
+;; Document Title2
+;; ===============
+;; 
+;; Document Title3
+;; ---------------
+;; 
+;; Document Title4
+;; ~~~~~~~~~~~~~~~
+;; 
+;; "
+;; "
+;; ==================
+;;   Document Title
+;; ==================
+;; 
+;; Document Title2
+;; ===============
+;; 
+;; Bli@
+;; ---
+;; 
+;; Document Title2
+;; ===============
+;; 
+;; Document Title3
+;; ---------------
+;; 
+;; Document Title4
+;; ~~~~~~~~~~~~~~~
+;; 
+;; "
+;; )
 
 ))
 
-- 
cgit v1.2.1


From 3152d1a9398847f2cc3b842cb89a15bb17270dd1 Mon Sep 17 00:00:00 2001
From: blais 
Date: Thu, 27 Oct 2005 15:47:03 +0000
Subject: - Added new function to insert the TOC inside the document;   (bound
 to C-x + by default).   See the many options.

- Fixed quit command in TOC mode, to always go back to the original
  buffer.



git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3955 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 297 ++++++++++++++++++++++++++------
 1 file changed, 244 insertions(+), 53 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index a8ecdf15f..15f4d9df4 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -20,7 +20,7 @@
 ;;    C-= : updates or rotates the section title around point or
 ;;          promotes/demotes the decorations within the region (see full details
 ;;          below).
-;;	        
+;;
 ;;          Note that C-= is a good binding, since it allows you to specify a
 ;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
 ;;          prefix arg with C-u C-=.
@@ -30,6 +30,9 @@
 ;;
 ;;    C-u C-x C-= : displays the title decorations from this file.
 ;;
+;;    C-x + : insert the table of contents in the text.  See the many options
+;;            for customizing how it will look.
+;;
 ;;    C-M-{, C-M-} : navigate between section titles.
 ;;
 ;; Other specialized and more generic functions are also available (see source
@@ -165,6 +168,7 @@ is for which (pred elem) is true)"
   "Default text mode hook for rest."
   (local-set-key [(control ?=)] 'rest-adjust)
   (local-set-key [(control x)(control ?=)] 'rest-toc-or-hierarchy)
+  (local-set-key [(control x)(?+)] 'rest-toc-insert)
   (local-set-key [(control meta ?{)] 'rest-backward-section)
   (local-set-key [(control meta ?})] 'rest-forward-section)
   )
@@ -1022,6 +1026,15 @@ the hierarchy is similar to that used by rest-adjust-decoration."
           ))
     )))
 
+(if (not (fboundp 'strip-whitespace))
+    (defun strip-whitespace (str)
+      "Strips the whitespace around a string."
+      (let ((tmp))
+	(string-match "\\`[ \t\n]*" str)
+	(setq tmp (substring str (match-end 0)))
+	(string-match "[ \t\n]*\\'" tmp)
+	(substring tmp 0 (match-beginning 0))
+	)))
 
 (defun rest-get-stripped-line ()
   "Returns the line at cursor, stripped from whitespace."
@@ -1033,6 +1046,194 @@ the hierarchy is similar to that used by rest-adjust-decoration."
 (defvar rest-toc-indent 4
   "Indentation for table-of-contents display.")
 
+
+(defun rest-section-tree (alldecos)
+  "Returns a pair of a hierarchical tree of the sections titles
+in the document, and a reference to the node where the cursor
+lives. This can be used to generate a table of contents for the
+document.
+
+Each section title consists in a cons of the stripped title
+string and a marker to the section in the original text document.
+
+If there are missing section levels, the section titles are
+inserted automatically, and are set to nil."
+
+  (let* (thelist
+	 (hier (rest-get-hierarchy alldecos))
+	 (levels (make-hash-table :test 'equal :size 10))
+	 lines)
+
+    (let ((lev 0))
+      (dolist (deco hier)
+	(puthash deco lev levels)
+	(incf lev)))
+
+    ;; Create a list of lines that contains (text, level, marker) for each
+    ;; decoration.
+    (save-excursion
+      (setq lines
+	    (mapcar (lambda (deco)
+		      (goto-line (car deco))
+		      (list (gethash (cdr deco) levels)
+			    (rest-get-stripped-line)
+			    (let ((m (make-marker)))
+			      (beginning-of-line 1)
+			      (set-marker m (point)))
+			    ))
+		    alldecos)))
+
+    (let ((lcontnr (cons nil lines)))
+      (rest-section-tree-rec lcontnr -1))))
+
+
+(defun rest-section-tree-rec (decos lev)
+  "Recursive function for the implementation of the section tree
+  building. DECOS is a cons cell whose cdr is the remaining list
+  of decorations, and we change it as we consume them.  LEV is
+  the current level of that node.  This function returns a pair
+  of the subtree that was built.  This treats the decos list
+  destructively."
+  
+  (let ((ndeco (cadr decos))
+	node
+	children)
+    ;; If the next decoration matches our level
+    (if (= (car ndeco) lev)
+	(progn
+	  ;; Pop the next decoration and create the current node with it
+	  (setcdr decos (cddr decos))
+	  (setq node (cdr ndeco)) ))
+      ;; Else we let the node title/marker be unset.
+
+    ;; Build the child nodes
+    (while (and (cdr decos) (> (caadr decos) lev))
+      (setq children 
+	    (cons (rest-section-tree-rec decos (1+ lev))
+		  children)))
+
+    ;; Return this node with its children.
+    (cons node (reverse children))
+    ))
+
+(defun rest-toc-insert (&optional pfxarg)
+  "Insert a simple text rendering of the table of contents.
+By default the top level is ignored if there is only one, because
+we assume that the document will have a single title.  
+
+If a numeric prefix argument is given, 
+- if it is zero or generic, include the top level titles;
+- otherwise insert the TOC up to the specified level."
+  (interactive "P")
+
+  (let* (;; Check maximum level override
+	 (rest-toc-insert-max-level
+	  (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
+	      (prefix-numeric-value pfxarg) rest-toc-insert-max-level))
+	 
+	 ;; Get the section tree.
+	 (sectree (rest-section-tree (rest-find-all-decorations)))
+		   
+	 ;; If there is only one top-level title, remove it by starting to print
+	 ;; one index lower (revert this behaviour with the prefix arg),
+	 ;; otherwise print all.
+	 (gen-pfx-arg (or (and pfxarg (listp pfxarg))
+			  (and (integerp pfxarg) 
+			       (= (prefix-numeric-value pfxarg) 0))))
+	 (start-lev (if (and (not rest-toc-insert-always-include-top)
+			     (= (length (cdr sectree)) 1)
+			     (not gen-pfx-arg))  -1 0)))
+
+  (rest-toc-insert-node sectree start-lev "")))
+
+(defvar rest-toc-insert-always-include-top nil
+  "Set this to 't if you want to always include top-level titles,
+  even when there is only one.")
+
+(defvar rest-toc-insert-numbering t
+  "Set this to 't if you want to always include top-level titles,
+  even when there is only one.")
+
+(defvar rest-toc-insert-initial-indent "   "
+  "Initial string that is inserted to the left of the inserted TOC.
+You will want to make this match the block indent where you mean to insert it.")
+
+(defvar rest-toc-insert-max-level nil
+  "If non-nil, maximum depth of the inserted TOC.")
+
+(defun rest-toc-insert-node (node level pfx)
+  "Recursive function that does the print of the inserted
+toc. PFX is the prefix numbering, that includes the alignment
+necessary for all the children of this level to align."
+  (let ((do-print (> level 0))
+	(count 1)
+	b)
+    (if do-print
+	(progn
+	  (if (car node)
+	      (progn
+		(insert rest-toc-insert-initial-indent)
+		(insert (make-string (* rest-toc-indent (1- level)) ? ))
+		(let ((b (point)))
+		  (if rest-toc-insert-numbering
+		      (insert pfx "  "))
+		  (insert (caar node))
+		  ;; Add properties to the text, even though in normal text mode
+		  ;; it won't be doing anything for now.  Not sure that I want
+		  ;; to change mode stuff.  At least the highlighting gives the
+		  ;; idea that this is generated automatically.
+		  (put-text-property b (point) 'mouse-face 'highlight)
+		  (put-text-property b (point) 'rest-toc-target (cadar node))
+		  )
+		(insert "\n")))
+	  ))
+
+    (if (or (eq rest-toc-insert-max-level nil) (< level rest-toc-insert-max-level))
+	(let ((do-child-numbering (>= level 0))
+	      fmt)
+	  (if do-child-numbering
+	      (progn
+		;; Add a separating dot if there is already a prefix
+		(if (> (length pfx) 0)
+		    (setq pfx (concat (strip-whitespace pfx) ".")))
+
+		;; Calculate the amount of space that the prefix will require for
+		;; the numbers.
+		(if (cdr node)
+		    (setq fmt (format "%%-%dd" (1+ (floor (log10 (length (cdr node))))))))
+		))
+
+	  (dolist (child (cdr node))
+	    (rest-toc-insert-node child 
+				  (1+ level) 
+				  (if do-child-numbering 
+				      (concat pfx (format fmt count)) pfx))
+	    (incf count)))
+
+      )))
+
+
+(defun rest-toc-node (node level)
+  "Recursive function that does the print of the TOC in rest-toc-mode."
+
+  (if (> level 0)
+      (let ((b (point)))
+	;; Insert line text.
+	(insert (make-string (* rest-toc-indent (1- level)) ? ))
+	(insert (if (car node) (caar node) "(missing node)"))
+
+	;; Highlight lines.
+	(put-text-property b (point) 'mouse-face 'highlight)
+    
+	;; Add link on lines.
+	(put-text-property b (point) 'rest-toc-target (cadar node))
+
+	(insert "\n")))
+
+  (dolist (child (cdr node))
+    (rest-toc-node child (1+ level))))
+
+
 (defun rest-toc ()
   "Finds all the section titles and their decorations in the
   file, and displays a hierarchically-organized list of the
@@ -1042,67 +1243,47 @@ the hierarchy is similar to that used by rest-adjust-decoration."
   The emacs buffer can be navigated, and selecting a section
   brings the cursor in that section."
   (interactive)
-  (let* ((curpoint (point))
-	 foundline
-	  (alldecos (rest-find-all-decorations))
-	 (hier (rest-get-hierarchy alldecos))
-	 (levels (make-hash-table :test 'equal :size 10))
+  (let* ((curbuf (current-buffer))
+	 outline
+
+	 ;; Get the section tree
+	 (alldecos (rest-find-all-decorations))
+	 (sectree (rest-section-tree alldecos))
+
+	 ;; Create a temporary buffer.
 	 (buf (get-buffer-create rest-toc-buffer-name))
-	 lines)
-    (let ((lev 0))
-      (dolist (deco hier)
-	(puthash deco lev levels)
-	(incf lev)))
+	 )
+
+    ;; Find the index of the section where the cursor currently is.
+    (setq outline (let ((idx 1)
+			(curline (line-number-at-pos (point)))
+			(decos alldecos))
+		    (while (and decos (<= (caar decos) curline))
+		      (setq decos (cdr decos))
+		      (incf idx))
+		    idx))
+    ;; FIXME: if there is a missing node inserted, the calculation of the
+    ;; current line will be off. You need to fix this by moving the finding of
+    ;; the current line somewhere else.
 
-    (let ((curline 1))
-      (save-excursion
-	(setq lines
-	      (mapcar (lambda (deco)
-			(goto-line (car deco))
-			(if (and (not foundline) (> (point) curpoint))
-			    (setq foundline curline))
-			(incf curline)
-			(list (rest-get-stripped-line)
-			      (gethash (cdr deco) levels)
-			      (let ((m (make-marker)))
-				(beginning-of-line 1)
-				(set-marker m (point)))
-			      ))
-		      alldecos)))
-      (if (not foundline)
-	  (setq foundline curline))
-      )
 
     (with-current-buffer buf
       (let ((inhibit-read-only t))
 	(rest-toc-mode)
 	(delete-region (point-min) (point-max))
-	(insert (format "Table of Contents: %s\n" (caar lines)))
-	(put-text-property (point-min) (point) 
+	(insert (format "Table of Contents: %s\n" (or (caar sectree) "")))
+	(put-text-property (point-min) (point)
 			   'face (list '(background-color . "lightgray")))
-	(dolist (x lines)
-	  (let* (
-		 ;; Compute line text to be inserted.
-		 (ins (concat (make-string (* rest-toc-indent (cadr x)) ? )
-			      (car x)))
-
-		 ;; Compute boundaries of this text.
-		 (beg (point))
-		 (end (+ beg (length ins)))
-		 )
-	    ;; Insert line.
-	    (insert ins "\n")
-
-	    ;; Highlight lines.
-	    (put-text-property beg end 'mouse-face 'highlight)
-
-	    ;; Add link on lines.
-	    (put-text-property beg end 'rest-toc-target (caddr x))
-	    ))
+	(rest-toc-node sectree 0)
 	))
     (display-buffer buf)
     (pop-to-buffer buf)
-    (goto-line foundline)
+
+    ;; Save the buffer to return to.
+    (set (make-local-variable 'rest-toc-return-buffer) curbuf)
+
+    ;; Move the cursor near the right section in the TOC.
+    (goto-line outline)
     ))
 
 
@@ -1142,19 +1323,29 @@ the hierarchy is similar to that used by rest-adjust-decoration."
   (interactive "e")
   (call-interactively 'rest-toc-mode-mouse-goto event)
   (kill-buffer (get-buffer rest-toc-buffer-name)))
-    
+
+(defvar rest-toc-return-buffer nil
+  "Buffer local variable that is used to return to the original
+  buffer from the TOC.")
+
+(defun rest-toc-quit-window ()
+  (interactive)
+  (quit-window)
+  (pop-to-buffer rest-toc-return-buffer))
+
 (defvar rest-toc-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map [mouse-1] 'rest-toc-mode-mouse-goto-kill)
     (define-key map [mouse-2] 'rest-toc-mode-mouse-goto)
     (define-key map "\C-m" 'rest-toc-mode-goto-section)
     (define-key map "f" 'rest-toc-mode-goto-section)
-    (define-key map "q" 'quit-window)
+    (define-key map "q" 'rest-toc-quit-window)
     (define-key map "z" 'kill-this-buffer)
     map)
   "Keymap for `rest-toc-mode'.")
 
 (put 'rest-toc-mode 'mode-class 'special)
+
 (defun rest-toc-mode ()
   "Major mode for output from \\[rest-toc]."
   (interactive)
-- 
cgit v1.2.1


From 25dc2754796b3acf2f3f0aaa49a1cbd39f0de3d0 Mon Sep 17 00:00:00 2001
From: blais 
Date: Thu, 27 Oct 2005 16:31:46 +0000
Subject: Small changes in numbered toc insertion style following dave
 comments.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3956 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 96 ++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 37 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 15f4d9df4..642b2e364 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -1026,15 +1026,13 @@ the hierarchy is similar to that used by rest-adjust-decoration."
           ))
     )))
 
-(if (not (fboundp 'strip-whitespace))
-    (defun strip-whitespace (str)
-      "Strips the whitespace around a string."
-      (let ((tmp))
-	(string-match "\\`[ \t\n]*" str)
-	(setq tmp (substring str (match-end 0)))
-	(string-match "[ \t\n]*\\'" tmp)
-	(substring tmp 0 (match-beginning 0))
-	)))
+
+(defun rest-rstrip (str)
+  "Strips the whitespace at the end of a string."
+  (let ((tmp))
+    (string-match "[ \t\n]*\\'" str)
+    (substring str 0 (match-beginning 0))
+    ))
 
 (defun rest-get-stripped-line ()
   "Returns the line at cursor, stripped from whitespace."
@@ -1044,7 +1042,8 @@ the hierarchy is similar to that used by rest-adjust-decoration."
 
 
 (defvar rest-toc-indent 4
-  "Indentation for table-of-contents display.")
+  "Indentation for table-of-contents display (also used for
+  formatting insertion, when numbering is disabled).")
 
 
 (defun rest-section-tree (alldecos)
@@ -1123,7 +1122,10 @@ we assume that the document will have a single title.
 
 If a numeric prefix argument is given, 
 - if it is zero or generic, include the top level titles;
-- otherwise insert the TOC up to the specified level."
+- otherwise insert the TOC up to the specified level.
+
+The TOC is inserted indented at the current column."
+
   (interactive "P")
 
   (let* (;; Check maximum level override
@@ -1142,9 +1144,17 @@ If a numeric prefix argument is given,
 			       (= (prefix-numeric-value pfxarg) 0))))
 	 (start-lev (if (and (not rest-toc-insert-always-include-top)
 			     (= (length (cdr sectree)) 1)
-			     (not gen-pfx-arg))  -1 0)))
+			     (not gen-pfx-arg))  -1 0))
+
+	 ;; Figure out initial indent.
+	 (initial-indent (make-string (current-column) ? ))
+	 (init-point (point)))
+
+    (rest-toc-insert-node sectree start-lev initial-indent "")
 
-  (rest-toc-insert-node sectree start-lev "")))
+    ;; Fixup for the first line.
+    (delete-region init-point (+ init-point (length initial-indent)))
+    ))
 
 (defvar rest-toc-insert-always-include-top nil
   "Set this to 't if you want to always include top-level titles,
@@ -1154,38 +1164,49 @@ If a numeric prefix argument is given,
   "Set this to 't if you want to always include top-level titles,
   even when there is only one.")
 
-(defvar rest-toc-insert-initial-indent "   "
-  "Initial string that is inserted to the left of the inserted TOC.
-You will want to make this match the block indent where you mean to insert it.")
-
 (defvar rest-toc-insert-max-level nil
   "If non-nil, maximum depth of the inserted TOC.")
 
-(defun rest-toc-insert-node (node level pfx)
+(defun rest-toc-insert-node (node level indent pfx)
   "Recursive function that does the print of the inserted
 toc. PFX is the prefix numbering, that includes the alignment
 necessary for all the children of this level to align."
   (let ((do-print (> level 0))
 	(count 1)
+	(numbered-indent-style 'aligned)
 	b)
     (if do-print
 	(progn
-	  (if (car node)
-	      (progn
-		(insert rest-toc-insert-initial-indent)
-		(insert (make-string (* rest-toc-indent (1- level)) ? ))
-		(let ((b (point)))
-		  (if rest-toc-insert-numbering
-		      (insert pfx "  "))
-		  (insert (caar node))
-		  ;; Add properties to the text, even though in normal text mode
-		  ;; it won't be doing anything for now.  Not sure that I want
-		  ;; to change mode stuff.  At least the highlighting gives the
-		  ;; idea that this is generated automatically.
-		  (put-text-property b (point) 'mouse-face 'highlight)
-		  (put-text-property b (point) 'rest-toc-target (cadar node))
-		  )
-		(insert "\n")))
+	  (insert indent)
+	  (let ((b (point)))
+	    (if rest-toc-insert-numbering
+		(insert pfx "  "))
+	    (insert (or (caar node) "[missing node]"))
+	    ;; Add properties to the text, even though in normal text mode it
+	    ;; won't be doing anything for now.  Not sure that I want to change
+	    ;; mode stuff.  At least the highlighting gives the idea that this
+	    ;; is generated automatically.
+	    (put-text-property b (point) 'mouse-face 'highlight)
+	    (put-text-property b (point) 'rest-toc-target (cadar node))
+	    )
+	  (insert "\n")
+
+	  ;; Prepare indent for children.
+	  (setq indent 
+		(if (not rest-toc-insert-numbering)
+		    (concat indent rest-toc-indent)
+		  (cond 
+		   ((eq numbered-indent-style 'fixed)
+		    (concat indent (make-string rest-toc-indent ? )))
+		   
+		   ((eq numbered-indent-style 'aligned)
+		    (concat indent (make-string (+ (length pfx) 2) ? )))
+		   
+		   ((eq numbered-indent-style 'listed)
+		    (concat (substring indent 0 -3) 
+			    (concat (make-string (+ (length pfx) 2) ? ) " - ")))
+		   )))
+
 	  ))
 
     (if (or (eq rest-toc-insert-max-level nil) (< level rest-toc-insert-max-level))
@@ -1195,7 +1216,7 @@ necessary for all the children of this level to align."
 	      (progn
 		;; Add a separating dot if there is already a prefix
 		(if (> (length pfx) 0)
-		    (setq pfx (concat (strip-whitespace pfx) ".")))
+		    (setq pfx (concat (rest-rstrip pfx) ".")))
 
 		;; Calculate the amount of space that the prefix will require for
 		;; the numbers.
@@ -1205,7 +1226,8 @@ necessary for all the children of this level to align."
 
 	  (dolist (child (cdr node))
 	    (rest-toc-insert-node child 
-				  (1+ level) 
+				  (1+ level)
+				  indent
 				  (if do-child-numbering 
 				      (concat pfx (format fmt count)) pfx))
 	    (incf count)))
@@ -1220,7 +1242,7 @@ necessary for all the children of this level to align."
       (let ((b (point)))
 	;; Insert line text.
 	(insert (make-string (* rest-toc-indent (1- level)) ? ))
-	(insert (if (car node) (caar node) "(missing node)"))
+	(insert (if (car node) (caar node) "[missing node]"))
 
 	;; Highlight lines.
 	(put-text-property b (point) 'mouse-face 'highlight)
-- 
cgit v1.2.1


From 1512a0a05f8f988c305e9a0f5f8dab08f20e8ae4 Mon Sep 17 00:00:00 2001
From: blais 
Date: Fri, 28 Oct 2005 13:14:43 +0000
Subject: Added auto-updating TOC at the top of the file and refined TOC
 features.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3957 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/restructuredtext.el | 223 ++++++++++++++++++++++++--------
 1 file changed, 168 insertions(+), 55 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
index 642b2e364..738ac18b4 100644
--- a/tools/editors/emacs/restructuredtext.el
+++ b/tools/editors/emacs/restructuredtext.el
@@ -39,12 +39,31 @@
 ;; code).  The most important function provided by this file for section title
 ;; adjustments is rest-adjust.
 ;;
-;; You should consider customizing the following variables:
+;; There are many variables that can be customized, look for defcustom and
+;; defvar in this file.
 ;;
-;; - rest-default-indent
-;; - rest-preferred-decorations
+;; If you use the table-of-contents feature, you may want to add a hook to
+;; update the TOC automatically everytime you adjust a section title::
 ;;
-;; TODO:
+;;   (add-hook 'rest-adjust-hook 'rest-toc-insert-update)
+;;
+;;
+;; TODO
+;; ====
+;;
+;; rest-toc-insert features
+;; ------------------------
+;; - Support local table of contents, like in doctree.txt.
+;; - On load, detect any existing TOCs and set the properties for links.
+;; - TOC insertion should have an option to add empty lines.
+;; - TOC insertion should deal with multiple lines
+;;
+;; - There is a bug on redo after undo of adjust when rest-adjust-hook uses the
+;;   automatic toc update. The cursor ends up in the TOC and this is
+;;   annoying. Gotta fix that.
+;;
+;; Other
+;; -----
 ;; - Add an option to forego using the file structure in order to make
 ;;   suggestion, and to always use the preferred decorations to do that.
 ;;
@@ -52,6 +71,34 @@
 
 (require 'cl)
 
+(defun rest-toc-or-hierarchy ()
+  "Binding for either TOC or decorations hierarchy."
+  (interactive)
+  (if (not current-prefix-arg)
+      (rest-toc)
+    (rest-display-decorations-hierarchy)))
+
+(defun rest-text-mode-hook ()
+  "Default text mode hook for rest."
+  (local-set-key [(control ?=)] 'rest-adjust)
+  (local-set-key [(control x)(control ?=)] 'rest-toc-or-hierarchy)
+  (local-set-key [(control x)(?+)] 'rest-toc-insert)
+  (local-set-key [(control meta ?{)] 'rest-backward-section)
+  (local-set-key [(control meta ?})] 'rest-forward-section)
+  )
+
+;; Note: we cannot do this because it messes with undo.  If we disable undo,
+;; since it adds and removes characters, the positions in the undo list are not
+;; making sense anymore.  Dunno what to do with this, it would be nice to update
+;; when saving.
+;;
+;; (add-hook 'write-contents-hooks 'rest-toc-insert-update-fun)
+;; (defun rest-toc-insert-update-fun ()
+;;   ;; Disable undo for the write file hook.
+;;   (let ((buffer-undo-list t)) (rest-toc-insert-update) ))
+
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Generic Filter function.
 
@@ -157,22 +204,6 @@ is for which (pred elem) is true)"
 ;; adjustment (unless we cycle, in which case we use the indent that has been
 ;; found previously).
 
-(defun rest-toc-or-hierarchy ()
-  "Binding for either TOC or decorations hierarchy."
-  (interactive)
-  (if (not current-prefix-arg)
-      (rest-toc)
-    (rest-display-decorations-hierarchy)))
-
-(defun rest-text-mode-hook ()
-  "Default text mode hook for rest."
-  (local-set-key [(control ?=)] 'rest-adjust)
-  (local-set-key [(control x)(control ?=)] 'rest-toc-or-hierarchy)
-  (local-set-key [(control x)(?+)] 'rest-toc-insert)
-  (local-set-key [(control meta ?{)] 'rest-backward-section)
-  (local-set-key [(control meta ?})] 'rest-forward-section)
-  )
-
 (defcustom rest-preferred-decorations '( (?= over-and-under 1)
 					 (?= simple 0)
 					 (?- simple 0)
@@ -655,8 +686,14 @@ b. a negative numerical argument, which generally inverts the
 	(rest-promote-region current-prefix-arg)
       ;; Adjust decoration around point.
       (rest-adjust-decoration toggle-style reverse-direction))
+    
+    ;; Run the hooks to run after adjusting.
+    (run-hooks 'rest-adjust-hook)
+
     ))
 
+(defvar rest-adjust-hook nil
+  "Hooks to be run after running rest-adjust.")
 
 (defun rest-adjust-decoration (&optional toggle-style reverse-direction)
 "Adjust/rotate the section decoration for the section title around point.
@@ -1041,7 +1078,7 @@ the hierarchy is similar to that used by rest-adjust-decoration."
 				  (match-end 0)) )
 
 
-(defvar rest-toc-indent 4
+(defcustom rest-toc-indent 2
   "Indentation for table-of-contents display (also used for
   formatting insertion, when numbering is disabled).")
 
@@ -1093,7 +1130,7 @@ inserted automatically, and are set to nil."
   the current level of that node.  This function returns a pair
   of the subtree that was built.  This treats the decos list
   destructively."
-  
+
   (let ((ndeco (cadr decos))
 	node
 	children)
@@ -1107,7 +1144,7 @@ inserted automatically, and are set to nil."
 
     ;; Build the child nodes
     (while (and (cdr decos) (> (caadr decos) lev))
-      (setq children 
+      (setq children
 	    (cons (rest-section-tree-rec decos (1+ lev))
 		  children)))
 
@@ -1115,12 +1152,13 @@ inserted automatically, and are set to nil."
     (cons node (reverse children))
     ))
 
+
 (defun rest-toc-insert (&optional pfxarg)
   "Insert a simple text rendering of the table of contents.
 By default the top level is ignored if there is only one, because
-we assume that the document will have a single title.  
+we assume that the document will have a single title.
 
-If a numeric prefix argument is given, 
+If a numeric prefix argument is given,
 - if it is zero or generic, include the top level titles;
 - otherwise insert the TOC up to the specified level.
 
@@ -1132,15 +1170,15 @@ The TOC is inserted indented at the current column."
 	 (rest-toc-insert-max-level
 	  (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
 	      (prefix-numeric-value pfxarg) rest-toc-insert-max-level))
-	 
+
 	 ;; Get the section tree.
 	 (sectree (rest-section-tree (rest-find-all-decorations)))
-		   
+
 	 ;; If there is only one top-level title, remove it by starting to print
 	 ;; one index lower (revert this behaviour with the prefix arg),
 	 ;; otherwise print all.
 	 (gen-pfx-arg (or (and pfxarg (listp pfxarg))
-			  (and (integerp pfxarg) 
+			  (and (integerp pfxarg)
 			       (= (prefix-numeric-value pfxarg) 0))))
 	 (start-lev (if (and (not rest-toc-insert-always-include-top)
 			     (= (length (cdr sectree)) 1)
@@ -1154,17 +1192,36 @@ The TOC is inserted indented at the current column."
 
     ;; Fixup for the first line.
     (delete-region init-point (+ init-point (length initial-indent)))
+    
+    ;; Delete the last newline added.
+    (delete-backward-char 1)
     ))
 
-(defvar rest-toc-insert-always-include-top nil
-  "Set this to 't if you want to always include top-level titles,
-  even when there is only one.")
 
-(defvar rest-toc-insert-numbering t
+(defcustom rest-toc-insert-always-include-top nil
   "Set this to 't if you want to always include top-level titles,
   even when there is only one.")
 
-(defvar rest-toc-insert-max-level nil
+(defcustom rest-toc-insert-style 'fixed
+  "Set this to one of the following values to determine numbering and
+indentation style:
+- plain: no numbering (fixed indentation)
+- fixed: numbering, but fixed indentation
+- aligned: numbering, titles aligned under each other
+- listed: numbering, with dashes like list items (EXPERIMENTAL)
+")
+
+(defcustom rest-toc-insert-number-separator "  "
+  "Separator that goes between the TOC number and the title.")
+
+;; This is used to avoid having to change the user's mode.
+(defvar rest-toc-insert-click-keymap
+  (let ((map (make-sparse-keymap)))
+       (define-key map [mouse-1] 'rest-toc-mode-mouse-goto)
+       map)
+  "(Internal) What happens when you click on propertized text in the TOC.")
+
+(defcustom rest-toc-insert-max-level nil
   "If non-nil, maximum depth of the inserted TOC.")
 
 (defun rest-toc-insert-node (node level indent pfx)
@@ -1173,14 +1230,13 @@ toc. PFX is the prefix numbering, that includes the alignment
 necessary for all the children of this level to align."
   (let ((do-print (> level 0))
 	(count 1)
-	(numbered-indent-style 'aligned)
 	b)
     (if do-print
 	(progn
 	  (insert indent)
 	  (let ((b (point)))
-	    (if rest-toc-insert-numbering
-		(insert pfx "  "))
+	    (if (not (equal rest-toc-insert-style 'plain))
+		(insert pfx rest-toc-insert-number-separator))
 	    (insert (or (caar node) "[missing node]"))
 	    ;; Add properties to the text, even though in normal text mode it
 	    ;; won't be doing anything for now.  Not sure that I want to change
@@ -1188,28 +1244,32 @@ necessary for all the children of this level to align."
 	    ;; is generated automatically.
 	    (put-text-property b (point) 'mouse-face 'highlight)
 	    (put-text-property b (point) 'rest-toc-target (cadar node))
+	    (put-text-property b (point) 'keymap rest-toc-insert-click-keymap)
+
 	    )
 	  (insert "\n")
 
 	  ;; Prepare indent for children.
-	  (setq indent 
-		(if (not rest-toc-insert-numbering)
-		    (concat indent rest-toc-indent)
-		  (cond 
-		   ((eq numbered-indent-style 'fixed)
-		    (concat indent (make-string rest-toc-indent ? )))
-		   
-		   ((eq numbered-indent-style 'aligned)
-		    (concat indent (make-string (+ (length pfx) 2) ? )))
-		   
-		   ((eq numbered-indent-style 'listed)
-		    (concat (substring indent 0 -3) 
-			    (concat (make-string (+ (length pfx) 2) ? ) " - ")))
-		   )))
+	  (setq indent
+		(cond
+		 ((eq rest-toc-insert-style 'plain)
+		  (concat indent rest-toc-indent))
+
+		 ((eq rest-toc-insert-style 'fixed)
+		  (concat indent (make-string rest-toc-indent ? )))
+
+		 ((eq rest-toc-insert-style 'aligned)
+		  (concat indent (make-string (+ (length pfx) 2) ? )))
+
+		 ((eq rest-toc-insert-style 'listed)
+		  (concat (substring indent 0 -3)
+			  (concat (make-string (+ (length pfx) 2) ? ) " - ")))
+		 ))
 
 	  ))
 
-    (if (or (eq rest-toc-insert-max-level nil) (< level rest-toc-insert-max-level))
+    (if (or (eq rest-toc-insert-max-level nil)
+	    (< level rest-toc-insert-max-level))
 	(let ((do-child-numbering (>= level 0))
 	      fmt)
 	  (if do-child-numbering
@@ -1221,20 +1281,73 @@ necessary for all the children of this level to align."
 		;; Calculate the amount of space that the prefix will require for
 		;; the numbers.
 		(if (cdr node)
-		    (setq fmt (format "%%-%dd" (1+ (floor (log10 (length (cdr node))))))))
+		    (setq fmt (format "%%-%dd"
+				      (1+ (floor (log10 (length (cdr node))))))))
 		))
 
 	  (dolist (child (cdr node))
-	    (rest-toc-insert-node child 
+	    (rest-toc-insert-node child
 				  (1+ level)
 				  indent
-				  (if do-child-numbering 
+				  (if do-child-numbering
 				      (concat pfx (format fmt count)) pfx))
 	    (incf count)))
 
       )))
 
 
+(defun rest-toc-insert-find-delete-contents ()
+  "Finds and deletes an existing comment after the first contents directive and
+delete that region. Return t if found and the cursor is left after the comment."
+  (goto-char (point-min))
+  ;; We look for the following and the following only (in other words, if your
+  ;; syntax differs, this won't work.  If you would like a more flexible thing,
+  ;; contact the author, I just can't imagine that this requirement is
+  ;; unreasonable for now).
+  ;;
+  ;;   .. contents:: [...anything here...]
+  ;;   ..
+  ;;      XXXXXXXX
+  ;;      XXXXXXXX
+  ;;      [more lines]
+  ;;
+  (let ((beg
+	 (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
+			    nil t))
+	last-real)
+    (when beg
+      ;; Look for the first line that starts at the first column.
+      (forward-line 1)
+      (beginning-of-line)
+      (while (or (and (looking-at "[ \t]+[^ \t]")
+		      (setq last-real (point)) t)
+		 (looking-at "\\s-*$"))
+	(forward-line 1)
+	)
+      (if last-real
+	  (progn
+	    (goto-char last-real)
+	    (end-of-line)
+	    (delete-region beg (point)))
+	(goto-char beg))
+      t
+      )))
+  
+(defun rest-toc-insert-update ()
+  "Automatically find the .. contents:: section of a document and update the
+inserted TOC if present.  You can use this in your file-write hook to always
+make it up-to-date automatically."
+  (interactive)
+  (save-excursion
+    (if (rest-toc-insert-find-delete-contents)
+	(progn (insert "\n    ")
+	       (rest-toc-insert))) )
+  ;; Note: always return nil, because this may be used as a hook.
+  )
+
+
+;;------------------------------------------------------------------------------
+
 (defun rest-toc-node (node level)
   "Recursive function that does the print of the TOC in rest-toc-mode."
 
@@ -1246,7 +1359,7 @@ necessary for all the children of this level to align."
 
 	;; Highlight lines.
 	(put-text-property b (point) 'mouse-face 'highlight)
-    
+
 	;; Add link on lines.
 	(put-text-property b (point) 'rest-toc-target (cadar node))
 
-- 
cgit v1.2.1


From d92350b57c08a3f642a8a2e6147eb999769180f7 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sat, 29 Oct 2005 12:28:44 +0000
Subject: converted latin1 files to utf8; removed unnecessary -*- coding -*-
 tags; made some source files ASCII only

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3968 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index 366a826da..115927604 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -1,4 +1,4 @@
-.. -*- coding: iso-8859-1 -*-
+.. -*- coding: utf-8 -*-
 
 =====================================
  Emacs Support for reStructuredText_
@@ -49,7 +49,7 @@ here are some useful resources for Emacs users in the Unicode world:
   to your .emacs file.
 
   - To get direct keyboard input of non-ASCII characters (like
-    "option-e e" resulting in "é" [eacute]), first enable the option
+    "option-e e" resulting in "é" [eacute]), first enable the option
     key by setting the command key as your meta key::
 
         (setq mac-command-key-is-meta t) ;; nil for option key
-- 
cgit v1.2.1


From 323d842b2d1803c0e27fa029745dc9f1eeb6e214 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 30 Oct 2005 15:13:46 +0000
Subject: I have cleaned up all the emacs support code for restructured text.
 If you are using it, this will most certainly affect you, here are the list
 of changes:

1. I moved the contents of restructuredtext.el, rst-mode.el and
   rst-html.el into a single file, named rst.el, and removed the old
   files.  You can remove the old files from your load-path and
   replace them with rst.el, the old files are to be considered
   OBSOLETE from now (2005-10-30).  All new contents will go to
   rst.el.

2. All the rest-* function names from restructuredtext.el have been
   RENAMED to rst-* (to be consistent with the code that was in
   rst-mode.el).  Almost all the contents of rst.el now start with
   rst-.

3. rst-text-mode-hook has been renamed to rst-text-mode-bindings.
   Because it is not a hook, but rather a function to be bound to a
   hook.  This was confusing and is now following the general emacs
   conventions.  This will affect you if you were enabling the
   adjusting and toc functions.

4. I removed the rst-html-stylesheet and the simpler rst-html-compile
   function.  It was replaced by the implementation of
   rst-html-html-comple-with-conf, which is more generic, and which
   now also uses the rst-html-options.

In addition, I wrote a document that describes how to use all the
features included in rst.el, because many emacs users I meet are not
aware of them.  You will be able to find it under
docs/user/emacs.txt.  I linked to it from the index page.



git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3981 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt                    |   89 +-
 tools/editors/emacs/restructuredtext.el           | 1649 --------------
 tools/editors/emacs/rst-html.el                   |  125 --
 tools/editors/emacs/rst-mode.el                   |  700 ------
 tools/editors/emacs/rst.el                        | 2479 +++++++++++++++++++++
 tools/editors/emacs/tests/tests-adjust-section.el |   10 +-
 tools/editors/emacs/tests/tests-basic.el          |   42 +-
 7 files changed, 2516 insertions(+), 2578 deletions(-)
 delete mode 100644 tools/editors/emacs/restructuredtext.el
 delete mode 100644 tools/editors/emacs/rst-html.el
 delete mode 100644 tools/editors/emacs/rst-mode.el
 create mode 100644 tools/editors/emacs/rst.el

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index 115927604..27be19f16 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -12,85 +12,18 @@ Directory Contents
 
 This directory contains the following Emacs lisp package files:
 
-* restructuredtext.el by Martin Blais and David Goodger
+* rst.el : Emacs support for ReStructuredText. This file contains
 
-  Support code for editing reStructuredText with Emacs indented-text
-  mode.
+  * Section decoration/adornment creation and updating (M. Blais);
+  * Table-of-contents mode and insertion (M. Blais);
+  * Font-lock syntax highlighting (S. Merten);
+  * Some handy editing functions (D. Goodger).
+  * Some functions for converting documents from emacs (M. Blais).  
 
-* rst-mode.el by Stefan Merten
+* tests subdirectory: automated tests for some of the features in rst.el.
+  Please make sure the tests pass if you change the LISP code.  Just type "make"
+  to run the tests.
 
-  Provides support for documents marked up using the reStructuredText
-  format, including font locking as well as some convenience functions
-  for editing.
+To install the package, put a copy of the package file in a directory on your
+``load-path`` (use ``C-h v load-path`` to check).
 
-* rst-html.el by Martin Blais
-
-  Provides a few functions and variables that can help in automating
-  the conversion of reST documents to HTML from within Emacs.
-
-Each file includes specific usage instructions.  To install a package,
-put a copy of the package file in a directory on your ``load-path``
-(use ``C-h v load-path`` to check).
-
-
-Character Processing Notes
-==========================
-
-Since reStructuredText punts on the issue of character processing,
-here are some useful resources for Emacs users in the Unicode world:
-
-* `xmlunicode.el and unichars.el from Norman Walsh
-  `__
-
-* `An essay by Tim Bray, with example code
-  `__
-
-* For Emacs users on Mac OS X, here are some useful useful additions
-  to your .emacs file.
-
-  - To get direct keyboard input of non-ASCII characters (like
-    "option-e e" resulting in "é" [eacute]), first enable the option
-    key by setting the command key as your meta key::
-
-        (setq mac-command-key-is-meta t) ;; nil for option key
-
-    Next, use one of these lines::
-
-        (set-keyboard-coding-system 'mac-roman)
-        (setq mac-keyboard-text-encoding kTextEncodingISOLatin1)
-
-    I prefer the first line, because it enables non-Latin-1 characters
-    as well (em-dash, curly quotes, etc.).
-
-  - To enable the display of all characters in the Mac-Roman charset,
-    first create a fontset listing the fonts to use for each range of
-    characters using charsets that Emacs understands::
-
-      (create-fontset-from-fontset-spec
-       "-apple-monaco-medium-r-normal--10-*-*-*-*-*-fontset-monaco,
-        ascii:-apple-monaco-medium-r-normal--10-100-75-75-m-100-mac-roman,
-        latin-iso8859-1:-apple-monaco-medium-r-normal--10-100-75-75-m-100-mac-roman,
-        mule-unicode-0100-24ff:-apple-monaco-medium-r-normal--10-100-75-75-m-100-mac-roman")
-
-    Latin-1 doesn't cover characters like em-dash and curly quotes, so
-    "mule-unicode-0100-24ff" is needed.
-
-    Next, use that fontset::
-
-        (set-frame-font "fontset-monaco")
-
-  - To enable cooperation between the system clipboard and the Emacs
-    kill ring, add this line::
-
-        (set-clipboard-coding-system 'mac-roman)
-
-  Other useful resources are in `Andrew Choi's Emacs 21 for Mac OS X
-  FAQ `__.
-
-No matter what platform (or editor) you're using, I recommend the
-ProFont__ programmer's font.  It's monospaced, small but readable,
-similar characters are visually distinctive (like "I1l|", "0O", "ao",
-and ".,:;"), and free.
-
-__ http://www.tobias-jung.de/seekingprofont/
-.. _reStructuredText: http://docutils.sf.net/rst.html
diff --git a/tools/editors/emacs/restructuredtext.el b/tools/editors/emacs/restructuredtext.el
deleted file mode 100644
index 738ac18b4..000000000
--- a/tools/editors/emacs/restructuredtext.el
+++ /dev/null
@@ -1,1649 +0,0 @@
-;; Authors: Martin Blais ,
-;;          David Goodger 
-;; Date: $Date$
-;; Copyright: This module has been placed in the public domain.
-;;
-;; Support code for editing reStructuredText with Emacs indented-text mode.
-;; The goal is to create an integrated reStructuredText editing mode.
-;;
-;; Installation instructions
-;; -------------------------
-;;
-;; Add this line to your .emacs file and bind the versatile sectioning commands
-;; in text mode, like this::
-;;
-;;   (require 'restructuredtext)
-;;   (add-hook 'text-mode-hook 'rest-text-mode-hook)
-;;
-;; The keys it defines are:
-;;
-;;    C-= : updates or rotates the section title around point or
-;;          promotes/demotes the decorations within the region (see full details
-;;          below).
-;;
-;;          Note that C-= is a good binding, since it allows you to specify a
-;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
-;;          prefix arg with C-u C-=.
-;;
-;;    C-x C-= : displays the hierarchical table-of-contents of the document and
-;;              allows you to jump to any section from it.
-;;
-;;    C-u C-x C-= : displays the title decorations from this file.
-;;
-;;    C-x + : insert the table of contents in the text.  See the many options
-;;            for customizing how it will look.
-;;
-;;    C-M-{, C-M-} : navigate between section titles.
-;;
-;; Other specialized and more generic functions are also available (see source
-;; code).  The most important function provided by this file for section title
-;; adjustments is rest-adjust.
-;;
-;; There are many variables that can be customized, look for defcustom and
-;; defvar in this file.
-;;
-;; If you use the table-of-contents feature, you may want to add a hook to
-;; update the TOC automatically everytime you adjust a section title::
-;;
-;;   (add-hook 'rest-adjust-hook 'rest-toc-insert-update)
-;;
-;;
-;; TODO
-;; ====
-;;
-;; rest-toc-insert features
-;; ------------------------
-;; - Support local table of contents, like in doctree.txt.
-;; - On load, detect any existing TOCs and set the properties for links.
-;; - TOC insertion should have an option to add empty lines.
-;; - TOC insertion should deal with multiple lines
-;;
-;; - There is a bug on redo after undo of adjust when rest-adjust-hook uses the
-;;   automatic toc update. The cursor ends up in the TOC and this is
-;;   annoying. Gotta fix that.
-;;
-;; Other
-;; -----
-;; - Add an option to forego using the file structure in order to make
-;;   suggestion, and to always use the preferred decorations to do that.
-;;
-
-
-(require 'cl)
-
-(defun rest-toc-or-hierarchy ()
-  "Binding for either TOC or decorations hierarchy."
-  (interactive)
-  (if (not current-prefix-arg)
-      (rest-toc)
-    (rest-display-decorations-hierarchy)))
-
-(defun rest-text-mode-hook ()
-  "Default text mode hook for rest."
-  (local-set-key [(control ?=)] 'rest-adjust)
-  (local-set-key [(control x)(control ?=)] 'rest-toc-or-hierarchy)
-  (local-set-key [(control x)(?+)] 'rest-toc-insert)
-  (local-set-key [(control meta ?{)] 'rest-backward-section)
-  (local-set-key [(control meta ?})] 'rest-forward-section)
-  )
-
-;; Note: we cannot do this because it messes with undo.  If we disable undo,
-;; since it adds and removes characters, the positions in the undo list are not
-;; making sense anymore.  Dunno what to do with this, it would be nice to update
-;; when saving.
-;;
-;; (add-hook 'write-contents-hooks 'rest-toc-insert-update-fun)
-;; (defun rest-toc-insert-update-fun ()
-;;   ;; Disable undo for the write file hook.
-;;   (let ((buffer-undo-list t)) (rest-toc-insert-update) ))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Generic Filter function.
-
-(if (not (fboundp 'filter))
-    (defun filter (pred list)
-      "Returns a list of all the elements fulfilling the pred requirement (that
-is for which (pred elem) is true)"
-      (if list
-          (let ((head (car list))
-                (tail (filter pred (cdr list))))
-            (if (funcall pred head)
-                (cons head tail)
-              tail)))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; From emacs-22
-
-(if (not (fboundp 'line-number-at-pos))
-    (defun line-number-at-pos (&optional pos)
-      "Return (narrowed) buffer line number at position POS.
-    If POS is nil, use current buffer location."
-      (let ((opoint (or pos (point))) start)
-        (save-excursion
-          (goto-char (point-min))
-          (setq start (point))
-          (goto-char opoint)
-          (forward-line 0)
-          (1+ (count-lines start (point)))))) )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; The following functions implement a smart automatic title sectioning feature.
-;; The idea is that with the cursor sitting on a section title, we try to get as
-;; much information from context and try to do the best thing automatically.
-;; This function can be invoked many times and/or with prefix argument to rotate
-;; between the various sectioning decorations.
-;;
-;; Definitions: the two forms of sectioning define semantically separate section
-;; levels.  A sectioning DECORATION consists in:
-;;
-;;   - a CHARACTER
-;;
-;;   - a STYLE which can be either of 'simple' or 'over-and-under'.
-;;
-;;   - an INDENT (meaningful for the over-and-under style only) which determines
-;;     how many characters and over-and-under style is hanging outside of the
-;;     title at the beginning and ending.
-;;
-;; Important note: an existing decoration must be formed by at least two
-;; characters to be recognized.
-;;
-;; Here are two examples of decorations (| represents the window border, column
-;; 0):
-;;
-;;                                  |
-;; 1. char: '-'   e                 |Some Title
-;;    style: simple                 |----------
-;;                                  |
-;; 2. char: '='                     |==============
-;;    style: over-and-under         |  Some Title
-;;    indent: 2                     |==============
-;;                                  |
-;;
-;; Some notes:
-;;
-;; - The underlining character that is used depends on context. The file is
-;;   scanned to find other sections and an appropriate character is selected.
-;;   If the function is invoked on a section that is complete, the character is
-;;   rotated among the existing section decorations.
-;;
-;;   Note that when rotating the characters, if we come to the end of the
-;;   hierarchy of decorations, the variable rest-preferred-decorations is
-;;   consulted to propose a new underline decoration, and if continued, we cycle
-;;   the decorations all over again.  Set this variable to nil if you want to
-;;   limit the underlining character propositions to the existing decorations in
-;;   the file.
-;;
-;; - A prefix argument can be used to alternate the style.
-;;
-;; - An underline/overline that is not extended to the column at which it should
-;;   be hanging is dubbed INCOMPLETE.  For example::
-;;
-;;      |Some Title
-;;      |-------
-;;
-;; Examples of default invocation:
-;;
-;;   |Some Title       --->    |Some Title
-;;   |                         |----------
-;;
-;;   |Some Title       --->    |Some Title
-;;   |-----                    |----------
-;;
-;;   |                         |------------
-;;   | Some Title      --->    | Some Title
-;;   |                         |------------
-;;
-;; In over-and-under style, when alternating the style, a variable is available
-;; to select how much default indent to use (it can be zero).  Note that if the
-;; current section decoration already has an indent, we don't adjust it to the
-;; default, we rather use the current indent that is already there for
-;; adjustment (unless we cycle, in which case we use the indent that has been
-;; found previously).
-
-(defcustom rest-preferred-decorations '( (?= over-and-under 1)
-					 (?= simple 0)
-					 (?- simple 0)
-					 (?~ simple 0)
-					 (?+ simple 0)
-					 (?` simple 0)
-					 (?# simple 0)
-					 (?@ simple 0) )
-  "Preferred ordering of section title decorations.  This
-  sequence is consulted to offer a new decoration suggestion when
-  we rotate the underlines at the end of the existing hierarchy
-  of characters, or when there is no existing section title in
-  the file.")
-
-
-(defcustom rest-default-indent 1
-  "Number of characters to indent the section title when toggling
-  decoration styles.  This is used when switching from a simple
-  decoration style to a over-and-under decoration style.")
-
-
-(defvar rest-section-text-regexp "^[ \t]*\\S-*[a-zA-Z0-9]\\S-*"
-  "Regular expression for valid section title text.")
-
-
-(defun rest-line-homogeneous-p (&optional accept-special)
-  "Predicate return the unique char if the current line is
-  composed only of a single repeated non-whitespace
-  character. This returns the char even if there is whitespace at
-  the beginning of the line.
-
-  If ACCEPT-SPECIAL is specified we do not ignore special sequences
-  which normally we would ignore when doing a search on many lines.
-  For example, normally we have cases to ignore commonly occuring
-  patterns, such as :: or ...;  with the flag do not ignore them."
-  (save-excursion
-    (back-to-indentation)
-    (if (not (looking-at "\n"))
-        (let ((c (thing-at-point 'char)))
-          (if (and (looking-at (format "[%s]+[ \t]*$" c))
-                   (or accept-special
-                       (and
-                        ;; Common patterns.
-                        (not (looking-at "::[ \t]*$"))
-                        (not (looking-at "\\.\\.\\.[ \t]*$"))
-                        ;; Discard one char line
-                        (not (looking-at ".[ \t]*$"))
-                        )))
-              (string-to-char c))
-          ))
-    ))
-
-(defun rest-line-homogeneous-nodent-p (&optional accept-special)
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at "^[ \t]+")
-	nil
-      (rest-line-homogeneous-p accept-special)
-      )))
-
-
-(defun rest-compare-decorations (deco1 deco2)
-  "Compare decorations.  Returns true if both are equal,
-according to restructured text semantics (only the character and
-the style are compared, the indentation does not matter."
-  (and (eq (car deco1) (car deco2))
-       (eq (cadr deco1) (cadr deco2))))
-
-
-(defun rest-get-decoration-match (hier deco)
-  "Returns the index (level) of the decoration in the given hierarchy.
-This basically just searches for the item using the appropriate
-comparison and returns the index.  We return nil if the item is
-not found."
-  (let ((cur hier))
-    (while (and cur (not (rest-compare-decorations (car cur) deco)))
-      (setq cur (cdr cur)))
-    cur))
-
-
-(defun rest-suggest-new-decoration (alldecos &optional prev)
-  "Suggest a new, different decoration, different from all that
-have been seen.
-
-  ALLDECOS is the set of all decorations, including the line
-  numbers.  PREV is the optional previous decoration, in order to
-  suggest a better match."
-
-  ;; For all the preferred decorations...
-  (let* (
-	 ;; If 'prev' is given, reorder the list to start searching after the
-	 ;; match.
-	 (fplist
-	  (cdr (rest-get-decoration-match rest-preferred-decorations prev)))
-
-	 ;; List of candidates to search.
-	 (curpotential (append fplist rest-preferred-decorations)))
-    (while
-	;; For all the decorations...
-	(let ((cur alldecos)
-	      found)
-	  (while (and cur (not found))
-	    (if (rest-compare-decorations (car cur) (car curpotential))
-		;; Found it!
-		(setq found (car curpotential))
-	      (setq cur (cdr cur))))
-	  found)
-
-      (setq curpotential (cdr curpotential)))
-
-    (copy-list (car curpotential)) ))
-
-(defun rest-delete-line ()
-  "A version of kill-line that does not use the kill-ring."
-  (delete-region (line-beginning-position) (+ 1 (line-end-position))))
-
-(defun rest-update-section (char style &optional indent)
-  "Unconditionally updates the style of a section decoration
-  using the given character CHAR, with STYLE 'simple or
-  'over-and-under, and with indent INDENT.  If the STYLE is
-  'simple, whitespace before the title is removed (indent is
-  always assume to be 0).
-
-  If there are existing overline and/or underline from the
-  existing decoration, they are removed before adding the
-  requested decoration."
-
-  (interactive)
-  (let (marker
-        len
-        ec
-        (c ?-))
-
-      (end-of-line)
-      (setq marker (point-marker))
-
-      ;; Fixup whitespace at the beginning and end of the line
-      (if (or (null indent) (eq style 'simple))
-          (setq indent 0))
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (insert (make-string indent ? ))
-
-      (end-of-line)
-      (delete-horizontal-space)
-
-      ;; Set the current column, we're at the end of the title line
-      (setq len (+ (current-column) indent))
-
-      ;; Remove previous line if it consists only of a single repeated character
-      (save-excursion
-        (forward-line -1)
-	(and (rest-line-homogeneous-p 1)
-	     ;; Avoid removing the underline of a title right above us.
-	     (save-excursion (forward-line -1)
-			     (not (looking-at rest-section-text-regexp)))
-             (rest-delete-line)))
-
-      ;; Remove following line if it consists only of a single repeated
-      ;; character
-      (save-excursion
-        (forward-line +1)
-        (and (rest-line-homogeneous-p 1)
-             (rest-delete-line))
-        ;; Add a newline if we're at the end of the buffer, for the subsequence
-        ;; inserting of the underline
-        (if (= (point) (buffer-end 1))
-            (newline 1)))
-
-      ;; Insert overline
-      (if (eq style 'over-and-under)
-          (save-excursion
-            (beginning-of-line)
-            (open-line 1)
-            (insert (make-string len char))))
-
-      ;; Insert underline
-      (forward-line +1)
-      (open-line 1)
-      (insert (make-string len char))
-
-      (forward-line +1)
-      (goto-char marker)
-      ))
-
-
-(defun rest-normalize-cursor-position ()
-  "If the cursor is on a decoration line or an empty line , place
-  it on the section title line (at the end).  Returns the line
-  offset by which the cursor was moved. This works both over or
-  under a line."
-  (if (save-excursion (beginning-of-line)
-                      (or (rest-line-homogeneous-p 1)
-                          (looking-at "^[ \t]*$")))
-      (progn
-        (beginning-of-line)
-        (cond
-         ((save-excursion (forward-line -1)
-                          (beginning-of-line)
-                          (and (looking-at rest-section-text-regexp)
-                               (not (rest-line-homogeneous-p 1))))
-          (progn (forward-line -1) -1))
-         ((save-excursion (forward-line +1)
-                          (beginning-of-line)
-                          (and (looking-at rest-section-text-regexp)
-                               (not (rest-line-homogeneous-p 1))))
-          (progn (forward-line +1) +1))
-         (t 0)))
-    0 ))
-
-
-(defun rest-find-all-decorations ()
-  "Finds all the decorations in the file, and returns a list of
-  (line, decoration) pairs.  Each decoration consists in a (char,
-  style, indent) triple.
-
-  This function does not detect the hierarchy of decorations, it
-  just finds all of them in a file.  You can then invoke another
-  function to remove redundancies and inconsistencies."
-
-  (let (positions
-        (curline 1))
-    ;; Iterate over all the section titles/decorations in the file.
-    (save-excursion
-      (beginning-of-buffer)
-      (while (< (point) (buffer-end 1))
-        (if (rest-line-homogeneous-nodent-p)
-            (progn
-              (setq curline (+ curline (rest-normalize-cursor-position)))
-
-              ;; Here we have found a potential site for a decoration,
-              ;; characterize it.
-              (let ((deco (rest-get-decoration)))
-                (if (cadr deco) ;; Style is existing.
-                    ;; Found a real decoration site.
-                    (progn
-                      (push (cons curline deco) positions)
-                      ;; Push beyond the underline.
-                      (forward-line 1)
-                      (setq curline (+ curline 1))
-                      )))
-              ))
-        (forward-line 1)
-        (setq curline (+ curline 1))
-        ))
-    (reverse positions)))
-
-
-(defun rest-infer-hierarchy (decorations)
-  "Build a hierarchy of decorations using the list of given decorations.
-
-  This function expects a list of (char, style, indent)
-  decoration specifications, in order that they appear in a file,
-  and will infer a hierarchy of section levels by removing
-  decorations that have already been seen in a forward traversal of the
-  decorations, comparing just the character and style.
-
-  Similarly returns a list of (char, style, indent), where each
-  list element should be unique."
-
-  (let ((hierarchy-alist (list)))
-    (dolist (x decorations)
-      (let ((char (car x))
-            (style (cadr x))
-            (indent (caddr x)))
-        (if (not (assoc (cons char style) hierarchy-alist))
-            (progn
-              (setq hierarchy-alist
-                    (append hierarchy-alist
-                            (list (cons (cons char style) x))))
-              ))
-        ))
-    (mapcar 'cdr hierarchy-alist)
-    ))
-
-
-(defun rest-get-hierarchy (&optional alldecos ignore)
-  "Returns a list of decorations that represents the hierarchy of
-  section titles in the file.
-
-  If the line number in IGNORE is specified, the decoration found
-  on that line (if there is one) is not taken into account when
-  building the hierarchy."
-  (let ((all (or alldecos (rest-find-all-decorations))))
-    (setq all (assq-delete-all ignore all))
-    (rest-infer-hierarchy (mapcar 'cdr all))))
-
-
-(defun rest-get-decoration (&optional point)
-  "Looks around point and finds the characteristics of the
-  decoration that is found there.  We assume that the cursor is
-  already placed on the title line (and not on the overline or
-  underline).
-
-  This function returns a (char, style, indent) triple.  If the
-  characters of overline and underline are different, we return
-  the underline character.  The indent is always calculated.  A
-  decoration can be said to exist if the style is not nil.
-
-  A point can be specified to go to the given location before
-  extracting the decoration."
-
-  (let (char style indent)
-    (save-excursion
-      (if point (goto-char point))
-      (beginning-of-line)
-      (if (looking-at rest-section-text-regexp)
-          (let* ((over (save-excursion
-			 (forward-line -1)
-			 (rest-line-homogeneous-nodent-p)))
-
-		(under (save-excursion
-			 (forward-line +1)
-			 (rest-line-homogeneous-nodent-p)))
-	        )
-
-	    ;; Check that the line above the overline is not part of a title
-	    ;; above it.
-	    (if (and over
-		     (save-excursion
-		       (and (equal (forward-line -2) 0)
-			    (looking-at rest-section-text-regexp))))
-		(setq over nil))
-
-            (cond
-             ;; No decoration found, leave all return values nil.
-             ((and (eq over nil) (eq under nil)))
-
-             ;; Overline only, leave all return values nil.
-             ;;
-             ;; Note: we don't return the overline character, but it could perhaps
-             ;; in some cases be used to do something.
-             ((and over (eq under nil)))
-
-             ;; Underline only.
-             ((and under (eq over nil))
-              (setq char under
-                    style 'simple))
-
-             ;; Both overline and underline.
-             (t
-              (setq char under
-                    style 'over-and-under))
-             )
-            )
-        )
-      ;; Find indentation.
-      (setq indent (save-excursion (back-to-indentation) (current-column)))
-      )
-    ;; Return values.
-    (list char style indent)))
-
-
-(defun rest-get-decorations-around (&optional alldecos)
-  "Given the list of all decorations (with positions),
-find the decorations before and after the given point.
-A list of the previous and next decorations is returned."
-  (let* ((all (or alldecos (rest-find-all-decorations)))
-	 (curline (line-number-at-pos))
-	 prev next
-	 (cur all))
-
-    ;; Search for the decorations around the current line.
-    (while (and cur (< (caar cur) curline))
-      (setq prev cur
-	    cur (cdr cur)))
-    ;; 'cur' is the following decoration.
-
-    (if (and cur (caar cur))
-	(setq next (if (= curline (caar cur)) (cdr cur) cur)))
-
-    (mapcar 'cdar (list prev next))
-    ))
-
-
-(defun rest-decoration-complete-p (deco &optional point)
-  "Return true if the decoration DECO around POINT is complete."
-  ;; Note: we assume that the detection of the overline as being the underline
-  ;; of a preceding title has already been detected, and has been eliminated
-  ;; from the decoration that is given to us.
-
-  ;; There is some sectioning already present, so check if the current
-  ;; sectioning is complete and correct.
-  (let* ((char (car deco))
-         (style (cadr deco))
-         (indent (caddr deco))
-         (endcol (save-excursion (end-of-line) (current-column)))
-         )
-    (if char
-        (let ((exps (concat "^"
-                            (regexp-quote (make-string (+ endcol indent) char))
-                            "$")))
-          (and
-           (save-excursion (forward-line +1)
-                           (beginning-of-line)
-                           (looking-at exps))
-           (or (not (eq style 'over-and-under))
-               (save-excursion (forward-line -1)
-                               (beginning-of-line)
-                               (looking-at exps))))
-          ))
-    ))
-
-
-(defun rest-get-next-decoration
-  (curdeco hier &optional suggestion reverse-direction)
-  "Get the next decoration for CURDECO, in given hierarchy HIER,
-and suggesting for new decoration SUGGESTION."
-
-  (let* (
-	 (char (car curdeco))
-	 (style (cadr curdeco))
-
-	 ;; Build a new list of decorations for the rotation.
-	 (rotdecos
-	  (append hier
-		  ;; Suggest a new decoration.
-		  (list suggestion
-			;; If nothing to suggest, use first decoration.
-			(car hier)))) )
-    (or
-     ;; Search for next decoration.
-     (cadr
-      (let ((cur (if reverse-direction rotdecos
-		   (reverse rotdecos)))
-	    found)
-	(while (and cur
-		    (not (and (eq char (caar cur))
-			      (eq style (cadar cur)))))
-	  (setq cur (cdr cur)))
-	cur))
-
-     ;; If not found, take the first of all decorations.
-     suggestion
-     )))
-
-
-(defun rest-adjust ()
-  "Adjust/rotate the section decoration for the section title
-around point or promote/demote the decorations inside the region,
-depending on if the region is active.  This function is meant to
-be invoked possibly multiple times, and can vary its behaviour
-with a positive prefix argument (toggle style), or with a
-negative prefix argument (alternate behaviour).
-
-This function is the main focus of this module and is a bit of a
-swiss knife.  It is meant as the single most essential function
-to be bound to invoke to adjust the decorations of a section
-title in restructuredtext.  It tries to deal with all the
-possible cases gracefully and to do `the right thing' in all
-cases.
-
-See the documentations of rest-adjust-decoration and
-rest-promote-region for full details.
-
-Prefix Arguments
-================
-
-The method can take either (but not both) of
-
-a. a (non-negative) prefix argument, which means to toggle the
-   decoration style.  Invoke with C-u prefix for example;
-
-b. a negative numerical argument, which generally inverts the
-   direction of search in the file or hierarchy.  Invoke with C--
-   prefix for example.
-
-"
-  (interactive)
-
-  (let* ( ;; Parse the positive and negative prefix arguments.
-	 (reverse-direction
-	  (and current-prefix-arg
-	       (< (prefix-numeric-value current-prefix-arg) 0)))
-	 (toggle-style
-	  (and current-prefix-arg (not reverse-direction))))
-
-    (if (and transient-mark-mode mark-active)
-	;; Adjust decorations within region.
-	(rest-promote-region current-prefix-arg)
-      ;; Adjust decoration around point.
-      (rest-adjust-decoration toggle-style reverse-direction))
-    
-    ;; Run the hooks to run after adjusting.
-    (run-hooks 'rest-adjust-hook)
-
-    ))
-
-(defvar rest-adjust-hook nil
-  "Hooks to be run after running rest-adjust.")
-
-(defun rest-adjust-decoration (&optional toggle-style reverse-direction)
-"Adjust/rotate the section decoration for the section title around point.
-
-This function is meant to be invoked possibly multiple times, and
-can vary its behaviour with a true TOGGLE-STYLE argument, or with
-a REVERSE-DIRECTION argument.
-
-General Behaviour
-=================
-
-The next action it takes depends on context around the point, and
-it is meant to be invoked possibly more than once to rotate among
-the various possibilities. Basically, this function deals with:
-
-- adding a decoration if the title does not have one;
-
-- adjusting the length of the underline characters to fit a
-  modified title;
-
-- rotating the decoration in the set of already existing
-  sectioning decorations used in the file;
-
-- switching between simple and over-and-under styles.
-
-You should normally not have to read all the following, just
-invoke the method and it will do the most obvious thing that you
-would expect.
-
-
-Decoration Definitions
-======================
-
-The decorations consist in
-
-1. a CHARACTER
-
-2. a STYLE which can be either of 'simple' or 'over-and-under'.
-
-3. an INDENT (meaningful for the over-and-under style only)
-   which determines how many characters and over-and-under
-   style is hanging outside of the title at the beginning and
-   ending.
-
-See source code for mode details.
-
-
-Detailed Behaviour Description
-==============================
-
-Here are the gory details of the algorithm (it seems quite
-complicated, but really, it does the most obvious thing in all
-the particular cases):
-
-Before applying the decoration change, the cursor is placed on
-the closest line that could contain a section title.
-
-Case 1: No Decoration
----------------------
-
-If the current line has no decoration around it,
-
-- search backwards for the last previous decoration, and apply
-  the decoration one level lower to the current line.  If there
-  is no defined level below this previous decoration, we suggest
-  the most appropriate of the rest-preferred-decorations.
-
-  If REVERSE-DIRECTION is true, we simply use the previous
-  decoration found directly.
-
-- if there is no decoration found in the given direction, we use
-  the first of rest-preferred-decorations.
-
-The prefix argument forces a toggle of the prescribed decoration
-style.
-
-Case 2: Incomplete Decoration
------------------------------
-
-If the current line does have an existing decoration, but the
-decoration is incomplete, that is, the underline/overline does
-not extend to exactly the end of the title line (it is either too
-short or too long), we simply extend the length of the
-underlines/overlines to fit exactly the section title.
-
-If the prefix argument is given, we toggle the style of the
-decoration as well.
-
-REVERSE-DIRECTION has no effect in this case.
-
-Case 3: Complete Existing Decoration
-------------------------------------
-
-If the decoration is complete (i.e. the underline (overline)
-length is already adjusted to the end of the title line), we
-search/parse the file to establish the hierarchy of all the
-decorations (making sure not to include the decoration around
-point), and we rotate the current title's decoration from within
-that list (by default, going *down* the hierarchy that is present
-in the file, i.e. to a lower section level).  This is meant to be
-used potentially multiple times, until the desired decoration is
-found around the title.
-
-If we hit the boundary of the hierarchy, exactly one choice from
-the list of preferred decorations is suggested/chosen, the first
-of those decoration that has not been seen in the file yet (and
-not including the decoration around point), and the next
-invocation rolls over to the other end of the hierarchy (i.e. it
-cycles).  This allows you to avoid having to set which character
-to use by always using the
-
-If REVERSE-DIRECTION is true, the effect is to change the
-direction of rotation in the hierarchy of decorations, thus
-instead going *up* the hierarchy.
-
-However, if there is a non-negative prefix argument, we do not
-rotate the decoration, but instead simply toggle the style of the
-current decoration (this should be the most common way to toggle
-the style of an existing complete decoration).
-
-
-Point Location
-==============
-
-The invocation of this function can be carried out anywhere
-within the section title line, on an existing underline or
-overline, as well as on an empty line following a section title.
-This is meant to be as convenient as possible.
-
-
-Indented Sections
-=================
-
-Indented section titles such as ::
-
-   My Title
-   --------
-
-are illegal in restructuredtext and thus not recognized by the
-parser.  This code will thus not work in a way that would support
-indented sections (it would be ambiguous anyway).
-
-
-Joint Sections
-==============
-
-Section titles that are right next to each other may not be
-treated well.  More work might be needed to support those, and
-special conditions on the completeness of existing decorations
-might be required to make it non-ambiguous.
-
-For now we assume that the decorations are disjoint, that is,
-there is at least a single line between the titles/decoration
-lines.
-
-
-Suggested Binding
-=================
-
-We suggest that you bind this function on C-=.  It is close to
-C-- so a negative argument can be easily specified with a flick
-of the right hand fingers and the binding is unused in text-mode."
-  (interactive)
-
-  ;; If we were invoked directly, parse the prefix arguments into the
-  ;; arguments of the function.
-  (if current-prefix-arg
-      (setq reverse-direction
-	    (and current-prefix-arg
-		 (< (prefix-numeric-value current-prefix-arg) 0))
-
-	    toggle-style
-	    (and current-prefix-arg (not reverse-direction))))
-
-  (let* (;; Check if we're on an underline around a section title, and move the
-         ;; cursor to the title if this is the case.
-         (moved (rest-normalize-cursor-position))
-
-         ;; Find the decoration and completeness around point.
-         (curdeco (rest-get-decoration))
-         (char (car curdeco))
-         (style (cadr curdeco))
-         (indent (caddr curdeco))
-
-	 ;; New values to be computed.
-	 char-new style-new indent-new
-         )
-
-    ;; We've moved the cursor... if we're not looking at some text, we have
-    ;; nothing to do.
-    (if (save-excursion (beginning-of-line)
-                        (looking-at rest-section-text-regexp))
-	(progn
-	  (cond
-	   ;;---------------------------------------------------------------------
-	   ;; Case 1: No Decoration
-	   ((and (eq char nil) (eq style nil))
-
-	    (let* ((alldecos (rest-find-all-decorations))
-
-		   (around (rest-get-decorations-around alldecos))
-		   (prev (car around))
-		   cur
-
-		   (hier (rest-get-hierarchy alldecos))
-		   )
-
-	      ;; Advance one level down.
-	      (setq cur
-		    (if prev
-			(if (not reverse-direction)
-			    (or (cadr (rest-get-decoration-match hier prev))
-				(rest-suggest-new-decoration hier prev))
-			  prev)
-		      (copy-list (car rest-preferred-decorations))
-		      ))
-
-	      ;; Invert the style if requested.
-	      (if toggle-style
-		  (setcar (cdr cur) (if (eq (cadr cur) 'simple)
-					'over-and-under 'simple)) )
-
-	      (setq char-new (car cur)
-		    style-new (cadr cur)
-		    indent-new (caddr cur))
-	      ))
-
-	   ;;---------------------------------------------------------------------
-	   ;; Case 2: Incomplete Decoration
-	   ((not (rest-decoration-complete-p curdeco))
-
-	    ;; Invert the style if requested.
-	    (if toggle-style
-		(setq style (if (eq style 'simple) 'over-and-under 'simple)))
-
-            (setq char-new char
-		  style-new style
-		  indent-new indent))
-
-	   ;;---------------------------------------------------------------------
-	   ;; Case 3: Complete Existing Decoration
-	   (t
-	    (if toggle-style
-
-		;; Simply switch the style of the current decoration.
-		(setq char-new char
-		      style-new (if (eq style 'simple) 'over-and-under 'simple)
-		      indent-new rest-default-indent)
-
-	      ;; Else, we rotate, ignoring the decoration around the current
-	      ;; line...
-	      (let* ((alldecos (rest-find-all-decorations))
-
-		     (hier (rest-get-hierarchy alldecos (line-number-at-pos)))
-
-		     ;; Suggestion, in case we need to come up with something
-		     ;; new
-		     (suggestion (rest-suggest-new-decoration
-				  hier
-				  (car (rest-get-decorations-around alldecos))))
-
-		     (nextdeco (rest-get-next-decoration
-				curdeco hier suggestion reverse-direction))
-
-		     )
-
-		;; Indent, if present, always overrides the prescribed indent.
-		(setq char-new (car nextdeco)
-		      style-new (cadr nextdeco)
-		      indent-new (caddr nextdeco))
-
-		)))
-	   )
-
-	  ;; Override indent with present indent!
-	  (setq indent-new (if (> indent 0) indent indent-new))
-
-	  (if (and char-new style-new)
-	      (rest-update-section char-new style-new indent-new))
-	  ))
-
-
-    ;; Correct the position of the cursor to more accurately reflect where it
-    ;; was located when the function was invoked.
-    (if (not (= moved 0))
-        (progn (forward-line (- moved))
-               (end-of-line)))
-
-    ))
-
-;; Maintain an alias for compatibility.
-(defalias 'rest-adjust-section-title 'rest-adjust)
-
-
-(defun rest-promote-region (&optional demote)
-  "Promote the section titles within the region.
-
-With argument DEMOTE or a prefix argument, demote the
-section titles instead.  The algorithm used at the boundaries of
-the hierarchy is similar to that used by rest-adjust-decoration."
-  (interactive)
-
-  (let* ((demote (or current-prefix-arg demote))
-	 (alldecos (rest-find-all-decorations))
-	 (cur alldecos)
-
-	 (hier (rest-get-hierarchy alldecos))
-	 (suggestion (rest-suggest-new-decoration hier))
-
-	 (region-begin-line (line-number-at-pos (region-beginning)))
-	 (region-end-line (line-number-at-pos (region-end)))
-
-	 marker-list
-	 )
-
-    ;; Skip the markers that come before the region beginning
-    (while (and cur (< (caar cur) region-begin-line))
-      (setq cur (cdr cur)))
-
-    ;; Create a list of markers for all the decorations which are found within
-    ;; the region.
-    (save-excursion
-      (let (m line)
-	(while (and cur (< (setq line (caar cur)) region-end-line))
-	  (setq m (make-marker))
-	  (goto-line line)
-	  (push (list (set-marker m (point)) (cdar cur)) marker-list)
-	  (setq cur (cdr cur)) ))
-
-      ;; Apply modifications.
-      (let (nextdeco)
-	(dolist (p marker-list)
-	  ;; Go to the decoration to promote.
-	  (goto-char (car p))
-
-	  ;; Rotate the next decoration.
-	  (setq nextdeco (rest-get-next-decoration
-			  (cadr p) hier suggestion demote))
-
-	  ;; Update the decoration.
-	  (apply 'rest-update-section nextdeco)
-
-	  ;; Clear marker to avoid slowing down the editing after we're done.
-	  (set-marker (car p) nil)
-	  ))
-      (setq deactivate-mark nil)
-    )))
-
-
-
-(defun rest-display-decorations-hierarchy (&optional decorations)
-  "Display the current file's section title decorations hierarchy.
-  This function expects a list of (char, style, indent) triples."
-  (interactive)
-
-  (if (not decorations)
-      (setq decorations (rest-get-hierarchy)))
-  (with-output-to-temp-buffer "*rest section hierarchy*"
-    (let ((level 1))
-      (with-current-buffer standard-output
-        (dolist (x decorations)
-          (insert (format "\nSection Level %d" level))
-          (apply 'rest-update-section x)
-          (end-of-buffer)
-          (insert "\n")
-          (incf level)
-          ))
-    )))
-
-
-(defun rest-rstrip (str)
-  "Strips the whitespace at the end of a string."
-  (let ((tmp))
-    (string-match "[ \t\n]*\\'" str)
-    (substring str 0 (match-beginning 0))
-    ))
-
-(defun rest-get-stripped-line ()
-  "Returns the line at cursor, stripped from whitespace."
-  (re-search-forward "\\S-.*\\S-" (line-end-position))
-  (buffer-substring-no-properties (match-beginning 0)
-				  (match-end 0)) )
-
-
-(defcustom rest-toc-indent 2
-  "Indentation for table-of-contents display (also used for
-  formatting insertion, when numbering is disabled).")
-
-
-(defun rest-section-tree (alldecos)
-  "Returns a pair of a hierarchical tree of the sections titles
-in the document, and a reference to the node where the cursor
-lives. This can be used to generate a table of contents for the
-document.
-
-Each section title consists in a cons of the stripped title
-string and a marker to the section in the original text document.
-
-If there are missing section levels, the section titles are
-inserted automatically, and are set to nil."
-
-  (let* (thelist
-	 (hier (rest-get-hierarchy alldecos))
-	 (levels (make-hash-table :test 'equal :size 10))
-	 lines)
-
-    (let ((lev 0))
-      (dolist (deco hier)
-	(puthash deco lev levels)
-	(incf lev)))
-
-    ;; Create a list of lines that contains (text, level, marker) for each
-    ;; decoration.
-    (save-excursion
-      (setq lines
-	    (mapcar (lambda (deco)
-		      (goto-line (car deco))
-		      (list (gethash (cdr deco) levels)
-			    (rest-get-stripped-line)
-			    (let ((m (make-marker)))
-			      (beginning-of-line 1)
-			      (set-marker m (point)))
-			    ))
-		    alldecos)))
-
-    (let ((lcontnr (cons nil lines)))
-      (rest-section-tree-rec lcontnr -1))))
-
-
-(defun rest-section-tree-rec (decos lev)
-  "Recursive function for the implementation of the section tree
-  building. DECOS is a cons cell whose cdr is the remaining list
-  of decorations, and we change it as we consume them.  LEV is
-  the current level of that node.  This function returns a pair
-  of the subtree that was built.  This treats the decos list
-  destructively."
-
-  (let ((ndeco (cadr decos))
-	node
-	children)
-    ;; If the next decoration matches our level
-    (if (= (car ndeco) lev)
-	(progn
-	  ;; Pop the next decoration and create the current node with it
-	  (setcdr decos (cddr decos))
-	  (setq node (cdr ndeco)) ))
-      ;; Else we let the node title/marker be unset.
-
-    ;; Build the child nodes
-    (while (and (cdr decos) (> (caadr decos) lev))
-      (setq children
-	    (cons (rest-section-tree-rec decos (1+ lev))
-		  children)))
-
-    ;; Return this node with its children.
-    (cons node (reverse children))
-    ))
-
-
-(defun rest-toc-insert (&optional pfxarg)
-  "Insert a simple text rendering of the table of contents.
-By default the top level is ignored if there is only one, because
-we assume that the document will have a single title.
-
-If a numeric prefix argument is given,
-- if it is zero or generic, include the top level titles;
-- otherwise insert the TOC up to the specified level.
-
-The TOC is inserted indented at the current column."
-
-  (interactive "P")
-
-  (let* (;; Check maximum level override
-	 (rest-toc-insert-max-level
-	  (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
-	      (prefix-numeric-value pfxarg) rest-toc-insert-max-level))
-
-	 ;; Get the section tree.
-	 (sectree (rest-section-tree (rest-find-all-decorations)))
-
-	 ;; If there is only one top-level title, remove it by starting to print
-	 ;; one index lower (revert this behaviour with the prefix arg),
-	 ;; otherwise print all.
-	 (gen-pfx-arg (or (and pfxarg (listp pfxarg))
-			  (and (integerp pfxarg)
-			       (= (prefix-numeric-value pfxarg) 0))))
-	 (start-lev (if (and (not rest-toc-insert-always-include-top)
-			     (= (length (cdr sectree)) 1)
-			     (not gen-pfx-arg))  -1 0))
-
-	 ;; Figure out initial indent.
-	 (initial-indent (make-string (current-column) ? ))
-	 (init-point (point)))
-
-    (rest-toc-insert-node sectree start-lev initial-indent "")
-
-    ;; Fixup for the first line.
-    (delete-region init-point (+ init-point (length initial-indent)))
-    
-    ;; Delete the last newline added.
-    (delete-backward-char 1)
-    ))
-
-
-(defcustom rest-toc-insert-always-include-top nil
-  "Set this to 't if you want to always include top-level titles,
-  even when there is only one.")
-
-(defcustom rest-toc-insert-style 'fixed
-  "Set this to one of the following values to determine numbering and
-indentation style:
-- plain: no numbering (fixed indentation)
-- fixed: numbering, but fixed indentation
-- aligned: numbering, titles aligned under each other
-- listed: numbering, with dashes like list items (EXPERIMENTAL)
-")
-
-(defcustom rest-toc-insert-number-separator "  "
-  "Separator that goes between the TOC number and the title.")
-
-;; This is used to avoid having to change the user's mode.
-(defvar rest-toc-insert-click-keymap
-  (let ((map (make-sparse-keymap)))
-       (define-key map [mouse-1] 'rest-toc-mode-mouse-goto)
-       map)
-  "(Internal) What happens when you click on propertized text in the TOC.")
-
-(defcustom rest-toc-insert-max-level nil
-  "If non-nil, maximum depth of the inserted TOC.")
-
-(defun rest-toc-insert-node (node level indent pfx)
-  "Recursive function that does the print of the inserted
-toc. PFX is the prefix numbering, that includes the alignment
-necessary for all the children of this level to align."
-  (let ((do-print (> level 0))
-	(count 1)
-	b)
-    (if do-print
-	(progn
-	  (insert indent)
-	  (let ((b (point)))
-	    (if (not (equal rest-toc-insert-style 'plain))
-		(insert pfx rest-toc-insert-number-separator))
-	    (insert (or (caar node) "[missing node]"))
-	    ;; Add properties to the text, even though in normal text mode it
-	    ;; won't be doing anything for now.  Not sure that I want to change
-	    ;; mode stuff.  At least the highlighting gives the idea that this
-	    ;; is generated automatically.
-	    (put-text-property b (point) 'mouse-face 'highlight)
-	    (put-text-property b (point) 'rest-toc-target (cadar node))
-	    (put-text-property b (point) 'keymap rest-toc-insert-click-keymap)
-
-	    )
-	  (insert "\n")
-
-	  ;; Prepare indent for children.
-	  (setq indent
-		(cond
-		 ((eq rest-toc-insert-style 'plain)
-		  (concat indent rest-toc-indent))
-
-		 ((eq rest-toc-insert-style 'fixed)
-		  (concat indent (make-string rest-toc-indent ? )))
-
-		 ((eq rest-toc-insert-style 'aligned)
-		  (concat indent (make-string (+ (length pfx) 2) ? )))
-
-		 ((eq rest-toc-insert-style 'listed)
-		  (concat (substring indent 0 -3)
-			  (concat (make-string (+ (length pfx) 2) ? ) " - ")))
-		 ))
-
-	  ))
-
-    (if (or (eq rest-toc-insert-max-level nil)
-	    (< level rest-toc-insert-max-level))
-	(let ((do-child-numbering (>= level 0))
-	      fmt)
-	  (if do-child-numbering
-	      (progn
-		;; Add a separating dot if there is already a prefix
-		(if (> (length pfx) 0)
-		    (setq pfx (concat (rest-rstrip pfx) ".")))
-
-		;; Calculate the amount of space that the prefix will require for
-		;; the numbers.
-		(if (cdr node)
-		    (setq fmt (format "%%-%dd"
-				      (1+ (floor (log10 (length (cdr node))))))))
-		))
-
-	  (dolist (child (cdr node))
-	    (rest-toc-insert-node child
-				  (1+ level)
-				  indent
-				  (if do-child-numbering
-				      (concat pfx (format fmt count)) pfx))
-	    (incf count)))
-
-      )))
-
-
-(defun rest-toc-insert-find-delete-contents ()
-  "Finds and deletes an existing comment after the first contents directive and
-delete that region. Return t if found and the cursor is left after the comment."
-  (goto-char (point-min))
-  ;; We look for the following and the following only (in other words, if your
-  ;; syntax differs, this won't work.  If you would like a more flexible thing,
-  ;; contact the author, I just can't imagine that this requirement is
-  ;; unreasonable for now).
-  ;;
-  ;;   .. contents:: [...anything here...]
-  ;;   ..
-  ;;      XXXXXXXX
-  ;;      XXXXXXXX
-  ;;      [more lines]
-  ;;
-  (let ((beg
-	 (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
-			    nil t))
-	last-real)
-    (when beg
-      ;; Look for the first line that starts at the first column.
-      (forward-line 1)
-      (beginning-of-line)
-      (while (or (and (looking-at "[ \t]+[^ \t]")
-		      (setq last-real (point)) t)
-		 (looking-at "\\s-*$"))
-	(forward-line 1)
-	)
-      (if last-real
-	  (progn
-	    (goto-char last-real)
-	    (end-of-line)
-	    (delete-region beg (point)))
-	(goto-char beg))
-      t
-      )))
-  
-(defun rest-toc-insert-update ()
-  "Automatically find the .. contents:: section of a document and update the
-inserted TOC if present.  You can use this in your file-write hook to always
-make it up-to-date automatically."
-  (interactive)
-  (save-excursion
-    (if (rest-toc-insert-find-delete-contents)
-	(progn (insert "\n    ")
-	       (rest-toc-insert))) )
-  ;; Note: always return nil, because this may be used as a hook.
-  )
-
-
-;;------------------------------------------------------------------------------
-
-(defun rest-toc-node (node level)
-  "Recursive function that does the print of the TOC in rest-toc-mode."
-
-  (if (> level 0)
-      (let ((b (point)))
-	;; Insert line text.
-	(insert (make-string (* rest-toc-indent (1- level)) ? ))
-	(insert (if (car node) (caar node) "[missing node]"))
-
-	;; Highlight lines.
-	(put-text-property b (point) 'mouse-face 'highlight)
-
-	;; Add link on lines.
-	(put-text-property b (point) 'rest-toc-target (cadar node))
-
-	(insert "\n")))
-
-  (dolist (child (cdr node))
-    (rest-toc-node child (1+ level))))
-
-
-(defun rest-toc ()
-  "Finds all the section titles and their decorations in the
-  file, and displays a hierarchically-organized list of the
-  titles, which is essentially a table-of-contents of the
-  document.
-
-  The emacs buffer can be navigated, and selecting a section
-  brings the cursor in that section."
-  (interactive)
-  (let* ((curbuf (current-buffer))
-	 outline
-
-	 ;; Get the section tree
-	 (alldecos (rest-find-all-decorations))
-	 (sectree (rest-section-tree alldecos))
-
-	 ;; Create a temporary buffer.
-	 (buf (get-buffer-create rest-toc-buffer-name))
-	 )
-
-    ;; Find the index of the section where the cursor currently is.
-    (setq outline (let ((idx 1)
-			(curline (line-number-at-pos (point)))
-			(decos alldecos))
-		    (while (and decos (<= (caar decos) curline))
-		      (setq decos (cdr decos))
-		      (incf idx))
-		    idx))
-    ;; FIXME: if there is a missing node inserted, the calculation of the
-    ;; current line will be off. You need to fix this by moving the finding of
-    ;; the current line somewhere else.
-
-
-    (with-current-buffer buf
-      (let ((inhibit-read-only t))
-	(rest-toc-mode)
-	(delete-region (point-min) (point-max))
-	(insert (format "Table of Contents: %s\n" (or (caar sectree) "")))
-	(put-text-property (point-min) (point)
-			   'face (list '(background-color . "lightgray")))
-	(rest-toc-node sectree 0)
-	))
-    (display-buffer buf)
-    (pop-to-buffer buf)
-
-    ;; Save the buffer to return to.
-    (set (make-local-variable 'rest-toc-return-buffer) curbuf)
-
-    ;; Move the cursor near the right section in the TOC.
-    (goto-line outline)
-    ))
-
-
-(defun rest-toc-mode-find-section ()
-  (let ((pos (get-text-property (point) 'rest-toc-target)))
-    (unless pos
-      (error "No section on this line"))
-    (unless (buffer-live-p (marker-buffer pos))
-      (error "Buffer for this section was killed"))
-    pos))
-
-(defvar rest-toc-buffer-name "*Table of Contents*"
-  "Name of the Table of Contents buffer.")
-
-(defun rest-toc-mode-goto-section ()
-  "Go to the section the current line describes."
-  (interactive)
-  (let ((pos (rest-toc-mode-find-section)))
-    (kill-buffer (get-buffer rest-toc-buffer-name))
-    (pop-to-buffer (marker-buffer pos))
-    (goto-char pos)
-    (recenter 5)))
-
-(defun rest-toc-mode-mouse-goto (event)
-  "In Rest-Toc mode, go to the occurrence whose line you click on."
-  (interactive "e")
-  (let (pos)
-    (save-excursion
-      (set-buffer (window-buffer (posn-window (event-end event))))
-      (save-excursion
-	(goto-char (posn-point (event-end event)))
-	(setq pos (rest-toc-mode-find-section))))
-    (pop-to-buffer (marker-buffer pos))
-    (goto-char pos)))
-
-(defun rest-toc-mode-mouse-goto-kill (event)
-  (interactive "e")
-  (call-interactively 'rest-toc-mode-mouse-goto event)
-  (kill-buffer (get-buffer rest-toc-buffer-name)))
-
-(defvar rest-toc-return-buffer nil
-  "Buffer local variable that is used to return to the original
-  buffer from the TOC.")
-
-(defun rest-toc-quit-window ()
-  (interactive)
-  (quit-window)
-  (pop-to-buffer rest-toc-return-buffer))
-
-(defvar rest-toc-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] 'rest-toc-mode-mouse-goto-kill)
-    (define-key map [mouse-2] 'rest-toc-mode-mouse-goto)
-    (define-key map "\C-m" 'rest-toc-mode-goto-section)
-    (define-key map "f" 'rest-toc-mode-goto-section)
-    (define-key map "q" 'rest-toc-quit-window)
-    (define-key map "z" 'kill-this-buffer)
-    map)
-  "Keymap for `rest-toc-mode'.")
-
-(put 'rest-toc-mode 'mode-class 'special)
-
-(defun rest-toc-mode ()
-  "Major mode for output from \\[rest-toc]."
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map rest-toc-mode-map)
-  (setq major-mode 'rest-toc-mode)
-  (setq mode-name "Rest-TOC")
-  (setq buffer-read-only t)
-  )
-
-;; Note: use occur-mode (replace.el) as a good example to complete missing
-;; features.
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Section movement commands.
-;;
-
-(defun rest-forward-section (&optional offset)
-  "Skip to the next restructured text section title.
-  OFFSET specifies how many titles to skip.  Use a negative OFFSET to move
-  backwards in the file (default is to use 1)."
-  (interactive)
-  (let* (;; Default value for offset.
-	 (offset (or offset 1))
-
-	 ;; Get all the decorations in the file, with their line numbers.
-	 (alldecos (rest-find-all-decorations))
-
-	 ;; Get the current line.
-	 (curline (line-number-at-pos))
-
-	 (cur alldecos)
-	 (idx 0)
-	 line
-	 )
-
-    ;; Find the index of the "next" decoration w.r.t. to the current line.
-    (while (and cur (< (caar cur) curline))
-      (setq cur (cdr cur))
-      (incf idx))
-    ;; 'cur' is the decoration on or following the current line.
-
-    (if (and (> offset 0) cur (= (caar cur) curline))
-  	(incf idx))
-
-    ;; Find the final index.
-    (setq idx (+ idx (if (> offset 0) (- offset 1) offset)))
-    (setq cur (nth idx alldecos))
-
-    ;; If the index is positive, goto the line, otherwise go to the buffer
-    ;; boundaries.
-    (if (and cur (>= idx 0))
-	(goto-line (car cur))
-      (if (> offset 0) (end-of-buffer) (beginning-of-buffer)))
-    ))
-
-(defun rest-backward-section ()
-  "Like rest-forward-section, except move back one title."
-  (interactive)
-  (rest-forward-section -1))
-
-
-
-
-
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Generic text functions that are more convenient than the defaults.
-;;
-
-(defun replace-lines (fromchar tochar)
-  "Replace flush-left lines, consisting of multiple FROMCHAR characters,
-with equal-length lines of TOCHAR."
-  (interactive "\
-cSearch for flush-left lines of char:
-cand replace with char: ")
-  (save-excursion
-    (let* ((fromstr (string fromchar))
-           (searchre (concat "^" (regexp-quote fromstr) "+ *$"))
-           (found 0))
-      (condition-case err
-          (while t
-            (search-forward-regexp searchre)
-            (setq found (1+ found))
-            (search-backward fromstr)  ;; point will be *before* last char
-            (setq p (1+ (point)))
-            (beginning-of-line)
-            (setq l (- p (point)))
-            (rest-delete-line)
-            (insert-char tochar l))
-        (search-failed
-         (message (format "%d lines replaced." found)))))))
-
-(defun join-paragraph ()
-  "Join lines in current paragraph into one line, removing end-of-lines."
-  (interactive)
-  (let ((fill-column 65000)) ; some big number
-    (call-interactively 'fill-paragraph)))
-
-(defun force-fill-paragraph ()
-  "Fill paragraph at point, first joining the paragraph's lines into one.
-This is useful for filling list item paragraphs."
-  (interactive)
-  (join-paragraph)
-  (fill-paragraph nil))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Generic character repeater function.
-;;
-;; For sections, better to use the specialized function above, but this can
-;; be useful for creating separators.
-
-(defun repeat-last-character (&optional tofill)
-  "Fills the current line up to the length of the preceding line (if not
-empty), using the last character on the current line.  If the preceding line is
-empty, we use the fill-column.
-
-If a prefix argument is provided, use the next line rather than the preceding
-line.
-
-If the current line is longer than the desired length, shave the characters off
-the current line to fit the desired length.
-
-As an added convenience, if the command is repeated immediately, the alternative
-column is used (fill-column vs. end of previous/next line)."
-  (interactive)
-  (let* ((curcol (current-column))
-         (curline (+ (count-lines (point-min) (point))
-                     (if (eq curcol 0) 1 0)))
-         (lbp (line-beginning-position 0))
-         (prevcol (if (and (= curline 1) (not current-prefix-arg))
-                      fill-column
-                    (save-excursion
-                      (forward-line (if current-prefix-arg 1 -1))
-                      (end-of-line)
-                      (skip-chars-backward " \t" lbp)
-                      (let ((cc (current-column)))
-                        (if (= cc 0) fill-column cc)))))
-         (rightmost-column
-          (cond (tofill fill-column)
-                ((equal last-command 'repeat-last-character)
-                 (if (= curcol fill-column) prevcol fill-column))
-                (t (save-excursion
-                     (if (= prevcol 0) fill-column prevcol)))
-                )) )
-    (end-of-line)
-    (if (> (current-column) rightmost-column)
-        ;; shave characters off the end
-        (delete-region (- (point)
-                          (- (current-column) rightmost-column))
-                       (point))
-      ;; fill with last characters
-      (insert-char (preceding-char)
-                   (- rightmost-column (current-column))))
-    ))
-
-
-(provide 'restructuredtext)
diff --git a/tools/editors/emacs/rst-html.el b/tools/editors/emacs/rst-html.el
deleted file mode 100644
index 57e4d0b55..000000000
--- a/tools/editors/emacs/rst-html.el
+++ /dev/null
@@ -1,125 +0,0 @@
-;;; rst-mode.el --- Goodies to automate converting reST documents to HTML.
-;;;
-;;; Author: Martin Blais
-;;; Contact: blais@furius.ca
-;;; Revision: $Revision$
-;;; Date: $Date$
-;;; Copyright: This module has been placed in the public domain.
-;;;
-;;; This package provides a few functions and variables that can help in
-;;; automating converting reST documents to HTML from within Emacs.  You could
-;;; use a makefile to do this, of use the compile command that this package
-;;; provides.
-;;;
-;;; You can also bind a command to automate converting to HTML::
-;;;
-;;;   (defun user-rst-mode-hook ()
-;;;     (local-set-key [(control c)(?9)] 'rst-html-compile))
-;;;   (add-hook 'rst-mode-hook 'user-rst-mode-hook)
-;;;
-;;; Commentary:
-;;;
-;;; History:
-;;; 
-
-;;; Code:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Customization:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defgroup rst-html nil
-  "Settings for conversion to HTML available by \\[rst-html-compile]. Use of
-this functionality is discouraged. Get a proper `Makefile' instead."
-  :group 'rst
-  :version "21.1")
-
-(defcustom rst-html-command "docutils-html"
-  "Command to convert an reST file to HTML."
-  :group 'rst-html
-  :type '(string))
-
-(defcustom rst-html-stylesheet ""
-  "Stylesheet for reST to HTML conversion.  Empty for no special stylesheet."
-  :group 'rst-html
-  :type '(string))
-
-(defcustom rst-html-options ""
-  "Local file options for reST to HTML conversion.
-Stylesheets are set by an own option."
-  :group 'rst-html
-  :type '(string))
-
-(defcustom rst-html-extension ".html"
-  "Extension for HTML output file."
-  :group 'rst-html
-  :type '(string))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Conversion to HTML
-
-(defun rst-html-compile ()
-  "Compile command to convert reST document into HTML."
-  (interactive)
-  (let* ((bufname (file-name-nondirectory buffer-file-name))
-	 (outname (file-name-sans-extension bufname))
-	 (ssheet
-	  (or (and (not (zerop (length rst-html-stylesheet)))
-		   (concat "--stylesheet=\"" rst-html-stylesheet "\""))
-	      "")))
-    (set (make-local-variable 'compile-command)
-	 (mapconcat 'identity
-		    (list rst-html-command
-			  ssheet rst-html-options
-			  bufname (concat outname rst-html-extension))
-		    " "))
-    (if (or compilation-read-command current-prefix-arg)
-	(call-interactively 'compile)
-      (compile compile-command))
-    ))
-
-(defun rst-html-compile-with-conf ()
-  "Compile command to convert reST document into HTML.
-Attempts to find configuration file, if it can, overrides the options."
-  (interactive)
-  (let ((conffile (rst-html-find-conf)))
-    (if conffile
-	(let* ((bufname (file-name-nondirectory buffer-file-name))
-	       (outname (file-name-sans-extension bufname)))
-	  (set (make-local-variable 'compile-command)
-	       (mapconcat 'identity
-			  (list rst-html-command
-				(concat "--config=\"" conffile "\"")
-				bufname (concat outname rst-html-extension))
-			  " "))
-	  (if (or compilation-read-command current-prefix-arg)
-	      (call-interactively 'compile)
-	    (compile compile-command)))
-      (call-interactively 'rst-html-compile)
-      )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Find the configuration file in the parents.
-
-(defun rst-html-find-conf ()
-  "Look for the configuration file in the parents of the current path."
-  (interactive)
-  (let ((file-name "docutils.conf")
-	(buffer-file (buffer-file-name)))
-    ;; Move up in the dir hierarchy till we find a change log file.
-    (let ((dir (file-name-directory buffer-file)))
-      (while (and (or (not (string= "/" dir)) (setq dir nil) nil)
-		  (not (file-exists-p (concat dir file-name))))
-	;; Move up to the parent dir and try again.
-	(setq dir (expand-file-name (file-name-directory
-				     (directory-file-name
-				     (file-name-directory dir))))) )
-      (or (and dir (concat dir file-name)) nil)
-    )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide 'rst-html)
-
-;;; rst-html.el ends here
diff --git a/tools/editors/emacs/rst-mode.el b/tools/editors/emacs/rst-mode.el
deleted file mode 100644
index 8fc14e4a5..000000000
--- a/tools/editors/emacs/rst-mode.el
+++ /dev/null
@@ -1,700 +0,0 @@
-;;; rst-mode.el --- Mode for viewing and editing reStructuredText-documents.
-
-;; Copyright 2003 Stefan Merten 
-;; 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2 of the License, or
-;; (at your option) any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-;;; Commentary:
-
-;; This package provides support for documents marked up using the
-;; reStructuredText format
-;; [http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html].
-;; Support includes font locking as well as some convenience functions
-;; for editing.
-
-;; The package is based on `text-mode' and inherits some things from it.
-;; Particularly `text-mode-hook' is run before `rst-mode-hook'.
-
-;; Add the following lines to your `.emacs' file:
-;;
-;; (autoload 'rst-mode "rst-mode" "mode for editing reStructuredText documents" t)
-;; (setq auto-mode-alist
-;;       (append '(("\\.rst$" . rst-mode)
-;;                 ("\\.rest$" . rst-mode)) auto-mode-alist))
-;;
-;; If you are using `.txt' as a standard extension for reST files as
-;; http://docutils.sourceforge.net/FAQ.html#what-s-the-standard-filename-extension-for-a-restructuredtext-file
-;; suggests you may use one of the `Local Variables in Files' mechanism Emacs
-;; provides to set the major mode automatically. For instance you may use
-;;
-;; .. -*- mode: rst -*-
-;;
-;; in the very first line of your file. However, because this is a major
-;; security breach you or your administrator may have chosen to switch that
-;; feature off. See `Local Variables in Files' in the Emacs documentation for a
-;; more complete discussion.
-
-;;; Code:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Customization:
-
-(defgroup rst nil "Support for reStructuredText documents"
-  :group 'wp
-  :version "21.1"
-  :link '(url-link "http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html"))
-
-(defcustom rst-mode-hook nil
-  "Hook run when Rst Mode is turned on. The hook for Text Mode is run before
-  this one."
-  :group 'rst
-  :type '(hook))
-
-(defcustom rst-mode-lazy t
-  "*If non-nil Rst Mode font-locks comment, literal blocks, and section titles
-correctly. Because this is really slow it switches on Lazy Lock Mode
-automatically. You may increase Lazy Lock Defer Time for reasonable results.
-
-If nil comments and literal blocks are font-locked only on the line they start.
-
-The value of this variable is used when Rst Mode is turned on."
-  :group 'rst
-  :type '(boolean))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defgroup rst-faces nil "Faces used in Rst Mode"
-  :group 'rst
-  :group 'faces
-  :version "21.1")
-
-(defcustom rst-block-face 'font-lock-keyword-face
-  "All syntax marking up a special block"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-external-face 'font-lock-type-face
-  "Field names and interpreted text"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-definition-face 'font-lock-function-name-face
-  "All other defining constructs"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-directive-face
-  ;; XEmacs compatibility
-  (if (boundp 'font-lock-builtin-face)
-      'font-lock-builtin-face
-    'font-lock-preprocessor-face)
-  "Directives and roles"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-comment-face 'font-lock-comment-face
-  "Comments"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-emphasis1-face
-  ;; XEmacs compatibility
-  (if (facep 'italic)
-      ''italic
-    'italic)
-  "Simple emphasis"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-emphasis2-face
-  ;; XEmacs compatibility
-  (if (facep 'bold)
-      ''bold
-    'bold)
-  "Double emphasis"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-literal-face 'font-lock-string-face
-  "Literal text"
-  :group 'rst-faces
-  :type '(face))
-
-(defcustom rst-reference-face 'font-lock-variable-name-face
-  "References to a definition"
-  :group 'rst-faces
-  :type '(face))
-
-;; Faces for displaying items on several levels; these definitions define
-;; different shades of grey where the lightest one is used for level 1
-(defconst rst-level-face-max 6
-  "Maximum depth of level faces defined")
-(defconst rst-level-face-base-color "grey"
-  "The base color to be used for creating level faces")
-(defconst rst-level-face-base-light 85
-  "The lightness factor for the base color")
-(defconst rst-level-face-format-light "%2d"
-  "The format for the lightness factor for the base color")
-(defconst rst-level-face-step-light -7
-  "The step width to use for next color")
-
-;; Define the faces
-(let ((i 1))
-  (while (<= i rst-level-face-max)
-    (let ((sym (intern (format "rst-level-%d-face" i)))
-	  (doc (format "Face for showing section title text at level %d" i))
-	  (col (format (concat "%s" rst-level-face-format-light)
-		       rst-level-face-base-color
-		       (+ (* (1- i) rst-level-face-step-light)
-			  rst-level-face-base-light))))
-      (make-empty-face sym)
-      (set-face-doc-string sym doc)
-      (set-face-background sym col)
-      (set sym sym)
-    (setq i (1+ i)))))
-
-(defcustom rst-adornment-faces-alist
-  '((1 . rst-level-1-face)
-    (2 . rst-level-2-face)
-    (3 . rst-level-3-face)
-    (4 . rst-level-4-face)
-    (5 . rst-level-5-face)
-    (6 . rst-level-6-face)
-    (t . font-lock-keyword-face)
-    (nil . font-lock-keyword-face))
-  "Provides faces for the various adornment types. Key is a number (for the
-section title text of that level), t (for transitions) or nil (for section
-title adornment)."
-  :group 'rst-faces
-  :type '(alist :key-type (choice (integer :tag "Section level")
-				  (boolean :tag "transitions (on) / section title adornment (off)"))
-		:value-type (face)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; FIXME: Code from `restructuredtext.el' should be integrated
-
-(defvar rst-mode-syntax-table nil
-  "Syntax table used while in rst mode.")
-
-(unless rst-mode-syntax-table
-  (setq rst-mode-syntax-table (make-syntax-table text-mode-syntax-table))
-  (modify-syntax-entry ?$ "." rst-mode-syntax-table)
-  (modify-syntax-entry ?% "." rst-mode-syntax-table)
-  (modify-syntax-entry ?& "." rst-mode-syntax-table)
-  (modify-syntax-entry ?' "." rst-mode-syntax-table)
-  (modify-syntax-entry ?* "." rst-mode-syntax-table)
-  (modify-syntax-entry ?+ "." rst-mode-syntax-table)
-  (modify-syntax-entry ?. "_" rst-mode-syntax-table)
-  (modify-syntax-entry ?/ "." rst-mode-syntax-table)
-  (modify-syntax-entry ?< "." rst-mode-syntax-table)
-  (modify-syntax-entry ?= "." rst-mode-syntax-table)
-  (modify-syntax-entry ?> "." rst-mode-syntax-table)
-  (modify-syntax-entry ?\\ "\\" rst-mode-syntax-table)
-  (modify-syntax-entry ?| "." rst-mode-syntax-table)
-  (modify-syntax-entry ?_ "." rst-mode-syntax-table)
-  )
-
-(defvar rst-mode-abbrev-table nil
- "Abbrev table used while in rst mode.")
-(define-abbrev-table 'rst-mode-abbrev-table ())
-
-;; FIXME: Movement keys to skip forward / backward over or mark an indented
-;; block could be defined; keys to markup section titles based on
-;; `rst-adornment-level-alist' would be useful
-(defvar rst-mode-map nil
-  "Keymap for rst mode. This inherits from Text mode.")
-
-(unless rst-mode-map
-  (setq rst-mode-map (copy-keymap text-mode-map)))
-
-(defun rst-mode ()
-  "Major mode for editing reStructuredText documents.
-
-You may customize `rst-mode-lazy' to switch font-locking of blocks.
-
-\\{rst-mode-map}
-Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
-`rst-mode-hook'."
-  (interactive)
-  (kill-all-local-variables)
-
-  ;; Maps and tables
-  (use-local-map rst-mode-map)
-  (setq local-abbrev-table rst-mode-abbrev-table)
-  (set-syntax-table rst-mode-syntax-table)
-
-  ;; For editing text
-  ;;
-  ;; FIXME: It would be better if this matches more exactly the start of a reST
-  ;; paragraph; however, this not always possible with a simple regex because
-  ;; paragraphs are determined by indentation of the following line
-  (set (make-local-variable 'paragraph-start)
-       (concat page-delimiter "\\|[ \t]*$"))
-  (if (eq ?^ (aref paragraph-start 0))
-      (setq paragraph-start (substring paragraph-start 1)))
-  (set (make-local-variable 'paragraph-separate) paragraph-start)
-  (set (make-local-variable 'indent-line-function) 'indent-relative-maybe)
-  (set (make-local-variable 'adaptive-fill-mode) t)
-  (set (make-local-variable 'comment-start) ".. ")
-
-  ;; Special variables
-  (make-local-variable 'rst-adornment-level-alist)
-
-  ;; Font lock
-  (set (make-local-variable 'font-lock-defaults)
-       '(rst-font-lock-keywords-function
-	 t nil nil nil
-	 (font-lock-multiline . t)
-	 (font-lock-mark-block-function . mark-paragraph)))
-  (when (boundp 'font-lock-support-mode)
-    ;; rst-mode has its own mind about font-lock-support-mode
-    (make-local-variable 'font-lock-support-mode)
-    (cond
-     ((and (not rst-mode-lazy) (not font-lock-support-mode)))
-     ;; No support mode set and none required - leave it alone
-     ((or (not font-lock-support-mode) ;; No support mode set (but required)
-	  (symbolp font-lock-support-mode)) ;; or a fixed mode for all
-      (setq font-lock-support-mode
-	    (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
-		  (cons t font-lock-support-mode))))
-     ((and (listp font-lock-support-mode)
-	   (not (assoc 'rst-mode font-lock-support-mode)))
-      ;; A list of modes missing rst-mode
-      (setq font-lock-support-mode
-	    (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
-		    font-lock-support-mode)))))
-
-  ;; Names and hooks
-  (setq mode-name "reST")
-  (setq major-mode 'rst-mode)
-  (run-hooks 'text-mode-hook)
-  (run-hooks 'rst-mode-hook))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Font lock
-
-(defun rst-font-lock-keywords-function ()
-  "Returns keywords to highlight in rst mode according to current settings."
-  ;; The reST-links in the comments below all relate to sections in
-  ;; http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html
-  (let* ( ;; This gets big - so let's define some abbreviations
-	 ;; horizontal white space
-	 (re-hws "[\t ]")
-	 ;; beginning of line with possible indentation
-	 (re-bol (concat "^" re-hws "*"))
-	 ;; Separates block lead-ins from their content
-	 (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
-	 ;; explicit markup tag
-	 (re-emt "\\.\\.")
-	 ;; explicit markup start
-	 (re-ems (concat re-emt re-hws "+"))
-	 ;; inline markup prefix
-	 (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
-	 ;; symbol character
-	 (re-sym1 "\\(\\sw\\|\\s_\\)")
-	 ;; inline markup content begin
-	 (re-imbeg2 "\\(\\S \\|\\S \\([^")
-
-	 ;; There seems to be a bug leading to error "Stack overflow in regexp
-	 ;; matcher" when "|" or "\\*" are the characters searched for
-	 (re-imendbeg
-	  (if (< emacs-major-version 21)
-	      "]"
-	    "\\]\\|\\\\."))
-	 ;; inline markup content end
-	 (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
-	 ;; inline markup content without asterisk
-	 (re-ima2 (concat re-imbeg2 "*" re-imend))
-	 ;; inline markup content without backquote
-	 (re-imb2 (concat re-imbeg2 "`" re-imend))
-	 ;; inline markup content without vertical bar
-	 (re-imv2 (concat re-imbeg2 "|" re-imend))
-	 ;; Supported URI schemes
-	 (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
-	 ;; Line starting with adornment and optional whitespace; complete
-	 ;; adornment is in (match-string 1); there must be at least 3
-	 ;; characters because otherwise explicit markup start would be
-	 ;; recognized
-	 (re-ado2 (concat "^\\(\\(["
-			  (if (or
-			       (< emacs-major-version 21)
-			       (save-match-data
-				 (string-match "XEmacs\\|Lucid" emacs-version)))
-			      "^a-zA-Z0-9 \t\x00-\x1F"
-			    "^[:word:][:space:][:cntrl:]")
-			  "]\\)\\2\\2+\\)" re-hws "*$"))
-	 )
-    (list
-     ;; FIXME: Block markup is not recognized in blocks after explicit markup
-     ;; start
-
-     ;; Simple `Body Elements`_
-     ;; `Bullet Lists`_
-     (list
-      (concat re-bol "\\([-*+]" re-blksep1 "\\)")
-      1 rst-block-face)
-     ;; `Enumerated Lists`_
-     (list
-      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" re-blksep1 "\\)")
-      1 rst-block-face)
-     ;; `Definition Lists`_ FIXME: missing
-     ;; `Field Lists`_
-     (list
-      (concat re-bol "\\(:[^:]+:\\)" re-blksep1)
-      1 rst-external-face)
-     ;; `Option Lists`_
-     (list
-      (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
-      1 rst-block-face)
-
-     ;; `Tables`_ FIXME: missing
-
-     ;; All the `Explicit Markup Blocks`_
-     ;; `Footnotes`_ / `Citations`_
-     (list
-      (concat re-bol "\\(" re-ems "\\[[^[]+\\]\\)" re-blksep1)
-      1 rst-definition-face)
-     ;; `Directives`_ / `Substitution Definitions`_
-     (list
-      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\(" re-sym1 "+::\\)" re-blksep1)
-      (list 1 rst-directive-face)
-      (list 2 rst-definition-face)
-      (list 4 rst-directive-face))
-     ;; `Hyperlink Targets`_
-     (list
-      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)" re-blksep1)
-      1 rst-definition-face)
-     (list
-      (concat re-bol "\\(__\\)" re-blksep1)
-      1 rst-definition-face)
-
-     ;; All `Inline Markup`_
-     ;; FIXME: Condition 5 preventing fontification of e.g. "*" not implemented
-     ;; `Strong Emphasis`_
-     (list
-      (concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1)
-      2 rst-emphasis2-face)
-     ;; `Emphasis`_
-     (list
-      (concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1)
-      2 rst-emphasis1-face)
-     ;; `Inline Literals`_
-     (list
-      (concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1)
-      2 rst-literal-face)
-     ;; `Inline Internal Targets`_
-     (list
-      (concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1)
-      2 rst-definition-face)
-     ;; `Hyperlink References`_
-     ;; FIXME: `Embedded URIs`_ not considered
-     (list
-      (concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\sw+\\)__?\\)" re-ims1)
-      2 rst-reference-face)
-     ;; `Interpreted Text`_
-     (list
-      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" re-sym1 "+:\\)?\\)" re-ims1)
-      (list 2 rst-directive-face)
-      (list 5 rst-external-face)
-      (list 8 rst-directive-face))
-     ;; `Footnote References`_ / `Citation References`_
-     (list
-      (concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1)
-      2 rst-reference-face)
-     ;; `Substitution References`_
-     (list
-      (concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1)
-      2 rst-reference-face)
-     ;; `Standalone Hyperlinks`_
-     (list
-      ;; FIXME: This takes it easy by using a whitespace as delimiter
-      (concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1)
-      2 rst-definition-face)
-     (list
-      (concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1)
-      2 rst-definition-face)
-
-     ;; Do all block fontification as late as possible so 'append works
-
-     ;; Sections_ / Transitions_
-     (append
-      (list
-       re-ado2)
-      (if (not rst-mode-lazy)
-	  (list 1 rst-block-face)
-	(list
-	 (list 'rst-font-lock-handle-adornment
-	       '(progn
-		  (setq rst-font-lock-adornment-point (match-end 1))
-		  (point-max))
-	       nil
-	       (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
-		     'append t)
-	       (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
-		     'append t)
-	       (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
-		     'append t)))))
-
-     ;; `Comments`_
-     (append
-      (list
-       (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:]\\|:\\([^:]\\|$\\)\\)*$")
-       (list 1 rst-comment-face))
-      (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point (match-end 1))
-		    (point-max))
-		 nil
-		 (list 0 rst-comment-face 'append)))))
-     (append
-      (list
-       (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
-       (list 1 rst-comment-face)
-       (list 2 rst-comment-face))
-      (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point 'next)
-		    (point-max))
-		 nil
-		 (list 0 rst-comment-face 'append)))))
-
-     ;; `Literal Blocks`_
-     (append
-      (list
-       (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$")
-       (list 3 rst-block-face))
-      (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point t)
-		    (point-max))
-		 nil
-		 (list 0 rst-literal-face 'append)))))
-     )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Indented blocks
-
-(defun rst-forward-indented-block (&optional column limit)
-  "Move forward across one indented block.
-Find the next non-empty line which is not indented at least to COLUMN (defaults
-to the column of the point). Moves point to first character of this line or the
-first empty line immediately before it and returns that position. If there is
-no such line before LIMIT (defaults to the end of the buffer) returns nil and
-point is not moved."
-  (interactive)
-  (let ((clm (or column (current-column)))
-	(start (point))
-	fnd beg cand)
-    (if (not limit)
-	(setq limit (point-max)))
-    (save-match-data
-      (while (and (not fnd) (< (point) limit))
-	(forward-line 1)
-	(when (< (point) limit)
-	  (setq beg (point))
-	  (if (looking-at "\\s *$")
-	      (setq cand (or cand beg)) ; An empty line is a candidate
-	    (move-to-column clm)
-	    ;; FIXME: No indentation [(zerop clm)] must be handled in some
-	    ;; useful way - though it is not clear what this should mean at all
-	    (if (string-match
-		 "^\\s *$" (buffer-substring-no-properties beg (point)))
-		(setq cand nil) ; An indented line resets a candidate
-	      (setq fnd (or cand beg)))))))
-    (goto-char (or fnd start))
-    fnd))
-
-;; Stores the point where the current indentation ends if a number. If `next'
-;; indicates `rst-font-lock-find-unindented-line' shall take the indentation
-;; from the next line if this is not empty. If non-nil indicates
-;; `rst-font-lock-find-unindented-line' shall take the indentation from the
-;; next non-empty line. Also used as a trigger for
-;; `rst-font-lock-find-unindented-line'.
-(defvar rst-font-lock-indentation-point nil)
-
-(defun rst-font-lock-find-unindented-line (limit)
-  (let* ((ind-pnt rst-font-lock-indentation-point)
-	 (beg-pnt ind-pnt))
-    ;; May run only once - enforce this
-    (setq rst-font-lock-indentation-point nil)
-    (when (and ind-pnt (not (numberp ind-pnt)))
-      ;; Find indentation point in next line if any
-      (setq ind-pnt
-	    (save-excursion
-	      (save-match-data
-		(if (eq ind-pnt 'next)
-		    (when (and (zerop (forward-line 1)) (< (point) limit))
-		      (setq beg-pnt (point))
-		      (when (not (looking-at "\\s *$"))
-			(looking-at "\\s *")
-			(match-end 0)))
-		  (while (and (zerop (forward-line 1)) (< (point) limit)
-			      (looking-at "\\s *$")))
-		  (when (< (point) limit)
-		    (setq beg-pnt (point))
-		    (looking-at "\\s *")
-		    (match-end 0)))))))
-    (when ind-pnt
-      (goto-char ind-pnt)
-      ;; Always succeeds because the limit set by PRE-MATCH-FORM is the
-      ;; ultimate point to find
-      (goto-char (or (rst-forward-indented-block nil limit) limit))
-      (set-match-data (list beg-pnt (point)))
-      t)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Adornments
-
-;; Stores the point where the current adornment ends. Also used as a trigger
-;; for `rst-font-lock-handle-adornment'.
-(defvar rst-font-lock-adornment-point nil)
-
-;; Here `rst-font-lock-handle-adornment' stores the section level of the
-;; current adornment or t for a transition.
-(defvar rst-font-lock-level nil)
-
-;; FIXME: It would be good if this could be used to markup section titles of
-;; given level with a special key; it would be even better to be able to
-;; customize this so it can be used for a generally available personal style
-;;
-;; FIXME: There should be some way to reset and reload this variable - probably
-;; a special key
-;;
-;; FIXME: Some support for `outline-mode' would be nice which should be based
-;; on this information
-(defvar rst-adornment-level-alist nil
-  "Associates adornments with section levels.
-The key is a two character string. The first character is the adornment
-character. The second character distinguishes underline section titles (`u')
-from overline/underline section titles (`o'). The value is the section level.
-
-This is made buffer local on start and adornments found during font lock are
-entered.")
-
-;; Returns section level for adornment key KEY. Adds new section level if KEY
-;; is not found and ADD. If KEY is not a string it is simply returned.
-(defun rst-adornment-level (key &optional add)
-  (let ((fnd (assoc key rst-adornment-level-alist))
-	(new 1))
-    (cond
-     ((not (stringp key))
-      key)
-     (fnd
-      (cdr fnd))
-     (add
-      (while (rassoc new rst-adornment-level-alist)
-	(setq new (1+ new)))
-      (setq rst-adornment-level-alist
-	    (append rst-adornment-level-alist (list (cons key new))))
-      new))))
-
-;; Classifies adornment for section titles and transitions. ADORNMENT is the
-;; complete adornment string as found in the buffer. END is the point after the
-;; last character of ADORNMENT. For overline section adornment LIMIT limits the
-;; search for the matching underline. Returns a list. The first entry is t for
-;; a transition, or a key string for `rst-adornment-level' for a section title.
-;; The following eight values forming four match groups as can be used for
-;; `set-match-data'. First match group contains the maximum points of the whole
-;; construct. Second and last match group matched pure section title adornment
-;; while third match group matched the section title text or the transition.
-;; Each group but the first may or may not exist.
-(defun rst-classify-adornment (adornment end limit)
-  (save-excursion
-    (save-match-data
-      (goto-char end)
-      (let ((ado-ch (aref adornment 0))
-	    (ado-re (regexp-quote adornment))
-	    (end-pnt (point))
-	    (beg-pnt (progn
-		       (forward-line 0)
-		       (point)))
-	    (nxt-emp
-	     (save-excursion
-	       (or (not (zerop (forward-line 1)))
-		   (looking-at "\\s *$"))))
-	    (prv-emp
-	     (save-excursion
-	       (or (not (zerop (forward-line -1)))
-		   (looking-at "\\s *$"))))
-	    key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
-	(cond
-	 ((and nxt-emp prv-emp)
-	  ;; A transition
-	  (setq key t)
-	  (setq beg-txt beg-pnt)
-	  (setq end-txt end-pnt))
-	 (prv-emp
-	  ;; An overline
-	  (setq key (concat (list ado-ch) "o"))
-	  (setq beg-ovr beg-pnt)
-	  (setq end-ovr end-pnt)
-	  (forward-line 1)
-	  (setq beg-txt (point))
-	  (while (and (< (point) limit) (not end-txt))
-	    (if (looking-at "\\s *$")
-		;; No underline found
-		(setq end-txt (1- (point)))
-	      (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
-		(setq end-und (match-end 1))
-		(setq beg-und (point))
-		(setq end-txt (1- beg-und))))
-	    (forward-line 1)))
-	 (t
-	  ;; An underline
-	  (setq key (concat (list ado-ch) "u"))
-	  (setq beg-und beg-pnt)
-	  (setq end-und end-pnt)
-	  (setq end-txt (1- beg-und))
-	  (setq beg-txt (progn
-			  (if (re-search-backward "^\\s *$" 1 'move)
-			      (forward-line 1))
-			  (point)))))
-	(list key
-	      (or beg-ovr beg-txt beg-und)
-	      (or end-und end-txt end-und)
-	      beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
-
-;; Handles adornments for font-locking section titles and transitions. Returns
-;; three match groups. First and last match group matched pure overline /
-;; underline adornment while second group matched section title text. Each
-;; group may not exist.
-(defun rst-font-lock-handle-adornment (limit)
-  (let ((ado-pnt rst-font-lock-adornment-point))
-    ;; May run only once - enforce this
-    (setq rst-font-lock-adornment-point nil)
-    (if ado-pnt
-      (let* ((ado (rst-classify-adornment (match-string-no-properties 1)
-					  ado-pnt limit))
-	     (key (car ado))
-	     (mtc (cdr ado)))
-	(setq rst-font-lock-level (rst-adornment-level key t))
-	(goto-char (nth 1 mtc))
-	(set-match-data mtc)
-	t))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide 'rst-mode)
-
-;;; rst-mode.el ends here
diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
new file mode 100644
index 000000000..94da15901
--- /dev/null
+++ b/tools/editors/emacs/rst.el
@@ -0,0 +1,2479 @@
+;; Authors: Martin Blais ,
+;;          Stefan Merten 
+;;          David Goodger 
+;; Date: $Date$
+;; Copyright: This module has been placed in the public domain.
+;;  
+;; Support code for editing reStructuredText with Emacs.  Basically, this
+;; package contains:
+;; 
+;; - Functions to automatically adjust and cycle the section underline
+;;   decorations;
+;; - A mode that displays the table of contents and allows you to jump anywhere
+;;   from it;
+;; - Functions to insert and automatically update a TOC in your source document;
+;; - A mode which supports font-lock highlighting of reStructuredText
+;;   structures;
+;; - Some other convenience functions.
+;; 
+;; See the accompanying document in the docutils documentation about
+;; the contents of this package and how to use it.
+;; 
+;; For more information about reStructuredText, see
+;; http://docutils.sourceforge.net/rst.html
+;;
+;; **IMPORTANT NOTE TO PACKAGERS**: this package is the result of merging:
+;;
+;; - restructuredtext.el
+;; - rst-mode.el
+;; - rst-html.el
+;;
+;; Those files are now OBSOLETE and have been replaced by this single package
+;; file (2005-10-30).
+;;
+;; Installation instructions
+;; -------------------------
+;;
+;; Add this line to your .emacs file and bind the versatile sectioning commands
+;; in text mode, like this::
+;;
+;;   (require 'rst)
+;;   (add-hook 'text-mode-hook 'rst-text-mode-bindings)
+;;
+;; The keys it defines are:
+;;
+;;    C-= : updates or rotates the section title around point or
+;;          promotes/demotes the decorations within the region (see full details
+;;          below).
+;;
+;;          Note that C-= is a good binding, since it allows you to specify a
+;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
+;;          prefix arg with C-u C-=.
+;;
+;;    C-x C-= : displays the hierarchical table-of-contents of the document and
+;;              allows you to jump to any section from it.
+;;
+;;    C-u C-x C-= : displays the title decorations from this file.
+;;
+;;    C-x + : insert the table of contents in the text.  See the many options
+;;            for customizing how it will look.
+;;
+;;    C-M-{, C-M-} : navigate between section titles.
+;;
+;; Other specialized and more generic functions are also available (see source
+;; code).  The most important function provided by this file for section title
+;; adjustments is rst-adjust.
+;;
+;; There are many variables that can be customized, look for defcustom and
+;; defvar in this file.
+;;
+;; If you use the table-of-contents feature, you may want to add a hook to
+;; update the TOC automatically everytime you adjust a section title::
+;;
+;;   (add-hook 'rst-adjust-hook 'rst-toc-insert-update)
+;;
+;; rst-mode
+;; --------
+;;
+;; There is a special mode that you can setup if you want to have syntax
+;; highlighting.  The mode is based on `text-mode' and inherits some things from
+;; it.  Particularly `text-mode-hook' is run before `rst-mode-hook'.
+;; 
+;; Add the following lines to your `.emacs' file:
+;;
+;; (setq auto-mode-alist
+;;       (append '(("\\.rst$" . rst-mode)
+;;                 ("\\.rest$" . rst-mode)) auto-mode-alist))
+;;
+;; If you are using `.txt' as a standard extension for reST files as
+;; http://docutils.sourceforge.net/FAQ.html#what-s-the-standard-filename-extension-for-a-restructuredtext-file
+;; suggests you may use one of the `Local Variables in Files' mechanism Emacs
+;; provides to set the major mode automatically. For instance you may use
+;;
+;; .. -*- mode: rst -*-
+;;
+;; in the very first line of your file. However, because this is a major
+;; security breach you or your administrator may have chosen to switch that
+;; feature off. See `Local Variables in Files' in the Emacs documentation for a
+;; more complete discussion.
+;;
+;;
+;; TODO list
+;; =========
+;;
+;; Bindings
+;; --------
+;; - We need to automatically add the rst-text-mode-bindings to rst-mode
+;; - We need to find better bindings because C-= does not generate an event on
+;;   the Macs.
+;;
+;; rst-toc-insert features
+;; ------------------------
+;; - Support local table of contents, like in doctree.txt.
+;; - On load, detect any existing TOCs and set the properties for links.
+;; - TOC insertion should have an option to add empty lines.
+;; - TOC insertion should deal with multiple lines
+;;
+;; - There is a bug on redo after undo of adjust when rst-adjust-hook uses the
+;;   automatic toc update. The cursor ends up in the TOC and this is
+;;   annoying. Gotta fix that.
+;;
+;; Other
+;; -----
+;; - Add an option to forego using the file structure in order to make
+;;   suggestion, and to always use the preferred decorations to do that.
+;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Bindings and hooks
+
+(defgroup rst nil "Support for reStructuredText documents"
+  :group 'wp
+  :version "21.1"
+  :link '(url-link "http://docutils.sourceforge.net/rst.html"))
+
+(defun rst-toc-or-hierarchy ()
+  "Binding for either TOC or decorations hierarchy."
+  (interactive)
+  (if (not current-prefix-arg)
+      (rst-toc)
+    (rst-display-decorations-hierarchy)))
+
+(defun rst-text-mode-bindings ()
+  "Default text mode hook for rest."
+  (local-set-key [(control ?=)] 'rst-adjust)
+  (local-set-key [(control x)(control ?=)] 'rst-toc-or-hierarchy)
+  (local-set-key [(control x)(?+)] 'rst-toc-insert)
+  (local-set-key [(control meta ?{)] 'rst-backward-section)
+  (local-set-key [(control meta ?})] 'rst-forward-section)
+  (local-set-key [(control c)(control r)] 'rst-shift-region-right)
+  (local-set-key [(control c)(control l)] 'rst-shift-region-left)
+  )
+
+;; Note: we cannot bind the TOC update on file write because it messes with
+;; undo.  If we disable undo, since it adds and removes characters, the
+;; positions in the undo list are not making sense anymore.  Dunno what to do
+;; with this, it would be nice to update when saving.
+;;
+;; (add-hook 'write-contents-hooks 'rst-toc-insert-update-fun)
+;; (defun rst-toc-insert-update-fun ()
+;;   ;; Disable undo for the write file hook.
+;;   (let ((buffer-undo-list t)) (rst-toc-insert-update) ))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Support functions
+
+(require 'cl)
+
+;; Generic Filter function.
+(if (not (fboundp 'filter))
+    (defun filter (pred list)
+      "Returns a list of all the elements fulfilling the pred requirement (that
+is for which (pred elem) is true)"
+      (if list
+          (let ((head (car list))
+                (tail (filter pred (cdr list))))
+            (if (funcall pred head)
+                (cons head tail)
+              tail)))))
+
+
+;; From emacs-22
+(if (not (fboundp 'line-number-at-pos))
+    (defun line-number-at-pos (&optional pos)
+      "Return (narrowed) buffer line number at position POS.
+    If POS is nil, use current buffer location."
+      (let ((opoint (or pos (point))) start)
+        (save-excursion
+          (goto-char (point-min))
+          (setq start (point))
+          (goto-char opoint)
+          (forward-line 0)
+          (1+ (count-lines start (point)))))) )
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Section Decoration Adjusment
+;; ============================
+;;
+;; The following functions implement a smart automatic title sectioning feature.
+;; The idea is that with the cursor sitting on a section title, we try to get as
+;; much information from context and try to do the best thing automatically.
+;; This function can be invoked many times and/or with prefix argument to rotate
+;; between the various sectioning decorations.
+;;
+;; Definitions: the two forms of sectioning define semantically separate section
+;; levels.  A sectioning DECORATION consists in:
+;;
+;;   - a CHARACTER
+;;
+;;   - a STYLE which can be either of 'simple' or 'over-and-under'.
+;;
+;;   - an INDENT (meaningful for the over-and-under style only) which determines
+;;     how many characters and over-and-under style is hanging outside of the
+;;     title at the beginning and ending.
+;;
+;; Important note: an existing decoration must be formed by at least two
+;; characters to be recognized.
+;;
+;; Here are two examples of decorations (| represents the window border, column
+;; 0):
+;;
+;;                                  |
+;; 1. char: '-'   e                 |Some Title
+;;    style: simple                 |----------
+;;                                  |
+;; 2. char: '='                     |==============
+;;    style: over-and-under         |  Some Title
+;;    indent: 2                     |==============
+;;                                  |
+;;
+;; Some notes:
+;;
+;; - The underlining character that is used depends on context. The file is
+;;   scanned to find other sections and an appropriate character is selected.
+;;   If the function is invoked on a section that is complete, the character is
+;;   rotated among the existing section decorations.
+;;
+;;   Note that when rotating the characters, if we come to the end of the
+;;   hierarchy of decorations, the variable rst-preferred-decorations is
+;;   consulted to propose a new underline decoration, and if continued, we cycle
+;;   the decorations all over again.  Set this variable to nil if you want to
+;;   limit the underlining character propositions to the existing decorations in
+;;   the file.
+;;
+;; - A prefix argument can be used to alternate the style.
+;;
+;; - An underline/overline that is not extended to the column at which it should
+;;   be hanging is dubbed INCOMPLETE.  For example::
+;;
+;;      |Some Title
+;;      |-------
+;;
+;; Examples of default invocation:
+;;
+;;   |Some Title       --->    |Some Title
+;;   |                         |----------
+;;
+;;   |Some Title       --->    |Some Title
+;;   |-----                    |----------
+;;
+;;   |                         |------------
+;;   | Some Title      --->    | Some Title
+;;   |                         |------------
+;;
+;; In over-and-under style, when alternating the style, a variable is
+;; available to select how much default indent to use (it can be zero).  Note
+;; that if the current section decoration already has an indent, we don't
+;; adjust it to the default, we rather use the current indent that is already
+;; there for adjustment (unless we cycle, in which case we use the indent
+;; that has been found previously).
+
+(defgroup rst-adjust nil
+  "Settings for adjustment and cycling of section title
+decorations."
+  :group 'rst
+  :version "21.1")
+
+(defcustom rst-preferred-decorations '( (?= over-and-under 1)
+					 (?= simple 0)
+					 (?- simple 0)
+					 (?~ simple 0)
+					 (?+ simple 0)
+					 (?` simple 0)
+					 (?# simple 0)
+					 (?@ simple 0) )
+  "Preferred ordering of section title decorations.  This
+  sequence is consulted to offer a new decoration suggestion when
+  we rotate the underlines at the end of the existing hierarchy
+  of characters, or when there is no existing section title in
+  the file."
+  :group 'rst-adjust)
+
+
+(defcustom rst-default-indent 1
+  "Number of characters to indent the section title when toggling
+  decoration styles.  This is used when switching from a simple
+  decoration style to a over-and-under decoration style."
+  :group 'rst-adjust)
+
+
+(defvar rst-section-text-regexp "^[ \t]*\\S-*[a-zA-Z0-9]\\S-*"
+  "Regular expression for valid section title text.")
+
+
+(defun rst-line-homogeneous-p (&optional accept-special)
+  "Predicate return the unique char if the current line is
+  composed only of a single repeated non-whitespace
+  character. This returns the char even if there is whitespace at
+  the beginning of the line.
+
+  If ACCEPT-SPECIAL is specified we do not ignore special sequences
+  which normally we would ignore when doing a search on many lines.
+  For example, normally we have cases to ignore commonly occuring
+  patterns, such as :: or ...;  with the flag do not ignore them."
+  (save-excursion
+    (back-to-indentation)
+    (if (not (looking-at "\n"))
+        (let ((c (thing-at-point 'char)))
+          (if (and (looking-at (format "[%s]+[ \t]*$" c))
+                   (or accept-special
+                       (and
+                        ;; Common patterns.
+                        (not (looking-at "::[ \t]*$"))
+                        (not (looking-at "\\.\\.\\.[ \t]*$"))
+                        ;; Discard one char line
+                        (not (looking-at ".[ \t]*$"))
+                        )))
+              (string-to-char c))
+          ))
+    ))
+
+(defun rst-line-homogeneous-nodent-p (&optional accept-special)
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at "^[ \t]+")
+	nil
+      (rst-line-homogeneous-p accept-special)
+      )))
+
+
+(defun rst-compare-decorations (deco1 deco2)
+  "Compare decorations.  Returns true if both are equal,
+according to restructured text semantics (only the character and
+the style are compared, the indentation does not matter."
+  (and (eq (car deco1) (car deco2))
+       (eq (cadr deco1) (cadr deco2))))
+
+
+(defun rst-get-decoration-match (hier deco)
+  "Returns the index (level) of the decoration in the given hierarchy.
+This basically just searches for the item using the appropriate
+comparison and returns the index.  We return nil if the item is
+not found."
+  (let ((cur hier))
+    (while (and cur (not (rst-compare-decorations (car cur) deco)))
+      (setq cur (cdr cur)))
+    cur))
+
+
+(defun rst-suggest-new-decoration (alldecos &optional prev)
+  "Suggest a new, different decoration, different from all that
+have been seen.
+
+  ALLDECOS is the set of all decorations, including the line
+  numbers.  PREV is the optional previous decoration, in order to
+  suggest a better match."
+
+  ;; For all the preferred decorations...
+  (let* (
+	 ;; If 'prev' is given, reorder the list to start searching after the
+	 ;; match.
+	 (fplist
+	  (cdr (rst-get-decoration-match rst-preferred-decorations prev)))
+
+	 ;; List of candidates to search.
+	 (curpotential (append fplist rst-preferred-decorations)))
+    (while
+	;; For all the decorations...
+	(let ((cur alldecos)
+	      found)
+	  (while (and cur (not found))
+	    (if (rst-compare-decorations (car cur) (car curpotential))
+		;; Found it!
+		(setq found (car curpotential))
+	      (setq cur (cdr cur))))
+	  found)
+
+      (setq curpotential (cdr curpotential)))
+
+    (copy-list (car curpotential)) ))
+
+(defun rst-delete-line ()
+  "A version of kill-line that does not use the kill-ring."
+  (delete-region (line-beginning-position) (+ 1 (line-end-position))))
+
+(defun rst-update-section (char style &optional indent)
+  "Unconditionally updates the style of a section decoration
+  using the given character CHAR, with STYLE 'simple or
+  'over-and-under, and with indent INDENT.  If the STYLE is
+  'simple, whitespace before the title is removed (indent is
+  always assume to be 0).
+
+  If there are existing overline and/or underline from the
+  existing decoration, they are removed before adding the
+  requested decoration."
+
+  (interactive)
+  (let (marker
+        len
+        ec
+        (c ?-))
+
+      (end-of-line)
+      (setq marker (point-marker))
+
+      ;; Fixup whitespace at the beginning and end of the line
+      (if (or (null indent) (eq style 'simple))
+          (setq indent 0))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (insert (make-string indent ? ))
+
+      (end-of-line)
+      (delete-horizontal-space)
+
+      ;; Set the current column, we're at the end of the title line
+      (setq len (+ (current-column) indent))
+
+      ;; Remove previous line if it consists only of a single repeated character
+      (save-excursion
+        (forward-line -1)
+	(and (rst-line-homogeneous-p 1)
+	     ;; Avoid removing the underline of a title right above us.
+	     (save-excursion (forward-line -1)
+			     (not (looking-at rst-section-text-regexp)))
+             (rst-delete-line)))
+
+      ;; Remove following line if it consists only of a single repeated
+      ;; character
+      (save-excursion
+        (forward-line +1)
+        (and (rst-line-homogeneous-p 1)
+             (rst-delete-line))
+        ;; Add a newline if we're at the end of the buffer, for the subsequence
+        ;; inserting of the underline
+        (if (= (point) (buffer-end 1))
+            (newline 1)))
+
+      ;; Insert overline
+      (if (eq style 'over-and-under)
+          (save-excursion
+            (beginning-of-line)
+            (open-line 1)
+            (insert (make-string len char))))
+
+      ;; Insert underline
+      (forward-line +1)
+      (open-line 1)
+      (insert (make-string len char))
+
+      (forward-line +1)
+      (goto-char marker)
+      ))
+
+
+(defun rst-normalize-cursor-position ()
+  "If the cursor is on a decoration line or an empty line , place
+  it on the section title line (at the end).  Returns the line
+  offset by which the cursor was moved. This works both over or
+  under a line."
+  (if (save-excursion (beginning-of-line)
+                      (or (rst-line-homogeneous-p 1)
+                          (looking-at "^[ \t]*$")))
+      (progn
+        (beginning-of-line)
+        (cond
+         ((save-excursion (forward-line -1)
+                          (beginning-of-line)
+                          (and (looking-at rst-section-text-regexp)
+                               (not (rst-line-homogeneous-p 1))))
+          (progn (forward-line -1) -1))
+         ((save-excursion (forward-line +1)
+                          (beginning-of-line)
+                          (and (looking-at rst-section-text-regexp)
+                               (not (rst-line-homogeneous-p 1))))
+          (progn (forward-line +1) +1))
+         (t 0)))
+    0 ))
+
+
+(defun rst-find-all-decorations ()
+  "Finds all the decorations in the file, and returns a list of
+  (line, decoration) pairs.  Each decoration consists in a (char,
+  style, indent) triple.
+
+  This function does not detect the hierarchy of decorations, it
+  just finds all of them in a file.  You can then invoke another
+  function to remove redundancies and inconsistencies."
+
+  (let (positions
+        (curline 1))
+    ;; Iterate over all the section titles/decorations in the file.
+    (save-excursion
+      (beginning-of-buffer)
+      (while (< (point) (buffer-end 1))
+        (if (rst-line-homogeneous-nodent-p)
+            (progn
+              (setq curline (+ curline (rst-normalize-cursor-position)))
+
+              ;; Here we have found a potential site for a decoration,
+              ;; characterize it.
+              (let ((deco (rst-get-decoration)))
+                (if (cadr deco) ;; Style is existing.
+                    ;; Found a real decoration site.
+                    (progn
+                      (push (cons curline deco) positions)
+                      ;; Push beyond the underline.
+                      (forward-line 1)
+                      (setq curline (+ curline 1))
+                      )))
+              ))
+        (forward-line 1)
+        (setq curline (+ curline 1))
+        ))
+    (reverse positions)))
+
+
+(defun rst-infer-hierarchy (decorations)
+  "Build a hierarchy of decorations using the list of given decorations.
+
+  This function expects a list of (char, style, indent)
+  decoration specifications, in order that they appear in a file,
+  and will infer a hierarchy of section levels by removing
+  decorations that have already been seen in a forward traversal of the
+  decorations, comparing just the character and style.
+
+  Similarly returns a list of (char, style, indent), where each
+  list element should be unique."
+
+  (let ((hierarchy-alist (list)))
+    (dolist (x decorations)
+      (let ((char (car x))
+            (style (cadr x))
+            (indent (caddr x)))
+        (if (not (assoc (cons char style) hierarchy-alist))
+            (progn
+              (setq hierarchy-alist
+                    (append hierarchy-alist
+                            (list (cons (cons char style) x))))
+              ))
+        ))
+    (mapcar 'cdr hierarchy-alist)
+    ))
+
+
+(defun rst-get-hierarchy (&optional alldecos ignore)
+  "Returns a list of decorations that represents the hierarchy of
+  section titles in the file.
+
+  If the line number in IGNORE is specified, the decoration found
+  on that line (if there is one) is not taken into account when
+  building the hierarchy."
+  (let ((all (or alldecos (rst-find-all-decorations))))
+    (setq all (assq-delete-all ignore all))
+    (rst-infer-hierarchy (mapcar 'cdr all))))
+
+
+(defun rst-get-decoration (&optional point)
+  "Looks around point and finds the characteristics of the
+  decoration that is found there.  We assume that the cursor is
+  already placed on the title line (and not on the overline or
+  underline).
+
+  This function returns a (char, style, indent) triple.  If the
+  characters of overline and underline are different, we return
+  the underline character.  The indent is always calculated.  A
+  decoration can be said to exist if the style is not nil.
+
+  A point can be specified to go to the given location before
+  extracting the decoration."
+
+  (let (char style indent)
+    (save-excursion
+      (if point (goto-char point))
+      (beginning-of-line)
+      (if (looking-at rst-section-text-regexp)
+          (let* ((over (save-excursion
+			 (forward-line -1)
+			 (rst-line-homogeneous-nodent-p)))
+
+		(under (save-excursion
+			 (forward-line +1)
+			 (rst-line-homogeneous-nodent-p)))
+	        )
+
+	    ;; Check that the line above the overline is not part of a title
+	    ;; above it.
+	    (if (and over
+		     (save-excursion
+		       (and (equal (forward-line -2) 0)
+			    (looking-at rst-section-text-regexp))))
+		(setq over nil))
+
+            (cond
+             ;; No decoration found, leave all return values nil.
+             ((and (eq over nil) (eq under nil)))
+
+             ;; Overline only, leave all return values nil.
+             ;;
+             ;; Note: we don't return the overline character, but it could perhaps
+             ;; in some cases be used to do something.
+             ((and over (eq under nil)))
+
+             ;; Underline only.
+             ((and under (eq over nil))
+              (setq char under
+                    style 'simple))
+
+             ;; Both overline and underline.
+             (t
+              (setq char under
+                    style 'over-and-under))
+             )
+            )
+        )
+      ;; Find indentation.
+      (setq indent (save-excursion (back-to-indentation) (current-column)))
+      )
+    ;; Return values.
+    (list char style indent)))
+
+
+(defun rst-get-decorations-around (&optional alldecos)
+  "Given the list of all decorations (with positions),
+find the decorations before and after the given point.
+A list of the previous and next decorations is returned."
+  (let* ((all (or alldecos (rst-find-all-decorations)))
+	 (curline (line-number-at-pos))
+	 prev next
+	 (cur all))
+
+    ;; Search for the decorations around the current line.
+    (while (and cur (< (caar cur) curline))
+      (setq prev cur
+	    cur (cdr cur)))
+    ;; 'cur' is the following decoration.
+
+    (if (and cur (caar cur))
+	(setq next (if (= curline (caar cur)) (cdr cur) cur)))
+
+    (mapcar 'cdar (list prev next))
+    ))
+
+
+(defun rst-decoration-complete-p (deco &optional point)
+  "Return true if the decoration DECO around POINT is complete."
+  ;; Note: we assume that the detection of the overline as being the underline
+  ;; of a preceding title has already been detected, and has been eliminated
+  ;; from the decoration that is given to us.
+
+  ;; There is some sectioning already present, so check if the current
+  ;; sectioning is complete and correct.
+  (let* ((char (car deco))
+         (style (cadr deco))
+         (indent (caddr deco))
+         (endcol (save-excursion (end-of-line) (current-column)))
+         )
+    (if char
+        (let ((exps (concat "^"
+                            (regexp-quote (make-string (+ endcol indent) char))
+                            "$")))
+          (and
+           (save-excursion (forward-line +1)
+                           (beginning-of-line)
+                           (looking-at exps))
+           (or (not (eq style 'over-and-under))
+               (save-excursion (forward-line -1)
+                               (beginning-of-line)
+                               (looking-at exps))))
+          ))
+    ))
+
+
+(defun rst-get-next-decoration
+  (curdeco hier &optional suggestion reverse-direction)
+  "Get the next decoration for CURDECO, in given hierarchy HIER,
+and suggesting for new decoration SUGGESTION."
+
+  (let* (
+	 (char (car curdeco))
+	 (style (cadr curdeco))
+
+	 ;; Build a new list of decorations for the rotation.
+	 (rotdecos
+	  (append hier
+		  ;; Suggest a new decoration.
+		  (list suggestion
+			;; If nothing to suggest, use first decoration.
+			(car hier)))) )
+    (or
+     ;; Search for next decoration.
+     (cadr
+      (let ((cur (if reverse-direction rotdecos
+		   (reverse rotdecos)))
+	    found)
+	(while (and cur
+		    (not (and (eq char (caar cur))
+			      (eq style (cadar cur)))))
+	  (setq cur (cdr cur)))
+	cur))
+
+     ;; If not found, take the first of all decorations.
+     suggestion
+     )))
+
+
+(defun rst-adjust ()
+  "Adjust/rotate the section decoration for the section title
+around point or promote/demote the decorations inside the region,
+depending on if the region is active.  This function is meant to
+be invoked possibly multiple times, and can vary its behaviour
+with a positive prefix argument (toggle style), or with a
+negative prefix argument (alternate behaviour).
+
+This function is the main focus of this module and is a bit of a
+swiss knife.  It is meant as the single most essential function
+to be bound to invoke to adjust the decorations of a section
+title in restructuredtext.  It tries to deal with all the
+possible cases gracefully and to do `the right thing' in all
+cases.
+
+See the documentations of rst-adjust-decoration and
+rst-promote-region for full details.
+
+Prefix Arguments
+================
+
+The method can take either (but not both) of
+
+a. a (non-negative) prefix argument, which means to toggle the
+   decoration style.  Invoke with C-u prefix for example;
+
+b. a negative numerical argument, which generally inverts the
+   direction of search in the file or hierarchy.  Invoke with C--
+   prefix for example.
+
+"
+  (interactive)
+
+  (let* ( ;; Parse the positive and negative prefix arguments.
+	 (reverse-direction
+	  (and current-prefix-arg
+	       (< (prefix-numeric-value current-prefix-arg) 0)))
+	 (toggle-style
+	  (and current-prefix-arg (not reverse-direction))))
+
+    (if (and transient-mark-mode mark-active)
+	;; Adjust decorations within region.
+	(rst-promote-region current-prefix-arg)
+      ;; Adjust decoration around point.
+      (rst-adjust-decoration toggle-style reverse-direction))
+    
+    ;; Run the hooks to run after adjusting.
+    (run-hooks 'rst-adjust-hook)
+
+    ))
+
+(defvar rst-adjust-hook nil
+  "Hooks to be run after running rst-adjust.")
+
+(defun rst-adjust-decoration (&optional toggle-style reverse-direction)
+"Adjust/rotate the section decoration for the section title around point.
+
+This function is meant to be invoked possibly multiple times, and
+can vary its behaviour with a true TOGGLE-STYLE argument, or with
+a REVERSE-DIRECTION argument.
+
+General Behaviour
+=================
+
+The next action it takes depends on context around the point, and
+it is meant to be invoked possibly more than once to rotate among
+the various possibilities. Basically, this function deals with:
+
+- adding a decoration if the title does not have one;
+
+- adjusting the length of the underline characters to fit a
+  modified title;
+
+- rotating the decoration in the set of already existing
+  sectioning decorations used in the file;
+
+- switching between simple and over-and-under styles.
+
+You should normally not have to read all the following, just
+invoke the method and it will do the most obvious thing that you
+would expect.
+
+
+Decoration Definitions
+======================
+
+The decorations consist in
+
+1. a CHARACTER
+
+2. a STYLE which can be either of 'simple' or 'over-and-under'.
+
+3. an INDENT (meaningful for the over-and-under style only)
+   which determines how many characters and over-and-under
+   style is hanging outside of the title at the beginning and
+   ending.
+
+See source code for mode details.
+
+
+Detailed Behaviour Description
+==============================
+
+Here are the gory details of the algorithm (it seems quite
+complicated, but really, it does the most obvious thing in all
+the particular cases):
+
+Before applying the decoration change, the cursor is placed on
+the closest line that could contain a section title.
+
+Case 1: No Decoration
+---------------------
+
+If the current line has no decoration around it,
+
+- search backwards for the last previous decoration, and apply
+  the decoration one level lower to the current line.  If there
+  is no defined level below this previous decoration, we suggest
+  the most appropriate of the rst-preferred-decorations.
+
+  If REVERSE-DIRECTION is true, we simply use the previous
+  decoration found directly.
+
+- if there is no decoration found in the given direction, we use
+  the first of rst-preferred-decorations.
+
+The prefix argument forces a toggle of the prescribed decoration
+style.
+
+Case 2: Incomplete Decoration
+-----------------------------
+
+If the current line does have an existing decoration, but the
+decoration is incomplete, that is, the underline/overline does
+not extend to exactly the end of the title line (it is either too
+short or too long), we simply extend the length of the
+underlines/overlines to fit exactly the section title.
+
+If the prefix argument is given, we toggle the style of the
+decoration as well.
+
+REVERSE-DIRECTION has no effect in this case.
+
+Case 3: Complete Existing Decoration
+------------------------------------
+
+If the decoration is complete (i.e. the underline (overline)
+length is already adjusted to the end of the title line), we
+search/parse the file to establish the hierarchy of all the
+decorations (making sure not to include the decoration around
+point), and we rotate the current title's decoration from within
+that list (by default, going *down* the hierarchy that is present
+in the file, i.e. to a lower section level).  This is meant to be
+used potentially multiple times, until the desired decoration is
+found around the title.
+
+If we hit the boundary of the hierarchy, exactly one choice from
+the list of preferred decorations is suggested/chosen, the first
+of those decoration that has not been seen in the file yet (and
+not including the decoration around point), and the next
+invocation rolls over to the other end of the hierarchy (i.e. it
+cycles).  This allows you to avoid having to set which character
+to use by always using the
+
+If REVERSE-DIRECTION is true, the effect is to change the
+direction of rotation in the hierarchy of decorations, thus
+instead going *up* the hierarchy.
+
+However, if there is a non-negative prefix argument, we do not
+rotate the decoration, but instead simply toggle the style of the
+current decoration (this should be the most common way to toggle
+the style of an existing complete decoration).
+
+
+Point Location
+==============
+
+The invocation of this function can be carried out anywhere
+within the section title line, on an existing underline or
+overline, as well as on an empty line following a section title.
+This is meant to be as convenient as possible.
+
+
+Indented Sections
+=================
+
+Indented section titles such as ::
+
+   My Title
+   --------
+
+are illegal in restructuredtext and thus not recognized by the
+parser.  This code will thus not work in a way that would support
+indented sections (it would be ambiguous anyway).
+
+
+Joint Sections
+==============
+
+Section titles that are right next to each other may not be
+treated well.  More work might be needed to support those, and
+special conditions on the completeness of existing decorations
+might be required to make it non-ambiguous.
+
+For now we assume that the decorations are disjoint, that is,
+there is at least a single line between the titles/decoration
+lines.
+
+
+Suggested Binding
+=================
+
+We suggest that you bind this function on C-=.  It is close to
+C-- so a negative argument can be easily specified with a flick
+of the right hand fingers and the binding is unused in text-mode."
+  (interactive)
+
+  ;; If we were invoked directly, parse the prefix arguments into the
+  ;; arguments of the function.
+  (if current-prefix-arg
+      (setq reverse-direction
+	    (and current-prefix-arg
+		 (< (prefix-numeric-value current-prefix-arg) 0))
+
+	    toggle-style
+	    (and current-prefix-arg (not reverse-direction))))
+
+  (let* (;; Check if we're on an underline around a section title, and move the
+         ;; cursor to the title if this is the case.
+         (moved (rst-normalize-cursor-position))
+
+         ;; Find the decoration and completeness around point.
+         (curdeco (rst-get-decoration))
+         (char (car curdeco))
+         (style (cadr curdeco))
+         (indent (caddr curdeco))
+
+	 ;; New values to be computed.
+	 char-new style-new indent-new
+         )
+
+    ;; We've moved the cursor... if we're not looking at some text, we have
+    ;; nothing to do.
+    (if (save-excursion (beginning-of-line)
+                        (looking-at rst-section-text-regexp))
+	(progn
+	  (cond
+	   ;;---------------------------------------------------------------------
+	   ;; Case 1: No Decoration
+	   ((and (eq char nil) (eq style nil))
+
+	    (let* ((alldecos (rst-find-all-decorations))
+
+		   (around (rst-get-decorations-around alldecos))
+		   (prev (car around))
+		   cur
+
+		   (hier (rst-get-hierarchy alldecos))
+		   )
+
+	      ;; Advance one level down.
+	      (setq cur
+		    (if prev
+			(if (not reverse-direction)
+			    (or (cadr (rst-get-decoration-match hier prev))
+				(rst-suggest-new-decoration hier prev))
+			  prev)
+		      (copy-list (car rst-preferred-decorations))
+		      ))
+
+	      ;; Invert the style if requested.
+	      (if toggle-style
+		  (setcar (cdr cur) (if (eq (cadr cur) 'simple)
+					'over-and-under 'simple)) )
+
+	      (setq char-new (car cur)
+		    style-new (cadr cur)
+		    indent-new (caddr cur))
+	      ))
+
+	   ;;---------------------------------------------------------------------
+	   ;; Case 2: Incomplete Decoration
+	   ((not (rst-decoration-complete-p curdeco))
+
+	    ;; Invert the style if requested.
+	    (if toggle-style
+		(setq style (if (eq style 'simple) 'over-and-under 'simple)))
+
+            (setq char-new char
+		  style-new style
+		  indent-new indent))
+
+	   ;;---------------------------------------------------------------------
+	   ;; Case 3: Complete Existing Decoration
+	   (t
+	    (if toggle-style
+
+		;; Simply switch the style of the current decoration.
+		(setq char-new char
+		      style-new (if (eq style 'simple) 'over-and-under 'simple)
+		      indent-new rst-default-indent)
+
+	      ;; Else, we rotate, ignoring the decoration around the current
+	      ;; line...
+	      (let* ((alldecos (rst-find-all-decorations))
+
+		     (hier (rst-get-hierarchy alldecos (line-number-at-pos)))
+
+		     ;; Suggestion, in case we need to come up with something
+		     ;; new
+		     (suggestion (rst-suggest-new-decoration
+				  hier
+				  (car (rst-get-decorations-around alldecos))))
+
+		     (nextdeco (rst-get-next-decoration
+				curdeco hier suggestion reverse-direction))
+
+		     )
+
+		;; Indent, if present, always overrides the prescribed indent.
+		(setq char-new (car nextdeco)
+		      style-new (cadr nextdeco)
+		      indent-new (caddr nextdeco))
+
+		)))
+	   )
+
+	  ;; Override indent with present indent!
+	  (setq indent-new (if (> indent 0) indent indent-new))
+
+	  (if (and char-new style-new)
+	      (rst-update-section char-new style-new indent-new))
+	  ))
+
+
+    ;; Correct the position of the cursor to more accurately reflect where it
+    ;; was located when the function was invoked.
+    (if (not (= moved 0))
+        (progn (forward-line (- moved))
+               (end-of-line)))
+
+    ))
+
+;; Maintain an alias for compatibility.
+(defalias 'rst-adjust-section-title 'rst-adjust)
+
+
+(defun rst-promote-region (&optional demote)
+  "Promote the section titles within the region.
+
+With argument DEMOTE or a prefix argument, demote the
+section titles instead.  The algorithm used at the boundaries of
+the hierarchy is similar to that used by rst-adjust-decoration."
+  (interactive)
+
+  (let* ((demote (or current-prefix-arg demote))
+	 (alldecos (rst-find-all-decorations))
+	 (cur alldecos)
+
+	 (hier (rst-get-hierarchy alldecos))
+	 (suggestion (rst-suggest-new-decoration hier))
+
+	 (region-begin-line (line-number-at-pos (region-beginning)))
+	 (region-end-line (line-number-at-pos (region-end)))
+
+	 marker-list
+	 )
+
+    ;; Skip the markers that come before the region beginning
+    (while (and cur (< (caar cur) region-begin-line))
+      (setq cur (cdr cur)))
+
+    ;; Create a list of markers for all the decorations which are found within
+    ;; the region.
+    (save-excursion
+      (let (m line)
+	(while (and cur (< (setq line (caar cur)) region-end-line))
+	  (setq m (make-marker))
+	  (goto-line line)
+	  (push (list (set-marker m (point)) (cdar cur)) marker-list)
+	  (setq cur (cdr cur)) ))
+
+      ;; Apply modifications.
+      (let (nextdeco)
+	(dolist (p marker-list)
+	  ;; Go to the decoration to promote.
+	  (goto-char (car p))
+
+	  ;; Rotate the next decoration.
+	  (setq nextdeco (rst-get-next-decoration
+			  (cadr p) hier suggestion demote))
+
+	  ;; Update the decoration.
+	  (apply 'rst-update-section nextdeco)
+
+	  ;; Clear marker to avoid slowing down the editing after we're done.
+	  (set-marker (car p) nil)
+	  ))
+      (setq deactivate-mark nil)
+    )))
+
+
+
+(defun rst-display-decorations-hierarchy (&optional decorations)
+  "Display the current file's section title decorations hierarchy.
+  This function expects a list of (char, style, indent) triples."
+  (interactive)
+
+  (if (not decorations)
+      (setq decorations (rst-get-hierarchy)))
+  (with-output-to-temp-buffer "*rest section hierarchy*"
+    (let ((level 1))
+      (with-current-buffer standard-output
+        (dolist (x decorations)
+          (insert (format "\nSection Level %d" level))
+          (apply 'rst-update-section x)
+          (end-of-buffer)
+          (insert "\n")
+          (incf level)
+          ))
+    )))
+
+
+(defun rst-rstrip (str)
+  "Strips the whitespace at the end of a string."
+  (let ((tmp))
+    (string-match "[ \t\n]*\\'" str)
+    (substring str 0 (match-beginning 0))
+    ))
+
+(defun rst-get-stripped-line ()
+  "Returns the line at cursor, stripped from whitespace."
+  (re-search-forward "\\S-.*\\S-" (line-end-position))
+  (buffer-substring-no-properties (match-beginning 0)
+				  (match-end 0)) )
+
+(defun rst-section-tree (alldecos)
+  "Returns a pair of a hierarchical tree of the sections titles
+in the document, and a reference to the node where the cursor
+lives. This can be used to generate a table of contents for the
+document.
+
+Each section title consists in a cons of the stripped title
+string and a marker to the section in the original text document.
+
+If there are missing section levels, the section titles are
+inserted automatically, and are set to nil."
+
+  (let* (thelist
+	 (hier (rst-get-hierarchy alldecos))
+	 (levels (make-hash-table :test 'equal :size 10))
+	 lines)
+
+    (let ((lev 0))
+      (dolist (deco hier)
+	(puthash deco lev levels)
+	(incf lev)))
+
+    ;; Create a list of lines that contains (text, level, marker) for each
+    ;; decoration.
+    (save-excursion
+      (setq lines
+	    (mapcar (lambda (deco)
+		      (goto-line (car deco))
+		      (list (gethash (cdr deco) levels)
+			    (rst-get-stripped-line)
+			    (let ((m (make-marker)))
+			      (beginning-of-line 1)
+			      (set-marker m (point)))
+			    ))
+		    alldecos)))
+
+    (let ((lcontnr (cons nil lines)))
+      (rst-section-tree-rec lcontnr -1))))
+
+
+(defun rst-section-tree-rec (decos lev)
+  "Recursive function for the implementation of the section tree
+  building. DECOS is a cons cell whose cdr is the remaining list
+  of decorations, and we change it as we consume them.  LEV is
+  the current level of that node.  This function returns a pair
+  of the subtree that was built.  This treats the decos list
+  destructively."
+
+  (let ((ndeco (cadr decos))
+	node
+	children)
+    ;; If the next decoration matches our level
+    (if (= (car ndeco) lev)
+	(progn
+	  ;; Pop the next decoration and create the current node with it
+	  (setcdr decos (cddr decos))
+	  (setq node (cdr ndeco)) ))
+      ;; Else we let the node title/marker be unset.
+
+    ;; Build the child nodes
+    (while (and (cdr decos) (> (caadr decos) lev))
+      (setq children
+	    (cons (rst-section-tree-rec decos (1+ lev))
+		  children)))
+
+    ;; Return this node with its children.
+    (cons node (reverse children))
+    ))
+
+
+(defun rst-toc-insert (&optional pfxarg)
+  "Insert a simple text rendering of the table of contents.
+By default the top level is ignored if there is only one, because
+we assume that the document will have a single title.
+
+If a numeric prefix argument is given,
+- if it is zero or generic, include the top level titles;
+- otherwise insert the TOC up to the specified level.
+
+The TOC is inserted indented at the current column."
+
+  (interactive "P")
+
+  (let* (;; Check maximum level override
+	 (rst-toc-insert-max-level
+	  (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
+	      (prefix-numeric-value pfxarg) rst-toc-insert-max-level))
+
+	 ;; Get the section tree.
+	 (sectree (rst-section-tree (rst-find-all-decorations)))
+
+	 ;; If there is only one top-level title, remove it by starting to print
+	 ;; one index lower (revert this behaviour with the prefix arg),
+	 ;; otherwise print all.
+	 (gen-pfx-arg (or (and pfxarg (listp pfxarg))
+			  (and (integerp pfxarg)
+			       (= (prefix-numeric-value pfxarg) 0))))
+	 (start-lev (if (and (not rst-toc-insert-always-include-top)
+			     (= (length (cdr sectree)) 1)
+			     (not gen-pfx-arg))  -1 0))
+
+	 ;; Figure out initial indent.
+	 (initial-indent (make-string (current-column) ? ))
+	 (init-point (point)))
+
+    (rst-toc-insert-node sectree start-lev initial-indent "")
+
+    ;; Fixup for the first line.
+    (delete-region init-point (+ init-point (length initial-indent)))
+    
+    ;; Delete the last newline added.
+    (delete-backward-char 1)
+    ))
+
+
+(defgroup rst-toc nil
+  "Settings for reStructuredText table of contents."
+  :group 'rst
+  :version "21.1")
+
+(defcustom rst-toc-indent 2
+  "Indentation for table-of-contents display (also used for
+  formatting insertion, when numbering is disabled)."
+  :group 'rst-toc)
+
+(defcustom rst-toc-insert-always-include-top nil
+  "Set this to 't if you want to always include top-level titles,
+  even when there is only one."
+  :group 'rst-toc)
+
+(defcustom rst-toc-insert-style 'fixed
+  "Set this to one of the following values to determine numbering and
+indentation style:
+- plain: no numbering (fixed indentation)
+- fixed: numbering, but fixed indentation
+- aligned: numbering, titles aligned under each other
+- listed: numbering, with dashes like list items (EXPERIMENTAL)
+"
+  :group 'rst-toc)
+
+(defcustom rst-toc-insert-number-separator "  "
+  "Separator that goes between the TOC number and the title."
+  :group 'rst-toc)
+
+;; This is used to avoid having to change the user's mode.
+(defvar rst-toc-insert-click-keymap
+  (let ((map (make-sparse-keymap)))
+       (define-key map [mouse-1] 'rst-toc-mode-mouse-goto)
+       map)
+  "(Internal) What happens when you click on propertized text in the TOC.")
+
+(defcustom rst-toc-insert-max-level nil
+  "If non-nil, maximum depth of the inserted TOC."
+  :group 'rst-toc)
+
+(defun rst-toc-insert-node (node level indent pfx)
+  "Recursive function that does the print of the inserted
+toc. PFX is the prefix numbering, that includes the alignment
+necessary for all the children of this level to align."
+  (let ((do-print (> level 0))
+	(count 1)
+	b)
+    (if do-print
+	(progn
+	  (insert indent)
+	  (let ((b (point)))
+	    (if (not (equal rst-toc-insert-style 'plain))
+		(insert pfx rst-toc-insert-number-separator))
+	    (insert (or (caar node) "[missing node]"))
+	    ;; Add properties to the text, even though in normal text mode it
+	    ;; won't be doing anything for now.  Not sure that I want to change
+	    ;; mode stuff.  At least the highlighting gives the idea that this
+	    ;; is generated automatically.
+	    (put-text-property b (point) 'mouse-face 'highlight)
+	    (put-text-property b (point) 'rst-toc-target (cadar node))
+	    (put-text-property b (point) 'keymap rst-toc-insert-click-keymap)
+
+	    )
+	  (insert "\n")
+
+	  ;; Prepare indent for children.
+	  (setq indent
+		(cond
+		 ((eq rst-toc-insert-style 'plain)
+		  (concat indent rst-toc-indent))
+
+		 ((eq rst-toc-insert-style 'fixed)
+		  (concat indent (make-string rst-toc-indent ? )))
+
+		 ((eq rst-toc-insert-style 'aligned)
+		  (concat indent (make-string (+ (length pfx) 2) ? )))
+
+		 ((eq rst-toc-insert-style 'listed)
+		  (concat (substring indent 0 -3)
+			  (concat (make-string (+ (length pfx) 2) ? ) " - ")))
+		 ))
+
+	  ))
+
+    (if (or (eq rst-toc-insert-max-level nil)
+	    (< level rst-toc-insert-max-level))
+	(let ((do-child-numbering (>= level 0))
+	      fmt)
+	  (if do-child-numbering
+	      (progn
+		;; Add a separating dot if there is already a prefix
+		(if (> (length pfx) 0)
+		    (setq pfx (concat (rst-rstrip pfx) ".")))
+
+		;; Calculate the amount of space that the prefix will require for
+		;; the numbers.
+		(if (cdr node)
+		    (setq fmt (format "%%-%dd"
+				      (1+ (floor (log10 (length (cdr node))))))))
+		))
+
+	  (dolist (child (cdr node))
+	    (rst-toc-insert-node child
+				  (1+ level)
+				  indent
+				  (if do-child-numbering
+				      (concat pfx (format fmt count)) pfx))
+	    (incf count)))
+
+      )))
+
+
+(defun rst-toc-insert-find-delete-contents ()
+  "Finds and deletes an existing comment after the first contents directive and
+delete that region. Return t if found and the cursor is left after the comment."
+  (goto-char (point-min))
+  ;; We look for the following and the following only (in other words, if your
+  ;; syntax differs, this won't work.  If you would like a more flexible thing,
+  ;; contact the author, I just can't imagine that this requirement is
+  ;; unreasonable for now).
+  ;;
+  ;;   .. contents:: [...anything here...]
+  ;;   ..
+  ;;      XXXXXXXX
+  ;;      XXXXXXXX
+  ;;      [more lines]
+  ;;
+  (let ((beg
+	 (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
+			    nil t))
+	last-real)
+    (when beg
+      ;; Look for the first line that starts at the first column.
+      (forward-line 1)
+      (beginning-of-line)
+      (while (or (and (looking-at "[ \t]+[^ \t]")
+		      (setq last-real (point)) t)
+		 (looking-at "\\s-*$"))
+	(forward-line 1)
+	)
+      (if last-real
+	  (progn
+	    (goto-char last-real)
+	    (end-of-line)
+	    (delete-region beg (point)))
+	(goto-char beg))
+      t
+      )))
+  
+(defun rst-toc-insert-update ()
+  "Automatically find the .. contents:: section of a document and update the
+inserted TOC if present.  You can use this in your file-write hook to always
+make it up-to-date automatically."
+  (interactive)
+  (save-excursion
+    (if (rst-toc-insert-find-delete-contents)
+	(progn (insert "\n    ")
+	       (rst-toc-insert))) )
+  ;; Note: always return nil, because this may be used as a hook.
+  )
+
+
+;;------------------------------------------------------------------------------
+
+(defun rst-toc-node (node level)
+  "Recursive function that does the print of the TOC in rst-toc-mode."
+
+  (if (> level 0)
+      (let ((b (point)))
+	;; Insert line text.
+	(insert (make-string (* rst-toc-indent (1- level)) ? ))
+	(insert (if (car node) (caar node) "[missing node]"))
+
+	;; Highlight lines.
+	(put-text-property b (point) 'mouse-face 'highlight)
+
+	;; Add link on lines.
+	(put-text-property b (point) 'rst-toc-target (cadar node))
+
+	(insert "\n")))
+
+  (dolist (child (cdr node))
+    (rst-toc-node child (1+ level))))
+
+
+(defun rst-toc ()
+  "Finds all the section titles and their decorations in the
+  file, and displays a hierarchically-organized list of the
+  titles, which is essentially a table-of-contents of the
+  document.
+
+  The emacs buffer can be navigated, and selecting a section
+  brings the cursor in that section."
+  (interactive)
+  (let* ((curbuf (current-buffer))
+	 outline
+
+	 ;; Get the section tree
+	 (alldecos (rst-find-all-decorations))
+	 (sectree (rst-section-tree alldecos))
+
+	 ;; Create a temporary buffer.
+	 (buf (get-buffer-create rst-toc-buffer-name))
+	 )
+
+    ;; Find the index of the section where the cursor currently is.
+    (setq outline (let ((idx 1)
+			(curline (line-number-at-pos (point)))
+			(decos alldecos))
+		    (while (and decos (<= (caar decos) curline))
+		      (setq decos (cdr decos))
+		      (incf idx))
+		    idx))
+    ;; FIXME: if there is a missing node inserted, the calculation of the
+    ;; current line will be off. You need to fix this by moving the finding of
+    ;; the current line somewhere else.
+
+
+    (with-current-buffer buf
+      (let ((inhibit-read-only t))
+	(rst-toc-mode)
+	(delete-region (point-min) (point-max))
+	(insert (format "Table of Contents: %s\n" (or (caar sectree) "")))
+	(put-text-property (point-min) (point)
+			   'face (list '(background-color . "lightgray")))
+	(rst-toc-node sectree 0)
+	))
+    (display-buffer buf)
+    (pop-to-buffer buf)
+
+    ;; Save the buffer to return to.
+    (set (make-local-variable 'rst-toc-return-buffer) curbuf)
+
+    ;; Move the cursor near the right section in the TOC.
+    (goto-line outline)
+    ))
+
+
+(defun rst-toc-mode-find-section ()
+  (let ((pos (get-text-property (point) 'rst-toc-target)))
+    (unless pos
+      (error "No section on this line"))
+    (unless (buffer-live-p (marker-buffer pos))
+      (error "Buffer for this section was killed"))
+    pos))
+
+(defvar rst-toc-buffer-name "*Table of Contents*"
+  "Name of the Table of Contents buffer.")
+
+(defun rst-toc-mode-goto-section ()
+  "Go to the section the current line describes."
+  (interactive)
+  (let ((pos (rst-toc-mode-find-section)))
+    (kill-buffer (get-buffer rst-toc-buffer-name))
+    (pop-to-buffer (marker-buffer pos))
+    (goto-char pos)
+    (recenter 5)))
+
+(defun rst-toc-mode-mouse-goto (event)
+  "In Rst-Toc mode, go to the occurrence whose line you click on."
+  (interactive "e")
+  (let (pos)
+    (save-excursion
+      (set-buffer (window-buffer (posn-window (event-end event))))
+      (save-excursion
+	(goto-char (posn-point (event-end event)))
+	(setq pos (rst-toc-mode-find-section))))
+    (pop-to-buffer (marker-buffer pos))
+    (goto-char pos)))
+
+(defun rst-toc-mode-mouse-goto-kill (event)
+  (interactive "e")
+  (call-interactively 'rst-toc-mode-mouse-goto event)
+  (kill-buffer (get-buffer rst-toc-buffer-name)))
+
+(defvar rst-toc-return-buffer nil
+  "Buffer local variable that is used to return to the original
+  buffer from the TOC.")
+
+(defun rst-toc-quit-window ()
+  (interactive)
+  (quit-window)
+  (pop-to-buffer rst-toc-return-buffer))
+
+(defvar rst-toc-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [mouse-1] 'rst-toc-mode-mouse-goto-kill)
+    (define-key map [mouse-2] 'rst-toc-mode-mouse-goto)
+    (define-key map "\C-m" 'rst-toc-mode-goto-section)
+    (define-key map "f" 'rst-toc-mode-goto-section)
+    (define-key map "q" 'rst-toc-quit-window)
+    (define-key map "z" 'kill-this-buffer)
+    map)
+  "Keymap for `rst-toc-mode'.")
+
+(put 'rst-toc-mode 'mode-class 'special)
+
+(defun rst-toc-mode ()
+  "Major mode for output from \\[rst-toc]."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map rst-toc-mode-map)
+  (setq major-mode 'rst-toc-mode)
+  (setq mode-name "Rst-TOC")
+  (setq buffer-read-only t)
+  )
+
+;; Note: use occur-mode (replace.el) as a good example to complete missing
+;; features.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Section movement commands.
+;;
+
+(defun rst-forward-section (&optional offset)
+  "Skip to the next restructured text section title.
+  OFFSET specifies how many titles to skip.  Use a negative OFFSET to move
+  backwards in the file (default is to use 1)."
+  (interactive)
+  (let* (;; Default value for offset.
+	 (offset (or offset 1))
+
+	 ;; Get all the decorations in the file, with their line numbers.
+	 (alldecos (rst-find-all-decorations))
+
+	 ;; Get the current line.
+	 (curline (line-number-at-pos))
+
+	 (cur alldecos)
+	 (idx 0)
+	 line
+	 )
+
+    ;; Find the index of the "next" decoration w.r.t. to the current line.
+    (while (and cur (< (caar cur) curline))
+      (setq cur (cdr cur))
+      (incf idx))
+    ;; 'cur' is the decoration on or following the current line.
+
+    (if (and (> offset 0) cur (= (caar cur) curline))
+  	(incf idx))
+
+    ;; Find the final index.
+    (setq idx (+ idx (if (> offset 0) (- offset 1) offset)))
+    (setq cur (nth idx alldecos))
+
+    ;; If the index is positive, goto the line, otherwise go to the buffer
+    ;; boundaries.
+    (if (and cur (>= idx 0))
+	(goto-line (car cur))
+      (if (> offset 0) (end-of-buffer) (beginning-of-buffer)))
+    ))
+
+(defun rst-backward-section ()
+  "Like rst-forward-section, except move back one title."
+  (interactive)
+  (rst-forward-section -1))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Functions to indent/dedent item lists, which are always two-characters apart
+;; horizontally with rest.
+
+(defun rst-shift-region-right ()
+  "Indent region ridigly, by two characters to the right."
+  (interactive)
+  (indent-rigidly (region-beginning) (region-end) 2))
+  
+(defun rst-find-leftmost-column (beg end)
+  "Finds the leftmost column in the region."
+  (let ((mincol 1000))
+    (save-excursion
+      (goto-char beg)
+      (while (< (point) end)
+	(back-to-indentation)
+	(if (not (looking-at "[ \t]*$"))
+	    (setq mincol (min mincol (current-column))))
+	(forward-line 1)
+	))
+    mincol))
+
+(defun rst-shift-region-left (pfxarg)
+  "Indent region ridigly, by two characters to the left.
+If invoked with a prefix arg, the entire indentation is removed,
+up to the leftmost character in the region."
+  (interactive "P")
+  (let ((chars
+	 (if pfxarg
+	     (- (rst-find-leftmost-column (region-beginning) (region-end)))
+	   -2)))
+    (indent-rigidly (region-beginning) (region-end) chars)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; rst-mode
+;; ========
+;;
+;;; Customization:
+
+(defcustom rst-mode-hook nil
+  "Hook run when Rst Mode is turned on. The hook for Text Mode is run before
+  this one."
+  :group 'rst
+  :type '(hook))
+
+(defcustom rst-mode-lazy t
+  "*If non-nil Rst Mode font-locks comment, literal blocks, and section titles
+correctly. Because this is really slow it switches on Lazy Lock Mode
+automatically. You may increase Lazy Lock Defer Time for reasonable results.
+
+If nil comments and literal blocks are font-locked only on the line they start.
+
+The value of this variable is used when Rst Mode is turned on."
+  :group 'rst
+  :type '(boolean))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defgroup rst-faces nil "Faces used in Rst Mode"
+  :group 'rst
+  :group 'faces
+  :version "21.1")
+
+(defcustom rst-block-face 'font-lock-keyword-face
+  "All syntax marking up a special block"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-external-face 'font-lock-type-face
+  "Field names and interpreted text"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-definition-face 'font-lock-function-name-face
+  "All other defining constructs"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-directive-face
+  ;; XEmacs compatibility
+  (if (boundp 'font-lock-builtin-face)
+      'font-lock-builtin-face
+    'font-lock-preprocessor-face)
+  "Directives and roles"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-comment-face 'font-lock-comment-face
+  "Comments"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-emphasis1-face
+  ;; XEmacs compatibility
+  (if (facep 'italic)
+      ''italic
+    'italic)
+  "Simple emphasis"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-emphasis2-face
+  ;; XEmacs compatibility
+  (if (facep 'bold)
+      ''bold
+    'bold)
+  "Double emphasis"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-literal-face 'font-lock-string-face
+  "Literal text"
+  :group 'rst-faces
+  :type '(face))
+
+(defcustom rst-reference-face 'font-lock-variable-name-face
+  "References to a definition"
+  :group 'rst-faces
+  :type '(face))
+
+;; Faces for displaying items on several levels; these definitions define
+;; different shades of grey where the lightest one is used for level 1
+(defconst rst-level-face-max 6
+  "Maximum depth of level faces defined")
+(defconst rst-level-face-base-color "grey"
+  "The base color to be used for creating level faces")
+(defconst rst-level-face-base-light 85
+  "The lightness factor for the base color")
+(defconst rst-level-face-format-light "%2d"
+  "The format for the lightness factor for the base color")
+(defconst rst-level-face-step-light -7
+  "The step width to use for next color")
+
+;; Define the faces
+(let ((i 1))
+  (while (<= i rst-level-face-max)
+    (let ((sym (intern (format "rst-level-%d-face" i)))
+	  (doc (format "Face for showing section title text at level %d" i))
+	  (col (format (concat "%s" rst-level-face-format-light)
+		       rst-level-face-base-color
+		       (+ (* (1- i) rst-level-face-step-light)
+			  rst-level-face-base-light))))
+      (make-empty-face sym)
+      (set-face-doc-string sym doc)
+      (set-face-background sym col)
+      (set sym sym)
+    (setq i (1+ i)))))
+
+(defcustom rst-adornment-faces-alist
+  '((1 . rst-level-1-face)
+    (2 . rst-level-2-face)
+    (3 . rst-level-3-face)
+    (4 . rst-level-4-face)
+    (5 . rst-level-5-face)
+    (6 . rst-level-6-face)
+    (t . font-lock-keyword-face)
+    (nil . font-lock-keyword-face))
+  "Provides faces for the various adornment types. Key is a number (for the
+section title text of that level), t (for transitions) or nil (for section
+title adornment)."
+  :group 'rst-faces
+  :type '(alist :key-type (choice (integer :tag "Section level")
+				  (boolean :tag "transitions (on) / section title adornment (off)"))
+		:value-type (face)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; FIXME: Code from `restructuredtext.el' should be integrated
+
+(defvar rst-mode-syntax-table nil
+  "Syntax table used while in rst mode.")
+
+(unless rst-mode-syntax-table
+  (setq rst-mode-syntax-table (make-syntax-table text-mode-syntax-table))
+  (modify-syntax-entry ?$ "." rst-mode-syntax-table)
+  (modify-syntax-entry ?% "." rst-mode-syntax-table)
+  (modify-syntax-entry ?& "." rst-mode-syntax-table)
+  (modify-syntax-entry ?' "." rst-mode-syntax-table)
+  (modify-syntax-entry ?* "." rst-mode-syntax-table)
+  (modify-syntax-entry ?+ "." rst-mode-syntax-table)
+  (modify-syntax-entry ?. "_" rst-mode-syntax-table)
+  (modify-syntax-entry ?/ "." rst-mode-syntax-table)
+  (modify-syntax-entry ?< "." rst-mode-syntax-table)
+  (modify-syntax-entry ?= "." rst-mode-syntax-table)
+  (modify-syntax-entry ?> "." rst-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" rst-mode-syntax-table)
+  (modify-syntax-entry ?| "." rst-mode-syntax-table)
+  (modify-syntax-entry ?_ "." rst-mode-syntax-table)
+  )
+
+(defvar rst-mode-abbrev-table nil
+ "Abbrev table used while in rst mode.")
+(define-abbrev-table 'rst-mode-abbrev-table ())
+
+;; FIXME: Movement keys to skip forward / backward over or mark an indented
+;; block could be defined; keys to markup section titles based on
+;; `rst-adornment-level-alist' would be useful
+(defvar rst-mode-map nil
+  "Keymap for rst mode. This inherits from Text mode.")
+
+(unless rst-mode-map
+  (setq rst-mode-map (copy-keymap text-mode-map)))
+
+(defun rst-mode ()
+  "Major mode for editing reStructuredText documents.
+
+You may customize `rst-mode-lazy' to switch font-locking of blocks.
+
+\\{rst-mode-map}
+Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
+`rst-mode-hook'."
+  (interactive)
+  (kill-all-local-variables)
+
+  ;; Maps and tables
+  (use-local-map rst-mode-map)
+  (setq local-abbrev-table rst-mode-abbrev-table)
+  (set-syntax-table rst-mode-syntax-table)
+
+  ;; For editing text
+  ;;
+  ;; FIXME: It would be better if this matches more exactly the start of a reST
+  ;; paragraph; however, this not always possible with a simple regex because
+  ;; paragraphs are determined by indentation of the following line
+  (set (make-local-variable 'paragraph-start)
+       (concat page-delimiter "\\|[ \t]*$"))
+  (if (eq ?^ (aref paragraph-start 0))
+      (setq paragraph-start (substring paragraph-start 1)))
+  (set (make-local-variable 'paragraph-separate) paragraph-start)
+  (set (make-local-variable 'indent-line-function) 'indent-relative-maybe)
+  (set (make-local-variable 'adaptive-fill-mode) t)
+  (set (make-local-variable 'comment-start) ".. ")
+
+  ;; Special variables
+  (make-local-variable 'rst-adornment-level-alist)
+
+  ;; Font lock
+  (set (make-local-variable 'font-lock-defaults)
+       '(rst-font-lock-keywords-function
+	 t nil nil nil
+	 (font-lock-multiline . t)
+	 (font-lock-mark-block-function . mark-paragraph)))
+  (when (boundp 'font-lock-support-mode)
+    ;; rst-mode has its own mind about font-lock-support-mode
+    (make-local-variable 'font-lock-support-mode)
+    (cond
+     ((and (not rst-mode-lazy) (not font-lock-support-mode)))
+     ;; No support mode set and none required - leave it alone
+     ((or (not font-lock-support-mode) ;; No support mode set (but required)
+	  (symbolp font-lock-support-mode)) ;; or a fixed mode for all
+      (setq font-lock-support-mode
+	    (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
+		  (cons t font-lock-support-mode))))
+     ((and (listp font-lock-support-mode)
+	   (not (assoc 'rst-mode font-lock-support-mode)))
+      ;; A list of modes missing rst-mode
+      (setq font-lock-support-mode
+	    (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
+		    font-lock-support-mode)))))
+
+  ;; Names and hooks
+  (setq mode-name "reST")
+  (setq major-mode 'rst-mode)
+  (run-hooks 'text-mode-hook)
+  (run-hooks 'rst-mode-hook))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Font lock
+
+(defun rst-font-lock-keywords-function ()
+  "Returns keywords to highlight in rst mode according to current settings."
+  ;; The reST links in the comments below all relate to sections in
+  ;; http://docutils.sourceforge.net/rst.html
+  (let* ( ;; This gets big - so let's define some abbreviations
+	 ;; horizontal white space
+	 (re-hws "[\t ]")
+	 ;; beginning of line with possible indentation
+	 (re-bol (concat "^" re-hws "*"))
+	 ;; Separates block lead-ins from their content
+	 (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
+	 ;; explicit markup tag
+	 (re-emt "\\.\\.")
+	 ;; explicit markup start
+	 (re-ems (concat re-emt re-hws "+"))
+	 ;; inline markup prefix
+	 (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
+	 ;; symbol character
+	 (re-sym1 "\\(\\sw\\|\\s_\\)")
+	 ;; inline markup content begin
+	 (re-imbeg2 "\\(\\S \\|\\S \\([^")
+
+	 ;; There seems to be a bug leading to error "Stack overflow in regexp
+	 ;; matcher" when "|" or "\\*" are the characters searched for
+	 (re-imendbeg
+	  (if (< emacs-major-version 21)
+	      "]"
+	    "\\]\\|\\\\."))
+	 ;; inline markup content end
+	 (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
+	 ;; inline markup content without asterisk
+	 (re-ima2 (concat re-imbeg2 "*" re-imend))
+	 ;; inline markup content without backquote
+	 (re-imb2 (concat re-imbeg2 "`" re-imend))
+	 ;; inline markup content without vertical bar
+	 (re-imv2 (concat re-imbeg2 "|" re-imend))
+	 ;; Supported URI schemes
+	 (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
+	 ;; Line starting with adornment and optional whitespace; complete
+	 ;; adornment is in (match-string 1); there must be at least 3
+	 ;; characters because otherwise explicit markup start would be
+	 ;; recognized
+	 (re-ado2 (concat "^\\(\\(["
+			  (if (or
+			       (< emacs-major-version 21)
+			       (save-match-data
+				 (string-match "XEmacs\\|Lucid" emacs-version)))
+			      "^a-zA-Z0-9 \t\x00-\x1F"
+			    "^[:word:][:space:][:cntrl:]")
+			  "]\\)\\2\\2+\\)" re-hws "*$"))
+	 )
+    (list
+     ;; FIXME: Block markup is not recognized in blocks after explicit markup
+     ;; start
+
+     ;; Simple `Body Elements`_
+     ;; `Bullet Lists`_
+     (list
+      (concat re-bol "\\([-*+]" re-blksep1 "\\)")
+      1 rst-block-face)
+     ;; `Enumerated Lists`_
+     (list
+      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" re-blksep1 "\\)")
+      1 rst-block-face)
+     ;; `Definition Lists`_ FIXME: missing
+     ;; `Field Lists`_
+     (list
+      (concat re-bol "\\(:[^:]+:\\)" re-blksep1)
+      1 rst-external-face)
+     ;; `Option Lists`_
+     (list
+      (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
+      1 rst-block-face)
+
+     ;; `Tables`_ FIXME: missing
+
+     ;; All the `Explicit Markup Blocks`_
+     ;; `Footnotes`_ / `Citations`_
+     (list
+      (concat re-bol "\\(" re-ems "\\[[^[]+\\]\\)" re-blksep1)
+      1 rst-definition-face)
+     ;; `Directives`_ / `Substitution Definitions`_
+     (list
+      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\(" re-sym1 "+::\\)" re-blksep1)
+      (list 1 rst-directive-face)
+      (list 2 rst-definition-face)
+      (list 4 rst-directive-face))
+     ;; `Hyperlink Targets`_
+     (list
+      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)" re-blksep1)
+      1 rst-definition-face)
+     (list
+      (concat re-bol "\\(__\\)" re-blksep1)
+      1 rst-definition-face)
+
+     ;; All `Inline Markup`_
+     ;; FIXME: Condition 5 preventing fontification of e.g. "*" not implemented
+     ;; `Strong Emphasis`_
+     (list
+      (concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1)
+      2 rst-emphasis2-face)
+     ;; `Emphasis`_
+     (list
+      (concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1)
+      2 rst-emphasis1-face)
+     ;; `Inline Literals`_
+     (list
+      (concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1)
+      2 rst-literal-face)
+     ;; `Inline Internal Targets`_
+     (list
+      (concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1)
+      2 rst-definition-face)
+     ;; `Hyperlink References`_
+     ;; FIXME: `Embedded URIs`_ not considered
+     (list
+      (concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\sw+\\)__?\\)" re-ims1)
+      2 rst-reference-face)
+     ;; `Interpreted Text`_
+     (list
+      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" re-sym1 "+:\\)?\\)" re-ims1)
+      (list 2 rst-directive-face)
+      (list 5 rst-external-face)
+      (list 8 rst-directive-face))
+     ;; `Footnote References`_ / `Citation References`_
+     (list
+      (concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1)
+      2 rst-reference-face)
+     ;; `Substitution References`_
+     (list
+      (concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1)
+      2 rst-reference-face)
+     ;; `Standalone Hyperlinks`_
+     (list
+      ;; FIXME: This takes it easy by using a whitespace as delimiter
+      (concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1)
+      2 rst-definition-face)
+     (list
+      (concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1)
+      2 rst-definition-face)
+
+     ;; Do all block fontification as late as possible so 'append works
+
+     ;; Sections_ / Transitions_
+     (append
+      (list
+       re-ado2)
+      (if (not rst-mode-lazy)
+	  (list 1 rst-block-face)
+	(list
+	 (list 'rst-font-lock-handle-adornment
+	       '(progn
+		  (setq rst-font-lock-adornment-point (match-end 1))
+		  (point-max))
+	       nil
+	       (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
+		     'append t)
+	       (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
+		     'append t)
+	       (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
+		     'append t)))))
+
+     ;; `Comments`_
+     (append
+      (list
+       (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:]\\|:\\([^:]\\|$\\)\\)*$")
+       (list 1 rst-comment-face))
+      (if rst-mode-lazy
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point (match-end 1))
+		    (point-max))
+		 nil
+		 (list 0 rst-comment-face 'append)))))
+     (append
+      (list
+       (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
+       (list 1 rst-comment-face)
+       (list 2 rst-comment-face))
+      (if rst-mode-lazy
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point 'next)
+		    (point-max))
+		 nil
+		 (list 0 rst-comment-face 'append)))))
+
+     ;; `Literal Blocks`_
+     (append
+      (list
+       (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$")
+       (list 3 rst-block-face))
+      (if rst-mode-lazy
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point t)
+		    (point-max))
+		 nil
+		 (list 0 rst-literal-face 'append)))))
+     )))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Indented blocks
+
+(defun rst-forward-indented-block (&optional column limit)
+  "Move forward across one indented block.
+Find the next non-empty line which is not indented at least to COLUMN (defaults
+to the column of the point). Moves point to first character of this line or the
+first empty line immediately before it and returns that position. If there is
+no such line before LIMIT (defaults to the end of the buffer) returns nil and
+point is not moved."
+  (interactive)
+  (let ((clm (or column (current-column)))
+	(start (point))
+	fnd beg cand)
+    (if (not limit)
+	(setq limit (point-max)))
+    (save-match-data
+      (while (and (not fnd) (< (point) limit))
+	(forward-line 1)
+	(when (< (point) limit)
+	  (setq beg (point))
+	  (if (looking-at "\\s *$")
+	      (setq cand (or cand beg)) ; An empty line is a candidate
+	    (move-to-column clm)
+	    ;; FIXME: No indentation [(zerop clm)] must be handled in some
+	    ;; useful way - though it is not clear what this should mean at all
+	    (if (string-match
+		 "^\\s *$" (buffer-substring-no-properties beg (point)))
+		(setq cand nil) ; An indented line resets a candidate
+	      (setq fnd (or cand beg)))))))
+    (goto-char (or fnd start))
+    fnd))
+
+;; Stores the point where the current indentation ends if a number. If `next'
+;; indicates `rst-font-lock-find-unindented-line' shall take the indentation
+;; from the next line if this is not empty. If non-nil indicates
+;; `rst-font-lock-find-unindented-line' shall take the indentation from the
+;; next non-empty line. Also used as a trigger for
+;; `rst-font-lock-find-unindented-line'.
+(defvar rst-font-lock-indentation-point nil)
+
+(defun rst-font-lock-find-unindented-line (limit)
+  (let* ((ind-pnt rst-font-lock-indentation-point)
+	 (beg-pnt ind-pnt))
+    ;; May run only once - enforce this
+    (setq rst-font-lock-indentation-point nil)
+    (when (and ind-pnt (not (numberp ind-pnt)))
+      ;; Find indentation point in next line if any
+      (setq ind-pnt
+	    (save-excursion
+	      (save-match-data
+		(if (eq ind-pnt 'next)
+		    (when (and (zerop (forward-line 1)) (< (point) limit))
+		      (setq beg-pnt (point))
+		      (when (not (looking-at "\\s *$"))
+			(looking-at "\\s *")
+			(match-end 0)))
+		  (while (and (zerop (forward-line 1)) (< (point) limit)
+			      (looking-at "\\s *$")))
+		  (when (< (point) limit)
+		    (setq beg-pnt (point))
+		    (looking-at "\\s *")
+		    (match-end 0)))))))
+    (when ind-pnt
+      (goto-char ind-pnt)
+      ;; Always succeeds because the limit set by PRE-MATCH-FORM is the
+      ;; ultimate point to find
+      (goto-char (or (rst-forward-indented-block nil limit) limit))
+      (set-match-data (list beg-pnt (point)))
+      t)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Adornments
+
+;; Stores the point where the current adornment ends. Also used as a trigger
+;; for `rst-font-lock-handle-adornment'.
+(defvar rst-font-lock-adornment-point nil)
+
+;; Here `rst-font-lock-handle-adornment' stores the section level of the
+;; current adornment or t for a transition.
+(defvar rst-font-lock-level nil)
+
+;; FIXME: It would be good if this could be used to markup section titles of
+;; given level with a special key; it would be even better to be able to
+;; customize this so it can be used for a generally available personal style
+;;
+;; FIXME: There should be some way to reset and reload this variable - probably
+;; a special key
+;;
+;; FIXME: Some support for `outline-mode' would be nice which should be based
+;; on this information
+(defvar rst-adornment-level-alist nil
+  "Associates adornments with section levels.
+The key is a two character string. The first character is the adornment
+character. The second character distinguishes underline section titles (`u')
+from overline/underline section titles (`o'). The value is the section level.
+
+This is made buffer local on start and adornments found during font lock are
+entered.")
+
+;; Returns section level for adornment key KEY. Adds new section level if KEY
+;; is not found and ADD. If KEY is not a string it is simply returned.
+(defun rst-adornment-level (key &optional add)
+  (let ((fnd (assoc key rst-adornment-level-alist))
+	(new 1))
+    (cond
+     ((not (stringp key))
+      key)
+     (fnd
+      (cdr fnd))
+     (add
+      (while (rassoc new rst-adornment-level-alist)
+	(setq new (1+ new)))
+      (setq rst-adornment-level-alist
+	    (append rst-adornment-level-alist (list (cons key new))))
+      new))))
+
+;; Classifies adornment for section titles and transitions. ADORNMENT is the
+;; complete adornment string as found in the buffer. END is the point after the
+;; last character of ADORNMENT. For overline section adornment LIMIT limits the
+;; search for the matching underline. Returns a list. The first entry is t for
+;; a transition, or a key string for `rst-adornment-level' for a section title.
+;; The following eight values forming four match groups as can be used for
+;; `set-match-data'. First match group contains the maximum points of the whole
+;; construct. Second and last match group matched pure section title adornment
+;; while third match group matched the section title text or the transition.
+;; Each group but the first may or may not exist.
+(defun rst-classify-adornment (adornment end limit)
+  (save-excursion
+    (save-match-data
+      (goto-char end)
+      (let ((ado-ch (aref adornment 0))
+	    (ado-re (regexp-quote adornment))
+	    (end-pnt (point))
+	    (beg-pnt (progn
+		       (forward-line 0)
+		       (point)))
+	    (nxt-emp
+	     (save-excursion
+	       (or (not (zerop (forward-line 1)))
+		   (looking-at "\\s *$"))))
+	    (prv-emp
+	     (save-excursion
+	       (or (not (zerop (forward-line -1)))
+		   (looking-at "\\s *$"))))
+	    key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
+	(cond
+	 ((and nxt-emp prv-emp)
+	  ;; A transition
+	  (setq key t)
+	  (setq beg-txt beg-pnt)
+	  (setq end-txt end-pnt))
+	 (prv-emp
+	  ;; An overline
+	  (setq key (concat (list ado-ch) "o"))
+	  (setq beg-ovr beg-pnt)
+	  (setq end-ovr end-pnt)
+	  (forward-line 1)
+	  (setq beg-txt (point))
+	  (while (and (< (point) limit) (not end-txt))
+	    (if (looking-at "\\s *$")
+		;; No underline found
+		(setq end-txt (1- (point)))
+	      (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
+		(setq end-und (match-end 1))
+		(setq beg-und (point))
+		(setq end-txt (1- beg-und))))
+	    (forward-line 1)))
+	 (t
+	  ;; An underline
+	  (setq key (concat (list ado-ch) "u"))
+	  (setq beg-und beg-pnt)
+	  (setq end-und end-pnt)
+	  (setq end-txt (1- beg-und))
+	  (setq beg-txt (progn
+			  (if (re-search-backward "^\\s *$" 1 'move)
+			      (forward-line 1))
+			  (point)))))
+	(list key
+	      (or beg-ovr beg-txt beg-und)
+	      (or end-und end-txt end-und)
+	      beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
+
+;; Handles adornments for font-locking section titles and transitions. Returns
+;; three match groups. First and last match group matched pure overline /
+;; underline adornment while second group matched section title text. Each
+;; group may not exist.
+(defun rst-font-lock-handle-adornment (limit)
+  (let ((ado-pnt rst-font-lock-adornment-point))
+    ;; May run only once - enforce this
+    (setq rst-font-lock-adornment-point nil)
+    (if ado-pnt
+      (let* ((ado (rst-classify-adornment (match-string-no-properties 1)
+					  ado-pnt limit))
+	     (key (car ado))
+	     (mtc (cdr ado)))
+	(setq rst-font-lock-level (rst-adornment-level key t))
+	(goto-char (nth 1 mtc))
+	(set-match-data mtc)
+	t))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Support for conversion from within Emacs
+
+(defgroup rst-html nil
+  "Settings for conversion to HTML available by \\[rst-html-compile]."
+  :group 'rst
+  :version "21.1")
+
+(defcustom rst-html-command "rst2html.py"
+  "Command to convert an reST file to HTML."
+  :group 'rst-html
+  :type '(string))
+
+(defcustom rst-html-options ""
+  "Local file options for reST to HTML conversion.
+Stylesheets are set by an own option."
+  :group 'rst-html
+  :type '(string))
+
+(defcustom rst-html-extension ".html"
+  "Extension for HTML output file."
+  :group 'rst-html
+  :type '(string))
+
+(defun rst-html-find-conf ()
+  "Look for the configuration file in the parents of the current path."
+  (interactive)
+  (let ((file-name "docutils.conf")
+	(buffer-file (buffer-file-name)))
+    ;; Move up in the dir hierarchy till we find a change log file.
+    (let ((dir (file-name-directory buffer-file)))
+      (while (and (or (not (string= "/" dir)) (setq dir nil) nil)
+		  (not (file-exists-p (concat dir file-name))))
+	;; Move up to the parent dir and try again.
+	(setq dir (expand-file-name (file-name-directory
+				     (directory-file-name
+				     (file-name-directory dir))))) )
+      (or (and dir (concat dir file-name)) nil)
+    )))
+
+(defun rst-html-compile ()
+  "Compile command to convert reST document into HTML.
+Attempts to find configuration file, if it can, overrides the options."
+  (interactive)
+  ;; Note: maybe we want to check if there is a Makefile too and not do anything
+  ;; if that is the case.  I dunno.
+  (let* ((conffile (rst-html-find-conf))
+	 (bufname (file-name-nondirectory buffer-file-name))
+	 (outname (file-name-sans-extension bufname)))
+
+    ;; Set compile-command before invocation of compile.
+    (set (make-local-variable 'compile-command)
+	 (mapconcat 'identity
+		    (list rst-html-command
+			  rst-html-options
+			  (if conffile
+			      (concat "--config=\"" conffile "\"")
+			    "")
+			  bufname
+			  (concat outname rst-html-extension))
+		    " "))
+
+    ;; Invoke the compile command.
+    (if (or compilation-read-command current-prefix-arg)
+	(call-interactively 'compile)
+      (compile compile-command))
+    ))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Generic text functions that are more convenient than the defaults.
+;;
+
+(defun replace-lines (fromchar tochar)
+  "Replace flush-left lines, consisting of multiple FROMCHAR characters,
+with equal-length lines of TOCHAR."
+  (interactive "\
+cSearch for flush-left lines of char:
+cand replace with char: ")
+  (save-excursion
+    (let* ((fromstr (string fromchar))
+           (searchre (concat "^" (regexp-quote fromstr) "+ *$"))
+           (found 0))
+      (condition-case err
+          (while t
+            (search-forward-regexp searchre)
+            (setq found (1+ found))
+            (search-backward fromstr)  ;; point will be *before* last char
+            (setq p (1+ (point)))
+            (beginning-of-line)
+            (setq l (- p (point)))
+            (rst-delete-line)
+            (insert-char tochar l))
+        (search-failed
+         (message (format "%d lines replaced." found)))))))
+
+(defun join-paragraph ()
+  "Join lines in current paragraph into one line, removing end-of-lines."
+  (interactive)
+  (let ((fill-column 65000)) ; some big number
+    (call-interactively 'fill-paragraph)))
+
+;; FIXME: can we remove this?
+(defun force-fill-paragraph ()
+  "Fill paragraph at point, first joining the paragraph's lines into one.
+This is useful for filling list item paragraphs."
+  (interactive)
+  (join-paragraph)
+  (fill-paragraph nil))
+
+
+;; Generic character repeater function.
+;; For sections, better to use the specialized function above, but this can
+;; be useful for creating separators.
+(defun repeat-last-character (&optional tofill)
+  "Fills the current line up to the length of the preceding line (if not
+empty), using the last character on the current line.  If the preceding line is
+empty, we use the fill-column.
+
+If a prefix argument is provided, use the next line rather than the preceding
+line.
+
+If the current line is longer than the desired length, shave the characters off
+the current line to fit the desired length.
+
+As an added convenience, if the command is repeated immediately, the alternative
+column is used (fill-column vs. end of previous/next line)."
+  (interactive)
+  (let* ((curcol (current-column))
+         (curline (+ (count-lines (point-min) (point))
+                     (if (eq curcol 0) 1 0)))
+         (lbp (line-beginning-position 0))
+         (prevcol (if (and (= curline 1) (not current-prefix-arg))
+                      fill-column
+                    (save-excursion
+                      (forward-line (if current-prefix-arg 1 -1))
+                      (end-of-line)
+                      (skip-chars-backward " \t" lbp)
+                      (let ((cc (current-column)))
+                        (if (= cc 0) fill-column cc)))))
+         (rightmost-column
+          (cond (tofill fill-column)
+                ((equal last-command 'repeat-last-character)
+                 (if (= curcol fill-column) prevcol fill-column))
+                (t (save-excursion
+                     (if (= prevcol 0) fill-column prevcol)))
+                )) )
+    (end-of-line)
+    (if (> (current-column) rightmost-column)
+        ;; shave characters off the end
+        (delete-region (- (point)
+                          (- (current-column) rightmost-column))
+                       (point))
+      ;; fill with last characters
+      (insert-char (preceding-char)
+                   (- rightmost-column (current-column))))
+    ))
+
+
+
+(provide 'rst)
+;;; rst.el ends here
+
diff --git a/tools/editors/emacs/tests/tests-adjust-section.el b/tools/editors/emacs/tests/tests-adjust-section.el
index 84a8d4ea3..a4d39f2bc 100644
--- a/tools/editors/emacs/tests/tests-adjust-section.el
+++ b/tools/editors/emacs/tests/tests-adjust-section.el
@@ -2,7 +2,7 @@
 ;; Date: $Date: 2005/04/01 23:19:41 $
 ;; Copyright: This module has been placed in the public domain.
 ;;
-;; Regression tests for rest-adjust-section-title.
+;; Regression tests for rst-adjust-section-title.
 ;; 
 ;; Run this with::
 ;;
@@ -12,7 +12,7 @@
 
 
 ;; Define tests.
-(setq rest-adjust-decoration-tests
+(setq rst-adjust-decoration-tests
   '(
 ;;------------------------------------------------------------------------------
 (nodec-first-simple-1
@@ -818,13 +818,13 @@ Document Title2
 (add-to-list 'load-path ".")
 (load "tests-runner.el")
 (add-to-list 'load-path "..")
-(load "restructuredtext.el")
+(load "rst.el")
 
 (progn
   (regression-test-compare-expect-buffer
    "Test interactive adjustment of sections."
-   rest-adjust-decoration-tests
+   rst-adjust-decoration-tests
    (lambda ()
-     (call-interactively 'rest-adjust))
+     (call-interactively 'rst-adjust))
    nil))
 
diff --git a/tools/editors/emacs/tests/tests-basic.el b/tools/editors/emacs/tests/tests-basic.el
index b5c5d7948..5f94304ce 100644
--- a/tools/editors/emacs/tests/tests-basic.el
+++ b/tools/editors/emacs/tests/tests-basic.el
@@ -2,7 +2,7 @@
 ;; Date: $Date: 2005/04/01 23:19:41 $
 ;; Copyright: This module has been placed in the public domain.
 ;;
-;; Regression tests for rest-adjust-section-title.
+;; Regression tests for rst-adjust-section-title.
 ;;
 ;; Run this with::
 ;;
@@ -15,12 +15,12 @@
 (add-to-list 'load-path ".")
 (load "tests-runner.el")
 (add-to-list 'load-path "..")
-(load "restructuredtext.el")
+(load "rst.el")
 
 ;; (setq debug-on-error t)
 
 
-(setq rest-line-homogeneous-p-tests
+(setq rst-line-homogeneous-p-tests
   '(
 ;;------------------------------------------------------------------------------
 (simple "Blablabla bla@" nil)
@@ -38,9 +38,9 @@
 (progn
   (regression-test-compare-expect-values
    "Tests for predicate for one char line."
-   rest-line-homogeneous-p-tests 'rest-line-homogeneous-p nil))
+   rst-line-homogeneous-p-tests 'rst-line-homogeneous-p nil))
 
-(setq rest-line-homogeneous-nodent-p-tests
+(setq rst-line-homogeneous-nodent-p-tests
   '(
 ;;------------------------------------------------------------------------------
 (simple "Blablabla bla@" nil)
@@ -58,12 +58,12 @@
 (progn
   (regression-test-compare-expect-values
    "Tests for predicate for one char line."
-   rest-line-homogeneous-nodent-p-tests 'rest-line-homogeneous-nodent-p nil))
+   rst-line-homogeneous-nodent-p-tests 'rst-line-homogeneous-nodent-p nil))
 
 
 
 
-(setq rest-normalize-cursor-position-tests
+(setq rst-normalize-cursor-position-tests
       '(
 ;;------------------------------------------------------------------------------
 (under
@@ -215,7 +215,7 @@ Another Title
 (progn
   (regression-test-compare-expect-buffer
    "Test preparation of cursor position."
-   rest-normalize-cursor-position-tests 'rest-normalize-cursor-position nil))
+   rst-normalize-cursor-position-tests 'rst-normalize-cursor-position nil))
 
 
 
@@ -223,7 +223,7 @@ Another Title
 
 
 
-(setq rest-get-decoration-tests
+(setq rst-get-decoration-tests
       '(
 ;;------------------------------------------------------------------------------
 (nodec-1
@@ -436,7 +436,7 @@ Du bon vin tous les jours
 (progn
   (regression-test-compare-expect-values
    "Test getting the decoration."
-   rest-get-decoration-tests 'rest-get-decoration nil))
+   rst-get-decoration-tests 'rst-get-decoration nil))
 
 
 
@@ -528,7 +528,7 @@ Current@
 ;;
 ;; ==========
 
-(setq rest-find-all-decorations-tests
+(setq rst-find-all-decorations-tests
       `(
  ;;------------------------------------------------------------------------------
 	(basic-1 ,text-1
@@ -558,12 +558,12 @@ Current@
 (progn
   (regression-test-compare-expect-values
    "Test finding all the decorations in a file."
-   rest-find-all-decorations-tests 'rest-find-all-decorations nil))
+   rst-find-all-decorations-tests 'rst-find-all-decorations nil))
 
 
 
 
-(setq rest-get-hierarchy-tests
+(setq rst-get-hierarchy-tests
       `(
  ;;------------------------------------------------------------------------------
 	(basic-1 ,text-1
@@ -577,12 +577,12 @@ Current@
 (progn
   (regression-test-compare-expect-values
    "Test finding the hierarchy of sections in a file."
-   rest-get-hierarchy-tests 'rest-get-hierarchy nil))
+   rst-get-hierarchy-tests 'rst-get-hierarchy nil))
 
 
 
 
-(setq rest-get-hierarchy-ignore-tests
+(setq rst-get-hierarchy-ignore-tests
       `(
  ;;------------------------------------------------------------------------------
 	(basic-1 ,text-1
@@ -595,8 +595,8 @@ Current@
 (progn
   (regression-test-compare-expect-values
    "Test finding the hierarchy of sections in a file, ignoring lines."
-   rest-get-hierarchy-ignore-tests
-   (lambda () (rest-get-hierarchy nil (line-number-at-pos))) nil))
+   rst-get-hierarchy-ignore-tests
+   (lambda () (rst-get-hierarchy nil (line-number-at-pos))) nil))
 
 
 
@@ -604,7 +604,7 @@ Current@
 
 
 
-(setq rest-decoration-complete-p-tests
+(setq rst-decoration-complete-p-tests
   '(
 ;;------------------------------------------------------------------------------
 (nodec
@@ -759,7 +759,7 @@ Current@
 (progn
   (regression-test-compare-expect-values
    "Tests for completeness predicate."
-   rest-decoration-complete-p-tests 'rest-decoration-complete-p nil))
+   rst-decoration-complete-p-tests 'rst-decoration-complete-p nil))
 
 
 
@@ -773,7 +773,7 @@ Current@
 
 
 
-(setq rest-get-decorations-around-tests
+(setq rst-get-decorations-around-tests
   '(
 ;;------------------------------------------------------------------------------
 (simple
@@ -809,5 +809,5 @@ Next
 (progn
   (regression-test-compare-expect-values
    "Tests getting the decorations around a point."
-   rest-get-decorations-around-tests 'rest-get-decorations-around nil))
+   rst-get-decorations-around-tests 'rst-get-decorations-around nil))
 
-- 
cgit v1.2.1


From e70238510f7a1d2a93fd9e98226153c3c7370b2b Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Sun, 30 Oct 2005 16:55:21 +0000
Subject: added missing target

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3983 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index 27be19f16..6f0f72891 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -6,6 +6,8 @@
 
 :Date: $Date$
 
+.. _reStructuredText: http://docutils.sourceforge.net/rst.html
+
 
 Directory Contents
 ==================
@@ -26,4 +28,3 @@ This directory contains the following Emacs lisp package files:
 
 To install the package, put a copy of the package file in a directory on your
 ``load-path`` (use ``C-h v load-path`` to check).
-
-- 
cgit v1.2.1


From eda4517f748495eeeb6eb5a49c4fd11e8a10ceda Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 30 Oct 2005 21:58:54 +0000
Subject: Minor changes to comments in rst.el for auto-gen of my web page.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3985 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 68 ++++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 23 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 94da15901..5fb0aa6d7 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -1,26 +1,46 @@
-;; Authors: Martin Blais ,
-;;          Stefan Merten 
-;;          David Goodger 
-;; Date: $Date$
-;; Copyright: This module has been placed in the public domain.
-;;  
-;; Support code for editing reStructuredText with Emacs.  Basically, this
-;; package contains:
-;; 
-;; - Functions to automatically adjust and cycle the section underline
-;;   decorations;
-;; - A mode that displays the table of contents and allows you to jump anywhere
-;;   from it;
-;; - Functions to insert and automatically update a TOC in your source document;
-;; - A mode which supports font-lock highlighting of reStructuredText
-;;   structures;
-;; - Some other convenience functions.
-;; 
-;; See the accompanying document in the docutils documentation about
-;; the contents of this package and how to use it.
-;; 
-;; For more information about reStructuredText, see
-;; http://docutils.sourceforge.net/rst.html
+;;; ================================================
+;;;   rst.el -- ReStructuredText Support for Emacs
+;;; ================================================
+;;;
+;;; :Authors: Martin Blais ,
+;;;           Stefan Merten ,
+;;;           David Goodger 
+;;; :Date: $Date$
+;;; :Copyright: This module has been placed in the public domain.
+;;; :Abstract:
+;;;
+;;;    Support code for editing reStructuredText with Emacs.  The latest version
+;;;    of this file lies in the docutils source code repository.
+;;;  
+;;; Description
+;;; ===========
+;;;
+;;; Basically, this package contains:
+;;; 
+;;; - Functions to automatically adjust and cycle the section underline
+;;;   decorations;
+;;; - A mode that displays the table of contents and allows you to jump anywhere
+;;;   from it;
+;;; - Functions to insert and automatically update a TOC in your source document;
+;;; - A mode which supports font-lock highlighting of reStructuredText
+;;;   structures;
+;;; - Some other convenience functions.
+;;; 
+;;; See the accompanying document in the docutils documentation about
+;;; the contents of this package and how to use it.
+;;; 
+;;; For more information about reStructuredText, see
+;;; http://docutils.sourceforge.net/rst.html
+;;;
+;;; For full details on how to use the contents of this file, see
+;;; http://docutils.sourceforge.net/docs/user/emacs.html
+;;;
+;;; Download
+;;; ========
+;;;
+;;; Click `Here `_ for download.
+;;;
+;;; END
 ;;
 ;; **IMPORTANT NOTE TO PACKAGERS**: this package is the result of merging:
 ;;
@@ -120,6 +140,8 @@
 ;;
 ;; Other
 ;; -----
+;; - We should rename "adornment" to "decoration" or vice-versa in this
+;;   document.
 ;; - Add an option to forego using the file structure in order to make
 ;;   suggestion, and to always use the preferred decorations to do that.
 ;;
-- 
cgit v1.2.1


From c5d1c54efe5b99787489f44e9fc60c78cb465e50 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sun, 30 Oct 2005 22:58:09 +0000
Subject: Changed rst-html-compile to be generic and support multiple toolsets.
  The group now starts with rst-compile and the function rst-compile replaces
 rst-html-compile.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3988 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 1171 ++++++++++++++++++++++----------------------
 1 file changed, 593 insertions(+), 578 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 5fb0aa6d7..68179e73c 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -11,12 +11,12 @@
 ;;;
 ;;;    Support code for editing reStructuredText with Emacs.  The latest version
 ;;;    of this file lies in the docutils source code repository.
-;;;  
+;;;
 ;;; Description
 ;;; ===========
 ;;;
 ;;; Basically, this package contains:
-;;; 
+;;;
 ;;; - Functions to automatically adjust and cycle the section underline
 ;;;   decorations;
 ;;; - A mode that displays the table of contents and allows you to jump anywhere
@@ -25,10 +25,10 @@
 ;;; - A mode which supports font-lock highlighting of reStructuredText
 ;;;   structures;
 ;;; - Some other convenience functions.
-;;; 
+;;;
 ;;; See the accompanying document in the docutils documentation about
 ;;; the contents of this package and how to use it.
-;;; 
+;;;
 ;;; For more information about reStructuredText, see
 ;;; http://docutils.sourceforge.net/rst.html
 ;;;
@@ -98,7 +98,7 @@
 ;; There is a special mode that you can setup if you want to have syntax
 ;; highlighting.  The mode is based on `text-mode' and inherits some things from
 ;; it.  Particularly `text-mode-hook' is run before `rst-mode-hook'.
-;; 
+;;
 ;; Add the following lines to your `.emacs' file:
 ;;
 ;; (setq auto-mode-alist
@@ -303,13 +303,13 @@ decorations."
   :version "21.1")
 
 (defcustom rst-preferred-decorations '( (?= over-and-under 1)
-					 (?= simple 0)
-					 (?- simple 0)
-					 (?~ simple 0)
-					 (?+ simple 0)
-					 (?` simple 0)
-					 (?# simple 0)
-					 (?@ simple 0) )
+                                         (?= simple 0)
+                                         (?- simple 0)
+                                         (?~ simple 0)
+                                         (?+ simple 0)
+                                         (?` simple 0)
+                                         (?# simple 0)
+                                         (?@ simple 0) )
   "Preferred ordering of section title decorations.  This
   sequence is consulted to offer a new decoration suggestion when
   we rotate the underlines at the end of the existing hierarchy
@@ -360,7 +360,7 @@ decorations."
   (save-excursion
     (beginning-of-line)
     (if (looking-at "^[ \t]+")
-	nil
+        nil
       (rst-line-homogeneous-p accept-special)
       )))
 
@@ -394,23 +394,23 @@ have been seen.
 
   ;; For all the preferred decorations...
   (let* (
-	 ;; If 'prev' is given, reorder the list to start searching after the
-	 ;; match.
-	 (fplist
-	  (cdr (rst-get-decoration-match rst-preferred-decorations prev)))
+         ;; If 'prev' is given, reorder the list to start searching after the
+         ;; match.
+         (fplist
+          (cdr (rst-get-decoration-match rst-preferred-decorations prev)))
 
-	 ;; List of candidates to search.
-	 (curpotential (append fplist rst-preferred-decorations)))
+         ;; List of candidates to search.
+         (curpotential (append fplist rst-preferred-decorations)))
     (while
-	;; For all the decorations...
-	(let ((cur alldecos)
-	      found)
-	  (while (and cur (not found))
-	    (if (rst-compare-decorations (car cur) (car curpotential))
-		;; Found it!
-		(setq found (car curpotential))
-	      (setq cur (cdr cur))))
-	  found)
+        ;; For all the decorations...
+        (let ((cur alldecos)
+              found)
+          (while (and cur (not found))
+            (if (rst-compare-decorations (car cur) (car curpotential))
+                ;; Found it!
+                (setq found (car curpotential))
+              (setq cur (cdr cur))))
+          found)
 
       (setq curpotential (cdr curpotential)))
 
@@ -456,10 +456,10 @@ have been seen.
       ;; Remove previous line if it consists only of a single repeated character
       (save-excursion
         (forward-line -1)
-	(and (rst-line-homogeneous-p 1)
-	     ;; Avoid removing the underline of a title right above us.
-	     (save-excursion (forward-line -1)
-			     (not (looking-at rst-section-text-regexp)))
+        (and (rst-line-homogeneous-p 1)
+             ;; Avoid removing the underline of a title right above us.
+             (save-excursion (forward-line -1)
+                             (not (looking-at rst-section-text-regexp)))
              (rst-delete-line)))
 
       ;; Remove following line if it consists only of a single repeated
@@ -612,21 +612,21 @@ have been seen.
       (beginning-of-line)
       (if (looking-at rst-section-text-regexp)
           (let* ((over (save-excursion
-			 (forward-line -1)
-			 (rst-line-homogeneous-nodent-p)))
-
-		(under (save-excursion
-			 (forward-line +1)
-			 (rst-line-homogeneous-nodent-p)))
-	        )
-
-	    ;; Check that the line above the overline is not part of a title
-	    ;; above it.
-	    (if (and over
-		     (save-excursion
-		       (and (equal (forward-line -2) 0)
-			    (looking-at rst-section-text-regexp))))
-		(setq over nil))
+                         (forward-line -1)
+                         (rst-line-homogeneous-nodent-p)))
+
+                (under (save-excursion
+                         (forward-line +1)
+                         (rst-line-homogeneous-nodent-p)))
+                )
+
+            ;; Check that the line above the overline is not part of a title
+            ;; above it.
+            (if (and over
+                     (save-excursion
+                       (and (equal (forward-line -2) 0)
+                            (looking-at rst-section-text-regexp))))
+                (setq over nil))
 
             (cond
              ;; No decoration found, leave all return values nil.
@@ -662,18 +662,18 @@ have been seen.
 find the decorations before and after the given point.
 A list of the previous and next decorations is returned."
   (let* ((all (or alldecos (rst-find-all-decorations)))
-	 (curline (line-number-at-pos))
-	 prev next
-	 (cur all))
+         (curline (line-number-at-pos))
+         prev next
+         (cur all))
 
     ;; Search for the decorations around the current line.
     (while (and cur (< (caar cur) curline))
       (setq prev cur
-	    cur (cdr cur)))
+            cur (cdr cur)))
     ;; 'cur' is the following decoration.
 
     (if (and cur (caar cur))
-	(setq next (if (= curline (caar cur)) (cdr cur) cur)))
+        (setq next (if (= curline (caar cur)) (cdr cur) cur)))
 
     (mapcar 'cdar (list prev next))
     ))
@@ -714,27 +714,27 @@ A list of the previous and next decorations is returned."
 and suggesting for new decoration SUGGESTION."
 
   (let* (
-	 (char (car curdeco))
-	 (style (cadr curdeco))
-
-	 ;; Build a new list of decorations for the rotation.
-	 (rotdecos
-	  (append hier
-		  ;; Suggest a new decoration.
-		  (list suggestion
-			;; If nothing to suggest, use first decoration.
-			(car hier)))) )
+         (char (car curdeco))
+         (style (cadr curdeco))
+
+         ;; Build a new list of decorations for the rotation.
+         (rotdecos
+          (append hier
+                  ;; Suggest a new decoration.
+                  (list suggestion
+                        ;; If nothing to suggest, use first decoration.
+                        (car hier)))) )
     (or
      ;; Search for next decoration.
      (cadr
       (let ((cur (if reverse-direction rotdecos
-		   (reverse rotdecos)))
-	    found)
-	(while (and cur
-		    (not (and (eq char (caar cur))
-			      (eq style (cadar cur)))))
-	  (setq cur (cdr cur)))
-	cur))
+                   (reverse rotdecos)))
+            found)
+        (while (and cur
+                    (not (and (eq char (caar cur))
+                              (eq style (cadar cur)))))
+          (setq cur (cdr cur)))
+        cur))
 
      ;; If not found, take the first of all decorations.
      suggestion
@@ -775,18 +775,18 @@ b. a negative numerical argument, which generally inverts the
   (interactive)
 
   (let* ( ;; Parse the positive and negative prefix arguments.
-	 (reverse-direction
-	  (and current-prefix-arg
-	       (< (prefix-numeric-value current-prefix-arg) 0)))
-	 (toggle-style
-	  (and current-prefix-arg (not reverse-direction))))
+         (reverse-direction
+          (and current-prefix-arg
+               (< (prefix-numeric-value current-prefix-arg) 0)))
+         (toggle-style
+          (and current-prefix-arg (not reverse-direction))))
 
     (if (and transient-mark-mode mark-active)
-	;; Adjust decorations within region.
-	(rst-promote-region current-prefix-arg)
+        ;; Adjust decorations within region.
+        (rst-promote-region current-prefix-arg)
       ;; Adjust decoration around point.
       (rst-adjust-decoration toggle-style reverse-direction))
-    
+
     ;; Run the hooks to run after adjusting.
     (run-hooks 'rst-adjust-hook)
 
@@ -962,11 +962,11 @@ of the right hand fingers and the binding is unused in text-mode."
   ;; arguments of the function.
   (if current-prefix-arg
       (setq reverse-direction
-	    (and current-prefix-arg
-		 (< (prefix-numeric-value current-prefix-arg) 0))
+            (and current-prefix-arg
+                 (< (prefix-numeric-value current-prefix-arg) 0))
 
-	    toggle-style
-	    (and current-prefix-arg (not reverse-direction))))
+            toggle-style
+            (and current-prefix-arg (not reverse-direction))))
 
   (let* (;; Check if we're on an underline around a section title, and move the
          ;; cursor to the title if this is the case.
@@ -978,102 +978,102 @@ of the right hand fingers and the binding is unused in text-mode."
          (style (cadr curdeco))
          (indent (caddr curdeco))
 
-	 ;; New values to be computed.
-	 char-new style-new indent-new
+         ;; New values to be computed.
+         char-new style-new indent-new
          )
 
     ;; We've moved the cursor... if we're not looking at some text, we have
     ;; nothing to do.
     (if (save-excursion (beginning-of-line)
                         (looking-at rst-section-text-regexp))
-	(progn
-	  (cond
-	   ;;---------------------------------------------------------------------
-	   ;; Case 1: No Decoration
-	   ((and (eq char nil) (eq style nil))
-
-	    (let* ((alldecos (rst-find-all-decorations))
-
-		   (around (rst-get-decorations-around alldecos))
-		   (prev (car around))
-		   cur
-
-		   (hier (rst-get-hierarchy alldecos))
-		   )
-
-	      ;; Advance one level down.
-	      (setq cur
-		    (if prev
-			(if (not reverse-direction)
-			    (or (cadr (rst-get-decoration-match hier prev))
-				(rst-suggest-new-decoration hier prev))
-			  prev)
-		      (copy-list (car rst-preferred-decorations))
-		      ))
-
-	      ;; Invert the style if requested.
-	      (if toggle-style
-		  (setcar (cdr cur) (if (eq (cadr cur) 'simple)
-					'over-and-under 'simple)) )
-
-	      (setq char-new (car cur)
-		    style-new (cadr cur)
-		    indent-new (caddr cur))
-	      ))
-
-	   ;;---------------------------------------------------------------------
-	   ;; Case 2: Incomplete Decoration
-	   ((not (rst-decoration-complete-p curdeco))
-
-	    ;; Invert the style if requested.
-	    (if toggle-style
-		(setq style (if (eq style 'simple) 'over-and-under 'simple)))
+        (progn
+          (cond
+           ;;---------------------------------------------------------------------
+           ;; Case 1: No Decoration
+           ((and (eq char nil) (eq style nil))
+
+            (let* ((alldecos (rst-find-all-decorations))
+
+                   (around (rst-get-decorations-around alldecos))
+                   (prev (car around))
+                   cur
+
+                   (hier (rst-get-hierarchy alldecos))
+                   )
+
+              ;; Advance one level down.
+              (setq cur
+                    (if prev
+                        (if (not reverse-direction)
+                            (or (cadr (rst-get-decoration-match hier prev))
+                                (rst-suggest-new-decoration hier prev))
+                          prev)
+                      (copy-list (car rst-preferred-decorations))
+                      ))
+
+              ;; Invert the style if requested.
+              (if toggle-style
+                  (setcar (cdr cur) (if (eq (cadr cur) 'simple)
+                                        'over-and-under 'simple)) )
+
+              (setq char-new (car cur)
+                    style-new (cadr cur)
+                    indent-new (caddr cur))
+              ))
+
+           ;;---------------------------------------------------------------------
+           ;; Case 2: Incomplete Decoration
+           ((not (rst-decoration-complete-p curdeco))
+
+            ;; Invert the style if requested.
+            (if toggle-style
+                (setq style (if (eq style 'simple) 'over-and-under 'simple)))
 
             (setq char-new char
-		  style-new style
-		  indent-new indent))
+                  style-new style
+                  indent-new indent))
 
-	   ;;---------------------------------------------------------------------
-	   ;; Case 3: Complete Existing Decoration
-	   (t
-	    (if toggle-style
+           ;;---------------------------------------------------------------------
+           ;; Case 3: Complete Existing Decoration
+           (t
+            (if toggle-style
 
-		;; Simply switch the style of the current decoration.
-		(setq char-new char
-		      style-new (if (eq style 'simple) 'over-and-under 'simple)
-		      indent-new rst-default-indent)
+                ;; Simply switch the style of the current decoration.
+                (setq char-new char
+                      style-new (if (eq style 'simple) 'over-and-under 'simple)
+                      indent-new rst-default-indent)
 
-	      ;; Else, we rotate, ignoring the decoration around the current
-	      ;; line...
-	      (let* ((alldecos (rst-find-all-decorations))
+              ;; Else, we rotate, ignoring the decoration around the current
+              ;; line...
+              (let* ((alldecos (rst-find-all-decorations))
 
-		     (hier (rst-get-hierarchy alldecos (line-number-at-pos)))
+                     (hier (rst-get-hierarchy alldecos (line-number-at-pos)))
 
-		     ;; Suggestion, in case we need to come up with something
-		     ;; new
-		     (suggestion (rst-suggest-new-decoration
-				  hier
-				  (car (rst-get-decorations-around alldecos))))
+                     ;; Suggestion, in case we need to come up with something
+                     ;; new
+                     (suggestion (rst-suggest-new-decoration
+                                  hier
+                                  (car (rst-get-decorations-around alldecos))))
 
-		     (nextdeco (rst-get-next-decoration
-				curdeco hier suggestion reverse-direction))
+                     (nextdeco (rst-get-next-decoration
+                                curdeco hier suggestion reverse-direction))
 
-		     )
+                     )
 
-		;; Indent, if present, always overrides the prescribed indent.
-		(setq char-new (car nextdeco)
-		      style-new (cadr nextdeco)
-		      indent-new (caddr nextdeco))
+                ;; Indent, if present, always overrides the prescribed indent.
+                (setq char-new (car nextdeco)
+                      style-new (cadr nextdeco)
+                      indent-new (caddr nextdeco))
 
-		)))
-	   )
+                )))
+           )
 
-	  ;; Override indent with present indent!
-	  (setq indent-new (if (> indent 0) indent indent-new))
+          ;; Override indent with present indent!
+          (setq indent-new (if (> indent 0) indent indent-new))
 
-	  (if (and char-new style-new)
-	      (rst-update-section char-new style-new indent-new))
-	  ))
+          (if (and char-new style-new)
+              (rst-update-section char-new style-new indent-new))
+          ))
 
 
     ;; Correct the position of the cursor to more accurately reflect where it
@@ -1097,17 +1097,17 @@ the hierarchy is similar to that used by rst-adjust-decoration."
   (interactive)
 
   (let* ((demote (or current-prefix-arg demote))
-	 (alldecos (rst-find-all-decorations))
-	 (cur alldecos)
+         (alldecos (rst-find-all-decorations))
+         (cur alldecos)
 
-	 (hier (rst-get-hierarchy alldecos))
-	 (suggestion (rst-suggest-new-decoration hier))
+         (hier (rst-get-hierarchy alldecos))
+         (suggestion (rst-suggest-new-decoration hier))
 
-	 (region-begin-line (line-number-at-pos (region-beginning)))
-	 (region-end-line (line-number-at-pos (region-end)))
+         (region-begin-line (line-number-at-pos (region-beginning)))
+         (region-end-line (line-number-at-pos (region-end)))
 
-	 marker-list
-	 )
+         marker-list
+         )
 
     ;; Skip the markers that come before the region beginning
     (while (and cur (< (caar cur) region-begin-line))
@@ -1117,28 +1117,28 @@ the hierarchy is similar to that used by rst-adjust-decoration."
     ;; the region.
     (save-excursion
       (let (m line)
-	(while (and cur (< (setq line (caar cur)) region-end-line))
-	  (setq m (make-marker))
-	  (goto-line line)
-	  (push (list (set-marker m (point)) (cdar cur)) marker-list)
-	  (setq cur (cdr cur)) ))
+        (while (and cur (< (setq line (caar cur)) region-end-line))
+          (setq m (make-marker))
+          (goto-line line)
+          (push (list (set-marker m (point)) (cdar cur)) marker-list)
+          (setq cur (cdr cur)) ))
 
       ;; Apply modifications.
       (let (nextdeco)
-	(dolist (p marker-list)
-	  ;; Go to the decoration to promote.
-	  (goto-char (car p))
+        (dolist (p marker-list)
+          ;; Go to the decoration to promote.
+          (goto-char (car p))
 
-	  ;; Rotate the next decoration.
-	  (setq nextdeco (rst-get-next-decoration
-			  (cadr p) hier suggestion demote))
+          ;; Rotate the next decoration.
+          (setq nextdeco (rst-get-next-decoration
+                          (cadr p) hier suggestion demote))
 
-	  ;; Update the decoration.
-	  (apply 'rst-update-section nextdeco)
+          ;; Update the decoration.
+          (apply 'rst-update-section nextdeco)
 
-	  ;; Clear marker to avoid slowing down the editing after we're done.
-	  (set-marker (car p) nil)
-	  ))
+          ;; Clear marker to avoid slowing down the editing after we're done.
+          (set-marker (car p) nil)
+          ))
       (setq deactivate-mark nil)
     )))
 
@@ -1175,7 +1175,7 @@ the hierarchy is similar to that used by rst-adjust-decoration."
   "Returns the line at cursor, stripped from whitespace."
   (re-search-forward "\\S-.*\\S-" (line-end-position))
   (buffer-substring-no-properties (match-beginning 0)
-				  (match-end 0)) )
+                                  (match-end 0)) )
 
 (defun rst-section-tree (alldecos)
   "Returns a pair of a hierarchical tree of the sections titles
@@ -1190,28 +1190,28 @@ If there are missing section levels, the section titles are
 inserted automatically, and are set to nil."
 
   (let* (thelist
-	 (hier (rst-get-hierarchy alldecos))
-	 (levels (make-hash-table :test 'equal :size 10))
-	 lines)
+         (hier (rst-get-hierarchy alldecos))
+         (levels (make-hash-table :test 'equal :size 10))
+         lines)
 
     (let ((lev 0))
       (dolist (deco hier)
-	(puthash deco lev levels)
-	(incf lev)))
+        (puthash deco lev levels)
+        (incf lev)))
 
     ;; Create a list of lines that contains (text, level, marker) for each
     ;; decoration.
     (save-excursion
       (setq lines
-	    (mapcar (lambda (deco)
-		      (goto-line (car deco))
-		      (list (gethash (cdr deco) levels)
-			    (rst-get-stripped-line)
-			    (let ((m (make-marker)))
-			      (beginning-of-line 1)
-			      (set-marker m (point)))
-			    ))
-		    alldecos)))
+            (mapcar (lambda (deco)
+                      (goto-line (car deco))
+                      (list (gethash (cdr deco) levels)
+                            (rst-get-stripped-line)
+                            (let ((m (make-marker)))
+                              (beginning-of-line 1)
+                              (set-marker m (point)))
+                            ))
+                    alldecos)))
 
     (let ((lcontnr (cons nil lines)))
       (rst-section-tree-rec lcontnr -1))))
@@ -1226,21 +1226,21 @@ inserted automatically, and are set to nil."
   destructively."
 
   (let ((ndeco (cadr decos))
-	node
-	children)
+        node
+        children)
     ;; If the next decoration matches our level
     (if (= (car ndeco) lev)
-	(progn
-	  ;; Pop the next decoration and create the current node with it
-	  (setcdr decos (cddr decos))
-	  (setq node (cdr ndeco)) ))
+        (progn
+          ;; Pop the next decoration and create the current node with it
+          (setcdr decos (cddr decos))
+          (setq node (cdr ndeco)) ))
       ;; Else we let the node title/marker be unset.
 
     ;; Build the child nodes
     (while (and (cdr decos) (> (caadr decos) lev))
       (setq children
-	    (cons (rst-section-tree-rec decos (1+ lev))
-		  children)))
+            (cons (rst-section-tree-rec decos (1+ lev))
+                  children)))
 
     ;; Return this node with its children.
     (cons node (reverse children))
@@ -1261,32 +1261,32 @@ The TOC is inserted indented at the current column."
   (interactive "P")
 
   (let* (;; Check maximum level override
-	 (rst-toc-insert-max-level
-	  (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
-	      (prefix-numeric-value pfxarg) rst-toc-insert-max-level))
-
-	 ;; Get the section tree.
-	 (sectree (rst-section-tree (rst-find-all-decorations)))
-
-	 ;; If there is only one top-level title, remove it by starting to print
-	 ;; one index lower (revert this behaviour with the prefix arg),
-	 ;; otherwise print all.
-	 (gen-pfx-arg (or (and pfxarg (listp pfxarg))
-			  (and (integerp pfxarg)
-			       (= (prefix-numeric-value pfxarg) 0))))
-	 (start-lev (if (and (not rst-toc-insert-always-include-top)
-			     (= (length (cdr sectree)) 1)
-			     (not gen-pfx-arg))  -1 0))
-
-	 ;; Figure out initial indent.
-	 (initial-indent (make-string (current-column) ? ))
-	 (init-point (point)))
+         (rst-toc-insert-max-level
+          (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
+              (prefix-numeric-value pfxarg) rst-toc-insert-max-level))
+
+         ;; Get the section tree.
+         (sectree (rst-section-tree (rst-find-all-decorations)))
+
+         ;; If there is only one top-level title, remove it by starting to print
+         ;; one index lower (revert this behaviour with the prefix arg),
+         ;; otherwise print all.
+         (gen-pfx-arg (or (and pfxarg (listp pfxarg))
+                          (and (integerp pfxarg)
+                               (= (prefix-numeric-value pfxarg) 0))))
+         (start-lev (if (and (not rst-toc-insert-always-include-top)
+                             (= (length (cdr sectree)) 1)
+                             (not gen-pfx-arg))  -1 0))
+
+         ;; Figure out initial indent.
+         (initial-indent (make-string (current-column) ? ))
+         (init-point (point)))
 
     (rst-toc-insert-node sectree start-lev initial-indent "")
 
     ;; Fixup for the first line.
     (delete-region init-point (+ init-point (length initial-indent)))
-    
+
     ;; Delete the last newline added.
     (delete-backward-char 1)
     ))
@@ -1337,69 +1337,69 @@ indentation style:
 toc. PFX is the prefix numbering, that includes the alignment
 necessary for all the children of this level to align."
   (let ((do-print (> level 0))
-	(count 1)
-	b)
+        (count 1)
+        b)
     (if do-print
-	(progn
-	  (insert indent)
-	  (let ((b (point)))
-	    (if (not (equal rst-toc-insert-style 'plain))
-		(insert pfx rst-toc-insert-number-separator))
-	    (insert (or (caar node) "[missing node]"))
-	    ;; Add properties to the text, even though in normal text mode it
-	    ;; won't be doing anything for now.  Not sure that I want to change
-	    ;; mode stuff.  At least the highlighting gives the idea that this
-	    ;; is generated automatically.
-	    (put-text-property b (point) 'mouse-face 'highlight)
-	    (put-text-property b (point) 'rst-toc-target (cadar node))
-	    (put-text-property b (point) 'keymap rst-toc-insert-click-keymap)
-
-	    )
-	  (insert "\n")
-
-	  ;; Prepare indent for children.
-	  (setq indent
-		(cond
-		 ((eq rst-toc-insert-style 'plain)
-		  (concat indent rst-toc-indent))
-
-		 ((eq rst-toc-insert-style 'fixed)
-		  (concat indent (make-string rst-toc-indent ? )))
-
-		 ((eq rst-toc-insert-style 'aligned)
-		  (concat indent (make-string (+ (length pfx) 2) ? )))
-
-		 ((eq rst-toc-insert-style 'listed)
-		  (concat (substring indent 0 -3)
-			  (concat (make-string (+ (length pfx) 2) ? ) " - ")))
-		 ))
-
-	  ))
+        (progn
+          (insert indent)
+          (let ((b (point)))
+            (if (not (equal rst-toc-insert-style 'plain))
+                (insert pfx rst-toc-insert-number-separator))
+            (insert (or (caar node) "[missing node]"))
+            ;; Add properties to the text, even though in normal text mode it
+            ;; won't be doing anything for now.  Not sure that I want to change
+            ;; mode stuff.  At least the highlighting gives the idea that this
+            ;; is generated automatically.
+            (put-text-property b (point) 'mouse-face 'highlight)
+            (put-text-property b (point) 'rst-toc-target (cadar node))
+            (put-text-property b (point) 'keymap rst-toc-insert-click-keymap)
+
+            )
+          (insert "\n")
+
+          ;; Prepare indent for children.
+          (setq indent
+                (cond
+                 ((eq rst-toc-insert-style 'plain)
+                  (concat indent rst-toc-indent))
+
+                 ((eq rst-toc-insert-style 'fixed)
+                  (concat indent (make-string rst-toc-indent ? )))
+
+                 ((eq rst-toc-insert-style 'aligned)
+                  (concat indent (make-string (+ (length pfx) 2) ? )))
+
+                 ((eq rst-toc-insert-style 'listed)
+                  (concat (substring indent 0 -3)
+                          (concat (make-string (+ (length pfx) 2) ? ) " - ")))
+                 ))
+
+          ))
 
     (if (or (eq rst-toc-insert-max-level nil)
-	    (< level rst-toc-insert-max-level))
-	(let ((do-child-numbering (>= level 0))
-	      fmt)
-	  (if do-child-numbering
-	      (progn
-		;; Add a separating dot if there is already a prefix
-		(if (> (length pfx) 0)
-		    (setq pfx (concat (rst-rstrip pfx) ".")))
-
-		;; Calculate the amount of space that the prefix will require for
-		;; the numbers.
-		(if (cdr node)
-		    (setq fmt (format "%%-%dd"
-				      (1+ (floor (log10 (length (cdr node))))))))
-		))
-
-	  (dolist (child (cdr node))
-	    (rst-toc-insert-node child
-				  (1+ level)
-				  indent
-				  (if do-child-numbering
-				      (concat pfx (format fmt count)) pfx))
-	    (incf count)))
+            (< level rst-toc-insert-max-level))
+        (let ((do-child-numbering (>= level 0))
+              fmt)
+          (if do-child-numbering
+              (progn
+                ;; Add a separating dot if there is already a prefix
+                (if (> (length pfx) 0)
+                    (setq pfx (concat (rst-rstrip pfx) ".")))
+
+                ;; Calculate the amount of space that the prefix will require for
+                ;; the numbers.
+                (if (cdr node)
+                    (setq fmt (format "%%-%dd"
+                                      (1+ (floor (log10 (length (cdr node))))))))
+                ))
+
+          (dolist (child (cdr node))
+            (rst-toc-insert-node child
+                                  (1+ level)
+                                  indent
+                                  (if do-child-numbering
+                                      (concat pfx (format fmt count)) pfx))
+            (incf count)))
 
       )))
 
@@ -1420,27 +1420,27 @@ delete that region. Return t if found and the cursor is left after the comment."
   ;;      [more lines]
   ;;
   (let ((beg
-	 (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
-			    nil t))
-	last-real)
+         (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
+                            nil t))
+        last-real)
     (when beg
       ;; Look for the first line that starts at the first column.
       (forward-line 1)
       (beginning-of-line)
       (while (or (and (looking-at "[ \t]+[^ \t]")
-		      (setq last-real (point)) t)
-		 (looking-at "\\s-*$"))
-	(forward-line 1)
-	)
+                      (setq last-real (point)) t)
+                 (looking-at "\\s-*$"))
+        (forward-line 1)
+        )
       (if last-real
-	  (progn
-	    (goto-char last-real)
-	    (end-of-line)
-	    (delete-region beg (point)))
-	(goto-char beg))
+          (progn
+            (goto-char last-real)
+            (end-of-line)
+            (delete-region beg (point)))
+        (goto-char beg))
       t
       )))
-  
+
 (defun rst-toc-insert-update ()
   "Automatically find the .. contents:: section of a document and update the
 inserted TOC if present.  You can use this in your file-write hook to always
@@ -1448,8 +1448,8 @@ make it up-to-date automatically."
   (interactive)
   (save-excursion
     (if (rst-toc-insert-find-delete-contents)
-	(progn (insert "\n    ")
-	       (rst-toc-insert))) )
+        (progn (insert "\n    ")
+               (rst-toc-insert))) )
   ;; Note: always return nil, because this may be used as a hook.
   )
 
@@ -1461,17 +1461,17 @@ make it up-to-date automatically."
 
   (if (> level 0)
       (let ((b (point)))
-	;; Insert line text.
-	(insert (make-string (* rst-toc-indent (1- level)) ? ))
-	(insert (if (car node) (caar node) "[missing node]"))
+        ;; Insert line text.
+        (insert (make-string (* rst-toc-indent (1- level)) ? ))
+        (insert (if (car node) (caar node) "[missing node]"))
 
-	;; Highlight lines.
-	(put-text-property b (point) 'mouse-face 'highlight)
+        ;; Highlight lines.
+        (put-text-property b (point) 'mouse-face 'highlight)
 
-	;; Add link on lines.
-	(put-text-property b (point) 'rst-toc-target (cadar node))
+        ;; Add link on lines.
+        (put-text-property b (point) 'rst-toc-target (cadar node))
 
-	(insert "\n")))
+        (insert "\n")))
 
   (dolist (child (cdr node))
     (rst-toc-node child (1+ level))))
@@ -1487,24 +1487,24 @@ make it up-to-date automatically."
   brings the cursor in that section."
   (interactive)
   (let* ((curbuf (current-buffer))
-	 outline
+         outline
 
-	 ;; Get the section tree
-	 (alldecos (rst-find-all-decorations))
-	 (sectree (rst-section-tree alldecos))
+         ;; Get the section tree
+         (alldecos (rst-find-all-decorations))
+         (sectree (rst-section-tree alldecos))
 
-	 ;; Create a temporary buffer.
-	 (buf (get-buffer-create rst-toc-buffer-name))
-	 )
+         ;; Create a temporary buffer.
+         (buf (get-buffer-create rst-toc-buffer-name))
+         )
 
     ;; Find the index of the section where the cursor currently is.
     (setq outline (let ((idx 1)
-			(curline (line-number-at-pos (point)))
-			(decos alldecos))
-		    (while (and decos (<= (caar decos) curline))
-		      (setq decos (cdr decos))
-		      (incf idx))
-		    idx))
+                        (curline (line-number-at-pos (point)))
+                        (decos alldecos))
+                    (while (and decos (<= (caar decos) curline))
+                      (setq decos (cdr decos))
+                      (incf idx))
+                    idx))
     ;; FIXME: if there is a missing node inserted, the calculation of the
     ;; current line will be off. You need to fix this by moving the finding of
     ;; the current line somewhere else.
@@ -1512,13 +1512,13 @@ make it up-to-date automatically."
 
     (with-current-buffer buf
       (let ((inhibit-read-only t))
-	(rst-toc-mode)
-	(delete-region (point-min) (point-max))
-	(insert (format "Table of Contents: %s\n" (or (caar sectree) "")))
-	(put-text-property (point-min) (point)
-			   'face (list '(background-color . "lightgray")))
-	(rst-toc-node sectree 0)
-	))
+        (rst-toc-mode)
+        (delete-region (point-min) (point-max))
+        (insert (format "Table of Contents: %s\n" (or (caar sectree) "")))
+        (put-text-property (point-min) (point)
+                           'face (list '(background-color . "lightgray")))
+        (rst-toc-node sectree 0)
+        ))
     (display-buffer buf)
     (pop-to-buffer buf)
 
@@ -1557,8 +1557,8 @@ make it up-to-date automatically."
     (save-excursion
       (set-buffer (window-buffer (posn-window (event-end event))))
       (save-excursion
-	(goto-char (posn-point (event-end event)))
-	(setq pos (rst-toc-mode-find-section))))
+        (goto-char (posn-point (event-end event)))
+        (setq pos (rst-toc-mode-find-section))))
     (pop-to-buffer (marker-buffer pos))
     (goto-char pos)))
 
@@ -1614,18 +1614,18 @@ make it up-to-date automatically."
   backwards in the file (default is to use 1)."
   (interactive)
   (let* (;; Default value for offset.
-	 (offset (or offset 1))
+         (offset (or offset 1))
 
-	 ;; Get all the decorations in the file, with their line numbers.
-	 (alldecos (rst-find-all-decorations))
+         ;; Get all the decorations in the file, with their line numbers.
+         (alldecos (rst-find-all-decorations))
 
-	 ;; Get the current line.
-	 (curline (line-number-at-pos))
+         ;; Get the current line.
+         (curline (line-number-at-pos))
 
-	 (cur alldecos)
-	 (idx 0)
-	 line
-	 )
+         (cur alldecos)
+         (idx 0)
+         line
+         )
 
     ;; Find the index of the "next" decoration w.r.t. to the current line.
     (while (and cur (< (caar cur) curline))
@@ -1634,7 +1634,7 @@ make it up-to-date automatically."
     ;; 'cur' is the decoration on or following the current line.
 
     (if (and (> offset 0) cur (= (caar cur) curline))
-  	(incf idx))
+        (incf idx))
 
     ;; Find the final index.
     (setq idx (+ idx (if (> offset 0) (- offset 1) offset)))
@@ -1643,7 +1643,7 @@ make it up-to-date automatically."
     ;; If the index is positive, goto the line, otherwise go to the buffer
     ;; boundaries.
     (if (and cur (>= idx 0))
-	(goto-line (car cur))
+        (goto-line (car cur))
       (if (> offset 0) (end-of-buffer) (beginning-of-buffer)))
     ))
 
@@ -1663,18 +1663,18 @@ make it up-to-date automatically."
   "Indent region ridigly, by two characters to the right."
   (interactive)
   (indent-rigidly (region-beginning) (region-end) 2))
-  
+
 (defun rst-find-leftmost-column (beg end)
   "Finds the leftmost column in the region."
   (let ((mincol 1000))
     (save-excursion
       (goto-char beg)
       (while (< (point) end)
-	(back-to-indentation)
-	(if (not (looking-at "[ \t]*$"))
-	    (setq mincol (min mincol (current-column))))
-	(forward-line 1)
-	))
+        (back-to-indentation)
+        (if (not (looking-at "[ \t]*$"))
+            (setq mincol (min mincol (current-column))))
+        (forward-line 1)
+        ))
     mincol))
 
 (defun rst-shift-region-left (pfxarg)
@@ -1683,9 +1683,9 @@ If invoked with a prefix arg, the entire indentation is removed,
 up to the leftmost character in the region."
   (interactive "P")
   (let ((chars
-	 (if pfxarg
-	     (- (rst-find-leftmost-column (region-beginning) (region-end)))
-	   -2)))
+         (if pfxarg
+             (- (rst-find-leftmost-column (region-beginning) (region-end)))
+           -2)))
     (indent-rigidly (region-beginning) (region-end) chars)))
 
 
@@ -1794,11 +1794,11 @@ The value of this variable is used when Rst Mode is turned on."
 (let ((i 1))
   (while (<= i rst-level-face-max)
     (let ((sym (intern (format "rst-level-%d-face" i)))
-	  (doc (format "Face for showing section title text at level %d" i))
-	  (col (format (concat "%s" rst-level-face-format-light)
-		       rst-level-face-base-color
-		       (+ (* (1- i) rst-level-face-step-light)
-			  rst-level-face-base-light))))
+          (doc (format "Face for showing section title text at level %d" i))
+          (col (format (concat "%s" rst-level-face-format-light)
+                       rst-level-face-base-color
+                       (+ (* (1- i) rst-level-face-step-light)
+                          rst-level-face-base-light))))
       (make-empty-face sym)
       (set-face-doc-string sym doc)
       (set-face-background sym col)
@@ -1819,8 +1819,8 @@ section title text of that level), t (for transitions) or nil (for section
 title adornment)."
   :group 'rst-faces
   :type '(alist :key-type (choice (integer :tag "Section level")
-				  (boolean :tag "transitions (on) / section title adornment (off)"))
-		:value-type (face)))
+                                  (boolean :tag "transitions (on) / section title adornment (off)"))
+                :value-type (face)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1896,9 +1896,9 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
   ;; Font lock
   (set (make-local-variable 'font-lock-defaults)
        '(rst-font-lock-keywords-function
-	 t nil nil nil
-	 (font-lock-multiline . t)
-	 (font-lock-mark-block-function . mark-paragraph)))
+         t nil nil nil
+         (font-lock-multiline . t)
+         (font-lock-mark-block-function . mark-paragraph)))
   (when (boundp 'font-lock-support-mode)
     ;; rst-mode has its own mind about font-lock-support-mode
     (make-local-variable 'font-lock-support-mode)
@@ -1906,16 +1906,16 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
      ((and (not rst-mode-lazy) (not font-lock-support-mode)))
      ;; No support mode set and none required - leave it alone
      ((or (not font-lock-support-mode) ;; No support mode set (but required)
-	  (symbolp font-lock-support-mode)) ;; or a fixed mode for all
+          (symbolp font-lock-support-mode)) ;; or a fixed mode for all
       (setq font-lock-support-mode
-	    (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
-		  (cons t font-lock-support-mode))))
+            (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
+                  (cons t font-lock-support-mode))))
      ((and (listp font-lock-support-mode)
-	   (not (assoc 'rst-mode font-lock-support-mode)))
+           (not (assoc 'rst-mode font-lock-support-mode)))
       ;; A list of modes missing rst-mode
       (setq font-lock-support-mode
-	    (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
-		    font-lock-support-mode)))))
+            (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
+                    font-lock-support-mode)))))
 
   ;; Names and hooks
   (setq mode-name "reST")
@@ -1931,54 +1931,54 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
   ;; The reST links in the comments below all relate to sections in
   ;; http://docutils.sourceforge.net/rst.html
   (let* ( ;; This gets big - so let's define some abbreviations
-	 ;; horizontal white space
-	 (re-hws "[\t ]")
-	 ;; beginning of line with possible indentation
-	 (re-bol (concat "^" re-hws "*"))
-	 ;; Separates block lead-ins from their content
-	 (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
-	 ;; explicit markup tag
-	 (re-emt "\\.\\.")
-	 ;; explicit markup start
-	 (re-ems (concat re-emt re-hws "+"))
-	 ;; inline markup prefix
-	 (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
-	 ;; symbol character
-	 (re-sym1 "\\(\\sw\\|\\s_\\)")
-	 ;; inline markup content begin
-	 (re-imbeg2 "\\(\\S \\|\\S \\([^")
-
-	 ;; There seems to be a bug leading to error "Stack overflow in regexp
-	 ;; matcher" when "|" or "\\*" are the characters searched for
-	 (re-imendbeg
-	  (if (< emacs-major-version 21)
-	      "]"
-	    "\\]\\|\\\\."))
-	 ;; inline markup content end
-	 (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
-	 ;; inline markup content without asterisk
-	 (re-ima2 (concat re-imbeg2 "*" re-imend))
-	 ;; inline markup content without backquote
-	 (re-imb2 (concat re-imbeg2 "`" re-imend))
-	 ;; inline markup content without vertical bar
-	 (re-imv2 (concat re-imbeg2 "|" re-imend))
-	 ;; Supported URI schemes
-	 (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
-	 ;; Line starting with adornment and optional whitespace; complete
-	 ;; adornment is in (match-string 1); there must be at least 3
-	 ;; characters because otherwise explicit markup start would be
-	 ;; recognized
-	 (re-ado2 (concat "^\\(\\(["
-			  (if (or
-			       (< emacs-major-version 21)
-			       (save-match-data
-				 (string-match "XEmacs\\|Lucid" emacs-version)))
-			      "^a-zA-Z0-9 \t\x00-\x1F"
-			    "^[:word:][:space:][:cntrl:]")
-			  "]\\)\\2\\2+\\)" re-hws "*$"))
-	 )
+         ;; horizontal white space
+         (re-hws "[\t ]")
+         ;; beginning of line with possible indentation
+         (re-bol (concat "^" re-hws "*"))
+         ;; Separates block lead-ins from their content
+         (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
+         ;; explicit markup tag
+         (re-emt "\\.\\.")
+         ;; explicit markup start
+         (re-ems (concat re-emt re-hws "+"))
+         ;; inline markup prefix
+         (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
+         ;; symbol character
+         (re-sym1 "\\(\\sw\\|\\s_\\)")
+         ;; inline markup content begin
+         (re-imbeg2 "\\(\\S \\|\\S \\([^")
+
+         ;; There seems to be a bug leading to error "Stack overflow in regexp
+         ;; matcher" when "|" or "\\*" are the characters searched for
+         (re-imendbeg
+          (if (< emacs-major-version 21)
+              "]"
+            "\\]\\|\\\\."))
+         ;; inline markup content end
+         (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
+         ;; inline markup content without asterisk
+         (re-ima2 (concat re-imbeg2 "*" re-imend))
+         ;; inline markup content without backquote
+         (re-imb2 (concat re-imbeg2 "`" re-imend))
+         ;; inline markup content without vertical bar
+         (re-imv2 (concat re-imbeg2 "|" re-imend))
+         ;; Supported URI schemes
+         (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
+         ;; Line starting with adornment and optional whitespace; complete
+         ;; adornment is in (match-string 1); there must be at least 3
+         ;; characters because otherwise explicit markup start would be
+         ;; recognized
+         (re-ado2 (concat "^\\(\\(["
+                          (if (or
+                               (< emacs-major-version 21)
+                               (save-match-data
+                                 (string-match "XEmacs\\|Lucid" emacs-version)))
+                              "^a-zA-Z0-9 \t\x00-\x1F"
+                            "^[:word:][:space:][:cntrl:]")
+                          "]\\)\\2\\2+\\)" re-hws "*$"))
+         )
     (list
      ;; FIXME: Block markup is not recognized in blocks after explicit markup
      ;; start
@@ -2076,19 +2076,19 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       (list
        re-ado2)
       (if (not rst-mode-lazy)
-	  (list 1 rst-block-face)
-	(list
-	 (list 'rst-font-lock-handle-adornment
-	       '(progn
-		  (setq rst-font-lock-adornment-point (match-end 1))
-		  (point-max))
-	       nil
-	       (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
-		     'append t)
-	       (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
-		     'append t)
-	       (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
-		     'append t)))))
+          (list 1 rst-block-face)
+        (list
+         (list 'rst-font-lock-handle-adornment
+               '(progn
+                  (setq rst-font-lock-adornment-point (match-end 1))
+                  (point-max))
+               nil
+               (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
+                     'append t)
+               (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
+                     'append t)
+               (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
+                     'append t)))))
 
      ;; `Comments`_
      (append
@@ -2096,26 +2096,26 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
        (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:]\\|:\\([^:]\\|$\\)\\)*$")
        (list 1 rst-comment-face))
       (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point (match-end 1))
-		    (point-max))
-		 nil
-		 (list 0 rst-comment-face 'append)))))
+          (list
+           (list 'rst-font-lock-find-unindented-line
+                 '(progn
+                    (setq rst-font-lock-indentation-point (match-end 1))
+                    (point-max))
+                 nil
+                 (list 0 rst-comment-face 'append)))))
      (append
       (list
        (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
        (list 1 rst-comment-face)
        (list 2 rst-comment-face))
       (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point 'next)
-		    (point-max))
-		 nil
-		 (list 0 rst-comment-face 'append)))))
+          (list
+           (list 'rst-font-lock-find-unindented-line
+                 '(progn
+                    (setq rst-font-lock-indentation-point 'next)
+                    (point-max))
+                 nil
+                 (list 0 rst-comment-face 'append)))))
 
      ;; `Literal Blocks`_
      (append
@@ -2123,13 +2123,13 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
        (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$")
        (list 3 rst-block-face))
       (if rst-mode-lazy
-	  (list
-	   (list 'rst-font-lock-find-unindented-line
-		 '(progn
-		    (setq rst-font-lock-indentation-point t)
-		    (point-max))
-		 nil
-		 (list 0 rst-literal-face 'append)))))
+          (list
+           (list 'rst-font-lock-find-unindented-line
+                 '(progn
+                    (setq rst-font-lock-indentation-point t)
+                    (point-max))
+                 nil
+                 (list 0 rst-literal-face 'append)))))
      )))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2144,24 +2144,24 @@ no such line before LIMIT (defaults to the end of the buffer) returns nil and
 point is not moved."
   (interactive)
   (let ((clm (or column (current-column)))
-	(start (point))
-	fnd beg cand)
+        (start (point))
+        fnd beg cand)
     (if (not limit)
-	(setq limit (point-max)))
+        (setq limit (point-max)))
     (save-match-data
       (while (and (not fnd) (< (point) limit))
-	(forward-line 1)
-	(when (< (point) limit)
-	  (setq beg (point))
-	  (if (looking-at "\\s *$")
-	      (setq cand (or cand beg)) ; An empty line is a candidate
-	    (move-to-column clm)
-	    ;; FIXME: No indentation [(zerop clm)] must be handled in some
-	    ;; useful way - though it is not clear what this should mean at all
-	    (if (string-match
-		 "^\\s *$" (buffer-substring-no-properties beg (point)))
-		(setq cand nil) ; An indented line resets a candidate
-	      (setq fnd (or cand beg)))))))
+        (forward-line 1)
+        (when (< (point) limit)
+          (setq beg (point))
+          (if (looking-at "\\s *$")
+              (setq cand (or cand beg)) ; An empty line is a candidate
+            (move-to-column clm)
+            ;; FIXME: No indentation [(zerop clm)] must be handled in some
+            ;; useful way - though it is not clear what this should mean at all
+            (if (string-match
+                 "^\\s *$" (buffer-substring-no-properties beg (point)))
+                (setq cand nil) ; An indented line resets a candidate
+              (setq fnd (or cand beg)))))))
     (goto-char (or fnd start))
     fnd))
 
@@ -2175,26 +2175,26 @@ point is not moved."
 
 (defun rst-font-lock-find-unindented-line (limit)
   (let* ((ind-pnt rst-font-lock-indentation-point)
-	 (beg-pnt ind-pnt))
+         (beg-pnt ind-pnt))
     ;; May run only once - enforce this
     (setq rst-font-lock-indentation-point nil)
     (when (and ind-pnt (not (numberp ind-pnt)))
       ;; Find indentation point in next line if any
       (setq ind-pnt
-	    (save-excursion
-	      (save-match-data
-		(if (eq ind-pnt 'next)
-		    (when (and (zerop (forward-line 1)) (< (point) limit))
-		      (setq beg-pnt (point))
-		      (when (not (looking-at "\\s *$"))
-			(looking-at "\\s *")
-			(match-end 0)))
-		  (while (and (zerop (forward-line 1)) (< (point) limit)
-			      (looking-at "\\s *$")))
-		  (when (< (point) limit)
-		    (setq beg-pnt (point))
-		    (looking-at "\\s *")
-		    (match-end 0)))))))
+            (save-excursion
+              (save-match-data
+                (if (eq ind-pnt 'next)
+                    (when (and (zerop (forward-line 1)) (< (point) limit))
+                      (setq beg-pnt (point))
+                      (when (not (looking-at "\\s *$"))
+                        (looking-at "\\s *")
+                        (match-end 0)))
+                  (while (and (zerop (forward-line 1)) (< (point) limit)
+                              (looking-at "\\s *$")))
+                  (when (< (point) limit)
+                    (setq beg-pnt (point))
+                    (looking-at "\\s *")
+                    (match-end 0)))))))
     (when ind-pnt
       (goto-char ind-pnt)
       ;; Always succeeds because the limit set by PRE-MATCH-FORM is the
@@ -2236,7 +2236,7 @@ entered.")
 ;; is not found and ADD. If KEY is not a string it is simply returned.
 (defun rst-adornment-level (key &optional add)
   (let ((fnd (assoc key rst-adornment-level-alist))
-	(new 1))
+        (new 1))
     (cond
      ((not (stringp key))
       key)
@@ -2244,9 +2244,9 @@ entered.")
       (cdr fnd))
      (add
       (while (rassoc new rst-adornment-level-alist)
-	(setq new (1+ new)))
+        (setq new (1+ new)))
       (setq rst-adornment-level-alist
-	    (append rst-adornment-level-alist (list (cons key new))))
+            (append rst-adornment-level-alist (list (cons key new))))
       new))))
 
 ;; Classifies adornment for section titles and transitions. ADORNMENT is the
@@ -2264,56 +2264,56 @@ entered.")
     (save-match-data
       (goto-char end)
       (let ((ado-ch (aref adornment 0))
-	    (ado-re (regexp-quote adornment))
-	    (end-pnt (point))
-	    (beg-pnt (progn
-		       (forward-line 0)
-		       (point)))
-	    (nxt-emp
-	     (save-excursion
-	       (or (not (zerop (forward-line 1)))
-		   (looking-at "\\s *$"))))
-	    (prv-emp
-	     (save-excursion
-	       (or (not (zerop (forward-line -1)))
-		   (looking-at "\\s *$"))))
-	    key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
-	(cond
-	 ((and nxt-emp prv-emp)
-	  ;; A transition
-	  (setq key t)
-	  (setq beg-txt beg-pnt)
-	  (setq end-txt end-pnt))
-	 (prv-emp
-	  ;; An overline
-	  (setq key (concat (list ado-ch) "o"))
-	  (setq beg-ovr beg-pnt)
-	  (setq end-ovr end-pnt)
-	  (forward-line 1)
-	  (setq beg-txt (point))
-	  (while (and (< (point) limit) (not end-txt))
-	    (if (looking-at "\\s *$")
-		;; No underline found
-		(setq end-txt (1- (point)))
-	      (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
-		(setq end-und (match-end 1))
-		(setq beg-und (point))
-		(setq end-txt (1- beg-und))))
-	    (forward-line 1)))
-	 (t
-	  ;; An underline
-	  (setq key (concat (list ado-ch) "u"))
-	  (setq beg-und beg-pnt)
-	  (setq end-und end-pnt)
-	  (setq end-txt (1- beg-und))
-	  (setq beg-txt (progn
-			  (if (re-search-backward "^\\s *$" 1 'move)
-			      (forward-line 1))
-			  (point)))))
-	(list key
-	      (or beg-ovr beg-txt beg-und)
-	      (or end-und end-txt end-und)
-	      beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
+            (ado-re (regexp-quote adornment))
+            (end-pnt (point))
+            (beg-pnt (progn
+                       (forward-line 0)
+                       (point)))
+            (nxt-emp
+             (save-excursion
+               (or (not (zerop (forward-line 1)))
+                   (looking-at "\\s *$"))))
+            (prv-emp
+             (save-excursion
+               (or (not (zerop (forward-line -1)))
+                   (looking-at "\\s *$"))))
+            key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
+        (cond
+         ((and nxt-emp prv-emp)
+          ;; A transition
+          (setq key t)
+          (setq beg-txt beg-pnt)
+          (setq end-txt end-pnt))
+         (prv-emp
+          ;; An overline
+          (setq key (concat (list ado-ch) "o"))
+          (setq beg-ovr beg-pnt)
+          (setq end-ovr end-pnt)
+          (forward-line 1)
+          (setq beg-txt (point))
+          (while (and (< (point) limit) (not end-txt))
+            (if (looking-at "\\s *$")
+                ;; No underline found
+                (setq end-txt (1- (point)))
+              (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
+                (setq end-und (match-end 1))
+                (setq beg-und (point))
+                (setq end-txt (1- beg-und))))
+            (forward-line 1)))
+         (t
+          ;; An underline
+          (setq key (concat (list ado-ch) "u"))
+          (setq beg-und beg-pnt)
+          (setq end-und end-pnt)
+          (setq end-txt (1- beg-und))
+          (setq beg-txt (progn
+                          (if (re-search-backward "^\\s *$" 1 'move)
+                              (forward-line 1))
+                          (point)))))
+        (list key
+              (or beg-ovr beg-txt beg-und)
+              (or end-und end-txt end-und)
+              beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
 
 ;; Handles adornments for font-locking section titles and transitions. Returns
 ;; three match groups. First and last match group matched pure overline /
@@ -2325,80 +2325,95 @@ entered.")
     (setq rst-font-lock-adornment-point nil)
     (if ado-pnt
       (let* ((ado (rst-classify-adornment (match-string-no-properties 1)
-					  ado-pnt limit))
-	     (key (car ado))
-	     (mtc (cdr ado)))
-	(setq rst-font-lock-level (rst-adornment-level key t))
-	(goto-char (nth 1 mtc))
-	(set-match-data mtc)
-	t))))
+                                          ado-pnt limit))
+             (key (car ado))
+             (mtc (cdr ado)))
+        (setq rst-font-lock-level (rst-adornment-level key t))
+        (goto-char (nth 1 mtc))
+        (set-match-data mtc)
+        t))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Support for conversion from within Emacs
 
-(defgroup rst-html nil
-  "Settings for conversion to HTML available by \\[rst-html-compile]."
+(defgroup rst-compile nil
+  "Settings for support of conversion of reStructuredText
+document with \\[rst-compile]."
   :group 'rst
   :version "21.1")
 
-(defcustom rst-html-command "rst2html.py"
-  "Command to convert an reST file to HTML."
-  :group 'rst-html
-  :type '(string))
+(defvar rst-compile-toolsets
+  '((html . ("rst2html.py" ".html" nil))
+    (latex . ("rst2latex.py" ".tex" nil))
+    (newlatex . ("rst2newlatex.py" ".tex" nil))
+    (pseudoxml . ("rst2pseudoxml.py" ".xml" nil))
+    (xml . ("rst2xml.py" ".xml" nil)))
+  "An association list of the toolset to a list of the (command to use,
+extension of produced filename, options to the tool (nil or a
+string)) to be used for converting the document.")
+
+;; Note for Python programmers not familiar with association lists: you can set
+;; values in an alists like this, e.g. :
+;; (setcdr (assq 'html rst-compile-toolsets)
+;;      '("rst2html.py" ".htm" "--stylesheet=/docutils.css"))
+
 
-(defcustom rst-html-options ""
-  "Local file options for reST to HTML conversion.
-Stylesheets are set by an own option."
-  :group 'rst-html
-  :type '(string))
+(defvar rst-compile-primary-toolset 'html
+  "The default toolset for rst-compile.")
 
-(defcustom rst-html-extension ".html"
-  "Extension for HTML output file."
-  :group 'rst-html
-  :type '(string))
+(defvar rst-compile-secondary-toolset 'latex
+  "The default toolset for rst-compile with a prefix argument.")
 
-(defun rst-html-find-conf ()
+(defun rst-compile-find-conf ()
   "Look for the configuration file in the parents of the current path."
   (interactive)
   (let ((file-name "docutils.conf")
-	(buffer-file (buffer-file-name)))
+        (buffer-file (buffer-file-name)))
     ;; Move up in the dir hierarchy till we find a change log file.
     (let ((dir (file-name-directory buffer-file)))
       (while (and (or (not (string= "/" dir)) (setq dir nil) nil)
-		  (not (file-exists-p (concat dir file-name))))
-	;; Move up to the parent dir and try again.
-	(setq dir (expand-file-name (file-name-directory
-				     (directory-file-name
-				     (file-name-directory dir))))) )
+                  (not (file-exists-p (concat dir file-name))))
+        ;; Move up to the parent dir and try again.
+        (setq dir (expand-file-name (file-name-directory
+                                     (directory-file-name
+                                     (file-name-directory dir))))) )
       (or (and dir (concat dir file-name)) nil)
     )))
 
-(defun rst-html-compile ()
-  "Compile command to convert reST document into HTML.
-Attempts to find configuration file, if it can, overrides the options."
-  (interactive)
+(defun rst-compile (&optional pfxarg)
+  "Compile command to convert reST document into some output file.
+Attempts to find configuration file, if it can, overrides the
+options."
+  (interactive "P")
   ;; Note: maybe we want to check if there is a Makefile too and not do anything
   ;; if that is the case.  I dunno.
-  (let* ((conffile (rst-html-find-conf))
-	 (bufname (file-name-nondirectory buffer-file-name))
-	 (outname (file-name-sans-extension bufname)))
+  (let* ((toolset (cdr (assq (if pfxarg
+				 rst-compile-secondary-toolset
+			       rst-compile-primary-toolset)
+			rst-compile-toolsets)))
+         (command (car toolset))
+         (extension (cadr toolset))
+         (options (caddr toolset))
+         (conffile (rst-compile-find-conf))
+         (bufname (file-name-nondirectory buffer-file-name))
+         (outname (file-name-sans-extension bufname)))
 
     ;; Set compile-command before invocation of compile.
     (set (make-local-variable 'compile-command)
-	 (mapconcat 'identity
-		    (list rst-html-command
-			  rst-html-options
-			  (if conffile
-			      (concat "--config=\"" conffile "\"")
-			    "")
-			  bufname
-			  (concat outname rst-html-extension))
-		    " "))
+         (mapconcat 'identity
+                    (list command
+                          (or options "")
+                          (if conffile
+                              (concat "--config=\"" conffile "\"")
+                            "")
+                          bufname
+                          (concat outname extension))
+                    " "))
 
     ;; Invoke the compile command.
     (if (or compilation-read-command current-prefix-arg)
-	(call-interactively 'compile)
+        (call-interactively 'compile)
       (compile compile-command))
     ))
 
-- 
cgit v1.2.1


From c2c4c2c253bb89375e71288cba91ef28c6d10046 Mon Sep 17 00:00:00 2001
From: blais 
Date: Mon, 31 Oct 2005 00:32:13 +0000
Subject: Fixed minor bug with underlining function invoked at the end of the
 document.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3989 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 68179e73c..d2ee8c225 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -418,7 +418,8 @@ have been seen.
 
 (defun rst-delete-line ()
   "A version of kill-line that does not use the kill-ring."
-  (delete-region (line-beginning-position) (+ 1 (line-end-position))))
+  (delete-region (line-beginning-position) (min (+ 1 (line-end-position))
+						(point-max))))
 
 (defun rst-update-section (char style &optional indent)
   "Unconditionally updates the style of a section decoration
-- 
cgit v1.2.1


From 034774dae47a063345a99ac6e91d8647720a9e9a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Mon, 31 Oct 2005 03:22:45 +0000
Subject: minor edits for consistency, typos, links, etc.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3990 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/README.txt | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/README.txt b/tools/editors/emacs/README.txt
index 6f0f72891..2c3e32ce5 100644
--- a/tools/editors/emacs/README.txt
+++ b/tools/editors/emacs/README.txt
@@ -1,20 +1,14 @@
 .. -*- coding: utf-8 -*-
 
-=====================================
- Emacs Support for reStructuredText_
-=====================================
+=====================
+ Emacs Support Files
+=====================
 
 :Date: $Date$
 
-.. _reStructuredText: http://docutils.sourceforge.net/rst.html
-
-
-Directory Contents
-==================
-
 This directory contains the following Emacs lisp package files:
 
-* rst.el : Emacs support for ReStructuredText. This file contains
+* rst.el: Emacs support for reStructuredText_.  This file contains
 
   * Section decoration/adornment creation and updating (M. Blais);
   * Table-of-contents mode and insertion (M. Blais);
@@ -28,3 +22,8 @@ This directory contains the following Emacs lisp package files:
 
 To install the package, put a copy of the package file in a directory on your
 ``load-path`` (use ``C-h v load-path`` to check).
+
+For setup and usage details, see `Emacs Support for reStructuredText
+<../../../docs/user/emacs.html>`_.
+
+.. _reStructuredText: http://docutils.sourceforge.net/rst.html
-- 
cgit v1.2.1


From d2fbea7bc8bdf75fe9a57b67062f688ea8ffae47 Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 1 Nov 2005 19:47:32 +0000
Subject: Updated rst.el with rst-mode.el 0.2.9

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3994 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 592 ++++++++++++++++++++++++++++-----------------
 1 file changed, 369 insertions(+), 223 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index d2ee8c225..43f3c380c 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -138,6 +138,11 @@
 ;;   automatic toc update. The cursor ends up in the TOC and this is
 ;;   annoying. Gotta fix that.
 ;;
+;; rst-mode
+;; --------
+;; - Look at the possibility of converting rst-mode from a Major mode to a Minor
+;;   mode of text-mode.
+;;
 ;; Other
 ;; -----
 ;; - We should rename "adornment" to "decoration" or vice-versa in this
@@ -1692,9 +1697,91 @@ up to the leftmost character in the region."
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; rst-mode
-;; ========
+;;; rst-mode.el --- Mode for viewing and editing reStructuredText-documents.
+;;
+;; Copyright 2003 Stefan Merten 
+;;
+;; Note: this is an update from version 0.2.9 of rst-mode.el
+;;
+;; DESCRIPTION
+;;
+;; This package provides support for documents marked up using the
+;; reStructuredText format. Support includes font locking as well as some
+;; convenience functions for editing. It does this by defining a Emacs major
+;; mode.
+;; 
+;; The package is based on text-mode and inherits some things from it.
+;; Particularly text-mode-hook is run before rst-mode-hook.
+;;
+;; OPTIONS
+;;
+;; There are a number of things which can be customized using the standard
+;; Emacs customization features. There are two customization groups for this
+;; mode.
+;;
+;; Customization
+;; =============
+;;
+;; rst
+;; ---
+;; This group contains some general customizable features.
+;;
+;; The group is contained in the wp group.
+;;
+;; rst-faces
+;; ---------
+;; This group contains all necessary for customizing fonts. The default
+;; settings use standard font-lock-*-face's so if you set these to your
+;; liking they are probably good in rst-mode also.
+;;
+;; The group is contained in the faces group as well as in the rst group.
+;;
+;; rst-faces-defaults
+;; ------------------
+;; This group contains all necessary for customizing the default fonts used for
+;; section title faces.
+;;
+;; The general idea for section title faces is to have a non-default background
+;; but do not change the background. The section level is shown by the
+;; lightness of the background color. If you like this general idea of
+;; generating faces for section titles but do not like the details this group
+;; is the point where you can customize the details. If you do not like the
+;; general idea, however, you should customize the faces used in
+;; rst-adornment-faces-alist.
+;;
+;; Note: If you are using a dark background please make sure the variable
+;; frame-background-mode is set to the symbol dark. This triggers
+;; some default values which are probably right for you.
+;;
+;; The group is contained in the rst-faces group.
+;;
+;; All customizable features have a comment explaining their meaning. Refer to
+;; the customization of your Emacs (try ``M-x customize``).
+
+;; SEE ALSO
+;;
+;; http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html
+
+;; AUTHOR
+;;
+;; Stefan Merten 
+
+;; LICENSE
+;;
+;; This program is licensed under the terms of the GPL. See
+;;
+;;   http://www.gnu.org/licenses/gpl.txt
+
+;; AVAILABILITY
 ;;
+;; See
+;;
+;;   http://www.merten-home.de/FreeSoftware/rst-mode/
+
+
+;;; Code:
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Customization:
 
 (defcustom rst-mode-hook nil
@@ -1778,50 +1865,106 @@ The value of this variable is used when Rst Mode is turned on."
   :group 'rst-faces
   :type '(face))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defgroup rst-faces-defaults nil
+  "Values used to generate default faces for section titles on all levels.
+Tweak these if you are content with how section title faces are built in
+general but you do not like the details."
+  :group 'rst-faces
+  :version "21.1")
+
+(defun rst-define-level-faces ()
+  "Define the faces for the section title text faces from the values."
+  ;; All variables used here must be checked in `rst-set-level-default'
+  (let ((i 1))
+    (while (<= i rst-level-face-max)
+      (let ((sym (intern (format "rst-level-%d-face" i)))
+	    (doc (format "Face for showing section title text at level %d" i))
+	    (col (format (concat "%s" rst-level-face-format-light)
+			 rst-level-face-base-color
+			 (+ (* (1- i) rst-level-face-step-light)
+			    rst-level-face-base-light))))
+	(make-empty-face sym)
+	(set-face-doc-string sym doc)
+	(set-face-background sym col)
+	(set sym sym)
+	(setq i (1+ i))))))
+
+(defun rst-set-level-default (sym val)
+  "Set a customized value affecting section title text face and recompute the
+faces."
+  (custom-set-default sym val)
+  ;; Also defines the faces initially when all values are available
+  (and (boundp 'rst-level-face-max)
+       (boundp 'rst-level-face-format-light)
+       (boundp 'rst-level-face-base-color)
+       (boundp 'rst-level-face-step-light)
+       (boundp 'rst-level-face-base-light)
+       (rst-define-level-faces)))
+
 ;; Faces for displaying items on several levels; these definitions define
-;; different shades of grey where the lightest one is used for level 1
-(defconst rst-level-face-max 6
-  "Maximum depth of level faces defined")
-(defconst rst-level-face-base-color "grey"
-  "The base color to be used for creating level faces")
-(defconst rst-level-face-base-light 85
-  "The lightness factor for the base color")
-(defconst rst-level-face-format-light "%2d"
-  "The format for the lightness factor for the base color")
-(defconst rst-level-face-step-light -7
-  "The step width to use for next color")
-
-;; Define the faces
-(let ((i 1))
-  (while (<= i rst-level-face-max)
-    (let ((sym (intern (format "rst-level-%d-face" i)))
-          (doc (format "Face for showing section title text at level %d" i))
-          (col (format (concat "%s" rst-level-face-format-light)
-                       rst-level-face-base-color
-                       (+ (* (1- i) rst-level-face-step-light)
-                          rst-level-face-base-light))))
-      (make-empty-face sym)
-      (set-face-doc-string sym doc)
-      (set-face-background sym col)
-      (set sym sym)
-    (setq i (1+ i)))))
+;; different shades of grey where the lightest one (i.e. least contrasting) is
+;; used for level 1
+(defcustom rst-level-face-max 6
+  "Maximum depth of levels for which section title faces are defined."
+  :group 'rst-faces-defaults
+  :type '(integer)
+  :set 'rst-set-level-default)
+(defcustom rst-level-face-base-color "grey"
+  "The base name of the color to be used for creating background colors in
+ection title faces for all levels."
+  :group 'rst-faces-defaults
+  :type '(string)
+  :set 'rst-set-level-default)
+(defcustom rst-level-face-base-light
+  (if (eq frame-background-mode 'dark)
+      15
+    85)
+  "The lightness factor for the base color. This value is used for level 1. The
+default depends on whether the value of `frame-background-mode' is `dark' or
+not."
+  :group 'rst-faces-defaults
+  :type '(integer)
+  :set 'rst-set-level-default)
+(defcustom rst-level-face-format-light "%2d"
+  "The format for the lightness factor appended to the base name of the color.
+This value is expanded by `format' with an integer."
+  :group 'rst-faces-defaults
+  :type '(string)
+  :set 'rst-set-level-default)
+(defcustom rst-level-face-step-light
+  (if (eq frame-background-mode 'dark)
+      7
+    -7)
+  "The step width to use for the next color. The formula
+`rst-level-face-base-light' + (`rst-level-face-max' - 1) * `rst-level-face-step-light'
+must result in a color level which appended to `rst-level-face-base-color'
+using `rst-level-face-format-light' results in a valid color such as `grey50'.
+This color is used as background for section title text on level
+`rst-level-face-max'."
+  :group 'rst-faces-defaults
+  :type '(integer)
+  :set 'rst-set-level-default)
 
 (defcustom rst-adornment-faces-alist
-  '((1 . rst-level-1-face)
-    (2 . rst-level-2-face)
-    (3 . rst-level-3-face)
-    (4 . rst-level-4-face)
-    (5 . rst-level-5-face)
-    (6 . rst-level-6-face)
-    (t . font-lock-keyword-face)
-    (nil . font-lock-keyword-face))
+  (let ((alist '((t . font-lock-keyword-face)
+		 (nil . font-lock-keyword-face)))
+	(i 1))
+    (while (<= i rst-level-face-max)
+      (nconc alist (list (cons i (intern (format "rst-level-%d-face" i)))))
+      (setq i (1+ i)))
+    alist)
   "Provides faces for the various adornment types. Key is a number (for the
 section title text of that level), t (for transitions) or nil (for section
-title adornment)."
+title adornment). If you generally do not like how section title text faces are
+set up tweak here. If the general idea is ok for you but you do not like the
+details check the Rst Faces Defaults group."
   :group 'rst-faces
-  :type '(alist :key-type (choice (integer :tag "Section level")
-                                  (boolean :tag "transitions (on) / section title adornment (off)"))
-                :value-type (face)))
+  :type '(alist :key-type (choice (integer :tag "Section level (may not be bigger than `rst-level-face-max')")
+				  (boolean :tag "transitions (on) / section title adornment (off)"))
+		:value-type (face))
+  :set-after '(rst-level-face-max))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1897,9 +2040,9 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
   ;; Font lock
   (set (make-local-variable 'font-lock-defaults)
        '(rst-font-lock-keywords-function
-         t nil nil nil
-         (font-lock-multiline . t)
-         (font-lock-mark-block-function . mark-paragraph)))
+	 t nil nil nil
+	 (font-lock-multiline . t)
+	 (font-lock-mark-block-function . mark-paragraph)))
   (when (boundp 'font-lock-support-mode)
     ;; rst-mode has its own mind about font-lock-support-mode
     (make-local-variable 'font-lock-support-mode)
@@ -1907,16 +2050,16 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
      ((and (not rst-mode-lazy) (not font-lock-support-mode)))
      ;; No support mode set and none required - leave it alone
      ((or (not font-lock-support-mode) ;; No support mode set (but required)
-          (symbolp font-lock-support-mode)) ;; or a fixed mode for all
+	  (symbolp font-lock-support-mode)) ;; or a fixed mode for all
       (setq font-lock-support-mode
-            (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
-                  (cons t font-lock-support-mode))))
+	    (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
+		  (cons t font-lock-support-mode))))
      ((and (listp font-lock-support-mode)
-           (not (assoc 'rst-mode font-lock-support-mode)))
+	   (not (assoc 'rst-mode font-lock-support-mode)))
       ;; A list of modes missing rst-mode
       (setq font-lock-support-mode
-            (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
-                    font-lock-support-mode)))))
+	    (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
+		    font-lock-support-mode)))))
 
   ;; Names and hooks
   (setq mode-name "reST")
@@ -1929,57 +2072,57 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
 
 (defun rst-font-lock-keywords-function ()
   "Returns keywords to highlight in rst mode according to current settings."
-  ;; The reST links in the comments below all relate to sections in
-  ;; http://docutils.sourceforge.net/rst.html
+  ;; The reST-links in the comments below all relate to sections in
+  ;; http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html
   (let* ( ;; This gets big - so let's define some abbreviations
-         ;; horizontal white space
-         (re-hws "[\t ]")
-         ;; beginning of line with possible indentation
-         (re-bol (concat "^" re-hws "*"))
-         ;; Separates block lead-ins from their content
-         (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
-         ;; explicit markup tag
-         (re-emt "\\.\\.")
-         ;; explicit markup start
-         (re-ems (concat re-emt re-hws "+"))
-         ;; inline markup prefix
-         (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
-         ;; symbol character
-         (re-sym1 "\\(\\sw\\|\\s_\\)")
-         ;; inline markup content begin
-         (re-imbeg2 "\\(\\S \\|\\S \\([^")
-
-         ;; There seems to be a bug leading to error "Stack overflow in regexp
-         ;; matcher" when "|" or "\\*" are the characters searched for
-         (re-imendbeg
-          (if (< emacs-major-version 21)
-              "]"
-            "\\]\\|\\\\."))
-         ;; inline markup content end
-         (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
-         ;; inline markup content without asterisk
-         (re-ima2 (concat re-imbeg2 "*" re-imend))
-         ;; inline markup content without backquote
-         (re-imb2 (concat re-imbeg2 "`" re-imend))
-         ;; inline markup content without vertical bar
-         (re-imv2 (concat re-imbeg2 "|" re-imend))
-         ;; Supported URI schemes
-         (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
-         ;; Line starting with adornment and optional whitespace; complete
-         ;; adornment is in (match-string 1); there must be at least 3
-         ;; characters because otherwise explicit markup start would be
-         ;; recognized
-         (re-ado2 (concat "^\\(\\(["
-                          (if (or
-                               (< emacs-major-version 21)
-                               (save-match-data
-                                 (string-match "XEmacs\\|Lucid" emacs-version)))
-                              "^a-zA-Z0-9 \t\x00-\x1F"
-                            "^[:word:][:space:][:cntrl:]")
-                          "]\\)\\2\\2+\\)" re-hws "*$"))
-         )
+	 ;; horizontal white space
+	 (re-hws "[\t ]")
+	 ;; beginning of line with possible indentation
+	 (re-bol (concat "^" re-hws "*"))
+	 ;; Separates block lead-ins from their content
+	 (re-blksep1 (concat "\\(" re-hws "+\\|$\\)"))
+	 ;; explicit markup tag
+	 (re-emt "\\.\\.")
+	 ;; explicit markup start
+	 (re-ems (concat re-emt re-hws "+"))
+	 ;; inline markup prefix
+	 (re-imp1 (concat "\\(^\\|" re-hws "\\|[-'\"([{/:.,;!?\\]\\|$\\)"))
+	 ;; symbol character
+	 (re-sym1 "\\(\\sw\\|\\s_\\)")
+	 ;; inline markup content begin
+	 (re-imbeg2 "\\(\\S \\|\\S \\([^")
+
+	 ;; There seems to be a bug leading to error "Stack overflow in regexp
+	 ;; matcher" when "|" or "\\*" are the characters searched for
+	 (re-imendbeg
+	  (if (< emacs-major-version 21)
+	      "]"
+	    "\\]\\|\\\\."))
+	 ;; inline markup content end
+	 (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)"))
+	 ;; inline markup content without asterisk
+	 (re-ima2 (concat re-imbeg2 "*" re-imend))
+	 ;; inline markup content without backquote
+	 (re-imb2 (concat re-imbeg2 "`" re-imend))
+	 ;; inline markup content without vertical bar
+	 (re-imv2 (concat re-imbeg2 "|" re-imend))
+	 ;; Supported URI schemes
+	 (re-uris1 "\\(acap\\|cid\\|data\\|dav\\|fax\\|file\\|ftp\\|gopher\\|http\\|https\\|imap\\|ldap\\|mailto\\|mid\\|modem\\|news\\|nfs\\|nntp\\|pop\\|prospero\\|rtsp\\|service\\|sip\\|tel\\|telnet\\|tip\\|urn\\|vemmi\\|wais\\)")
+	 ;; Line starting with adornment and optional whitespace; complete
+	 ;; adornment is in (match-string 1); there must be at least 3
+	 ;; characters because otherwise explicit markup start would be
+	 ;; recognized
+	 (re-ado2 (concat "^\\(\\(["
+			  (if (or
+			       (< emacs-major-version 21)
+			       (save-match-data
+				 (string-match "XEmacs\\|Lucid" emacs-version)))
+			      "^a-zA-Z0-9 \t\x00-\x1F"
+			    "^[:word:][:space:][:cntrl:]")
+			  "]\\)\\2\\2+\\)" re-hws "*$"))
+	 )
     (list
      ;; FIXME: Block markup is not recognized in blocks after explicit markup
      ;; start
@@ -2077,19 +2220,19 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       (list
        re-ado2)
       (if (not rst-mode-lazy)
-          (list 1 rst-block-face)
-        (list
-         (list 'rst-font-lock-handle-adornment
-               '(progn
-                  (setq rst-font-lock-adornment-point (match-end 1))
-                  (point-max))
-               nil
-               (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
-                     'append t)
-               (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
-                     'append t)
-               (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
-                     'append t)))))
+	  (list 1 rst-block-face)
+	(list
+	 (list 'rst-font-lock-handle-adornment
+	       '(progn
+		  (setq rst-font-lock-adornment-point (match-end 1))
+		  (point-max))
+	       nil
+	       (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
+		     'append t)
+	       (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
+		     'append t)
+	       (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
+		     'append t)))))
 
      ;; `Comments`_
      (append
@@ -2097,26 +2240,26 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
        (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:]\\|:\\([^:]\\|$\\)\\)*$")
        (list 1 rst-comment-face))
       (if rst-mode-lazy
-          (list
-           (list 'rst-font-lock-find-unindented-line
-                 '(progn
-                    (setq rst-font-lock-indentation-point (match-end 1))
-                    (point-max))
-                 nil
-                 (list 0 rst-comment-face 'append)))))
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point (match-end 1))
+		    (point-max))
+		 nil
+		 (list 0 rst-comment-face 'append)))))
      (append
       (list
        (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
        (list 1 rst-comment-face)
        (list 2 rst-comment-face))
       (if rst-mode-lazy
-          (list
-           (list 'rst-font-lock-find-unindented-line
-                 '(progn
-                    (setq rst-font-lock-indentation-point 'next)
-                    (point-max))
-                 nil
-                 (list 0 rst-comment-face 'append)))))
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point 'next)
+		    (point-max))
+		 nil
+		 (list 0 rst-comment-face 'append)))))
 
      ;; `Literal Blocks`_
      (append
@@ -2124,13 +2267,13 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
        (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$")
        (list 3 rst-block-face))
       (if rst-mode-lazy
-          (list
-           (list 'rst-font-lock-find-unindented-line
-                 '(progn
-                    (setq rst-font-lock-indentation-point t)
-                    (point-max))
-                 nil
-                 (list 0 rst-literal-face 'append)))))
+	  (list
+	   (list 'rst-font-lock-find-unindented-line
+		 '(progn
+		    (setq rst-font-lock-indentation-point t)
+		    (point-max))
+		 nil
+		 (list 0 rst-literal-face 'append)))))
      )))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2145,24 +2288,24 @@ no such line before LIMIT (defaults to the end of the buffer) returns nil and
 point is not moved."
   (interactive)
   (let ((clm (or column (current-column)))
-        (start (point))
-        fnd beg cand)
+	(start (point))
+	fnd beg cand)
     (if (not limit)
-        (setq limit (point-max)))
+	(setq limit (point-max)))
     (save-match-data
       (while (and (not fnd) (< (point) limit))
-        (forward-line 1)
-        (when (< (point) limit)
-          (setq beg (point))
-          (if (looking-at "\\s *$")
-              (setq cand (or cand beg)) ; An empty line is a candidate
-            (move-to-column clm)
-            ;; FIXME: No indentation [(zerop clm)] must be handled in some
-            ;; useful way - though it is not clear what this should mean at all
-            (if (string-match
-                 "^\\s *$" (buffer-substring-no-properties beg (point)))
-                (setq cand nil) ; An indented line resets a candidate
-              (setq fnd (or cand beg)))))))
+	(forward-line 1)
+	(when (< (point) limit)
+	  (setq beg (point))
+	  (if (looking-at "\\s *$")
+	      (setq cand (or cand beg)) ; An empty line is a candidate
+	    (move-to-column clm)
+	    ;; FIXME: No indentation [(zerop clm)] must be handled in some
+	    ;; useful way - though it is not clear what this should mean at all
+	    (if (string-match
+		 "^\\s *$" (buffer-substring-no-properties beg (point)))
+		(setq cand nil) ; An indented line resets a candidate
+	      (setq fnd (or cand beg)))))))
     (goto-char (or fnd start))
     fnd))
 
@@ -2176,26 +2319,26 @@ point is not moved."
 
 (defun rst-font-lock-find-unindented-line (limit)
   (let* ((ind-pnt rst-font-lock-indentation-point)
-         (beg-pnt ind-pnt))
+	 (beg-pnt ind-pnt))
     ;; May run only once - enforce this
     (setq rst-font-lock-indentation-point nil)
     (when (and ind-pnt (not (numberp ind-pnt)))
       ;; Find indentation point in next line if any
       (setq ind-pnt
-            (save-excursion
-              (save-match-data
-                (if (eq ind-pnt 'next)
-                    (when (and (zerop (forward-line 1)) (< (point) limit))
-                      (setq beg-pnt (point))
-                      (when (not (looking-at "\\s *$"))
-                        (looking-at "\\s *")
-                        (match-end 0)))
-                  (while (and (zerop (forward-line 1)) (< (point) limit)
-                              (looking-at "\\s *$")))
-                  (when (< (point) limit)
-                    (setq beg-pnt (point))
-                    (looking-at "\\s *")
-                    (match-end 0)))))))
+	    (save-excursion
+	      (save-match-data
+		(if (eq ind-pnt 'next)
+		    (when (and (zerop (forward-line 1)) (< (point) limit))
+		      (setq beg-pnt (point))
+		      (when (not (looking-at "\\s *$"))
+			(looking-at "\\s *")
+			(match-end 0)))
+		  (while (and (zerop (forward-line 1)) (< (point) limit)
+			      (looking-at "\\s *$")))
+		  (when (< (point) limit)
+		    (setq beg-pnt (point))
+		    (looking-at "\\s *")
+		    (match-end 0)))))))
     (when ind-pnt
       (goto-char ind-pnt)
       ;; Always succeeds because the limit set by PRE-MATCH-FORM is the
@@ -2237,7 +2380,7 @@ entered.")
 ;; is not found and ADD. If KEY is not a string it is simply returned.
 (defun rst-adornment-level (key &optional add)
   (let ((fnd (assoc key rst-adornment-level-alist))
-        (new 1))
+	(new 1))
     (cond
      ((not (stringp key))
       key)
@@ -2245,9 +2388,9 @@ entered.")
       (cdr fnd))
      (add
       (while (rassoc new rst-adornment-level-alist)
-        (setq new (1+ new)))
+	(setq new (1+ new)))
       (setq rst-adornment-level-alist
-            (append rst-adornment-level-alist (list (cons key new))))
+	    (append rst-adornment-level-alist (list (cons key new))))
       new))))
 
 ;; Classifies adornment for section titles and transitions. ADORNMENT is the
@@ -2265,56 +2408,56 @@ entered.")
     (save-match-data
       (goto-char end)
       (let ((ado-ch (aref adornment 0))
-            (ado-re (regexp-quote adornment))
-            (end-pnt (point))
-            (beg-pnt (progn
-                       (forward-line 0)
-                       (point)))
-            (nxt-emp
-             (save-excursion
-               (or (not (zerop (forward-line 1)))
-                   (looking-at "\\s *$"))))
-            (prv-emp
-             (save-excursion
-               (or (not (zerop (forward-line -1)))
-                   (looking-at "\\s *$"))))
-            key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
-        (cond
-         ((and nxt-emp prv-emp)
-          ;; A transition
-          (setq key t)
-          (setq beg-txt beg-pnt)
-          (setq end-txt end-pnt))
-         (prv-emp
-          ;; An overline
-          (setq key (concat (list ado-ch) "o"))
-          (setq beg-ovr beg-pnt)
-          (setq end-ovr end-pnt)
-          (forward-line 1)
-          (setq beg-txt (point))
-          (while (and (< (point) limit) (not end-txt))
-            (if (looking-at "\\s *$")
-                ;; No underline found
-                (setq end-txt (1- (point)))
-              (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
-                (setq end-und (match-end 1))
-                (setq beg-und (point))
-                (setq end-txt (1- beg-und))))
-            (forward-line 1)))
-         (t
-          ;; An underline
-          (setq key (concat (list ado-ch) "u"))
-          (setq beg-und beg-pnt)
-          (setq end-und end-pnt)
-          (setq end-txt (1- beg-und))
-          (setq beg-txt (progn
-                          (if (re-search-backward "^\\s *$" 1 'move)
-                              (forward-line 1))
-                          (point)))))
-        (list key
-              (or beg-ovr beg-txt beg-und)
-              (or end-und end-txt end-und)
-              beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
+	    (ado-re (regexp-quote adornment))
+	    (end-pnt (point))
+	    (beg-pnt (progn
+		       (forward-line 0)
+		       (point)))
+	    (nxt-emp
+	     (save-excursion
+	       (or (not (zerop (forward-line 1)))
+		   (looking-at "\\s *$"))))
+	    (prv-emp
+	     (save-excursion
+	       (or (not (zerop (forward-line -1)))
+		   (looking-at "\\s *$"))))
+	    key beg-ovr end-ovr beg-txt end-txt beg-und end-und)
+	(cond
+	 ((and nxt-emp prv-emp)
+	  ;; A transition
+	  (setq key t)
+	  (setq beg-txt beg-pnt)
+	  (setq end-txt end-pnt))
+	 (prv-emp
+	  ;; An overline
+	  (setq key (concat (list ado-ch) "o"))
+	  (setq beg-ovr beg-pnt)
+	  (setq end-ovr end-pnt)
+	  (forward-line 1)
+	  (setq beg-txt (point))
+	  (while (and (< (point) limit) (not end-txt))
+	    (if (looking-at "\\s *$")
+		;; No underline found
+		(setq end-txt (1- (point)))
+	      (when (looking-at (concat "\\(" ado-re "\\)\\s *$"))
+		(setq end-und (match-end 1))
+		(setq beg-und (point))
+		(setq end-txt (1- beg-und))))
+	    (forward-line 1)))
+	 (t
+	  ;; An underline
+	  (setq key (concat (list ado-ch) "u"))
+	  (setq beg-und beg-pnt)
+	  (setq end-und end-pnt)
+	  (setq end-txt (1- beg-und))
+	  (setq beg-txt (progn
+			  (if (re-search-backward "^\\s *$" 1 'move)
+			      (forward-line 1))
+			  (point)))))
+	(list key
+	      (or beg-ovr beg-txt beg-und)
+	      (or end-und end-txt end-und)
+	      beg-ovr end-ovr beg-txt end-txt beg-und end-und)))))
 
 ;; Handles adornments for font-locking section titles and transitions. Returns
 ;; three match groups. First and last match group matched pure overline /
@@ -2326,13 +2469,16 @@ entered.")
     (setq rst-font-lock-adornment-point nil)
     (if ado-pnt
       (let* ((ado (rst-classify-adornment (match-string-no-properties 1)
-                                          ado-pnt limit))
-             (key (car ado))
-             (mtc (cdr ado)))
-        (setq rst-font-lock-level (rst-adornment-level key t))
-        (goto-char (nth 1 mtc))
-        (set-match-data mtc)
-        t))))
+					  ado-pnt limit))
+	     (key (car ado))
+	     (mtc (cdr ado)))
+	(setq rst-font-lock-level (rst-adornment-level key t))
+	(goto-char (nth 1 mtc))
+	(set-match-data mtc)
+	t))))
+
+;;; rst-mode.el ends here
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.1


From 747b9ac9bdb4d54a7eacca166ad3865c89bf93e7 Mon Sep 17 00:00:00 2001
From: blais 
Date: Mon, 7 Nov 2005 14:35:10 +0000
Subject: - Changed the default bindings due to the explosion of new   feature:
 we now have a prefix-map, which is bound to 'C-c p',   so the 'C-x p XXXX'
 commands are all for the rst.el file   functions.  I left a few bindings:

  * C-= is still there, because it is the single most useful
    command and it should be invoked with one key (you can get to
    it with 'C-c p a' too).

  * I moved 'C-M-{' to 'C-c n' or 'C-c p n' and did the same for
    the forward movement commands.

  * 'C-c C-l' and 'C-c C-r' have been kept, since they have a
    similar role than those bindings have in progmodes.

- I removed all the bindings from 'C-x ...' prefix map, since we
  should be using the mode-specific map, which is 'C-c ...'.  I'm
  also now using the mode-prefix-map variable, so people who have
  rebound theirs will get the benefits of their customization.

- Started defining some abbrevs, e.g. 'con' for ''.. contents::'

- Changed a lot of 'if's to 'when' and 'unless' clauses.

- I added a function to find the node within the section subtree
  where the cursor lives. This function is used to compute the
  desired location of point in the toc table, which fixes a bug
  with the cursor being off when there were missing nodes.

- The toc insertion now uses the insertion point to determine
  where to start rendering the TOC.  This fixes a problem with
  guessing the titles and subtitles and heuristically removing
  them, simplifies the rst-toc-insert function and this new
  choices automatically supports local tocs.

- Fixed the shifting functions to use markers, so that they can
  be used repeatedly with my repeat-repeatable-command advice.
  This just makes the functions more robust.

- Added an option to automatically fill on shifting a region left
  or right (this needs more work).




git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4004 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 438 ++++++++++++++++++++++++++++-----------------
 1 file changed, 273 insertions(+), 165 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 43f3c380c..143c7f688 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -60,25 +60,47 @@
 ;;   (require 'rst)
 ;;   (add-hook 'text-mode-hook 'rst-text-mode-bindings)
 ;;
-;; The keys it defines are:
+;; rst-prefix-map is the prefix map for all the functionality provide by this
+;; module.  In addition, other shorter bindings are also provided on the
+;; mode-specific-map prefix (i.e C-c).
 ;;
-;;    C-= : updates or rotates the section title around point or
-;;          promotes/demotes the decorations within the region (see full details
-;;          below).
 ;;
-;;          Note that C-= is a good binding, since it allows you to specify a
-;;          negative arg easily with C-- C-= (easy to type), as well as ordinary
-;;          prefix arg with C-u C-=.
+;;    C-c p a (also C-=): rst-adjust 
 ;;
-;;    C-x C-= : displays the hierarchical table-of-contents of the document and
-;;              allows you to jump to any section from it.
+;;       Updates or rotates the section title around point or promotes/demotes
+;;       the decorations within the region (see full details below).
 ;;
-;;    C-u C-x C-= : displays the title decorations from this file.
+;;       Note that C-= is a good binding, since it allows you to specify a
+;;       negative arg easily with C-- C-= (easy to type), as well as ordinary
+;;       prefix arg with C-u C-=.
 ;;
-;;    C-x + : insert the table of contents in the text.  See the many options
-;;            for customizing how it will look.
+;;    C-c p h: rst-display-decorations-hierarchy
+;;
+;;       Displays the level decorations that are available in the file.
+;;
+;;    C-c p t: rst-toc
+;;
+;;       Displays the hierarchical table-of-contents of the document and allows
+;;       you to jump to any section from it.
+;;
+;;    C-c p i: rst-toc-insert
+;;
+;;       Inserts a table-of-contents in the document at the column where the
+;;       cursor is.
+;;
+;;    C-c p u: rst-toc-insert-update
+;;
+;;       Find an existing inserted table-of-contents in the document an updates it.
+;;
+;;    C-c p p, C-c p n  (C-c C-p, C-c C-n): rst-backward-section, rst-forward-section
+;;
+;;       Navigate between section titles.
+;;
+;;    C-c p l, C-c p r  (C-c C-l, C-c C-r): rst-shift-region-left, rst-shift-region-right
+;;
+;;       Shift the region left or right by two-char increments, which is perfect
+;;       for bulleted lists.
 ;;
-;;    C-M-{, C-M-} : navigate between section titles.
 ;;
 ;; Other specialized and more generic functions are also available (see source
 ;; code).  The most important function provided by this file for section title
@@ -129,7 +151,8 @@
 ;;
 ;; rst-toc-insert features
 ;; ------------------------
-;; - Support local table of contents, like in doctree.txt.
+;; - rst-toc-insert: We should parse the contents:: options to figure out how
+;;   deep to render the inserted TOC.
 ;; - On load, detect any existing TOCs and set the properties for links.
 ;; - TOC insertion should have an option to add empty lines.
 ;; - TOC insertion should deal with multiple lines
@@ -167,17 +190,37 @@
       (rst-toc)
     (rst-display-decorations-hierarchy)))
 
+;; Define a prefix map for the long form of key combinations.
+(defvar rst-prefix-map (make-sparse-keymap) 
+  "Keymap for rst commands.")
+(define-key rst-prefix-map "a" 'rst-adjust)
+(define-key rst-prefix-map "=" 'rst-adjust)
+(define-key rst-prefix-map "t" 'rst-toc)
+(define-key rst-prefix-map "h" 'rst-display-decorations-hierarchy)
+(define-key rst-prefix-map "i" 'rst-toc-insert)
+(define-key rst-prefix-map "+" 'rst-toc-insert)
+(define-key rst-prefix-map "p" 'rst-backward-section)
+(define-key rst-prefix-map "n" 'rst-forward-section)
+(define-key rst-prefix-map "r" 'rst-shift-region-right)
+(define-key rst-prefix-map "l" 'rst-shift-region-left)
+(define-key rst-prefix-map "u" 'rst-toc-insert-update)
+
 (defun rst-text-mode-bindings ()
   "Default text mode hook for rest."
+
+  ;; Direct command (somehow this one does not work on the Mac).
   (local-set-key [(control ?=)] 'rst-adjust)
-  (local-set-key [(control x)(control ?=)] 'rst-toc-or-hierarchy)
-  (local-set-key [(control x)(?+)] 'rst-toc-insert)
-  (local-set-key [(control meta ?{)] 'rst-backward-section)
-  (local-set-key [(control meta ?})] 'rst-forward-section)
-  (local-set-key [(control c)(control r)] 'rst-shift-region-right)
-  (local-set-key [(control c)(control l)] 'rst-shift-region-left)
+
+  (define-key mode-specific-map [(control p)] 'rst-backward-section)
+  (define-key mode-specific-map [(control n)] 'rst-forward-section)
+  (define-key mode-specific-map [(control r)] 'rst-shift-region-right)
+  (define-key mode-specific-map [(control l)] 'rst-shift-region-left)
+
+  ;; Bind the rst commands on the C-c p prefix.
+  (define-key mode-specific-map [(p)] rst-prefix-map)
   )
 
+
 ;; Note: we cannot bind the TOC update on file write because it messes with
 ;; undo.  If we disable undo, since it adds and removes characters, the
 ;; positions in the undo list are not making sense anymore.  Dunno what to do
@@ -189,6 +232,11 @@
 ;;   (let ((buffer-undo-list t)) (rst-toc-insert-update) ))
 
 
+;; Additional abbreviations for text-mode.
+(define-abbrev text-mode-abbrev-table
+  "con" ".. contents::\n..\n   " nil 0)
+
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -197,30 +245,30 @@
 (require 'cl)
 
 ;; Generic Filter function.
-(if (not (fboundp 'filter))
-    (defun filter (pred list)
-      "Returns a list of all the elements fulfilling the pred requirement (that
+(unless (fboundp 'filter)
+  (defun filter (pred list)
+    "Returns a list of all the elements fulfilling the pred requirement (that
 is for which (pred elem) is true)"
-      (if list
-          (let ((head (car list))
-                (tail (filter pred (cdr list))))
-            (if (funcall pred head)
-                (cons head tail)
-              tail)))))
+    (if list
+	(let ((head (car list))
+	      (tail (filter pred (cdr list))))
+	  (if (funcall pred head)
+	      (cons head tail)
+	    tail)))))
 
 
 ;; From emacs-22
-(if (not (fboundp 'line-number-at-pos))
-    (defun line-number-at-pos (&optional pos)
-      "Return (narrowed) buffer line number at position POS.
+(unless (fboundp 'line-number-at-pos)
+  (defun line-number-at-pos (&optional pos)
+    "Return (narrowed) buffer line number at position POS.
     If POS is nil, use current buffer location."
-      (let ((opoint (or pos (point))) start)
-        (save-excursion
-          (goto-char (point-min))
-          (setq start (point))
-          (goto-char opoint)
-          (forward-line 0)
-          (1+ (count-lines start (point)))))) )
+    (let ((opoint (or pos (point))) start)
+      (save-excursion
+	(goto-char (point-min))
+	(setq start (point))
+	(goto-char opoint)
+	(forward-line 0)
+	(1+ (count-lines start (point)))))) )
 
 
 
@@ -346,19 +394,19 @@ decorations."
   patterns, such as :: or ...;  with the flag do not ignore them."
   (save-excursion
     (back-to-indentation)
-    (if (not (looking-at "\n"))
-        (let ((c (thing-at-point 'char)))
-          (if (and (looking-at (format "[%s]+[ \t]*$" c))
-                   (or accept-special
-                       (and
-                        ;; Common patterns.
-                        (not (looking-at "::[ \t]*$"))
-                        (not (looking-at "\\.\\.\\.[ \t]*$"))
-                        ;; Discard one char line
-                        (not (looking-at ".[ \t]*$"))
-                        )))
-              (string-to-char c))
-          ))
+    (unless (looking-at "\n")
+      (let ((c (thing-at-point 'char)))
+	(if (and (looking-at (format "[%s]+[ \t]*$" c))
+		 (or accept-special
+		     (and
+		      ;; Common patterns.
+		      (not (looking-at "::[ \t]*$"))
+		      (not (looking-at "\\.\\.\\.[ \t]*$"))
+		      ;; Discard one char line
+		      (not (looking-at ".[ \t]*$"))
+		      )))
+	    (string-to-char c))
+	))
     ))
 
 (defun rst-line-homogeneous-nodent-p (&optional accept-special)
@@ -575,12 +623,10 @@ have been seen.
       (let ((char (car x))
             (style (cadr x))
             (indent (caddr x)))
-        (if (not (assoc (cons char style) hierarchy-alist))
-            (progn
-              (setq hierarchy-alist
-                    (append hierarchy-alist
-                            (list (cons (cons char style) x))))
-              ))
+        (unless (assoc (cons char style) hierarchy-alist)
+	  (setq hierarchy-alist
+		(append hierarchy-alist
+			(list (cons (cons char style) x)))) )
         ))
     (mapcar 'cdr hierarchy-alist)
     ))
@@ -1084,9 +1130,9 @@ of the right hand fingers and the binding is unused in text-mode."
 
     ;; Correct the position of the cursor to more accurately reflect where it
     ;; was located when the function was invoked.
-    (if (not (= moved 0))
-        (progn (forward-line (- moved))
-               (end-of-line)))
+    (unless (= moved 0)
+      (forward-line (- moved))
+      (end-of-line))
 
     ))
 
@@ -1184,16 +1230,21 @@ the hierarchy is similar to that used by rst-adjust-decoration."
                                   (match-end 0)) )
 
 (defun rst-section-tree (alldecos)
-  "Returns a pair of a hierarchical tree of the sections titles
-in the document, and a reference to the node where the cursor
-lives. This can be used to generate a table of contents for the
-document.
+  "Returns a hierarchical tree of the sections titles in the
+document.  This can be used to generate a table of contents for
+the document.  The top node will always be a nil node, with the
+top-level titles as children (there may potentially be more than
+one).
 
 Each section title consists in a cons of the stripped title
 string and a marker to the section in the original text document.
 
 If there are missing section levels, the section titles are
-inserted automatically, and are set to nil."
+inserted automatically, and the title string is set to nil, and
+the marker set to the first non-nil child of itself.
+Conceptually, the nil nodes--i.e. those which have no title--are
+to be considered as being the same line as their first non-nil
+child.  This has advantages later in processing the graph."
 
   (let* (thelist
          (hier (rst-get-hierarchy alldecos))
@@ -1235,21 +1286,62 @@ inserted automatically, and are set to nil."
         node
         children)
     ;; If the next decoration matches our level
-    (if (= (car ndeco) lev)
-        (progn
-          ;; Pop the next decoration and create the current node with it
-          (setcdr decos (cddr decos))
-          (setq node (cdr ndeco)) ))
-      ;; Else we let the node title/marker be unset.
+    (when (= (car ndeco) lev)
+      ;; Pop the next decoration and create the current node with it
+      (setcdr decos (cddr decos))
+      (setq node (cdr ndeco)) )
+    ;; Else we let the node title/marker be unset.
 
     ;; Build the child nodes
     (while (and (cdr decos) (> (caadr decos) lev))
       (setq children
             (cons (rst-section-tree-rec decos (1+ lev))
                   children)))
+    (setq children (reverse children))
 
+    ;; If node is still unset, we use the marker of the first child.
+    (when (eq node nil)
+      (setq node (cons nil (cdaar children))))
+	
     ;; Return this node with its children.
-    (cons node (reverse children))
+    (cons node children)
+    ))
+
+
+(defun rst-section-tree-point (node &optional point)
+  "Given a computed and valid section tree SECTREE and a point
+  POINT (default being the current point in the current buffer),
+  find and return the node within the sectree where the cursor
+  lives.  
+
+  Return values: a pair of (parent path, container subtree).  The
+  parent path is simply a list of the nodes above the container
+  subtree node that we're returning."
+  
+  (let (path outtree)
+    
+    (let* ((curpoint (or point (point))))
+	  
+      ;; Check if we are before the current node.
+      (if (> curpoint (cadar node))
+	      
+	  ;; Iterate all the children, looking for one that might contain the
+	  ;; current section.
+	  (let ((curnode (cdr node))
+		last)
+		
+	    (while (and curnode (> curpoint (cadaar curnode)))
+	      (setq last curnode
+		    curnode (cdr curnode)))
+	  
+	    (if last 
+		(let ((sub (rst-section-tree-point (car last) curpoint)))
+		  (setq path (car sub)
+			outtree (cdr sub)))
+	      (setq outtree node))
+	    
+	    )))
+    (cons (cons (car node) path) outtree)
     ))
 
 
@@ -1258,9 +1350,8 @@ inserted automatically, and are set to nil."
 By default the top level is ignored if there is only one, because
 we assume that the document will have a single title.
 
-If a numeric prefix argument is given,
-- if it is zero or generic, include the top level titles;
-- otherwise insert the TOC up to the specified level.
+If a numeric prefix argument is given, insert the TOC up to the
+specified level.  
 
 The TOC is inserted indented at the current column."
 
@@ -1271,31 +1362,24 @@ The TOC is inserted indented at the current column."
           (if (and (integerp pfxarg) (> (prefix-numeric-value pfxarg) 0))
               (prefix-numeric-value pfxarg) rst-toc-insert-max-level))
 
-         ;; Get the section tree.
-         (sectree (rst-section-tree (rst-find-all-decorations)))
-
-         ;; If there is only one top-level title, remove it by starting to print
-         ;; one index lower (revert this behaviour with the prefix arg),
-         ;; otherwise print all.
-         (gen-pfx-arg (or (and pfxarg (listp pfxarg))
-                          (and (integerp pfxarg)
-                               (= (prefix-numeric-value pfxarg) 0))))
-         (start-lev (if (and (not rst-toc-insert-always-include-top)
-                             (= (length (cdr sectree)) 1)
-                             (not gen-pfx-arg))  -1 0))
+         ;; Get the section tree for the current cursor point.
+         (sectree-pair
+	  (rst-section-tree-point
+	   (rst-section-tree (rst-find-all-decorations))))
 
          ;; Figure out initial indent.
          (initial-indent (make-string (current-column) ? ))
          (init-point (point)))
 
-    (rst-toc-insert-node sectree start-lev initial-indent "")
-
-    ;; Fixup for the first line.
-    (delete-region init-point (+ init-point (length initial-indent)))
+    (when (cddr sectree-pair)
+      (rst-toc-insert-node (cdr sectree-pair) 0 initial-indent "")
 
-    ;; Delete the last newline added.
-    (delete-backward-char 1)
-    ))
+      ;; Fixup for the first line.
+      (delete-region init-point (+ init-point (length initial-indent)))
+   
+      ;; Delete the last newline added.
+      (delete-backward-char 1)
+    )))
 
 
 (defgroup rst-toc nil
@@ -1308,11 +1392,6 @@ The TOC is inserted indented at the current column."
   formatting insertion, when numbering is disabled)."
   :group 'rst-toc)
 
-(defcustom rst-toc-insert-always-include-top nil
-  "Set this to 't if you want to always include top-level titles,
-  even when there is only one."
-  :group 'rst-toc)
-
 (defcustom rst-toc-insert-style 'fixed
   "Set this to one of the following values to determine numbering and
 indentation style:
@@ -1342,45 +1421,46 @@ indentation style:
   "Recursive function that does the print of the inserted
 toc. PFX is the prefix numbering, that includes the alignment
 necessary for all the children of this level to align."
+
+  ;; Note: we do child numbering from the parent, so we start number the
+  ;; children one level before we print them.
   (let ((do-print (> level 0))
         (count 1)
         b)
-    (if do-print
-        (progn
-          (insert indent)
-          (let ((b (point)))
-            (if (not (equal rst-toc-insert-style 'plain))
-                (insert pfx rst-toc-insert-number-separator))
-            (insert (or (caar node) "[missing node]"))
-            ;; Add properties to the text, even though in normal text mode it
-            ;; won't be doing anything for now.  Not sure that I want to change
-            ;; mode stuff.  At least the highlighting gives the idea that this
-            ;; is generated automatically.
-            (put-text-property b (point) 'mouse-face 'highlight)
-            (put-text-property b (point) 'rst-toc-target (cadar node))
-            (put-text-property b (point) 'keymap rst-toc-insert-click-keymap)
-
-            )
-          (insert "\n")
-
-          ;; Prepare indent for children.
-          (setq indent
-                (cond
-                 ((eq rst-toc-insert-style 'plain)
-                  (concat indent rst-toc-indent))
-
-                 ((eq rst-toc-insert-style 'fixed)
-                  (concat indent (make-string rst-toc-indent ? )))
-
-                 ((eq rst-toc-insert-style 'aligned)
-                  (concat indent (make-string (+ (length pfx) 2) ? )))
-
-                 ((eq rst-toc-insert-style 'listed)
-                  (concat (substring indent 0 -3)
-                          (concat (make-string (+ (length pfx) 2) ? ) " - ")))
-                 ))
-
-          ))
+    (when do-print
+      (insert indent)
+      (let ((b (point)))
+	(unless (equal rst-toc-insert-style 'plain)
+	  (insert pfx rst-toc-insert-number-separator))
+	(insert (or (caar node) "[missing node]"))
+	;; Add properties to the text, even though in normal text mode it
+	;; won't be doing anything for now.  Not sure that I want to change
+	;; mode stuff.  At least the highlighting gives the idea that this
+	;; is generated automatically.
+	(put-text-property b (point) 'mouse-face 'highlight)
+	(put-text-property b (point) 'rst-toc-target (cadar node))
+	(put-text-property b (point) 'keymap rst-toc-insert-click-keymap)
+
+	)
+      (insert "\n")
+
+      ;; Prepare indent for children.
+      (setq indent
+	    (cond
+	     ((eq rst-toc-insert-style 'plain)
+	      (concat indent rst-toc-indent))
+
+	     ((eq rst-toc-insert-style 'fixed)
+	      (concat indent (make-string rst-toc-indent ? )))
+
+	     ((eq rst-toc-insert-style 'aligned)
+	      (concat indent (make-string (+ (length pfx) 2) ? )))
+
+	     ((eq rst-toc-insert-style 'listed)
+	      (concat (substring indent 0 -3)
+		      (concat (make-string (+ (length pfx) 2) ? ) " - ")))
+	     )) 
+      )
 
     (if (or (eq rst-toc-insert-max-level nil)
             (< level rst-toc-insert-max-level))
@@ -1401,12 +1481,12 @@ necessary for all the children of this level to align."
 
           (dolist (child (cdr node))
             (rst-toc-insert-node child
-                                  (1+ level)
-                                  indent
-                                  (if do-child-numbering
-                                      (concat pfx (format fmt count)) pfx))
+				 (1+ level)
+				 indent
+				 (if do-child-numbering
+				     (concat pfx (format fmt count)) pfx))
             (incf count)))
-
+      
       )))
 
 
@@ -1469,7 +1549,7 @@ make it up-to-date automatically."
       (let ((b (point)))
         ;; Insert line text.
         (insert (make-string (* rst-toc-indent (1- level)) ? ))
-        (insert (if (car node) (caar node) "[missing node]"))
+        (insert (or (caar node) "[missing node]"))
 
         ;; Highlight lines.
         (put-text-property b (point) 'mouse-face 'highlight)
@@ -1477,11 +1557,30 @@ make it up-to-date automatically."
         ;; Add link on lines.
         (put-text-property b (point) 'rst-toc-target (cadar node))
 
-        (insert "\n")))
+        (insert "\n")
+	))
 
   (dolist (child (cdr node))
     (rst-toc-node child (1+ level))))
 
+(defun rst-toc-count-lines (node target-node)
+  "Count the number of lines to the TARGET-NODE node.  This
+recursive function returns a cons of the number of additional
+lines that have been counted for its node and children and 't if
+the node has been found."
+
+  (let ((count 1)
+	found)
+    (if (eq node target-node)
+	(setq found t)
+      (let ((child (cdr node)))
+	(while (and child (not found))
+	  (let ((cl (rst-toc-count-lines (car child) target-node)))
+	    (setq count (+ count (car cl))
+		  found (cdr cl)
+		  child (cdr child))))))
+    (cons count found)))
+
 
 (defun rst-toc ()
   "Finds all the section titles and their decorations in the
@@ -1493,29 +1592,18 @@ make it up-to-date automatically."
   brings the cursor in that section."
   (interactive)
   (let* ((curbuf (current-buffer))
-         outline
-
+	 
          ;; Get the section tree
          (alldecos (rst-find-all-decorations))
          (sectree (rst-section-tree alldecos))
 
+ 	 (our-node (cdr (rst-section-tree-point sectree)))
+	 line
+	 
          ;; Create a temporary buffer.
          (buf (get-buffer-create rst-toc-buffer-name))
          )
 
-    ;; Find the index of the section where the cursor currently is.
-    (setq outline (let ((idx 1)
-                        (curline (line-number-at-pos (point)))
-                        (decos alldecos))
-                    (while (and decos (<= (caar decos) curline))
-                      (setq decos (cdr decos))
-                      (incf idx))
-                    idx))
-    ;; FIXME: if there is a missing node inserted, the calculation of the
-    ;; current line will be off. You need to fix this by moving the finding of
-    ;; the current line somewhere else.
-
-
     (with-current-buffer buf
       (let ((inhibit-read-only t))
         (rst-toc-mode)
@@ -1524,6 +1612,9 @@ make it up-to-date automatically."
         (put-text-property (point-min) (point)
                            'face (list '(background-color . "lightgray")))
         (rst-toc-node sectree 0)
+
+	;; Count the lines to our found node.
+	(setq line (car (rst-toc-count-lines sectree our-node)))
         ))
     (display-buffer buf)
     (pop-to-buffer buf)
@@ -1532,7 +1623,7 @@ make it up-to-date automatically."
     (set (make-local-variable 'rst-toc-return-buffer) curbuf)
 
     ;; Move the cursor near the right section in the TOC.
-    (goto-line outline)
+    (goto-line line)
     ))
 
 
@@ -1660,15 +1751,26 @@ make it up-to-date automatically."
 
 
 
-
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Functions to indent/dedent item lists, which are always two-characters apart
 ;; horizontally with rest.
 
+(defvar rst-shift-fill-region nil
+  "Set to true if you want to automatically re-fill the region that is being
+shifted.")
+;; FIXME: need to finish this feature properly.
+
+
 (defun rst-shift-region-right ()
   "Indent region ridigly, by two characters to the right."
   (interactive)
-  (indent-rigidly (region-beginning) (region-end) 2))
+  (let ((mbeg (set-marker (make-marker) (region-beginning)))
+	(mend (set-marker (make-marker) (region-end))))
+    (indent-rigidly mbeg mend 2)
+    (when rst-shift-fill-region
+      (fill-region mbeg mend))
+    ))
 
 (defun rst-find-leftmost-column (beg end)
   "Finds the leftmost column in the region."
@@ -1677,8 +1779,8 @@ make it up-to-date automatically."
       (goto-char beg)
       (while (< (point) end)
         (back-to-indentation)
-        (if (not (looking-at "[ \t]*$"))
-            (setq mincol (min mincol (current-column))))
+        (unless (looking-at "[ \t]*$")
+	  (setq mincol (min mincol (current-column))))
         (forward-line 1)
         ))
     mincol))
@@ -1691,8 +1793,14 @@ up to the leftmost character in the region."
   (let ((chars
          (if pfxarg
              (- (rst-find-leftmost-column (region-beginning) (region-end)))
-           -2)))
-    (indent-rigidly (region-beginning) (region-end) chars)))
+           -2))
+	(mbeg (set-marker (make-marker) (region-beginning)))
+	(mend (set-marker (make-marker) (region-end)))
+	)
+    (indent-rigidly mbeg mend chars)
+    (when rst-shift-fill-region
+      (fill-region mbeg mend))
+    ))
 
 
 
-- 
cgit v1.2.1


From 1c513403e0ba8b3e011653c35bb4b94bf672cfc8 Mon Sep 17 00:00:00 2001
From: blais 
Date: Tue, 8 Nov 2005 14:28:52 +0000
Subject: Fixed minor bug in rst-toc.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4014 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 143c7f688..041ba223e 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -1323,14 +1323,14 @@ child.  This has advantages later in processing the graph."
     (let* ((curpoint (or point (point))))
 	  
       ;; Check if we are before the current node.
-      (if (> curpoint (cadar node))
+      (if (>= curpoint (cadar node))
 	      
 	  ;; Iterate all the children, looking for one that might contain the
 	  ;; current section.
 	  (let ((curnode (cdr node))
 		last)
 		
-	    (while (and curnode (> curpoint (cadaar curnode)))
+	    (while (and curnode (>= curpoint (cadaar curnode)))
 	      (setq last curnode
 		    curnode (cdr curnode)))
 	  
@@ -1614,7 +1614,8 @@ the node has been found."
         (rst-toc-node sectree 0)
 
 	;; Count the lines to our found node.
-	(setq line (car (rst-toc-count-lines sectree our-node)))
+	(let ((linefound (rst-toc-count-lines sectree our-node)))
+	  (setq line (if (cdr linefound) (car linefound) 0)))
         ))
     (display-buffer buf)
     (pop-to-buffer buf)
-- 
cgit v1.2.1


From ee0347212ded62289dcaaa63c5b208c1c3fc97f7 Mon Sep 17 00:00:00 2001
From: blais 
Date: Wed, 9 Nov 2005 18:33:49 +0000
Subject: Added revision field to rst.el since it is likely it will be copied
 around

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4023 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 041ba223e..c9f597753 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -5,6 +5,7 @@
 ;;; :Authors: Martin Blais ,
 ;;;           Stefan Merten ,
 ;;;           David Goodger 
+;;; :Revision: $Revision$
 ;;; :Date: $Date$
 ;;; :Copyright: This module has been placed in the public domain.
 ;;; :Abstract:
-- 
cgit v1.2.1


From 4c6e12f22380c422aabc8f34b0f1409f4a60229f Mon Sep 17 00:00:00 2001
From: blais 
Date: Mon, 14 Nov 2005 19:18:01 +0000
Subject: - Added default bindings for rst-compile - Added constants for
 paragraph-{start,separate} - Fixed bug with rst-toc when the file was empty.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4050 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index c9f597753..692bf5075 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -205,6 +205,8 @@
 (define-key rst-prefix-map "r" 'rst-shift-region-right)
 (define-key rst-prefix-map "l" 'rst-shift-region-left)
 (define-key rst-prefix-map "u" 'rst-toc-insert-update)
+(define-key rst-prefix-map "c" 'rst-compile)
+(define-key rst-prefix-map "C" (lambda () (interactive) (rst-compile t)))
 
 (defun rst-text-mode-bindings ()
   "Default text mode hook for rest."
@@ -238,6 +240,20 @@
   "con" ".. contents::\n..\n   " nil 0)
 
 
+;; Paragraph separation customization.  Set those to replace the default values
+;; of text-mode. These will work better in restructuredtext documents and should
+;; not affect filling for other documents too much.  Set it up like this:
+;;
+;; (setq paragraph-start rst-paragraph-start
+;;       paragraph-separate rst-paragraph-separate)
+(defvar rst-paragraph-separate 
+  "\f\\|>*[ \t]*$"
+  "Extra parapraph-separate patterns to add for text-mode.")
+
+(defvar rst-paragraph-start 
+  "\f\\|>*[ \t]*$\\|>*[ \t]*[-+*] \\|>*[ \t]*[0-9]+\\. "
+  "Extra parapraph-start patterns to add for text-mode.")
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1286,8 +1302,9 @@ child.  This has advantages later in processing the graph."
   (let ((ndeco (cadr decos))
         node
         children)
+
     ;; If the next decoration matches our level
-    (when (= (car ndeco) lev)
+    (when (and ndeco (= (car ndeco) lev))
       ;; Pop the next decoration and create the current node with it
       (setcdr decos (cddr decos))
       (setq node (cdr ndeco)) )
@@ -1324,7 +1341,7 @@ child.  This has advantages later in processing the graph."
     (let* ((curpoint (or point (point))))
 	  
       ;; Check if we are before the current node.
-      (if (>= curpoint (cadar node))
+      (if (and (cadar node) (>= curpoint (cadar node)))
 	      
 	  ;; Iterate all the children, looking for one that might contain the
 	  ;; current section.
-- 
cgit v1.2.1


From 9c3c37edc8bfbbc040b8d2b7635dcf06d0522210 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Thu, 17 Nov 2005 23:36:02 +0000
Subject: use rst-set-paragraph-separation function for setting
 paragraph-start; removed stuff for filling quoted text -- it breaks for
 trailing quote signs and after all that's what message-mode is for

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4069 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 692bf5075..65ed2602d 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -240,19 +240,14 @@
   "con" ".. contents::\n..\n   " nil 0)
 
 
-;; Paragraph separation customization.  Set those to replace the default values
-;; of text-mode. These will work better in restructuredtext documents and should
-;; not affect filling for other documents too much.  Set it up like this:
-;;
-;; (setq paragraph-start rst-paragraph-start
-;;       paragraph-separate rst-paragraph-separate)
-(defvar rst-paragraph-separate 
-  "\f\\|>*[ \t]*$"
-  "Extra parapraph-separate patterns to add for text-mode.")
-
-(defvar rst-paragraph-start 
-  "\f\\|>*[ \t]*$\\|>*[ \t]*[-+*] \\|>*[ \t]*[0-9]+\\. "
-  "Extra parapraph-start patterns to add for text-mode.")
+;; Paragraph separation customization.  This will work better for
+;; bulleted and enumerated lists in restructuredtext documents and
+;; should not affect filling for other documents too much.  Set it up
+;; like this:
+;;
+;; (add-hook 'text-mode-hook 'rst-set-paragraph-separation)
+(defun rst-set-paragraph-separation ()
+  (setq paragraph-start (concat paragraph-start "\\|[ \t]*[-+*] ")))
 
 
 
-- 
cgit v1.2.1


From 284948ef75ebb252eee6a827def10adbc11c989e Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Nov 2005 04:26:57 +0000
Subject: restored paragraph start for enumerated lists

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4071 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 65ed2602d..6b6292cff 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -241,14 +241,14 @@
 
 
 ;; Paragraph separation customization.  This will work better for
-;; bulleted and enumerated lists in restructuredtext documents and
+;; bullet and enumerated lists in restructuredtext documents and
 ;; should not affect filling for other documents too much.  Set it up
 ;; like this:
 ;;
 ;; (add-hook 'text-mode-hook 'rst-set-paragraph-separation)
 (defun rst-set-paragraph-separation ()
-  (setq paragraph-start (concat paragraph-start "\\|[ \t]*[-+*] ")))
-
+  (setq paragraph-start (concat paragraph-start
+				"\\|[ \t]*[-+*] \\|[ \t]*[0-9]+\\. ")))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.1


From 138b51f47305388e9ea149bb1159d6605e1a46af Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Nov 2005 18:02:08 +0000
Subject: fixed line wrapping

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4072 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 64 +++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 23 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 6b6292cff..01c2df9e8 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -22,7 +22,8 @@
 ;;;   decorations;
 ;;; - A mode that displays the table of contents and allows you to jump anywhere
 ;;;   from it;
-;;; - Functions to insert and automatically update a TOC in your source document;
+;;; - Functions to insert and automatically update a TOC in your source
+;;;   document;
 ;;; - A mode which supports font-lock highlighting of reStructuredText
 ;;;   structures;
 ;;; - Some other convenience functions.
@@ -91,13 +92,16 @@
 ;;
 ;;    C-c p u: rst-toc-insert-update
 ;;
-;;       Find an existing inserted table-of-contents in the document an updates it.
+;;       Find an existing inserted table-of-contents in the document an
+;;       updates it.
 ;;
-;;    C-c p p, C-c p n  (C-c C-p, C-c C-n): rst-backward-section, rst-forward-section
+;;    C-c p p, C-c p n (C-c C-p, C-c C-n): rst-backward-section,
+;;    rst-forward-section
 ;;
 ;;       Navigate between section titles.
 ;;
-;;    C-c p l, C-c p r  (C-c C-l, C-c C-r): rst-shift-region-left, rst-shift-region-right
+;;    C-c p l, C-c p r (C-c C-l, C-c C-r): rst-shift-region-left,
+;;    rst-shift-region-right
 ;;
 ;;       Shift the region left or right by two-char increments, which is perfect
 ;;       for bulleted lists.
@@ -698,8 +702,8 @@ have been seen.
 
              ;; Overline only, leave all return values nil.
              ;;
-             ;; Note: we don't return the overline character, but it could perhaps
-             ;; in some cases be used to do something.
+             ;; Note: we don't return the overline character, but it could
+             ;; perhaps in some cases be used to do something.
              ((and over (eq under nil)))
 
              ;; Underline only.
@@ -1052,7 +1056,7 @@ of the right hand fingers and the binding is unused in text-mode."
                         (looking-at rst-section-text-regexp))
         (progn
           (cond
-           ;;---------------------------------------------------------------------
+           ;;-------------------------------------------------------------------
            ;; Case 1: No Decoration
            ((and (eq char nil) (eq style nil))
 
@@ -1085,7 +1089,7 @@ of the right hand fingers and the binding is unused in text-mode."
                     indent-new (caddr cur))
               ))
 
-           ;;---------------------------------------------------------------------
+           ;;-------------------------------------------------------------------
            ;; Case 2: Incomplete Decoration
            ((not (rst-decoration-complete-p curdeco))
 
@@ -1097,7 +1101,7 @@ of the right hand fingers and the binding is unused in text-mode."
                   style-new style
                   indent-new indent))
 
-           ;;---------------------------------------------------------------------
+           ;;-------------------------------------------------------------------
            ;; Case 3: Complete Existing Decoration
            (t
             (if toggle-style
@@ -1485,11 +1489,12 @@ necessary for all the children of this level to align."
                 (if (> (length pfx) 0)
                     (setq pfx (concat (rst-rstrip pfx) ".")))
 
-                ;; Calculate the amount of space that the prefix will require for
-                ;; the numbers.
+                ;; Calculate the amount of space that the prefix will require
+                ;; for the numbers.
                 (if (cdr node)
                     (setq fmt (format "%%-%dd"
-                                      (1+ (floor (log10 (length (cdr node))))))))
+                                      (1+ (floor (log10 (length
+							 (cdr node))))))))
                 ))
 
           (dolist (child (cdr node))
@@ -2060,7 +2065,10 @@ This value is expanded by `format' with an integer."
       7
     -7)
   "The step width to use for the next color. The formula
-`rst-level-face-base-light' + (`rst-level-face-max' - 1) * `rst-level-face-step-light'
+
+    `rst-level-face-base-light'
+    + (`rst-level-face-max' - 1) * `rst-level-face-step-light'
+
 must result in a color level which appended to `rst-level-face-base-color'
 using `rst-level-face-format-light' results in a valid color such as `grey50'.
 This color is used as background for section title text on level
@@ -2083,9 +2091,14 @@ title adornment). If you generally do not like how section title text faces are
 set up tweak here. If the general idea is ok for you but you do not like the
 details check the Rst Faces Defaults group."
   :group 'rst-faces
-  :type '(alist :key-type (choice (integer :tag "Section level (may not be bigger than `rst-level-face-max')")
-				  (boolean :tag "transitions (on) / section title adornment (off)"))
-		:value-type (face))
+  :type '(alist
+	  :key-type
+	  (choice
+	   (integer 
+	    :tag
+	    "Section level (may not be bigger than `rst-level-face-max')")
+	   (boolean :tag "transitions (on) / section title adornment (off)"))
+	  :value-type (face))
   :set-after '(rst-level-face-max))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2256,7 +2269,8 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       1 rst-block-face)
      ;; `Enumerated Lists`_
      (list
-      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" re-blksep1 "\\)")
+      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" 
+	      re-blksep1 "\\)")
       1 rst-block-face)
      ;; `Definition Lists`_ FIXME: missing
      ;; `Field Lists`_
@@ -2265,7 +2279,8 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       1 rst-external-face)
      ;; `Option Lists`_
      (list
-      (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
+      (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*"
+	      "\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
       1 rst-block-face)
 
      ;; `Tables`_ FIXME: missing
@@ -2277,13 +2292,15 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       1 rst-definition-face)
      ;; `Directives`_ / `Substitution Definitions`_
      (list
-      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\(" re-sym1 "+::\\)" re-blksep1)
+      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\(" 
+	      re-sym1 "+::\\)" re-blksep1)
       (list 1 rst-directive-face)
       (list 2 rst-definition-face)
       (list 4 rst-directive-face))
      ;; `Hyperlink Targets`_
      (list
-      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)" re-blksep1)
+      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)" 
+	      re-blksep1)
       1 rst-definition-face)
      (list
       (concat re-bol "\\(__\\)" re-blksep1)
@@ -2314,7 +2331,8 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       2 rst-reference-face)
      ;; `Interpreted Text`_
      (list
-      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" re-sym1 "+:\\)?\\)" re-ims1)
+      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" 
+	      re-sym1 "+:\\)?\\)" re-ims1)
       (list 2 rst-directive-face)
       (list 5 rst-external-face)
       (list 8 rst-directive-face))
@@ -2351,7 +2369,8 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
 	       nil
 	       (list 1 '(cdr (assoc nil rst-adornment-faces-alist))
 		     'append t)
-	       (list 2 '(cdr (assoc rst-font-lock-level rst-adornment-faces-alist))
+	       (list 2 '(cdr (assoc rst-font-lock-level
+				    rst-adornment-faces-alist))
 		     'append t)
 	       (list 3 '(cdr (assoc nil rst-adornment-faces-alist))
 		     'append t)))))
@@ -2782,4 +2801,3 @@ column is used (fill-column vs. end of previous/next line)."
 
 (provide 'rst)
 ;;; rst.el ends here
-
-- 
cgit v1.2.1


From 10fe81815ee364ef2faf683b4deebe3f2240a5d6 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 18 Nov 2005 18:03:03 +0000
Subject: fixed rst-set-paragraph-separation, added
 rst-extra-paragraph-separate

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4073 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 01c2df9e8..fa49e1fee 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -250,9 +250,13 @@
 ;; like this:
 ;;
 ;; (add-hook 'text-mode-hook 'rst-set-paragraph-separation)
+(defvar rst-extra-paragraph-separate
+  "\\|[ \t]*\\([-+*]\\|[0-9]+\\.\\) "
+  "Extra parapraph-separate patterns to add for text-mode.")
+
 (defun rst-set-paragraph-separation ()
-  (setq paragraph-start (concat paragraph-start
-				"\\|[ \t]*[-+*] \\|[ \t]*[0-9]+\\. ")))
+  (make-local-variable 'paragraph-start) ; prevent it growing every time
+  (setq paragraph-start (concat paragraph-start rst-extra-paragraph-separate)))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.1


From 297e9964bdfcfd25c26c24668ef2027a3d90a776 Mon Sep 17 00:00:00 2001
From: blais 
Date: Sat, 19 Nov 2005 00:51:08 +0000
Subject: Fixed bug with incorrect comparison of decorations and added
 comments.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4077 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 65 +++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 26 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index fa49e1fee..efebb349c 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -67,7 +67,7 @@
 ;; mode-specific-map prefix (i.e C-c).
 ;;
 ;;
-;;    C-c p a (also C-=): rst-adjust 
+;;    C-c p a (also C-=): rst-adjust
 ;;
 ;;       Updates or rotates the section title around point or promotes/demotes
 ;;       the decorations within the region (see full details below).
@@ -196,7 +196,7 @@
     (rst-display-decorations-hierarchy)))
 
 ;; Define a prefix map for the long form of key combinations.
-(defvar rst-prefix-map (make-sparse-keymap) 
+(defvar rst-prefix-map (make-sparse-keymap)
   "Keymap for rst commands.")
 (define-key rst-prefix-map "a" 'rst-adjust)
 (define-key rst-prefix-map "=" 'rst-adjust)
@@ -253,11 +253,23 @@
 (defvar rst-extra-paragraph-separate
   "\\|[ \t]*\\([-+*]\\|[0-9]+\\.\\) "
   "Extra parapraph-separate patterns to add for text-mode.")
+;; FIXME: What about the missing >?
+;; The author uses a hardcoded for paragraph-separate: "\f\\|>*[ \t]*$"
 
 (defun rst-set-paragraph-separation ()
+  "Sets the paragraph separation for restructuredtext."
+  ;; FIXME: the variable should be made automatically buffer local rather than
+  ;; using a function here, this function is unnecessary.
   (make-local-variable 'paragraph-start) ; prevent it growing every time
   (setq paragraph-start (concat paragraph-start rst-extra-paragraph-separate)))
 
+;; FIXME: What about paragraph-separate?  paragraph-start and paragraph-separate
+;; are different.  The author hardcodes the value to
+;; "\f\\|>*[ \t]*$\\|>*[ \t]*[-+*] \\|>*[ \t]*[0-9#]+\\. "
+
+;; FIXME: the variables above are in limbo and need some fixing.
+
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Support functions
@@ -1273,7 +1285,8 @@ child.  This has advantages later in processing the graph."
 
     (let ((lev 0))
       (dolist (deco hier)
-        (puthash deco lev levels)
+	;; Compare just the character and indent in the hash table.
+        (puthash (cons (car deco) (cadr deco)) lev levels)
         (incf lev)))
 
     ;; Create a list of lines that contains (text, level, marker) for each
@@ -1282,7 +1295,7 @@ child.  This has advantages later in processing the graph."
       (setq lines
             (mapcar (lambda (deco)
                       (goto-line (car deco))
-                      (list (gethash (cdr deco) levels)
+                      (list (gethash (cons (cadr deco) (caddr deco)) levels)
                             (rst-get-stripped-line)
                             (let ((m (make-marker)))
                               (beginning-of-line 1)
@@ -1323,7 +1336,7 @@ child.  This has advantages later in processing the graph."
     ;; If node is still unset, we use the marker of the first child.
     (when (eq node nil)
       (setq node (cons nil (cdaar children))))
-	
+
     ;; Return this node with its children.
     (cons node children)
     ))
@@ -1333,34 +1346,34 @@ child.  This has advantages later in processing the graph."
   "Given a computed and valid section tree SECTREE and a point
   POINT (default being the current point in the current buffer),
   find and return the node within the sectree where the cursor
-  lives.  
+  lives.
 
   Return values: a pair of (parent path, container subtree).  The
   parent path is simply a list of the nodes above the container
   subtree node that we're returning."
-  
+
   (let (path outtree)
-    
+
     (let* ((curpoint (or point (point))))
-	  
+
       ;; Check if we are before the current node.
       (if (and (cadar node) (>= curpoint (cadar node)))
-	      
+
 	  ;; Iterate all the children, looking for one that might contain the
 	  ;; current section.
 	  (let ((curnode (cdr node))
 		last)
-		
+
 	    (while (and curnode (>= curpoint (cadaar curnode)))
 	      (setq last curnode
 		    curnode (cdr curnode)))
-	  
-	    (if last 
+
+	    (if last
 		(let ((sub (rst-section-tree-point (car last) curpoint)))
 		  (setq path (car sub)
 			outtree (cdr sub)))
 	      (setq outtree node))
-	    
+
 	    )))
     (cons (cons (car node) path) outtree)
     ))
@@ -1372,7 +1385,7 @@ By default the top level is ignored if there is only one, because
 we assume that the document will have a single title.
 
 If a numeric prefix argument is given, insert the TOC up to the
-specified level.  
+specified level.
 
 The TOC is inserted indented at the current column."
 
@@ -1397,7 +1410,7 @@ The TOC is inserted indented at the current column."
 
       ;; Fixup for the first line.
       (delete-region init-point (+ init-point (length initial-indent)))
-   
+
       ;; Delete the last newline added.
       (delete-backward-char 1)
     )))
@@ -1480,7 +1493,7 @@ necessary for all the children of this level to align."
 	     ((eq rst-toc-insert-style 'listed)
 	      (concat (substring indent 0 -3)
 		      (concat (make-string (+ (length pfx) 2) ? ) " - ")))
-	     )) 
+	     ))
       )
 
     (if (or (eq rst-toc-insert-max-level nil)
@@ -1508,7 +1521,7 @@ necessary for all the children of this level to align."
 				 (if do-child-numbering
 				     (concat pfx (format fmt count)) pfx))
             (incf count)))
-      
+
       )))
 
 
@@ -1614,14 +1627,14 @@ the node has been found."
   brings the cursor in that section."
   (interactive)
   (let* ((curbuf (current-buffer))
-	 
+
          ;; Get the section tree
          (alldecos (rst-find-all-decorations))
          (sectree (rst-section-tree alldecos))
 
  	 (our-node (cdr (rst-section-tree-point sectree)))
 	 line
-	 
+
          ;; Create a temporary buffer.
          (buf (get-buffer-create rst-toc-buffer-name))
          )
@@ -1840,7 +1853,7 @@ up to the leftmost character in the region."
 ;; reStructuredText format. Support includes font locking as well as some
 ;; convenience functions for editing. It does this by defining a Emacs major
 ;; mode.
-;; 
+;;
 ;; The package is based on text-mode and inherits some things from it.
 ;; Particularly text-mode-hook is run before rst-mode-hook.
 ;;
@@ -2098,7 +2111,7 @@ details check the Rst Faces Defaults group."
   :type '(alist
 	  :key-type
 	  (choice
-	   (integer 
+	   (integer
 	    :tag
 	    "Section level (may not be bigger than `rst-level-face-max')")
 	   (boolean :tag "transitions (on) / section title adornment (off)"))
@@ -2273,7 +2286,7 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       1 rst-block-face)
      ;; `Enumerated Lists`_
      (list
-      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" 
+      (concat re-bol "\\((?\\([0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]"
 	      re-blksep1 "\\)")
       1 rst-block-face)
      ;; `Definition Lists`_ FIXME: missing
@@ -2296,14 +2309,14 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       1 rst-definition-face)
      ;; `Directives`_ / `Substitution Definitions`_
      (list
-      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\(" 
+      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|]+|[\t ]+\\)?\\)\\("
 	      re-sym1 "+::\\)" re-blksep1)
       (list 1 rst-directive-face)
       (list 2 rst-definition-face)
       (list 4 rst-directive-face))
      ;; `Hyperlink Targets`_
      (list
-      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)" 
+      (concat re-bol "\\(" re-ems "_\\([^:\\`]\\|\\\\.\\|`[^`]+`\\)+:\\)"
 	      re-blksep1)
       1 rst-definition-face)
      (list
@@ -2335,7 +2348,7 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
       2 rst-reference-face)
      ;; `Interpreted Text`_
      (list
-      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" 
+      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:"
 	      re-sym1 "+:\\)?\\)" re-ims1)
       (list 2 rst-directive-face)
       (list 5 rst-external-face)
-- 
cgit v1.2.1


From 656b4fab28abdf9a2d3361c385fd20b313fd114d Mon Sep 17 00:00:00 2001
From: blais 
Date: Mon, 21 Nov 2005 02:43:33 +0000
Subject: Fixed bug with TOC update when it is at the end of a file.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4091 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index efebb349c..5bb8f18bf 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -1548,10 +1548,11 @@ delete that region. Return t if found and the cursor is left after the comment."
       ;; Look for the first line that starts at the first column.
       (forward-line 1)
       (beginning-of-line)
-      (while (or (and (looking-at "[ \t]+[^ \t]")
-                      (setq last-real (point)) t)
-                 (looking-at "\\s-*$"))
-        (forward-line 1)
+      (while (and
+	      (< (point) (point-max))
+	      (or (and (looking-at "[ \t]+[^ \t]") (setq last-real (point)) t)
+		  (looking-at "\\s-*$")))
+	(forward-line 1)
         )
       (if last-real
           (progn
-- 
cgit v1.2.1


From e44c7e7c66a2ff0339be0b4e7480f2eeaa994414 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 25 Nov 2005 05:02:29 +0000
Subject: fixed variable names

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4100 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index 5bb8f18bf..cd4277837 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -250,8 +250,8 @@
 ;; like this:
 ;;
 ;; (add-hook 'text-mode-hook 'rst-set-paragraph-separation)
-(defvar rst-extra-paragraph-separate
-  "\\|[ \t]*\\([-+*]\\|[0-9]+\\.\\) "
+(defvar rst-extra-paragraph-start
+  "\\|[ \t]*\\([-+*] \\|[0-9]+\\. \\)"
   "Extra parapraph-separate patterns to add for text-mode.")
 ;; FIXME: What about the missing >?
 ;; The author uses a hardcoded for paragraph-separate: "\f\\|>*[ \t]*$"
@@ -261,7 +261,7 @@
   ;; FIXME: the variable should be made automatically buffer local rather than
   ;; using a function here, this function is unnecessary.
   (make-local-variable 'paragraph-start) ; prevent it growing every time
-  (setq paragraph-start (concat paragraph-start rst-extra-paragraph-separate)))
+  (setq paragraph-start (concat paragraph-start rst-extra-paragraph-start)))
 
 ;; FIXME: What about paragraph-separate?  paragraph-start and paragraph-separate
 ;; are different.  The author hardcodes the value to
-- 
cgit v1.2.1


From 118dd3d2aa36cf563590197e28830c1a905f9cd8 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Thu, 8 Dec 2005 04:43:13 +0000
Subject: merged branches/s5 changes r4011:4155 into trunk/docutils

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4156 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/rst2s5.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100755 tools/rst2s5.py

(limited to 'tools')

diff --git a/tools/rst2s5.py b/tools/rst2s5.py
new file mode 100755
index 000000000..b4a9396d1
--- /dev/null
+++ b/tools/rst2s5.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+# Author: Chris Liechti
+# Contact: cliechti@gmx.net
+# Revision: $Revision$
+# Date: $Date$
+# Copyright: This module has been placed in the public domain.
+
+"""
+A minimal front end to the Docutils Publisher, producing HTML slides using
+the S5 template system.
+"""
+
+try:
+    import locale
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
+
+from docutils.core import publish_cmdline, default_description
+
+
+description = ('Generates S5 (X)HTML slideshow documents from standalone '
+               'reStructuredText sources.  ' + default_description)
+
+publish_cmdline(writer_name='s5', description=description)
-- 
cgit v1.2.1


From c2737d5c145b4715cf6ed0b4fd9362e07d50b86b Mon Sep 17 00:00:00 2001
From: goodger 
Date: Fri, 9 Dec 2005 04:21:34 +0000
Subject: Converted ``docutils/writers/support/`` into individual writer
 packages; updated docs & refs.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4163 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index dbe42e14a..769269340 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -6,6 +6,6 @@ generator: on
 
 [html4css1 writer]
 # These entries affect HTML output:
-stylesheet-path: ../docutils/writers/support/html4css1.css
+stylesheet-path: ../docutils/writers/html4css1/html4css1.css
 embed-stylesheet: no
 field-name-limit: 20
-- 
cgit v1.2.1


From 22a03c19bf38192515a03dc577a772cb3dadb22a Mon Sep 17 00:00:00 2001
From: goodger 
Date: Sun, 11 Dec 2005 23:00:30 +0000
Subject: rely on default settings

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4179 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 769269340..30633d497 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -6,6 +6,5 @@ generator: on
 
 [html4css1 writer]
 # These entries affect HTML output:
-stylesheet-path: ../docutils/writers/html4css1/html4css1.css
 embed-stylesheet: no
 field-name-limit: 20
-- 
cgit v1.2.1


From ad023b4c0e0d1c22a251ba2f631b277f124e8269 Mon Sep 17 00:00:00 2001
From: goodger 
Date: Mon, 12 Dec 2005 00:05:55 +0000
Subject: restored stylesheet-path setting; needed for the web site

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4181 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/docutils.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/docutils.conf b/tools/docutils.conf
index 30633d497..f4bcf8c6c 100644
--- a/tools/docutils.conf
+++ b/tools/docutils.conf
@@ -1,10 +1,12 @@
-[general]
 # These entries affect all processing:
+[general]
 source-link: yes
 datestamp: %Y-%m-%d %H:%M UTC
 generator: on
 
-[html4css1 writer]
 # These entries affect HTML output:
+[html4css1 writer]
+# Required for docutils-update, the website build system:
+stylesheet-path: ../docutils/writers/html4css1/html4css1.css
 embed-stylesheet: no
 field-name-limit: 20
-- 
cgit v1.2.1


From fd5c42c0f1b05949777718b6d033af521c5f3e70 Mon Sep 17 00:00:00 2001
From: wiemann 
Date: Tue, 27 Dec 2005 13:12:04 +0000
Subject: recognize empty comments

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4232 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 tools/editors/emacs/rst.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index cd4277837..88a74e2fe 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -2408,7 +2408,7 @@ Turning on `rst-mode' calls the normal hooks `text-mode-hook' and
 		 (list 0 rst-comment-face 'append)))))
      (append
       (list
-       (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
+       (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)\\?$")
        (list 1 rst-comment-face)
        (list 2 rst-comment-face))
       (if rst-mode-lazy
-- 
cgit v1.2.1