1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 01_upstream_04_branch_r4646.dpatch by Simon McVittie <smcv@ianadd.pseudorandom.co.uk>
5
## All lines beginning with `## DP:' are a description of the patch.
6
## DP: Upstream changes from the docutils-0.4 branch:
7
## DP: <http://svn.berlios.de/svnroot/repos/docutils/branches/docutils-0.4>
8
## DP: Checked out with TZ=Europe/Paris svn co ... to avoid spurious
9
## DP: timestamp changes.
13
diff -ur docutils-0.4/COPYING.txt docutils-0.4-branch/COPYING.txt
14
--- docutils-0.4/COPYING.txt 2005-12-09 04:21:34.000000000 +0000
15
+++ docutils-0.4-branch/COPYING.txt 2006-07-02 16:10:39.000000000 +0100
18
:Author: David Goodger
19
:Contact: goodger@users.sourceforge.net
20
-:Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
21
+:Date: $Date: 2006-04-01 03:06:59 +0200 (Sat, 01 Apr 2006) $
22
:Web site: http://docutils.sourceforge.net/
23
:Copyright: This document has been placed in the public domain.
27
__ licenses/python-2-2.txt
29
-* tools/pep2html.py, copyright by the Python Software Foundation,
30
- released under the `Python 2.2 license`_ (`local copy`__).
32
- __ licenses/python-2-2.txt
34
-* tools/editors/emacs/rst-html.el, copyright by Martin Blais, released
35
- under the `GNU General Public License`_ (`local copy`__).
39
-* tools/editors/emacs/rst-mode.el, copyright by Stefan Merten,
40
- released under the `GNU General Public License`_ (`local copy`__).
41
+* tools/editors/emacs/rst.el, copyright by Martin Blais, Stefan
42
+ Merten, and David Goodger, released under the `GNU General Public
43
+ License`_ (`local copy`__).
47
(Disclaimer: I am not a lawyer.) The BSD license and the Python
48
-licenses are OSI-approved_ and GPL-compatible_. Although complicated
49
-by multiple owners and lots of legalese, the Python license basically
50
-lets you copy, use, modify, and redistribute files as long as you keep
51
-the copyright attribution intact, note any changes you make, and don't
52
-use the owner's name in vain. The BSD license is similar.
53
+licenses are OSI-approved_ and GPL-compatible_. The BSD license
54
+basically lets you copy, use, modify, and redistribute files as long
55
+as you keep the copyright attribution intact, note any changes you
56
+make, and don't use the owner's name in vain. Although complicated by
57
+multiple owners and lots of legalese, the Python license is similar.
59
Plaintext versions of all the linked-to licenses are provided in the
61
diff -ur docutils-0.4/docs/dev/policies.txt docutils-0.4-branch/docs/dev/policies.txt
62
--- docutils-0.4/docs/dev/policies.txt 2005-11-14 18:11:32.000000000 +0000
63
+++ docutils-0.4-branch/docs/dev/policies.txt 2006-07-02 16:10:32.000000000 +0100
66
:Author: David Goodger; open to all Docutils developers
67
:Contact: goodger@python.org
68
-:Date: $Date: 2005-11-14 19:11:32 +0100 (Mon, 14 Nov 2005) $
69
-:Revision: $Revision: 4048 $
70
+:Date: $Date: 2006-04-01 03:04:58 +0200 (Sat, 01 Apr 2006) $
71
+:Revision: $Revision: 4470 $
72
:Copyright: This document has been placed in the public domain.
76
distributed as part of Docutils releases. Feel free to check in code
77
to the sandbox; that way people can try it out but you won't have to
78
worry about it working 100% error-free, as is the goal of the Docutils
79
-core. Each developer who wants to play in the sandbox should create
80
-either a project-specific subdirectory or personal subdirectory
81
-(suggested name: SourceForge ID, nickname, or given name + family
82
-initial). It's OK to make a mess in your personal space! But please,
84
+core. A project-specific subdirectory should be created for each new
85
+project. Any developer who wants to play in the sandbox may do so,
86
+but project directories are recommended over personal directories,
87
+which discourage collaboration. It's OK to make a mess in the
88
+sandbox! But please, play nice.
90
Please update the `sandbox README`_ file with links and a brief
91
description of your work.
95
project_name/ # For a collaborative project.
96
- # Structure as in userid/component_name below.
97
- userid/ # For personal space.
98
- component_name/ # A verbose name is best.
99
- README.txt # Please explain the requirements,
100
- # purpose/goals, and usage.
103
- component.py # The component is a single module.
104
+ README.txt # Describe the requirements, purpose/goals, usage,
105
+ # and list the maintainers.
108
+ component.py # The component is a single module.
109
# *OR* (but *not* both)
110
- component/ # The component is a package.
111
- __init__.py # Contains the Reader/Writer class.
112
- other1.py # Other modules and data files used
113
- data.txt # by this component.
115
- test/ # Test suite.
117
- tools/ # For front ends etc.
119
- setup.py # Use Distutils to install the component
120
- # code and tools/ files into the right
121
- # places in Docutils.
122
+ component/ # The component is a package.
123
+ __init__.py # Contains the Reader/Writer class.
124
+ other1.py # Other modules and data files used
125
+ data.txt # by this component.
127
+ test/ # Test suite.
129
+ tools/ # For front ends etc.
131
+ setup.py # Use Distutils to install the component
132
+ # code and tools/ files into the right
133
+ # places in Docutils.
134
+ userid/ # For *temporary* personal space.
136
-Some sandbox projects are destined to become Docutils components once
137
+Some sandbox projects are destined to move to the Docutils core once
138
completed. Others, such as add-ons to Docutils or applications of
139
-Docutils, graduate to become `parallel projects`_.
140
+Docutils, may graduate to become `parallel projects`_.
142
.. _sandbox README: http://docutils.sf.net/sandbox/README.html
143
.. _sandbox directory:
144
diff -ur docutils-0.4/docs/dev/pysource.dtd docutils-0.4-branch/docs/dev/pysource.dtd
145
--- docutils-0.4/docs/dev/pysource.dtd 2004-06-05 20:32:15.000000000 +0100
146
+++ docutils-0.4-branch/docs/dev/pysource.dtd 2006-07-02 16:10:32.000000000 +0100
148
======================================================================
149
:Author: David Goodger
150
:Contact: goodger@users.sourceforge.net
151
-:Revision: $Revision: 2223 $
152
-:Date: $Date: 2004-06-05 21:32:15 +0200 (Sat, 05 Jun 2004) $
153
+:Revision: $Revision: 4480 $
154
+:Date: $Date: 2006-04-01 03:33:44 +0200 (Sat, 01 Apr 2006) $
155
:Copyright: This DTD has been placed in the public domain.
156
:Filename: pysource.dtd
159
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
162
+<!-- package's namespace == __init__.py module's namespace -->
163
<!ELEMENT package_section
164
(package, fullname?, import_list?, %structure.model;)>
165
<!ATTLIST package_section %basic.atts;>
166
diff -ur docutils-0.4/docs/dev/repository.txt docutils-0.4-branch/docs/dev/repository.txt
167
--- docutils-0.4/docs/dev/repository.txt 2005-11-06 16:50:19.000000000 +0000
168
+++ docutils-0.4-branch/docs/dev/repository.txt 2006-07-02 16:10:32.000000000 +0100
171
:Author: Felix Wiemann
172
:Contact: Felix.Wiemann@ososo.de
173
-:Revision: $Revision: 4002 $
174
-:Date: $Date: 2005-11-06 17:50:19 +0100 (Sun, 06 Nov 2005) $
175
+:Revision: $Revision: 4609 $
176
+:Date: $Date: 2006-06-05 22:19:55 +0200 (Mon, 05 Jun 2006) $
177
:Copyright: This document has been placed in the public domain.
179
.. _Docutils: http://docutils.sourceforge.net/
183
If you previously had an anonymous working copy and gained developer
184
-access, you can switch the URL associated with your working copy by
186
+access, you can switch the URL associated with your working copy with
187
+this command (executed in the root of your working copy) ::
189
- svn switch --relocate svn://svn.berlios.de/docutils/trunk/docutils \
190
+ svn switch --relocate svn://svn.berlios.de/docutils \
191
svn+ssh://<user>@svn.berlios.de/svnroot/repos/docutils
193
(Again, ``<user>`` is your BerliOS user account name.)
194
diff -ur docutils-0.4/docs/ref/doctree.txt docutils-0.4-branch/docs/ref/doctree.txt
195
--- docutils-0.4/docs/ref/doctree.txt 2005-10-28 17:12:56.000000000 +0100
196
+++ docutils-0.4-branch/docs/ref/doctree.txt 2006-07-02 16:10:31.000000000 +0100
199
:Author: David Goodger
200
:Contact: goodger@users.sourceforge.net
201
-:Revision: $Revision: 3963 $
202
-:Date: $Date: 2005-10-28 18:12:56 +0200 (Fri, 28 Oct 2005) $
203
+:Revision: $Revision: 4611 $
204
+:Date: $Date: 2006-06-05 22:22:36 +0200 (Mon, 05 Jun 2006) $
205
:Copyright: This document has been placed in the public domain.
208
@@ -4432,7 +4432,7 @@
210
`Attribute type`_: ``NMTOKENS``. Default value: none.
212
-The ``classes`` attribute is a list containing one or more names used
213
+The ``classes`` attribute is a list containing zero or more names used
214
to classify an element. The purpose of the attribute is to indicate
215
an "is-a" variant relationship, to allow an extensible way of defining
216
sub-classes of existing elements. It can be used to carry context
217
diff -ur docutils-0.4/docs/ref/docutils.dtd docutils-0.4-branch/docs/ref/docutils.dtd
218
--- docutils-0.4/docs/ref/docutils.dtd 2005-10-28 17:12:56.000000000 +0100
219
+++ docutils-0.4-branch/docs/ref/docutils.dtd 2006-07-02 16:10:31.000000000 +0100
221
======================================================================
222
:Author: David Goodger
223
:Contact: goodger@users.sourceforge.net
224
-:Revision: $Revision: 3963 $
225
-:Date: $Date: 2005-10-28 18:12:56 +0200 (Fri, 28 Oct 2005) $
226
+:Revision: $Revision: 4465 $
227
+:Date: $Date: 2006-04-01 02:46:27 +0200 (Sat, 01 Apr 2006) $
228
:Copyright: This DTD has been placed in the public domain.
229
:Filename: docutils.dtd
232
<!-- Can also be a body element, when it contains an "image" element. -->
233
<!ELEMENT reference %text.model;>
235
+ name CDATA #IMPLIED
239
diff -ur docutils-0.4/docs/ref/rst/directives.txt docutils-0.4-branch/docs/ref/rst/directives.txt
240
--- docutils-0.4/docs/ref/rst/directives.txt 2005-12-22 23:46:04.000000000 +0000
241
+++ docutils-0.4-branch/docs/ref/rst/directives.txt 2006-07-02 16:10:31.000000000 +0100
243
=============================
244
:Author: David Goodger
245
:Contact: goodger@python.org
246
-:Revision: $Revision: 4228 $
247
-:Date: $Date: 2005-12-23 00:46:04 +0100 (Fri, 23 Dec 2005) $
248
+:Revision: $Revision: 4610 $
249
+:Date: $Date: 2006-06-05 22:21:34 +0200 (Mon, 05 Jun 2006) $
250
:Copyright: This document has been placed in the public domain.
254
This is a generic, titled admonition. The title may be anything the
257
-The author-supplied title is also used as a "class" attribute value
258
+The author-supplied title is also used as a "classes" attribute value
259
after being converted into a valid identifier form (down-cased;
260
non-alphanumeric characters converted to single hyphens; "admonition-"
261
prefixed). For example, this admonition::
263
becomes the following document tree (pseudo-XML)::
265
<document source="test data">
266
- <admonition class="admonition-and-by-the-way">
267
+ <admonition classes="admonition-and-by-the-way">
272
The following option is recognized:
275
- Override the computed "class" attribute value. See the class_
276
+ Override the computed "classes" attribute value. See the class_
281
reference name with underscore suffix (e.g. ``name_``).
284
- Set a "class" attribute value on the image element. See the
285
+ Set a "classes" attribute value on the image element. See the
286
class_ directive below.
290
+---------------------------+
293
- Set a "class" attribute value on the figure element. See the
294
+ Set a "classes" attribute value on the figure element. See the
295
class_ directive below.
297
``align`` : "left", "center", or "right"
299
The following option is recognized:
302
- Set a "class" attribute value on the topic element. See the
303
+ Set a "classes" attribute value on the topic element. See the
304
class_ directive below.
308
The sidebar's subtitle.
311
- Set a "class" attribute value on the sidebar element. See the
312
+ Set a "classes" attribute value on the sidebar element. See the
313
class_ directive below.
317
The following option is recognized:
320
- Set a "class" attribute value on the line_block element. See the
321
+ Set a "classes" attribute value on the line_block element. See the
322
class_ directive below.
326
The following option is recognized:
329
- Set a "class" attribute value on the literal_block element. See
330
+ Set a "classes" attribute value on the literal_block element. See
331
the class_ directive below.
335
The following option is recognized:
338
- Set a "class" attribute value on the rubric element. See the
339
+ Set a "classes" attribute value on the rubric element. See the
340
class_ directive below.
345
becomes this document tree fragment::
347
- <block_quote class="epigraph">
348
+ <block_quote classes="epigraph">
350
No matter where you go, there you are.
353
The following option is recognized:
356
- Set a "class" attribute value on the compound element. See the
357
+ Set a "classes" attribute value on the compound element. See the
358
class_ directive below.
363
The "container" directive surrounds its contents (arbitrary body
364
elements) with a generic block-level "container" element. Combined
365
-with the optional "class_" attribute argument(s), this is an extension
366
-mechanism for users & applications. For example::
367
+with the optional "classes_" attribute argument(s), this is an
368
+extension mechanism for users & applications. For example::
370
.. container:: custom
373
The following option is recognized:
376
- Set a "class" attribute value on the table element. See the
377
+ Set a "classes" attribute value on the table element. See the
378
class_ directive below.
382
The following options are recognized:
385
- Set a "class" attribute value on the table element. See the
386
+ Set a "classes" attribute value on the table element. See the
387
class_ directive below.
389
``widths`` : integer [, integer...]
391
The following options are recognized:
394
- Set a "class" attribute value on the table element. See the
395
+ Set a "classes" attribute value on the table element. See the
396
class_ directive below.
398
``widths`` : integer [integer...]
400
entries, the table of contents itself, or generate no backlinks.
403
- Set a "class" attribute value on the topic element. See the
404
+ Set a "classes" attribute value on the topic element. See the
405
class_ directive below.
408
@@ -1077,7 +1077,7 @@
409
The following option is recognized:
412
- Set a "class" attribute value on all footnote_reference elements.
413
+ Set a "classes" attribute value on all footnote_reference elements.
414
See the class_ directive below.
417
@@ -1455,6 +1455,8 @@
418
Defaults to the document's encoding (if specified).
426
@@ -1466,15 +1468,15 @@
427
:Directive Content: Optional. If present, it is interpreted as body
430
-The "class" directive sets the "class" attribute value on its content
431
+The "class" directive sets the "classes" attribute value on its content
432
or on the first immediately following non-comment element [#]_. For
433
-details of the "class" attribute, see `its entry`__ in `The Docutils
434
+details of the "classes" attribute, see `its entry`__ in `The Docutils
435
Document Tree`_. The directive argument consists of one or more
436
space-separated class names, which are converted to lowercase and all
437
non-alphanumeric characters are converted to hyphens. (For the
438
rationale, see below.)
440
-__ ../doctree.html#class
441
+__ ../doctree.html#classes
445
@@ -1497,36 +1499,38 @@
447
The text above is parsed and transformed into this doctree fragment::
449
- <paragraph class="special">
450
+ <paragraph classes="special">
451
This is a "special" paragraph.
452
- <section class="exceptional remarkable">
453
+ <section classes="exceptional remarkable">
455
An Exceptional Section
457
This is an ordinary paragraph.
458
- <paragraph class="multiple">
459
+ <paragraph classes="multiple">
461
- <paragraph class="multiple">
462
+ <paragraph classes="multiple">
465
-.. [#] To set a "class" attribute value on a block quote, the "class"
466
- directive must be followed by an empty comment::
467
+.. [#] To set a "classes" attribute value on a block quote, the
468
+ "class" directive must be followed by an empty comment::
470
.. class:: highlights
475
- The directive doesn't allow content, therefore an empty comment is
476
- required to terminate the directive. Without the empty comment,
477
- the block quote text would be interpreted as the "class"
478
- directive's content, and the parser would complain.
479
+ An empty comment is required to terminate the directive to allow
480
+ the indented text to be parsed as a block quote. Without the empty
481
+ comment, the indented text would be interpreted as the "class"
482
+ directive's content, and the classes would be applied to each
483
+ element (paragraphi, in this case) individually, instead of to the
484
+ block quote as a whole.
486
-.. topic:: Rationale for Class Attribute Value Conversion
487
+.. topic:: Rationale for "classes" Attribute Value Conversion
489
Docutils identifiers are converted to conform to the regular
490
expression ``[a-z](-?[a-z0-9]+)*``. For CSS compatibility,
491
- identifiers (the "class" and "id" attributes) should have no
492
+ identifiers (the "classes" and "id" attributes) should have no
493
underscores, colons, or periods. Hyphens may be used.
495
- The `HTML 4.01 spec`_ defines identifiers based on SGML tokens:
496
@@ -1539,7 +1543,7 @@
497
- However the `CSS1 spec`_ defines identifiers based on the "name"
498
token, a tighter interpretation ("flex" tokenizer notation
499
below; "latin1" and "escape" 8-bit characters have been replaced
501
+ with XML entities)::
503
unicode \\[0-9a-f]{1,4}
504
latin1 [¡-ÿ]
505
@@ -1548,7 +1552,7 @@
508
The CSS1 "nmchar" rule does not include underscores ("_"), colons
509
- (":"), or periods ("."), therefore "class" and "id" attributes
510
+ (":"), or periods ("."), therefore "classes" and "id" attributes
511
should not contain these characters. They should be replaced with
512
hyphens ("-"). Combined with HTML's requirements (the first
513
character must be a letter; no "unicode", "latin1", or "escape"
514
@@ -1586,7 +1590,7 @@
518
- <inline class="custom">
519
+ <inline classes="custom">
522
The role must be declared in a document before it can be used.
523
@@ -1601,15 +1605,15 @@
524
The parsed result is as follows::
527
- <emphasis class="custom">
528
+ <emphasis classes="custom">
531
If no base role is explicitly specified, a generic custom role is
532
automatically used. Subsequent interpreted text will produce an
533
-"inline" element with a "class" attribute, as in the first example
534
+"inline" element with a "classes" attribute, as in the first example
537
-With most roles, the ":class:" option can be used to set a "class"
538
+With most roles, the ":class:" option can be used to set a "classes"
539
attribute that is different from the role name. For example::
542
@@ -1620,7 +1624,7 @@
543
This is the parsed result::
546
- <inline class="special">
547
+ <inline classes="special">
551
@@ -1629,9 +1633,9 @@
555
- Set a "class" attribute value on the element produced (``inline``,
556
- or element associated with a base class) when the custom
557
- interpreted text role is used. If no directive options are
558
+ Set the "classes" attribute value on the element produced
559
+ (``inline``, or element associated with a base class) when the
560
+ custom interpreted text role is used. If no directive options are
561
specified, a "class" option with the directive argument (role
562
name) as the value is implied. See the class_ directive above.
564
diff -ur docutils-0.4/docs/user/links.txt docutils-0.4-branch/docs/user/links.txt
565
--- docutils-0.4/docs/user/links.txt 2005-11-08 21:48:57.000000000 +0000
566
+++ docutils-0.4-branch/docs/user/links.txt 2006-07-02 16:10:37.000000000 +0100
569
:Author: Felix Wiemann
570
:Contact: Felix.Wiemann@ososo.de
571
-:Revision: $Revision: 4020 $
572
-:Date: $Date: 2005-11-08 22:48:57 +0100 (Tue, 08 Nov 2005) $
573
+:Revision: $Revision: 4479 $
574
+:Date: $Date: 2006-04-01 03:32:19 +0200 (Sat, 01 Apr 2006) $
575
:Copyright: This document has been placed in the public domain.
577
.. title:: Docutils Links
580
* For Blogs (Weblogs), please see the `FAQ entry about Blogs`_.
582
+* ReSTedit_ by Bill Bumgarner is a Docutils GUI for Mac OS X.
584
+* There is an `ASCII art to SVG converter`_ (aafigure), developed by
587
* Alberto Berti is developing an `OpenDocument writer`_.
589
+* Jens J. Mortensen developed `LaTeX math for reST`_, which writes to
590
+ LaTeX or to MathML.
592
* xml2rst_, an XSLT stylesheet written by Stefan Merten, converts XML
593
dumps of the document tree (e.g. created with rst2xml.py) back to
596
.. _Docutils: http://docutils.sourceforge.net/
597
.. _FAQ entry about Wikis: http://docutils.sf.net/FAQ.html#are-there-any-wikis-that-use-restructuredtext-syntax
598
.. _FAQ entry about Blogs: http://docutils.sf.net/FAQ.html#are-there-any-weblog-blog-projects-that-use-restructuredtext-syntax
599
-.. _OpenDocument writer: http://thread.gmane.org/gmane.text.docutils.devel/3388
600
+.. _ReSTedit: http://www.friday.com/bbum/index.php?s=restedit
601
+.. _ASCII art to SVG converter: http://docutils.sf.net/sandbox/cliechti/aafigure/
602
+.. _OpenDocument writer: http://thread.gmane.org/gmane.text.docutils.devel/3613
603
+.. _LaTeX math for reST:
604
+ http://docutils.sourceforge.net/sandbox/jensj/latex_math/
605
.. _xml2rst: http://www.merten-home.de/FreeSoftware/xml2rst/index.html
606
.. _rst2ht: http://www.rutherfurd.net/articles/rst-ht2html.html
607
.. _ht2html: http://ht2html.sourceforge.net/
608
diff -ur docutils-0.4/docs/user/rst/cheatsheet.txt docutils-0.4-branch/docs/user/rst/cheatsheet.txt
609
--- docutils-0.4/docs/user/rst/cheatsheet.txt 2005-12-22 23:47:07.000000000 +0000
610
+++ docutils-0.4-branch/docs/user/rst/cheatsheet.txt 2006-07-02 16:10:36.000000000 +0100
612
=====================================================
613
:Info: See <http://docutils.sf.net/rst.html> for introductory docs.
614
:Author: David Goodger <goodger@python.org>
615
-:Date: $Date: 2005-12-23 00:47:07 +0100 (Fri, 23 Dec 2005) $
616
-:Revision: $Revision: 4230 $
617
+:Date: $Date: 2006-04-01 02:51:34 +0200 (Sat, 01 Apr 2006) $
618
+:Revision: $Revision: 4467 $
619
:Description: This is a "docinfo block", or bibliographic field list
623
Directive ("::") .. image:: images/biohazard.png
624
Substitution Def .. |substitution| replace:: like an inline directive
625
Comment .. is anything else
626
+Empty Comment (".." on a line by itself, with blank lines before & after,
627
+ used to separate indentation contexts)
628
================ ============================================================
631
diff -ur docutils-0.4/docs/user/rst/quickref.html docutils-0.4-branch/docs/user/rst/quickref.html
632
--- docutils-0.4/docs/user/rst/quickref.html 2005-09-05 21:44:51.000000000 +0100
633
+++ docutils-0.4-branch/docs/user/rst/quickref.html 2006-07-02 16:10:36.000000000 +0100
635
<p align="right"><em><a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"
636
>http://docutils.sourceforge.net/docs/user/rst/quickref.html</a></em>
637
<br><em>Being a cheat-sheet for reStructuredText</em>
638
- <br><em>Updated $Date: 2005-09-05 22:44:51 +0200 (Mon, 05 Sep 2005) $</em>
639
+ <br><em>Updated $Date: 2006-04-01 02:54:47 +0200 (Sat, 01 Apr 2006) $</em>
642
<p>Copyright: This document has been placed in the public domain.
647
+ <p>Use <a href="#comments">empty comments</a> to separate indentation
648
+ contexts, such as block quotes and directive contents.</p>
650
<h2><a href="#contents" name="doctest-blocks" class="backref"
651
>Doctest Blocks</a></h2>
653
@@ -1313,14 +1316,18 @@
657
- <samp>An empty "comment" does not</samp>
658
- <br><samp>"consume" following blocks.</samp>
659
+ <samp>An "empty comment" does not</samp>
660
+ <br><samp>consume following blocks.</samp>
661
+ <br><samp>(An empty comment is ".." with</samp>
662
+ <br><samp>blank lines before and after.)</samp>
664
<p><samp> So this block is not "lost",</samp>
665
<br><samp> despite its indentation.</samp>
667
- An empty "comment" does not
668
- "consume" following blocks.
669
+ An "empty comment" does not
670
+ consume following blocks.
671
+ (An empty comment is ".." with
672
+ blank lines before and after.)
674
So this block is not "lost",
675
despite its indentation.
676
diff -ur docutils-0.4/docs/user/rst/quickstart.txt docutils-0.4-branch/docs/user/rst/quickstart.txt
677
--- docutils-0.4/docs/user/rst/quickstart.txt 2005-05-28 01:30:02.000000000 +0100
678
+++ docutils-0.4-branch/docs/user/rst/quickstart.txt 2006-07-02 16:10:36.000000000 +0100
680
=========================
682
:Author: Richard Jones
683
-:Version: $Revision: 3396 $
684
+:Version: $Revision: 4478 $
685
:Copyright: This document has been placed in the public domain.
690
__ quickref.html#paragraphs
698
__ quickref.html#escaping
705
paragraphs or body elements, indented relative to the term.
706
Blank lines are not allowed between term and definition.
709
Preformatting (code samples)
710
----------------------------
713
This is preformatted text, and the
714
last "::" paragraph is removed
720
diff -ur docutils-0.4/docs/user/slide-shows.txt docutils-0.4-branch/docs/user/slide-shows.txt
721
--- docutils-0.4/docs/user/slide-shows.txt 2005-12-21 02:01:15.000000000 +0000
722
+++ docutils-0.4-branch/docs/user/slide-shows.txt 2006-07-02 16:10:37.000000000 +0100
724
=================================
726
:Authors: David Goodger & Chris Liechti
727
-:Date: $Date: 2005-12-21 03:01:15 +0100 (Wed, 21 Dec 2005) $
728
+:Date: $Date: 2006-06-05 22:12:37 +0200 (Mon, 05 Jun 2006) $
730
.. This document has been placed in the public domain.
733
* http://meyerweb.com/eric/tools/s5/themes/
734
* http://mozilla.wikicities.com/wiki/Firefox_S5:Designs
735
* http://lachy.id.au/dev/mozilla/firefox/s5/
736
+ * http://www.openlight.com/Python-S5-Theme.tar.gz
738
S5 is becoming more popular every day. Do a web search for "S5
739
theme" and you're bound to find plenty of choices.
740
@@ -671,11 +672,12 @@
741
Start with ``pretty.css``; edit ``framing.css`` if you need to make
744
-4. Run "``rst2s5.py --theme <new-theme> <doc>.txt <doc>.html``".
745
+4. Run "``rst2s5.py --theme-url ui/<new-theme> <doc>.txt <doc>.html``".
749
- Open your ``<doc>.html`` in a browser to test the new theme.
750
+ We use the ``--theme-url`` option to refer to the new theme. Open
751
+ your ``<doc>.html`` in a browser to test the new theme.
755
diff -ur docutils-0.4/docutils/core.py docutils-0.4-branch/docutils/core.py
756
--- docutils-0.4/docutils/core.py 2005-12-14 02:12:00.000000000 +0000
757
+++ docutils-0.4-branch/docutils/core.py 2006-07-02 16:10:26.000000000 +0100
759
# Authors: David Goodger
760
# Contact: goodger@python.org
761
-# Revision: $Revision: 4208 $
762
-# Date: $Date: 2005-12-14 03:12:00 +0100 (Wed, 14 Dec 2005) $
763
+# Revision: $Revision: 4606 $
764
+# Date: $Date: 2006-06-05 21:49:46 +0200 (Mon, 05 Jun 2006) $
765
# Copyright: This module has been placed in the public domain.
769
settings_overrides=None, config_section=None,
770
enable_exit_status=None):
772
- Set up & run a `Publisher` to render from an existing document tree data
773
- structure, for programmatic use with string I/O. Return a pair of encoded
774
- string output and document parts.
775
+ Set up & run a `Publisher` to render from an existing document
776
+ tree data structure, for programmatic use with string I/O. Return
777
+ the encoded string output.
779
Note that document.settings is overridden; if you want to use the settings
780
of the original `document`, pass settings=document.settings.
781
diff -ur docutils-0.4/docutils/__init__.py docutils-0.4-branch/docutils/__init__.py
782
--- docutils-0.4/docutils/__init__.py 2006-01-09 18:28:09.000000000 +0000
783
+++ docutils-0.4-branch/docutils/__init__.py 2006-07-02 16:10:26.000000000 +0100
785
# Author: David Goodger
786
# Contact: goodger@python.org
787
-# Revision: $Revision: 4260 $
788
-# Date: $Date: 2006-01-09 19:28:09 +0100 (Mon, 09 Jan 2006) $
789
+# Revision: $Revision: 4613 $
790
+# Date: $Date: 2006-06-05 22:25:57 +0200 (Mon, 05 Jun 2006) $
791
# Copyright: This module has been placed in the public domain.
796
__docformat__ = 'reStructuredText'
799
+__version__ = '0.4.1'
800
"""``major.minor.micro`` version number. The micro number is bumped for API
801
changes, for new functionality, and for interim project releases. The minor
802
number is bumped whenever there is a significant project release. The major
803
number will be bumped when the project is feature-complete, and perhaps if
804
there is a major change in the design."""
806
-__version_details__ = 'release'
807
+__version_details__ = 'repository'
808
"""Extra version details (e.g. 'snapshot 2005-05-29, r3410', 'repository',
809
'release'), modified automatically & manually."""
812
unknown_reference_resolvers = ()
813
"""List of functions to try to resolve unknown references. Unknown
814
references have a 'refname' attribute which doesn't correspond to any
815
- target in the document. Called when FinalCheckVisitor is unable to find a
816
- correct target. The list should contain functions which will try to
817
- resolve unknown references, with the following signature::
818
+ target in the document. Called when the transforms in
819
+ `docutils.tranforms.references` are unable to find a correct target. The
820
+ list should contain functions which will try to resolve unknown
821
+ references, with the following signature::
823
def reference_resolver(node):
824
'''Returns boolean: true if resolved, false if not.'''
825
diff -ur docutils-0.4/docutils/parsers/rst/__init__.py docutils-0.4-branch/docutils/parsers/rst/__init__.py
826
--- docutils-0.4/docutils/parsers/rst/__init__.py 2005-06-01 14:52:43.000000000 +0100
827
+++ docutils-0.4-branch/docutils/parsers/rst/__init__.py 2006-07-02 16:10:21.000000000 +0100
829
# Author: David Goodger
830
# Contact: goodger@users.sourceforge.net
831
-# Revision: $Revision: 3416 $
832
-# Date: $Date: 2005-06-01 15:52:43 +0200 (Wed, 01 Jun 2005) $
833
+# Revision: $Revision: 4490 $
834
+# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
835
# Copyright: This module has been placed in the public domain.
838
diff -ur docutils-0.4/docutils/parsers/rst/states.py docutils-0.4-branch/docutils/parsers/rst/states.py
839
--- docutils-0.4/docutils/parsers/rst/states.py 2006-01-09 03:29:23.000000000 +0000
840
+++ docutils-0.4-branch/docutils/parsers/rst/states.py 2006-07-02 16:10:21.000000000 +0100
842
# Author: David Goodger
843
# Contact: goodger@users.sourceforge.net
844
-# Revision: $Revision: 4258 $
845
-# Date: $Date: 2006-01-09 04:29:23 +0100 (Mon, 09 Jan 2006) $
846
+# Revision: $Revision: 4318 $
847
+# Date: $Date: 2006-01-22 23:53:32 +0100 (Sun, 22 Jan 2006) $
848
# Copyright: This module has been placed in the public domain.
851
@@ -1720,6 +1720,7 @@
855
+ (?!_) # no underscore at the beginning
856
(?P<quote>`?) # optional open quote
857
(?![ `]) # first char. not space or
859
diff -ur docutils-0.4/docutils/transforms/peps.py docutils-0.4-branch/docutils/transforms/peps.py
860
--- docutils-0.4/docutils/transforms/peps.py 2005-09-26 19:17:31.000000000 +0100
861
+++ docutils-0.4-branch/docutils/transforms/peps.py 2006-07-02 16:10:26.000000000 +0100
863
# Author: David Goodger
864
# Contact: goodger@users.sourceforge.net
865
-# Revision: $Revision: 3909 $
866
-# Date: $Date: 2005-09-26 20:17:31 +0200 (Mon, 26 Sep 2005) $
867
+# Revision: $Revision: 4490 $
868
+# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
869
# Copyright: This module has been placed in the public domain.
872
diff -ur docutils-0.4/docutils/utils.py docutils-0.4-branch/docutils/utils.py
873
--- docutils-0.4/docutils/utils.py 2005-12-07 23:46:30.000000000 +0000
874
+++ docutils-0.4-branch/docutils/utils.py 2006-07-02 16:10:26.000000000 +0100
876
# Author: David Goodger
877
# Contact: goodger@users.sourceforge.net
878
-# Revision: $Revision: 4152 $
879
-# Date: $Date: 2005-12-08 00:46:30 +0100 (Thu, 08 Dec 2005) $
880
+# Revision: $Revision: 4605 $
881
+# Date: $Date: 2006-06-05 21:41:45 +0200 (Mon, 05 Jun 2006) $
882
# Copyright: This module has been placed in the public domain.
886
Return a new empty document object.
890
+ `source_path` : string
891
The path to or description of the source text of the document.
892
`settings` : optparse.Values object
893
Runtime settings. If none provided, a default set will be used.
894
diff -ur docutils-0.4/docutils/writers/latex2e/__init__.py docutils-0.4-branch/docutils/writers/latex2e/__init__.py
895
--- docutils-0.4/docutils/writers/latex2e/__init__.py 2006-01-05 23:28:53.000000000 +0000
896
+++ docutils-0.4-branch/docutils/writers/latex2e/__init__.py 2006-07-02 16:10:22.000000000 +0100
898
# Author: Engelbert Gruber
899
# Contact: grubert@users.sourceforge.net
900
-# Revision: $Revision: 4242 $
901
-# Date: $Date: 2006-01-06 00:28:53 +0100 (Fri, 06 Jan 2006) $
902
+# Revision: $Revision: 4614 $
903
+# Date: $Date: 2006-06-05 22:33:33 +0200 (Mon, 05 Jun 2006) $
904
# Copyright: This module has been placed in the public domain.
907
@@ -694,18 +694,20 @@
908
# mbox_newline: to tell encode to add mbox and newline.
909
self.mbox_newline = 0
911
- # enumeration is done by list environment.
914
# Stack of section counters so that we don't have to use_latex_toc.
915
# This will grow and shrink as processing occurs.
916
# Initialized for potential first-level sections.
917
self._section_number = [0]
919
# The current stack of enumerations so that we can expand
920
- # them into a compound enumeration
921
+ # them into a compound enumeration.
922
self._enumeration_counters = []
924
+ # The maximum number of enumeration counters we've used.
925
+ # If we go beyond this number, we need to create a new
926
+ # counter; otherwise, just reuse an old one.
927
+ self._max_enumeration_counters = 0
932
@@ -1283,8 +1285,6 @@
933
# We create our own enumeration list environment.
934
# This allows to set the style and starting value
935
# and unlimited nesting.
936
- self._enum_cnt += 1
938
enum_style = {'arabic':'arabic',
941
@@ -1303,16 +1303,24 @@
942
pref += '%d.' % self._section_number[i]
943
pref = pref[:-1] + self.section_enumerator_separator
945
- for counter in self._enumeration_counters:
946
- enum_prefix += counter + '.'
947
+ for ctype, cname in self._enumeration_counters:
948
+ enum_prefix += '\\%s{%s}.' % (ctype, cname)
950
if node.has_key('enumtype'):
951
enum_type = node['enumtype']
952
if enum_style.has_key(enum_type):
953
enum_type = enum_style[enum_type]
954
- counter_name = "listcnt%d" % self._enum_cnt;
955
- self._enumeration_counters.append("\\%s{%s}" % (enum_type,counter_name))
956
- self.body.append('\\newcounter{%s}\n' % counter_name)
958
+ counter_name = "listcnt%d" % len(self._enumeration_counters)
959
+ self._enumeration_counters.append((enum_type, counter_name))
960
+ # If we haven't used this counter name before, then create a
961
+ # new counter; otherwise, reset & reuse the old counter.
962
+ if len(self._enumeration_counters) > self._max_enumeration_counters:
963
+ self._max_enumeration_counters = len(self._enumeration_counters)
964
+ self.body.append('\\newcounter{%s}\n' % counter_name)
966
+ self.body.append('\\setcounter{%s}{0}\n' % counter_name)
968
self.body.append('\\begin{list}{%s\\%s{%s}%s}\n' % \
969
(enum_prefix,enum_type,counter_name,enum_suffix))
970
self.body.append('{\n')
971
@@ -1382,7 +1390,8 @@
972
self.body.append(':]')
974
def visit_figure(self, node):
975
- if not node.attributes.has_key('align'):
976
+ if (not node.attributes.has_key('align') or
977
+ node.attributes['align'] == 'center'):
980
align = 'flush'+node.attributes['align']
981
diff -ur docutils-0.4/docutils/writers/pep_html/__init__.py docutils-0.4-branch/docutils/writers/pep_html/__init__.py
982
--- docutils-0.4/docutils/writers/pep_html/__init__.py 2005-12-09 04:21:34.000000000 +0000
983
+++ docutils-0.4-branch/docutils/writers/pep_html/__init__.py 2006-07-02 16:10:22.000000000 +0100
985
# Author: David Goodger
986
# Contact: goodger@users.sourceforge.net
987
-# Revision: $Revision: 4163 $
988
-# Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
989
+# Revision: $Revision: 4490 $
990
+# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
991
# Copyright: This module has been placed in the public domain.
994
diff -ur docutils-0.4/FAQ.txt docutils-0.4-branch/FAQ.txt
995
--- docutils-0.4/FAQ.txt 2005-12-09 04:21:34.000000000 +0000
996
+++ docutils-0.4-branch/FAQ.txt 2006-07-02 16:10:39.000000000 +0100
998
Docutils FAQ (Frequently Asked Questions)
999
===========================================
1001
-:Date: $Date: 2005-12-09 05:21:34 +0100 (Fri, 09 Dec 2005) $
1002
-:Revision: $Revision: 4163 $
1003
+:Date: $Date: 2006-06-05 22:16:34 +0200 (Mon, 05 Jun 2006) $
1004
+:Revision: $Revision: 4608 $
1005
:Web site: http://docutils.sourceforge.net/
1006
:Copyright: This document has been placed in the public domain.
1009
`PEPs (Python Enhancement Proposals)`_ (implemented), and others as
1012
+The Docutils distribution consists of:
1014
+* a library (the "docutils" package), which `can be used by client
1016
+* several `front-end tools`_ (such as ``rst2html.py``, which converts
1017
+ reStructuredText input into HTML output);
1018
+* a `test suite`_; and
1019
+* extensive documentation_.
1021
For an overview of the Docutils project implementation, see `PEP
1022
258`_, "Docutils Design Specification".
1025
.. _Docutils: http://docutils.sourceforge.net/
1026
.. _PEPs (Python Enhancement Proposals):
1027
http://www.python.org/peps/pep-0012.html
1028
+.. _can be used by client code:
1029
+ http://docutils.sourceforge.net/docs/api/publisher.html
1030
+.. _front-end tools: http://docutils.sourceforge.net/docs/user/tools.html
1031
+.. _test suite: http://docutils.sourceforge.net/docs/dev/testing.html
1032
+.. _documentation: http://docutils.sourceforge.net/docs/
1033
.. _PEP 258: http://www.python.org/peps/pep-0258.html
1034
.. _Python: http://www.python.org/
1037
Introduction to reStructuredText`_.
1039
Please note that the name is "Docutils", not "DocUtils" or "Doc-Utils"
1040
-or any other variation.
1041
+or any other variation. It is pronounced as in "DOCumentation
1042
+UTILitieS", with emphasis on the first syllable.
1044
.. _An Introduction to reStructuredText:
1045
http://docutils.sourceforge.net/docs/ref/rst/introduction.html
1048
* `Firedrop <http://www.voidspace.org.uk/python/firedrop2/>`__
1049
* `Python Desktop Server <http://pyds.muensterland.org/>`__
1050
-* `PyBloxsom <http://roughingit.subtlehints.net/pyblosxom/>`__
1051
+* `PyBloxsom <http://pyblosxom.sourceforge.net/>`__
1052
* `Lino WebMan <http://lino.sourceforge.net/webman.html>`__
1054
Please `let us know`_ of any other reStructuredText Blogs.
1055
@@ -923,8 +938,10 @@
1056
recognizing that. You can either try to fix your browser (enable
1057
"UTF-8 character set", sometimes called "Unicode"), or choose a
1058
different encoding for the HTML output. You can also try
1059
-``--output-encoding=ascii:xmlcharrefreplace`` for HTML (not applicable
1060
-to non-XMLish outputs).
1061
+``--output-encoding=ascii:xmlcharrefreplace`` for HTML or XML, but not
1062
+applicable to non-XMLish outputs (if using runtime
1063
+settings/configuration files, use ``output_encoding=ascii`` and
1064
+``output_encoding_error_handler=xmlcharrefreplace``).
1066
If you're generating document fragments, the "Content-Type" metadata
1067
(between the HTML ``<head>`` and ``</head>`` tags) must agree with the
1068
diff -ur docutils-0.4/HISTORY.txt docutils-0.4-branch/HISTORY.txt
1069
--- docutils-0.4/HISTORY.txt 2006-01-09 19:54:47.000000000 +0000
1070
+++ docutils-0.4-branch/HISTORY.txt 2006-07-02 16:10:39.000000000 +0100
1073
:Author: David Goodger; open to all Docutils developers
1074
:Contact: goodger@python.org
1075
-:Date: $Date: 2006-01-09 20:54:47 +0100 (Mon, 09 Jan 2006) $
1076
-:Revision: $Revision: 4262 $
1077
+:Date: $Date: 2006-06-05 02:34:01 +0200 (Mon, 05 Jun 2006) $
1078
+:Revision: $Revision: 4598 $
1079
:Web site: http://docutils.sourceforge.net/
1080
:Copyright: This document has been placed in the public domain.
1088
+* docutils/parsers/rst/states.py:
1090
+ - Unquoted targets beginning with an underscore (``.. __target:
1091
+ URI``) are no longer accepted.
1093
+* tools/editors/emacs/rst.el:
1095
+ - Changed license to "GPL".
1098
Release 0.4 (2006-01-09)
1099
========================
1101
diff -ur docutils-0.4/RELEASE-NOTES.txt docutils-0.4-branch/RELEASE-NOTES.txt
1102
--- docutils-0.4/RELEASE-NOTES.txt 2006-01-09 19:26:08.000000000 +0000
1103
+++ docutils-0.4-branch/RELEASE-NOTES.txt 2006-07-02 16:10:39.000000000 +0100
1106
:Author: Felix Wiemann
1107
:Contact: Felix.Wiemann@ososo.de
1108
-:Date: $Date: 2006-01-09 20:26:08 +0100 (Mon, 09 Jan 2006) $
1109
-:Revision: $Revision: 4261 $
1110
+:Date: $Date: 2006-01-09 23:05:13 +0100 (Mon, 09 Jan 2006) $
1111
+:Revision: $Revision: 4278 $
1112
:Web site: http://docutils.sourceforge.net/
1113
:Copyright: This document has been placed in the public domain.
1123
Release 0.4 (2006-01-09)
1124
========================
1126
diff -ur docutils-0.4/setup.py docutils-0.4-branch/setup.py
1127
--- docutils-0.4/setup.py 2006-01-09 18:28:09.000000000 +0000
1128
+++ docutils-0.4-branch/setup.py 2006-07-02 16:10:39.000000000 +0100
1130
#!/usr/bin/env python
1131
-# $Id: setup.py 4260 2006-01-09 18:28:09Z fwiemann $
1132
+# $Id: setup.py 4462 2006-04-01 00:29:53Z fwiemann $
1133
# Copyright: This file has been placed in the public domain.
1138
-from distutils.core import setup
1139
-from distutils.command.build_py import build_py
1141
+ from distutils.core import setup
1142
+ from distutils.command.build_py import build_py
1143
+except ImportError:
1144
+ print 'Error: The "distutils" standard module, which is required for the '
1145
+ print 'installation of Docutils, could not be found. You may need to '
1146
+ print 'install a package called "python-devel" (or similar) on your '
1147
+ print 'system using your package manager.'
1150
# From <http://groups.google.de/groups?as_umsgid=f70e3538.0404141327.6cea58ca@posting.google.com>.
1151
from distutils.command.install import INSTALL_SCHEMES
1153
input Docutils supports reStructuredText, an easy-to-read,
1154
what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
1155
'url': 'http://docutils.sourceforge.net/',
1157
+ 'version': '0.4.1',
1158
'author': 'David Goodger',
1159
'author_email': 'goodger@users.sourceforge.net',
1160
'license': 'public domain, Python, BSD, GPL (see COPYING.txt)',
1161
Only in docutils-0.4-branch: .svn
1162
Only in docutils-0.4-branch/test/data: .svn
1163
diff -ur docutils-0.4/test/functional/expected/compact_lists.html docutils-0.4-branch/test/functional/expected/compact_lists.html
1164
--- docutils-0.4/test/functional/expected/compact_lists.html 2006-01-07 17:05:13.000000000 +0000
1165
+++ docutils-0.4-branch/test/functional/expected/compact_lists.html 2006-07-02 16:10:14.000000000 +0100
1167
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1169
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1170
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1171
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1173
<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
1175
diff -ur docutils-0.4/test/functional/expected/dangerous.html docutils-0.4-branch/test/functional/expected/dangerous.html
1176
--- docutils-0.4/test/functional/expected/dangerous.html 2006-01-07 17:05:13.000000000 +0000
1177
+++ docutils-0.4-branch/test/functional/expected/dangerous.html 2006-07-02 16:10:14.000000000 +0100
1179
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1181
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1182
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1183
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1185
<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
1187
diff -ur docutils-0.4/test/functional/expected/field_name_limit.html docutils-0.4-branch/test/functional/expected/field_name_limit.html
1188
--- docutils-0.4/test/functional/expected/field_name_limit.html 2006-01-07 17:05:13.000000000 +0000
1189
+++ docutils-0.4-branch/test/functional/expected/field_name_limit.html 2006-07-02 16:10:14.000000000 +0100
1191
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1193
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1194
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1195
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1197
<link rel="stylesheet" href="../../../docutils/writers/html4css1/html4css1.css" type="text/css" />
1199
diff -ur docutils-0.4/test/functional/expected/misc_rst_html4css1.html docutils-0.4-branch/test/functional/expected/misc_rst_html4css1.html
1200
--- docutils-0.4/test/functional/expected/misc_rst_html4css1.html 2006-01-07 17:05:13.000000000 +0000
1201
+++ docutils-0.4-branch/test/functional/expected/misc_rst_html4css1.html 2006-07-02 16:10:14.000000000 +0100
1203
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1205
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1206
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1207
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1209
<link rel="stylesheet" href="foo&bar.css" type="text/css" />
1211
diff -ur docutils-0.4/test/functional/expected/pep_html.html docutils-0.4-branch/test/functional/expected/pep_html.html
1212
--- docutils-0.4/test/functional/expected/pep_html.html 2006-01-07 17:05:13.000000000 +0000
1213
+++ docutils-0.4-branch/test/functional/expected/pep_html.html 2006-07-02 16:10:14.000000000 +0100
1217
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1218
- <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1219
+ <meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1220
<title>PEP 100 -- Test PEP</title>
1221
<link rel="stylesheet" href="../../../docutils/writers/pep_html/pep.css" type="text/css" />
1223
diff -ur docutils-0.4/test/functional/expected/standalone_rst_html4css1.html docutils-0.4-branch/test/functional/expected/standalone_rst_html4css1.html
1224
--- docutils-0.4/test/functional/expected/standalone_rst_html4css1.html 2006-01-07 17:05:13.000000000 +0000
1225
+++ docutils-0.4-branch/test/functional/expected/standalone_rst_html4css1.html 2006-07-02 16:10:14.000000000 +0100
1227
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1229
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1230
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1231
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1232
<title>reStructuredText Test Document</title>
1233
<meta name="author" content="David Goodger" />
1234
<meta name="authors" content="Me Myself I" />
1235
diff -ur docutils-0.4/test/functional/expected/standalone_rst_latex.tex docutils-0.4-branch/test/functional/expected/standalone_rst_latex.tex
1236
--- docutils-0.4/test/functional/expected/standalone_rst_latex.tex 2005-11-20 19:54:07.000000000 +0000
1237
+++ docutils-0.4-branch/test/functional/expected/standalone_rst_latex.tex 2006-07-02 16:10:14.000000000 +0100
1238
@@ -382,42 +382,42 @@
1239
\hypertarget{enumerated-lists}{}
1240
\pdfbookmark[1]{2.3~~~Enumerated Lists}{enumerated-lists}
1241
\subsection*{2.3~~~Enumerated Lists}
1242
-\newcounter{listcnt1}
1243
-\begin{list}{\arabic{listcnt1}.}
1244
+\newcounter{listcnt0}
1245
+\begin{list}{\arabic{listcnt0}.}
1247
-\usecounter{listcnt1}
1248
+\usecounter{listcnt0}
1249
\setlength{\rightmargin}{\leftmargin}
1253
-\newcounter{listcnt2}
1254
-\begin{list}{\alph{listcnt2})}
1255
+\newcounter{listcnt1}
1256
+\begin{list}{\alph{listcnt1})}
1258
-\usecounter{listcnt2}
1259
+\usecounter{listcnt1}
1260
\setlength{\rightmargin}{\leftmargin}
1264
-\newcounter{listcnt3}
1265
-\begin{list}{(\roman{listcnt3})}
1266
+\newcounter{listcnt2}
1267
+\begin{list}{(\roman{listcnt2})}
1269
-\usecounter{listcnt3}
1270
+\usecounter{listcnt2}
1271
\setlength{\rightmargin}{\leftmargin}
1275
-\newcounter{listcnt4}
1276
-\begin{list}{\Alph{listcnt4}.}
1277
+\newcounter{listcnt3}
1278
+\begin{list}{\Alph{listcnt3}.}
1280
-\usecounter{listcnt4}
1281
+\usecounter{listcnt3}
1282
\setlength{\rightmargin}{\leftmargin}
1286
-\newcounter{listcnt5}
1287
-\begin{list}{\Roman{listcnt5})}
1288
+\newcounter{listcnt4}
1289
+\begin{list}{\Roman{listcnt4})}
1291
-\usecounter{listcnt5}
1292
+\usecounter{listcnt4}
1293
\setlength{\rightmargin}{\leftmargin}
1296
@@ -433,11 +433,11 @@
1299
Lists that don't start at 1:
1300
-\newcounter{listcnt6}
1301
-\begin{list}{\arabic{listcnt6}.}
1302
+\setcounter{listcnt1}{0}
1303
+\begin{list}{\arabic{listcnt1}.}
1305
-\usecounter{listcnt6}
1306
-\addtocounter{listcnt6}{2}
1307
+\usecounter{listcnt1}
1308
+\addtocounter{listcnt1}{2}
1309
\setlength{\rightmargin}{\leftmargin}
1312
@@ -447,11 +447,11 @@
1316
-\newcounter{listcnt7}
1317
-\begin{list}{\Alph{listcnt7}.}
1318
+\setcounter{listcnt1}{0}
1319
+\begin{list}{\Alph{listcnt1}.}
1321
-\usecounter{listcnt7}
1322
-\addtocounter{listcnt7}{2}
1323
+\usecounter{listcnt1}
1324
+\addtocounter{listcnt1}{2}
1325
\setlength{\rightmargin}{\leftmargin}
1328
@@ -461,11 +461,11 @@
1332
-\newcounter{listcnt8}
1333
-\begin{list}{\roman{listcnt8}.}
1334
+\setcounter{listcnt1}{0}
1335
+\begin{list}{\roman{listcnt1}.}
1337
-\usecounter{listcnt8}
1338
-\addtocounter{listcnt8}{2}
1339
+\usecounter{listcnt1}
1340
+\addtocounter{listcnt1}{2}
1341
\setlength{\rightmargin}{\leftmargin}
1344
@@ -925,14 +925,14 @@
1345
This paragraph might flow around the figure...
1348
-\begin{figure}[htbp]\begin{flushcenter}
1349
+\begin{figure}[htbp]\begin{center}
1351
\includegraphics[width=50]{../../../docs/user/rst/images/biohazard.png}
1352
\caption{This is the caption.}{\small
1355
The legend may consist of several paragraphs.
1356
-}\end{flushcenter}\end{figure}
1357
+}\end{center}\end{figure}
1359
This paragraph might flow around the figure...
1361
diff -ur docutils-0.4/test/functional/expected/standalone_rst_s5_html_1.html docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_1.html
1362
--- docutils-0.4/test/functional/expected/standalone_rst_s5_html_1.html 2006-01-07 17:05:13.000000000 +0000
1363
+++ docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_1.html 2006-07-02 16:10:14.000000000 +0100
1365
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1367
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1368
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1369
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1370
<meta name="version" content="S5 1.1" />
1371
<title>Slide Shows</title>
1372
<meta name="author" content="David Goodger" />
1373
diff -ur docutils-0.4/test/functional/expected/standalone_rst_s5_html_2.html docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_2.html
1374
--- docutils-0.4/test/functional/expected/standalone_rst_s5_html_2.html 2006-01-07 17:05:13.000000000 +0000
1375
+++ docutils-0.4-branch/test/functional/expected/standalone_rst_s5_html_2.html 2006-07-02 16:10:14.000000000 +0100
1377
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
1379
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1380
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
1381
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
1382
<meta name="version" content="S5 1.1" />
1383
<title>Slide Shows</title>
1384
<meta name="author" content="David Goodger" />
1385
diff -ur docutils-0.4/test/test_dependencies.py docutils-0.4-branch/test/test_dependencies.py
1386
--- docutils-0.4/test/test_dependencies.py 2005-12-03 02:13:12.000000000 +0000
1387
+++ docutils-0.4-branch/test/test_dependencies.py 2006-07-02 16:10:18.000000000 +0100
1390
# Author: Felix Wiemann
1391
# Contact: Felix_Wiemann@ososo.de
1392
-# Revision: $Revision: 4132 $
1393
-# Date: $Date: 2005-12-03 03:13:12 +0100 (Sat, 03 Dec 2005) $
1394
+# Revision: $Revision: 4617 $
1395
+# Date: $Date: 2006-06-05 22:46:27 +0200 (Mon, 05 Jun 2006) $
1396
# Copyright: This module has been placed in the public domain.
1401
class RecordDependenciesTests(unittest.TestCase):
1404
- os.chdir(os.path.join(DocutilsTestSupport.testroot, 'data'))
1406
- def get_record(self, inputfile=None, **settings):
1407
+ # docutils.utils.DependencyList records relative URLs, not platform paths,
1408
+ # so use "/" as a path separator even on Windows (not os.path.join).
1410
+ def get_record(self, **settings):
1411
recordfile = 'record.txt'
1412
- settings.setdefault('source_path', 'dependencies.txt')
1413
+ settings.setdefault('source_path',
1414
+ os.path.join('data', 'dependencies.txt'))
1415
settings.setdefault('settings_overrides', {})
1416
settings['settings_overrides'] = settings['settings_overrides'].copy()
1417
settings['settings_overrides']['_disable_config'] = 1
1420
def test_dependencies(self):
1421
self.assertEqual(self.get_record(),
1424
+ ['data/include.txt', 'data/raw.txt'])
1425
self.assertEqual(self.get_record(writer_name='latex'),
1428
+ ['data/include.txt',
1430
+ # this is a URL, not a path:
1433
def test_csv_dependencies(self):
1436
- self.assertEqual(self.get_record(source_path='csv_dep.txt'),
1439
+ self.get_record(source_path=os.path.join('data',
1441
+ ['data/csv_data.txt'])
1446
s = {'settings_overrides': {}}
1447
so = s['settings_overrides']
1448
so['embed_stylesheet'] = 0
1449
- so['stylesheet_path'] = 'stylesheet.txt'
1450
+ so['stylesheet_path'] = os.path.join('data', 'stylesheet.txt')
1451
so['stylesheet'] = None
1452
s['writer_name'] = 'html'
1453
- self.assert_('stylesheet.txt' not in
1454
+ self.assert_(os.path.join('data', 'stylesheet.txt') not in
1455
self.get_record(**s))
1456
so['embed_stylesheet'] = 1
1457
- self.assert_('stylesheet.txt' in
1458
- self.get_record(**s))
1459
+ self.assert_('data/stylesheet.txt' in self.get_record(**s))
1460
del so['embed_stylesheet']
1461
s['writer_name'] = 'latex'
1462
- self.assert_('stylesheet.txt' in
1463
- self.get_record(**s))
1464
+ self.assert_('data/stylesheet.txt' in self.get_record(**s))
1467
if __name__ == '__main__':
1468
diff -ur docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_tables.py
1469
--- docutils-0.4/test/test_parsers/test_rst/test_directives/test_tables.py 2005-04-05 03:55:06.000000000 +0100
1470
+++ docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_tables.py 2006-07-02 16:10:17.000000000 +0100
1473
# Author: David Goodger
1474
# Contact: goodger@python.org
1475
-# Revision: $Revision: 3165 $
1476
-# Date: $Date: 2005-04-05 04:55:06 +0200 (Tue, 05 Apr 2005) $
1477
+# Revision: $Revision: 4484 $
1478
+# Date: $Date: 2006-04-01 03:47:31 +0200 (Sat, 01 Apr 2006) $
1479
# Copyright: This module has been placed in the public domain.
1483
utf_16_csv_rel = DocutilsTestSupport.utils.relative_path(None, utf_16_csv)
1484
empty_txt = os.path.join(mydir, 'empty.txt')
1486
+unichr_exception = DocutilsTestSupport.exception_data(
1487
+ 'unichr(int("9999999999999", 16))')[0]
1488
+if isinstance(unichr_exception, OverflowError):
1489
+ unichr_exception_string = 'code too large (%s)' % unichr_exception
1491
+ unichr_exception_string = str(unichr_exception)
1496
@@ -678,11 +685,11 @@
1498
Error in "csv-table" directive:
1499
invalid option value: (option: "delim"; value: 'U+9999999999999')
1500
- code too large (long int too large to convert to int).
1502
<literal_block xml:space="preserve">
1503
.. csv-table:: bad delimiter
1504
:delim: U+9999999999999
1506
+""" % unichr_exception_string],
1508
.. csv-table:: bad CSV data
1510
diff -ur docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_unicode.py
1511
--- docutils-0.4/test/test_parsers/test_rst/test_directives/test_unicode.py 2005-10-02 02:06:42.000000000 +0100
1512
+++ docutils-0.4-branch/test/test_parsers/test_rst/test_directives/test_unicode.py 2006-07-02 16:10:17.000000000 +0100
1515
# Author: David Goodger
1516
# Contact: goodger@users.sourceforge.net
1517
-# Revision: $Revision: 3915 $
1518
-# Date: $Date: 2005-10-02 03:06:42 +0200 (Sun, 02 Oct 2005) $
1519
+# Revision: $Revision: 4483 $
1520
+# Date: $Date: 2006-04-01 03:42:07 +0200 (Sat, 01 Apr 2006) $
1521
# Copyright: This module has been placed in the public domain.
1525
s.generateTests(totest)
1528
+unichr_exception = DocutilsTestSupport.exception_data(
1529
+ 'unichr(int("111111111111111111", 16))')[0]
1530
+if isinstance(unichr_exception, OverflowError):
1531
+ unichr_exception_string = 'code too large (%s)' % unichr_exception
1533
+ unichr_exception_string = str(unichr_exception)
1537
totest['unicode'] = [
1538
@@ -157,12 +164,7 @@
1539
Substitution definition "too big for unicode" empty or invalid.
1540
<literal_block xml:space="preserve">
1541
.. |too big for unicode| unicode:: 0x11111111
1542
-""" % ([DocutilsTestSupport.exception_data(
1543
- 'unichr(int("111111111111111111", 16))')[0],
1544
- 'code too large (%s)' % DocutilsTestSupport.exception_data(
1545
- 'unichr(int("111111111111111111", 16))')[0]]
1546
- [isinstance(DocutilsTestSupport.exception_data(
1547
- 'unichr(int("111111111111111111", 16))')[0], OverflowError)],
1548
+""" % (unichr_exception_string,
1549
DocutilsTestSupport.exception_data('unichr(int("11111111", 16))')[2])]
1552
diff -ur docutils-0.4/test/test_parsers/test_rst/test_interpreted.py docutils-0.4-branch/test/test_parsers/test_rst/test_interpreted.py
1553
--- docutils-0.4/test/test_parsers/test_rst/test_interpreted.py 2005-03-26 16:21:28.000000000 +0000
1554
+++ docutils-0.4-branch/test/test_parsers/test_rst/test_interpreted.py 2006-07-02 16:10:18.000000000 +0100
1557
# Author: David Goodger
1558
# Contact: goodger@users.sourceforge.net
1559
-# Revision: $Revision: 3129 $
1560
-# Date: $Date: 2005-03-26 17:21:28 +0100 (Sat, 26 Mar 2005) $
1561
+# Revision: $Revision: 4490 $
1562
+# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
1563
# Copyright: This module has been placed in the public domain.
1566
diff -ur docutils-0.4/test/test_parsers/test_rst/test_targets.py docutils-0.4-branch/test/test_parsers/test_rst/test_targets.py
1567
--- docutils-0.4/test/test_parsers/test_rst/test_targets.py 2005-10-02 02:06:42.000000000 +0100
1568
+++ docutils-0.4-branch/test/test_parsers/test_rst/test_targets.py 2006-07-02 16:10:18.000000000 +0100
1571
# Author: David Goodger
1572
# Contact: goodger@users.sourceforge.net
1573
-# Revision: $Revision: 3915 $
1574
-# Date: $Date: 2005-10-02 03:06:42 +0200 (Sun, 02 Oct 2005) $
1575
+# Revision: $Revision: 4318 $
1576
+# Date: $Date: 2006-01-22 23:53:32 +0100 (Sun, 22 Jan 2006) $
1577
# Copyright: This module has been placed in the public domain.
1581
<target ids="a-target-name-including-a-colon-escaped" names="a\ target\ name:\ including\ a\ colon\ (escaped)">
1584
+.. _`target: No matching backquote.
1585
+.. _`: No matching backquote either.
1588
+<document source="test data">
1589
+ <comment xml:space="preserve">
1590
+ _`target: No matching backquote.
1591
+ <system_message level="2" line="1" source="test data" type="WARNING">
1593
+ malformed hyperlink target.
1594
+ <comment xml:space="preserve">
1595
+ _`: No matching backquote either.
1596
+ <system_message level="2" line="2" source="test data" type="WARNING">
1598
+ malformed hyperlink target.
1601
.. _a very long target name,
1604
@@ -123,6 +140,28 @@
1605
<target ids="multi-line-email" names="multi-line\ email" refuri="mailto:jdoe@example.com">
1610
+.. __malformed: no good
1612
+Target beginning with an underscore:
1617
+<document source="test data">
1620
+ <comment xml:space="preserve">
1621
+ __malformed: no good
1622
+ <system_message level="2" line="3" source="test data" type="WARNING">
1624
+ malformed hyperlink target.
1626
+ Target beginning with an underscore:
1627
+ <target ids="target" names="_target" refuri="OK">
1630
Duplicate external targets (different URIs):
1633
diff -ur docutils-0.4/test/test_readers/test_pep/test_inline_markup.py docutils-0.4-branch/test/test_readers/test_pep/test_inline_markup.py
1634
--- docutils-0.4/test/test_readers/test_pep/test_inline_markup.py 2005-03-26 16:21:28.000000000 +0000
1635
+++ docutils-0.4-branch/test/test_readers/test_pep/test_inline_markup.py 2006-07-02 16:10:09.000000000 +0100
1638
# Author: David Goodger
1639
# Contact: goodger@users.sourceforge.net
1640
-# Revision: $Revision: 3129 $
1641
-# Date: $Date: 2005-03-26 17:21:28 +0100 (Sat, 26 Mar 2005) $
1642
+# Revision: $Revision: 4490 $
1643
+# Date: $Date: 2006-04-02 15:18:47 +0200 (Sun, 02 Apr 2006) $
1644
# Copyright: This module has been placed in the public domain.
1647
diff -ur docutils-0.4/test/test_writers/test_latex2e.py docutils-0.4-branch/test/test_writers/test_latex2e.py
1648
--- docutils-0.4/test/test_writers/test_latex2e.py 2005-08-27 14:43:58.000000000 +0100
1649
+++ docutils-0.4-branch/test/test_writers/test_latex2e.py 2006-07-02 16:10:12.000000000 +0100
1652
# Author: engelbert gruber
1653
# Contact: grubert@users.sourceforge.net
1654
-# Revision: $Revision: 3840 $
1655
-# Date: $Date: 2005-08-27 15:43:58 +0200 (Sat, 27 Aug 2005) $
1656
+# Revision: $Revision: 4614 $
1657
+# Date: $Date: 2006-06-05 22:33:33 +0200 (Mon, 05 Jun 2006) $
1658
# Copyright: This module has been placed in the public domain.
1661
@@ -162,10 +162,10 @@
1664
\\setlength{\\locallinewidth}{\\linewidth}
1665
-\\newcounter{listcnt1}
1666
-\\begin{list}{\\arabic{listcnt1}.}
1667
+\\newcounter{listcnt0}
1668
+\\begin{list}{\\arabic{listcnt0}.}
1670
-\\usecounter{listcnt1}
1671
+\\usecounter{listcnt0}
1672
\\setlength{\\rightmargin}{\\leftmargin}
1675
@@ -176,10 +176,10 @@
1679
-\\newcounter{listcnt2}
1680
-\\begin{list}{\\alph{listcnt2})}
1681
+\\setcounter{listcnt0}{0}
1682
+\\begin{list}{\\alph{listcnt0})}
1684
-\\usecounter{listcnt2}
1685
+\\usecounter{listcnt0}
1686
\\setlength{\\rightmargin}{\\leftmargin}
1689
@@ -190,11 +190,11 @@
1693
-\\newcounter{listcnt3}
1694
-\\begin{list}{\\arabic{listcnt3}.}
1695
+\\setcounter{listcnt0}{0}
1696
+\\begin{list}{\\arabic{listcnt0}.}
1698
-\\usecounter{listcnt3}
1699
-\\addtocounter{listcnt3}{2}
1700
+\\usecounter{listcnt0}
1701
+\\addtocounter{listcnt0}{2}
1702
\\setlength{\\rightmargin}{\\leftmargin}
1705
@@ -202,10 +202,10 @@
1709
-\\newcounter{listcnt4}
1710
-\\begin{list}{(\\Roman{listcnt4})}
1711
+\\setcounter{listcnt0}{0}
1712
+\\begin{list}{(\\Roman{listcnt0})}
1714
-\\usecounter{listcnt4}
1715
+\\usecounter{listcnt0}
1716
\\setlength{\\rightmargin}{\\leftmargin}
1719
diff -ur docutils-0.4/tools/editors/emacs/rst.el docutils-0.4-branch/tools/editors/emacs/rst.el
1720
--- docutils-0.4/tools/editors/emacs/rst.el 2005-12-27 13:12:04.000000000 +0000
1721
+++ docutils-0.4-branch/tools/editors/emacs/rst.el 2006-07-02 16:10:37.000000000 +0100
1723
;;; :Authors: Martin Blais <blais@furius.ca>,
1724
;;; Stefan Merten <smerten@oekonux.de>,
1725
;;; David Goodger <goodger@python.org>
1726
-;;; :Revision: $Revision: 4232 $
1727
-;;; :Date: $Date: 2005-12-27 14:12:04 +0100 (Tue, 27 Dec 2005) $
1728
-;;; :Copyright: This module has been placed in the public domain.
1730
+;;; :Revision: $Revision: 4481 $
1731
+;;; :Date: $Date: 2006-04-01 03:36:26 +0200 (Sat, 01 Apr 2006) $
1732
+;;; :Copyright: 2003-2006 by Martin Blais, Stefan Merten, and David Goodger.
1734
+;;; This program is free software; you can redistribute it and/or modify
1735
+;;; it under the terms of the GNU General Public License version 2,
1736
+;;; as published by the Free Software Foundation.
1738
+;;; This program is distributed in the hope that it will be useful,
1739
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
1740
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1741
+;;; GNU General Public License for more details.
1743
+;;; You should have received a copy of the GNU General Public License
1744
+;;; version 2 along with this program (../../../licenses/gpl.txt) and
1745
+;;; available at http://docutils.sf.net/licenses/gpl.txt
1746
+;;; and at http://www.gnu.org/licenses/gpl.txt.
1748
-;;; Support code for editing reStructuredText with Emacs. The latest version
1749
-;;; of this file lies in the docutils source code repository.
1751
+;;; Support code for editing reStructuredText with Emacs. The latest
1752
+;;; version of this file lies in the docutils source code repository.
1756
@@ -1903,29 +1917,6 @@
1757
;; All customizable features have a comment explaining their meaning. Refer to
1758
;; the customization of your Emacs (try ``M-x customize``).
1762
-;; http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html
1766
-;; Stefan Merten <smerten AT oekonux.de>
1770
-;; This program is licensed under the terms of the GPL. See
1772
-;; http://www.gnu.org/licenses/gpl.txt
1778
-;; http://www.merten-home.de/FreeSoftware/rst-mode/
1783
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1786
@@ -2687,6 +2678,9 @@
1787
(or (and dir (concat dir file-name)) nil)
1793
(defun rst-compile (&optional pfxarg)
1794
"Compile command to convert reST document into some output file.
1795
Attempts to find configuration file, if it can, overrides the
1796
diff -ur docutils-0.4/tools/editors/README.txt docutils-0.4-branch/tools/editors/README.txt
1797
--- docutils-0.4/tools/editors/README.txt 2005-06-28 14:11:20.000000000 +0100
1798
+++ docutils-0.4-branch/tools/editors/README.txt 2006-07-02 16:10:37.000000000 +0100
1800
Editor Support for reStructuredText_
1801
======================================
1803
-:Date: $Date: 2005-06-28 15:11:20 +0200 (Tue, 28 Jun 2005) $
1804
+:Date: $Date: 2006-04-01 03:06:59 +0200 (Sat, 01 Apr 2006) $
1806
The files in this directory contain support code for reStructuredText
1807
editing for the following editors:
1809
* `reStructuredText syntax highlighting mode for vim
1810
<http://www.vim.org/scripts/script.php?script_id=973>`__
1812
+* `VST (Vim reStructured Text) is a plugin for Vim7 with folding for
1813
+ reST <http://skawina.eu.org/mikolaj/vst.html>`__
1815
* `rst mode <http://jedmodes.sf.net/mode/rst/>`__ for the `JED`_
1818
diff -ur docutils-0.4/tools/rst2s5.py docutils-0.4-branch/tools/rst2s5.py
1819
--- docutils-0.4/tools/rst2s5.py 2005-12-08 04:43:13.000000000 +0000
1820
+++ docutils-0.4-branch/tools/rst2s5.py 2006-07-02 16:10:38.000000000 +0100
1823
+#!/usr/bin/env python
1825
# Author: Chris Liechti
1826
# Contact: cliechti@gmx.net
1827
-# Revision: $Revision: 4156 $
1828
-# Date: $Date: 2005-12-08 05:43:13 +0100 (Thu, 08 Dec 2005) $
1829
+# Revision: $Revision: 4477 $
1830
+# Date: $Date: 2006-04-01 03:13:25 +0200 (Sat, 01 Apr 2006) $
1831
# Copyright: This module has been placed in the public domain.
1834
--- docutils-0.4/MANIFEST.in
1835
+++ docutils-0.4-branch/MANIFEST.in
1839
+recursive-include docutils *
1840
+recursive-include docs *
1841
+recursive-include extras *
1842
+recursive-include licenses *
1843
+recursive-include test *
1844
+recursive-include tools *
1845
+recursive-exclude * .cvsignore *.pyc *~ .DS_Store
added
removed
debian/patches/01_upstream_04_branch_r4646.dpatch
