structuredtext-checkins Mailing List for reStructuredText (Page 2)
Status: Pre-Alpha
Brought to you by:
goodger
Menu
▾
▴
structuredtext-checkins — CVS checkin messages
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(83) |
Sep
(171) |
Oct
(49) |
Nov
(58) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(34) |
Feb
(76) |
Mar
(111) |
Apr
(47) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: David G. <go...@us...> - 2002-04-13 16:57:25
|
Update of /cvsroot/structuredtext/web In directory usw-pr-cvs1:/tmp/cvs-serv12152/web Modified Files: index.html Log Message: updated Index: index.html =================================================================== RCS file: /cvsroot/structuredtext/web/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.html 7 Sep 2001 02:44:21 -0000 1.4 --- index.html 13 Apr 2002 16:57:18 -0000 1.5 *************** *** 10,14 **** ><IMG SRC="title.png" ALT="reStructuredText" BORDER=0 ALIGN=bottom></A></P> ! <P><I>last updated: 2001-09-06</I></P> <P>reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext --- 10,14 ---- ><IMG SRC="title.png" ALT="reStructuredText" BORDER=0 ALIGN=bottom></A></P> ! <P><I>last updated: 2002-04-12</I></P> <P>reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext *************** *** 20,25 **** Processing System</A>. reStructuredText is a revision and reinterpretation of the <A HREF="http://dev.zope.org/Members/jim/StructuredTextWiki/FrontPage/" ! >StructuredText</A> and <A HREF="http://www.bsdi.com/setext/" >Setext</A> ! lightweight markup systems.</P> <P>The primary goal of the reStructuredText project is to define and implement --- 20,25 ---- Processing System</A>. reStructuredText is a revision and reinterpretation of the <A HREF="http://dev.zope.org/Members/jim/StructuredTextWiki/FrontPage/" ! >StructuredText</A> and <A HREF="http://docutils.sourceforge.net/mirror/setext.html" ! >Setext</A> lightweight markup systems.</P> <P>The primary goal of the reStructuredText project is to define and implement *************** *** 38,64 **** “<TT>dps.parsers.restructuredtext</TT>”, a component of the <A HREF="http://docstring.sourceforge.net/">Python Docstring Processing System ! (DPS)</A>. The reStructuredText parser is almost complete. Only a few details ! remain to be implemented.</P> ! ! <P>The <A ! HREF="http://prdownloads.sourceforge.net/structuredtext/rst.0.3.tar.gz" ! >latest project release package (rst.0.3.tar.gz)</A> and past project ! releases can be downloaded from the <A ! HREF="http://sourceforge.net/project/showfiles.php?group_id=7050">project ! files page</A>. Please also download the <A ! HREF="http://prdownloads.sourceforge.net/docstring/dps.0.3.tar.gz" ! >latest DPS package (dps.0.3.tar.gz)</A> which is required by the ! reStructuredText parser. <A ! HREF="http://sourceforge.net/cvs/?group_id=7050">Anonymous CVS access is ! available.</A> You can also <A ! HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/~checkout~/structuredtext/restructuredtext/" ! >browse the latest reStructuredText source files (CVS) individually</A>, and ! read the latest <A HREF="README.txt">README.txt</A> and <A ! HREF="HISTORY.txt">HISTORY.txt</A>.</P> <H3><A NAME="snapshots">Daily Snapshots</A></H3> <P>Daily snapshots of the project files are also available. They are ! generated automatically from CVS at 24:00 in North America's Eastern time zone (UTC-0400 from April to October, UTC-0500 from October to April). The snapshots should be used with caution, as they may contain --- 38,47 ---- “<TT>dps.parsers.restructuredtext</TT>”, a component of the <A HREF="http://docstring.sourceforge.net/">Python Docstring Processing System ! (DPS)</A>. The reStructuredText parser is functionally complete.</P> <H3><A NAME="snapshots">Daily Snapshots</A></H3> <P>Daily snapshots of the project files are also available. They are ! generated automatically from CVS around midnight in North America's Eastern time zone (UTC-0400 from April to October, UTC-0500 from October to April). The snapshots should be used with caution, as they may contain *************** *** 84,87 **** --- 67,91 ---- </UL> + <H3><A NAME="releases">Project Releases</A></H3> + + <P>Please note that the <A HREF="#snapshots">snapshots</A> above + contain the latest versions of project files.</P> + + <P>The <A + HREF="http://prdownloads.sourceforge.net/structuredtext/rst.0.3.tar.gz" + >latest project release package (rst.0.3.tar.gz)</A> and past project + releases can be downloaded from the <A + HREF="http://sourceforge.net/project/showfiles.php?group_id=7050">project + files page</A>. Please also download the <A + HREF="http://prdownloads.sourceforge.net/docstring/dps.0.3.tar.gz" + >latest DPS package (dps.0.3.tar.gz)</A> which is required by the + reStructuredText parser. <A + HREF="http://sourceforge.net/cvs/?group_id=7050">Anonymous CVS access is + available.</A> You can also <A + HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/~checkout~/structuredtext/restructuredtext/" + >browse the latest reStructuredText source files (CVS) individually</A>, and + read the latest <A HREF="README.txt">README.txt</A> and <A + HREF="HISTORY.txt">HISTORY.txt</A>.</P> + <H2>User Documentation</H2> *************** *** 95,101 **** <UL> <LI><P><A HREF="docs/quickref.html" ! >Quick reStructuredText</A> </P></LI> </UL> --- 99,110 ---- <UL> + + <LI><P><A HREF="docs/quickstart.html">A ReStructuredText Primer</A> (HTML file), + and <A HREF="docs/quickstart.txt">A ReStructuredText Primer</A> (text source). + </P></LI> + <LI><P><A HREF="docs/quickref.html" ! >Quick reStructuredText</A> (user reference) </P></LI> </UL> *************** *** 124,128 **** <LI><P><A HREF="spec/alternatives.txt" ! >Record of reStructuredText Syntax Alternatives</A> </P></LI> --- 133,137 ---- <LI><P><A HREF="spec/alternatives.txt" ! >A Record of reStructuredText Syntax Alternatives</A> </P></LI> |
|
From: David G. <go...@us...> - 2002-04-13 16:54:12
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv11201/restructuredtext/docs
Modified Files:
quickstart.txt
Log Message:
Added links to quickref.
Minor edits & additions.
Index: quickstart.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** quickstart.txt 5 Apr 2002 04:42:33 -0000 1.7
--- quickstart.txt 13 Apr 2002 16:54:07 -0000 1.8
***************
*** 5,22 ****
:Version: $Revision$
Structure
---------
! From the outset, let me say that "Structured Text" is probably a bit of a
! misnomer. It's more like "Relaxed Text" that uses certain consistent
! patterns. These patterns are interpreted by a HTML converter to produce
! "Very Structured Text" that can be used by a web browser.
! The most basic pattern recognised is a **paragraph**. That's a chunk
! of text that is separated by blank lines (one is enough). Paragraphs must
! have the same indentation - that is, line up at their left edge. Paragraphs
! that start indented will result in indented quote paragraphs. For example::
! This is a paragraph. It's quite
short.
--- 5,35 ----
:Version: $Revision$
+ The text below contains links that look like "(quickref__)". These
+ are relative links that point to the `Quick reStructuredText`_ user
+ reference. If these links don't work, please refer to the `master
+ quick reference`_ document.
+
+ __
+ .. _Quick reStructuredText: quickref.html
+ .. _master quick reference:
+ http://structuredtext.sourceforge.net/docs/quickref.html
+
+
Structure
---------
! From the outset, let me say that "Structured Text" is probably a bit
! of a misnomer. It's more like "Relaxed Text" that uses certain
! consistent patterns. These patterns are interpreted by a HTML
! converter to produce "Very Structured Text" that can be used by a web
! browser.
! The most basic pattern recognised is a **paragraph** (quickref__).
! That's a chunk of text that is separated by blank lines (one is
! enough). Paragraphs must have the same indentation -- that is, line
! up at their left edge. Paragraphs that start indented will result in
! indented quote paragraphs. For example::
! This is a paragraph. It's quite
short.
***************
*** 28,32 ****
Results in:
! This is a paragraph. It's quite
short.
--- 41,45 ----
Results in:
! This is a paragraph. It's quite
short.
***************
*** 36,72 ****
This is another one.
Text styles
-----------
Inside paragraphs and other bodies of text, you may additionally mark
! text for *italics* with "``*italics*``" or **bold** with "``**bold**``".
If you want something to appear as a fixed-space literal, use
! "````double back-quotes````". Note that no further fiddling is done inside
! the double back-quotes - so asterisks "``*``" etc. are left alone.
! If you find that you want to use one of the "special" characters in text, it
! will generally be OK - ReST is pretty smart. For example, this * asterisk is
! handled just fine. If you actually want text \*surrounded by asterisks* to
! **not** be italicised, then you need to indicate that the asterisk is not
! special. You do this by placing a backslash just before it, like so "``\*``".
Lists
-----
! Lists of items come in three flavours: **enumerated**, **bulleted** and
! **definitions**. In all list cases, you may have as many paragraphs,
! sublists, etc. as you want, as long as the left-hand side of the paragraph
! or whatever aligns with the first line of text in the list item.
! Lists must always start a new paragraph - that is, they must appear after a
! blank line.
- **enumerated** lists (numbers, letters or roman numerals)
Start a line off with a number or letter followed by a period ".",
! right bracket ")" or surrounded by brackets "( )" - whatever you're
! comfortable with. All of the following forms are recognised::
1. numbers
--- 49,97 ----
This is another one.
+ __ quickref.html#paragraphs
Text styles
-----------
+ (quickref__)
+
+ __ quickref.html#inline-markup
+
Inside paragraphs and other bodies of text, you may additionally mark
! text for *italics* with "``*italics*``" or **bold** with
! "``**bold**``".
If you want something to appear as a fixed-space literal, use
! "````double back-quotes````". Note that no further fiddling is done
! inside the double back-quotes -- so asterisks "``*``" etc. are left
! alone.
! If you find that you want to use one of the "special" characters in
! text, it will generally be OK -- ReST is pretty smart. For example,
! this * asterisk is handled just fine. If you actually want text
! \*surrounded by asterisks* to **not** be italicised, then you need to
! indicate that the asterisk is not special. You do this by placing a
! backslash just before it, like so "``\*``" (quickref__).
+ __ quickref.html#escaping
Lists
-----
! Lists of items come in three main flavours: **enumerated**,
! **bulleted** and **definitions**. In all list cases, you may have as
! many paragraphs, sublists, etc. as you want, as long as the left-hand
! side of the paragraph or whatever aligns with the first line of text
! in the list item.
! Lists must always start a new paragraph -- that is, they must appear
! after a blank line.
!
! **enumerated** lists (numbers, letters or roman numerals; quickref__)
! __ quickref.html#enumerated-lists
Start a line off with a number or letter followed by a period ".",
! right bracket ")" or surrounded by brackets "( )" -- whatever you're
! comfortable with. All of the following forms are recognised::
1. numbers
***************
*** 90,95 ****
1) and again
! Results in (note - the different enumerated list styles are not always
! supported by every web browser, so you may not get the full effect here):
1. numbers
--- 115,121 ----
1) and again
! Results in (note: the different enumerated list styles are not
! always supported by every web browser, so you may not get the full
! effect here):
1. numbers
***************
*** 113,117 ****
1) and again
! **bulleted** lists
Just like enumerated lists, start the line off with a bullet point
character - either "-", "+" or "*"::
--- 139,145 ----
1) and again
! **bulleted** lists (quickref__)
! __ quickref.html#bullet-lists
!
Just like enumerated lists, start the line off with a bullet point
character - either "-", "+" or "*"::
***************
*** 135,185 ****
- another item
! **definition** lists
! Unlike the other two, the definition lists consist of a term, and the
! definition of that term. The format of a definition list is::
what
! Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
! paragraphs or body elements, indented relative to the term. Blank
! lines are not allowed between term and definition.
Results in:
what
! Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
! paragraphs or body elements, indented relative to the term. Blank
! lines are not allowed between term and definition.
Preformatting (code samples)
----------------------------
To just include a chunk of preformatted, never-to-be-fiddled-with
! text, finish the prior paragraph with "``::``". The preformatted block is
! finished when the text falls back to the same indentation level as a
! paragraph prior to the preformatted block. For example::
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
! no more example
Results in:
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
! no more example
Note that if a paragraph consists only of "``::``", then it's removed
--- 163,220 ----
- another item
! **definition** lists (quickref__)
! __ quickref.html#definition-lists
!
! Unlike the other two, the definition lists consist of a term, and
! the definition of that term. The format of a definition list is::
what
! Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
! paragraphs or body elements, indented relative to the term.
! Blank lines are not allowed between term and definition.
Results in:
what
! Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
! paragraphs or body elements, indented relative to the term.
! Blank lines are not allowed between term and definition.
Preformatting (code samples)
----------------------------
+ (quickref__)
+
+ __ quickref.html#literal-blocks
To just include a chunk of preformatted, never-to-be-fiddled-with
! text, finish the prior paragraph with "``::``". The preformatted
! block is finished when the text falls back to the same indentation
! level as a paragraph prior to the preformatted block. For example::
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup
! (like *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level
! (but not far enough)
! no more example
Results in:
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup
! (like *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level
! (but not far enough)
! no more example
Note that if a paragraph consists only of "``::``", then it's removed
***************
*** 188,192 ****
::
! This is preformatted text, and the last "::" paragraph is removed
Results in:
--- 223,228 ----
::
! This is preformatted text, and the
! last "::" paragraph is removed
Results in:
***************
*** 194,209 ****
::
! This is preformatted text, and the last "::" paragraph is removed
Sections
--------
! To break longer text up into sections, you use **section headers**. These
! are a single line of text (one or more words) with an underline (and
! optionally an overline) in dashes
! "``-----``", equals "``======``", tildes "``~~~~~~``" or any of the
! non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >`` that you feel
! comfortable with. Be consistent though, since all sections marked with the
! same underline style are deemed to be at the same level::
Chapter 1 Title
--- 230,250 ----
::
! This is preformatted text, and the
! last "::" paragraph is removed
Sections
--------
! (quickref__)
!
! __ quickref.html#section-structure
!
! To break longer text up into sections, you use **section headers**.
! These are a single line of text (one or more words) with an underline
! (and optionally an overline) in dashes "``-----``", equals
! "``======``", tildes "``~~~~~~``" or any of the non-alphanumeric
! characters ``= - ` : ' " ~ ^ _ * + # < >`` that you feel comfortable
! with. Be consistent though, since all sections marked with the same
! underline style are deemed to be at the same level::
Chapter 1 Title
***************
*** 241,247 ****
~~~~~~~~~~~~~~~
! Note that section headers are available as link targets, just using their
! name. To link to the Lists_ heading, I write "``Lists_``". If the heading
! has a space in it like `text styles`_, we need to quote the heading
! "```text styles`_``".
--- 282,298 ----
~~~~~~~~~~~~~~~
! Note that section headers are available as link targets, just using
! their name. To link to the Lists_ heading, I write "``Lists_``". If
! the heading has a space in it like `text styles`_, we need to quote
! the heading "```text styles`_``".
!
! What Next?
! ----------
+ This primer introduces the most common features of reStructuredText,
+ but there are a lot more to explore. The `Quick reStructuredText`_
+ user reference is a good place to go next. If you want all the
+ details, the `reStructuredText Markup Specification`_ has them.
+
+ .. _reStructuredText Markup Specification:
+ ../spec/reStructuredText.html
|
|
From: David G. <go...@us...> - 2002-04-13 16:52:50
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv10879/restructuredtext/docs
Modified Files:
quickref.html
Log Message:
- Fixed internal & external links.
Index: quickref.html
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickref.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** quickref.html 16 Mar 2002 05:42:32 -0000 1.13
--- quickref.html 13 Apr 2002 16:52:45 -0000 1.14
***************
*** 20,24 ****
<p align="right"><em><a href="http://structuredtext.sourceforge.net/docs/quickref.html">http://structuredtext.sourceforge.net/docs/quickref.html</a></em>
<br align="right"><em>Being a cheat-sheet for reStructuredText</em>
! <br align="right"><em>Version 0.6 of 2002-03-15</em>
--- 20,24 ----
<p align="right"><em><a href="http://structuredtext.sourceforge.net/docs/quickref.html">http://structuredtext.sourceforge.net/docs/quickref.html</a></em>
<br align="right"><em>Being a cheat-sheet for reStructuredText</em>
! <br align="right"><em>Version 0.7 of 2002-04-13</em>
***************
*** 27,68 ****
page. This document is just intended as a reminder.
! <p>Links that look like "(<a href="#details">details?</a>)" are currently not
! functional, but will eventually point into the HTML version of the
! full <a href="http://structuredtext.sourceforge.net/spec/reStructuredText.txt">reStructuredText specification</a> document.
<h2><a name="contents">Contents</a></h2>
<ul>
! <li><a href="#InlineMarkup">Inline Markup</a></li>
! <li><a href="#EscapingWithBashslashes">Escaping with Bashslashes</a></li>
! <li><a href="#SectionStructure">Section Structure</a></li>
! <li><a href="#Paragraphs">Paragraphs</a></li>
! <li><a href="#BulletLists">Bullet Lists</a></li>
! <li><a href="#EnumeratedLists">Enumerated Lists</a></li>
! <li><a href="#DefinitionLists">Definition Lists</a></li>
! <li><a href="#FieldLists">Field Lists</a></li>
! <li><a href="#OptionLists">Option Lists</a></li>
! <li><a href="#LiteralBlocks">Literal Blocks</a></li>
! <li><a href="#BlockQuotes">Block Quotes</a></li>
! <li><a href="#DoctestBlocks">Doctest Blocks</a></li>
! <li><a href="#Tables">Tables</a></li>
! <li><a href="#Transitions">Transitions</a></li>
! <li><a href="#Footnotes">Footnotes</a></li>
! <li><a href="#Citations">Citations</a></li>
! <li><a href="#HyperlinkTargets">Hyperlink Targets</a></li>
<ul>
! <li><a href="#ExternalHyperlinkTargets">External Hyperlink Targets</a></li>
! <li><a href="#InternalHyperlinkTargets">Internal Hyperlink Targets</a></li>
! <li><a href="#IndirectHyperlinkTargets">Indirect Hyperlink Targets</a></li>
! <li><a href="#ImplicitHyperlinkTargets">Implicit Hyperlink Targets</a></li>
</ul>
! <li><a href="#Directives">Directives</a></li>
! <li><a href="#SubstitutionReferencesAndDefinitions">Substitution References and Definitions</a></li>
! <li><a href="#Comments">Comments</a></li>
</ul>
! <h2><a href="#contents" name="InlineMarkup">Inline Markup</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#inline_markup">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 27,72 ----
page. This document is just intended as a reminder.
! <p>Links that look like "(<a href="#details">details?</a>)" point
! into the HTML version of the full <a
! href="../spec/reStructuredText.html">reStructuredText
! specification</a> document. These are relative links; if they
! don't work, please use the <a
! href="http://structuredtext.sourceforge.net/docs/quickref.html"
! >master Quick reStructuredText</a> document.
<h2><a name="contents">Contents</a></h2>
<ul>
! <li><a href="#inline-markup">Inline Markup</a></li>
! <li><a href="#escaping">Escaping with Bashslashes</a></li>
! <li><a href="#section-structure">Section Structure</a></li>
! <li><a href="#paragraphs">Paragraphs</a></li>
! <li><a href="#bullet-lists">Bullet Lists</a></li>
! <li><a href="#enumerated-lists">Enumerated Lists</a></li>
! <li><a href="#definition-lists">Definition Lists</a></li>
! <li><a href="#field-lists">Field Lists</a></li>
! <li><a href="#option-lists">Option Lists</a></li>
! <li><a href="#literal-blocks">Literal Blocks</a></li>
! <li><a href="#block-quotes">Block Quotes</a></li>
! <li><a href="#doctest-blocks">Doctest Blocks</a></li>
! <li><a href="#tables">Tables</a></li>
! <li><a href="#transitions">Transitions</a></li>
! <li><a href="#footnotes">Footnotes</a></li>
! <li><a href="#citations">Citations</a></li>
! <li><a href="#hyperlink-targets">Hyperlink Targets</a></li>
<ul>
! <li><a href="#external-hyperlink-targets">External Hyperlink Targets</a></li>
! <li><a href="#internal-hyperlink-targets">Internal Hyperlink Targets</a></li>
! <li><a href="#indirect-hyperlink-targets">Indirect Hyperlink Targets</a></li>
! <li><a href="#implicit-hyperlink-targets">Implicit Hyperlink Targets</a></li>
</ul>
! <li><a href="#directives">Directives</a></li>
! <li><a href="#substitution-references-and-definitions">Substitution References and Definitions</a></li>
! <li><a href="#comments">Comments</a></li>
</ul>
! <h2><a href="#contents" name="inline-markup">Inline Markup</a></h2>
! <p>(<a href="../spec/reStructuredText.html#inline-markup">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 96,124 ****
<tr valign="top">
<td nowrap><samp>reference_</samp>
! <td><a href="#hyperlinkTargets">reference</a>
<td>A simple, one-word hyperlink reference. See <a href="#hyperlinks">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>`phrase reference`_</samp>
! <td><a href="#hyperlinkTargets">phrase reference</a>
<td>A hyperlink reference with spaces or punctuation needs to be quoted with backquotes.
! See <a href="#hyperlinkTargets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>anonymous__</samp>
! <td><a href="#hyperlinkTargets">anonymous</a>
<td>Both simple and phrase references may be anonymous (two underscores).
! See <a href="#hyperlinkTargets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>_`inline hyperlink target`</samp>
! <td><a name="inline_hyperlink_target">inline hyperlink target</a>
<td>A crossreference target within text.
! See <a href="#hyperlinkTargets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>|substitution reference|</samp>
<td>(see note)
! <td>The result is substituted in from the <a href="#SubstitutionReferencesAndDefinitions">substitution definition</a>.
It could be text, an image, a hyperlink, or a combination of these and others.
--- 100,128 ----
<tr valign="top">
<td nowrap><samp>reference_</samp>
! <td><a href="#hyperlink-targets">reference</a>
<td>A simple, one-word hyperlink reference. See <a href="#hyperlinks">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>`phrase reference`_</samp>
! <td><a href="#hyperlink-targets">phrase reference</a>
<td>A hyperlink reference with spaces or punctuation needs to be quoted with backquotes.
! See <a href="#hyperlink-targets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>anonymous__</samp>
! <td><a href="#hyperlink-targets">anonymous</a>
<td>Both simple and phrase references may be anonymous (two underscores).
! See <a href="#hyperlink-targets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>_`inline hyperlink target`</samp>
! <td><a name="inline-hyperlink-target">inline hyperlink target</a>
<td>A crossreference target within text.
! See <a href="#hyperlink-targets">Hyperlinks</a>.
<tr valign="top">
<td nowrap><samp>|substitution reference|</samp>
<td>(see note)
! <td>The result is substituted in from the <a href="#substitution-references-and-definitions">substitution definition</a>.
It could be text, an image, a hyperlink, or a combination of these and others.
***************
*** 176,183 ****
nothing is processed).
! <h2><a href="#contents" name="EscapingWithBashslashes"><a name="escaping">Escaping with Bashslashes</a></a></h2>
<p>(<a
! href="http://structuredtext.sourceforge.net/spec/pep257.html#backslashes">details?</a>)
<p>reStructuredText uses backslashes ("\") to override the special
--- 180,187 ----
nothing is processed).
! <h2><a href="#contents" name="escaping">Escaping with Bashslashes</a></h2>
<p>(<a
! href="../spec/reStructuredText.html#backslashes">details?</a>)
<p>reStructuredText uses backslashes ("\") to override the special
***************
*** 224,230 ****
</table>
! <h2><a href="#contents" name="SectionStructure">Section Structure</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#titles">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 228,234 ----
</table>
! <h2><a href="#contents" name="section-structure">Section Structure</a></h2>
! <p>(<a href="../spec/reStructuredText.html#sections">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 257,263 ****
</table>
! <h2><a href="#contents" name="Paragraphs">Paragraphs</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#paragraphs">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 261,267 ----
</table>
! <h2><a href="#contents" name="paragraphs">Paragraphs</a></h2>
! <p>(<a href="../spec/reStructuredText.html#paragraphs">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 284,290 ****
</table>
! <h2><a href="#contents" name="BulletLists">Bullet Lists</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#bullet_lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 288,294 ----
</table>
! <h2><a href="#contents" name="bullet-lists">Bullet Lists</a></h2>
! <p>(<a href="../spec/reStructuredText.html#bullet-lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 321,327 ****
</table>
! <h2><a href="#contents" name="EnumeratedLists">Enumerated Lists</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#enumerated_lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 325,331 ----
</table>
! <h2><a href="#contents" name="enumerated-lists">Enumerated Lists</a></h2>
! <p>(<a href="../spec/reStructuredText.html#enumerated-lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 356,362 ****
</table>
! <h2><a href="#contents" name="DefinitionLists">Definition Lists</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#definition_lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 360,366 ----
</table>
! <h2><a href="#contents" name="definition-lists">Definition Lists</a></h2>
! <p>(<a href="../spec/reStructuredText.html#definition-lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 396,402 ****
</table>
! <h2><a href="#contents" name="FieldLists">Field Lists</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#field_lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 400,406 ----
</table>
! <h2><a href="#contents" name="field-lists">Field Lists</a></h2>
! <p>(<a href="../spec/reStructuredText.html#field-lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 429,435 ****
</table>
! <h2><a href="#contents" name="OptionLists">Option Lists</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#option_lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 433,439 ----
</table>
! <h2><a href="#contents" name="option-lists">Option Lists</a></h2>
! <p>(<a href="../spec/reStructuredText.html#option-lists">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 476,482 ****
description.
! <h2><a href="#contents" name="LiteralBlocks">Literal Blocks</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#literal_blocks">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 480,486 ----
description.
! <h2><a href="#contents" name="literal-blocks">Literal Blocks</a></h2>
! <p>(<a href="../spec/reStructuredText.html#literal-blocks">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 554,560 ****
</table>
! <h2><a href="#contents" name="BlockQuotes">Block Quotes</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#block_quotes">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 558,564 ----
</table>
! <h2><a href="#contents" name="block-quotes">Block Quotes</a></h2>
! <p>(<a href="../spec/reStructuredText.html#block-quotes">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 582,588 ****
</table>
! <h2><a href="#contents" name="DoctestBlocks">Doctest Blocks</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#doctest_blocks">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 586,592 ----
</table>
! <h2><a href="#contents" name="doctest-blocks">Doctest Blocks</a></h2>
! <p>(<a href="../spec/reStructuredText.html#doctest-blocks">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 617,623 ****
verify they still work exactly as shown." (From the doctest docs.)
! <h2><a href="#contents" name="Tables">Tables</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#tables">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 621,627 ----
verify they still work exactly as shown." (From the doctest docs.)
! <h2><a href="#contents" name="tables">Tables</a></h2>
! <p>(<a href="../spec/reStructuredText.html#tables">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 668,674 ****
</table>
! <h2><a href="#contents" name="Transitions">Transitions</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#transitions">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 672,678 ----
</table>
! <h2><a href="#contents" name="transitions">Transitions</a></h2>
! <p>(<a href="../spec/reStructuredText.html#transitions">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 708,714 ****
signaling changes in subject, time, point of view, or emphasis.
! <h2><a href="#contents" name="Footnotes">Footnotes</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#footnotes">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 712,718 ----
signaling changes in subject, time, point of view, or emphasis.
! <h2><a href="#contents" name="footnotes">Footnotes</a></h2>
! <p>(<a href="../spec/reStructuredText.html#footnotes">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 800,806 ****
("<samp>[*]_</samp>").
! <h2><a href="#contents" name="Citations">Citations</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#citations">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 804,810 ----
("<samp>[*]_</samp>").
! <h2><a href="#contents" name="citations">Citations</a></h2>
! <p>(<a href="../spec/reStructuredText.html#citations">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 852,860 ****
</table>
! <h2><a href="#contents" name="HyperlinkTargets">Hyperlink Targets</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#hyperlink_targets">details?</a>)
! <h3><a href="#contents" name="ExternalHyperlinkTargets">External Hyperlink Targets</a></h3>
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 856,864 ----
</table>
! <h2><a href="#contents" name="hyperlink-targets">Hyperlink Targets</a></h2>
! <p>(<a href="../spec/reStructuredText.html#hyperlink-targets">details?</a>)
! <h3><a href="#contents" name="external-hyperlink-targets">External Hyperlink Targets</a></h3>
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 894,898 ****
example as a footnote.
! <h3><a href="#contents" name="InternalHyperlinkTargets">Internal Hyperlink Targets</a></h3>
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 898,902 ----
example as a footnote.
! <h3><a href="#contents" name="internal-hyperlink-targets">Internal Hyperlink Targets</a></h3>
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 929,935 ****
</table>
! <h3><a href="#contents" name="IndirectHyperlinkTargets">Indirect Hyperlink Targets</a></h3>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#indirect_hyperlink_targets">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 933,939 ----
</table>
! <h3><a href="#contents" name="indirect-hyperlink-targets">Indirect Hyperlink Targets</a></h3>
! <p>(<a href="../spec/reStructuredText.html#indirect-hyperlink-targets">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 964,970 ****
indicate an <b>anonymous hyperlink reference</b>.
! <h3><a href="#contents" name="ImplicitHyperlinkTargets">Implicit Hyperlink Targets</a></h3>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#implicit_hyperlink_targets">details?</a>)
<p>Section titles, footnotes, and citations automatically generate
--- 968,974 ----
indicate an <b>anonymous hyperlink reference</b>.
! <h3><a href="#contents" name="implicit-hyperlink-targets">Implicit Hyperlink Targets</a></h3>
! <p>(<a href="../spec/reStructuredText.html#implicit-hyperlink-targets">details?</a>)
<p>Section titles, footnotes, and citations automatically generate
***************
*** 985,996 ****
<br><samp>targets, too`_.</samp>
<td>
! <font size="+2"><strong><a name="Title">Titles are targets, too</a></strong></font>
<p>Implict references, like <a href="#Title">Titles are
targets, too</a>.
</table>
! <h2><a href="#contents" name="Directives">Directives</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#directives">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 989,1000 ----
<br><samp>targets, too`_.</samp>
<td>
! <font size="+2"><strong><a name="title">Titles are targets, too</a></strong></font>
<p>Implict references, like <a href="#Title">Titles are
targets, too</a>.
</table>
! <h2><a href="#contents" name="directives">Directives</a></h2>
! <p>(<a href="../spec/reStructuredText.html#directives">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 1011,1017 ****
</table>
! <h2><a href="#contents" name="SubstitutionReferencesAndDefinitions">Substitution References and Definitions</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#substitution_definitions">details?</a>)
<p>Substitutions are like inline directives, allowing graphics and
--- 1015,1021 ----
</table>
! <h2><a href="#contents" name="substitution-references-and-definitions">Substitution References and Definitions</a></h2>
! <p>(<a href="../spec/reStructuredText.html#substitution-definitions">details?</a>)
<p>Substitutions are like inline directives, allowing graphics and
***************
*** 1041,1047 ****
</table>
! <h2><a href="#contents" name="Comments">Comments</a></h2>
! <p>(<a href="http://structuredtext.sourceforge.net/spec/reStructuredText.html#comments">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
--- 1045,1051 ----
</table>
! <h2><a href="#contents" name="comments">Comments</a></h2>
! <p>(<a href="../spec/reStructuredText.html#comments">details?</a>)
<p><table border="1" width="100%" bgcolor="#ffffcc" cellpadding="3">
***************
*** 1089,1093 ****
<!-- Created: Fri Aug 03 09:11:57 GMT Daylight Time 2001 -->
<!-- hhmts start -->
! Last modified: Fri Mar 15 21:44 EST 2002
<!-- hhmts end -->
</body>
--- 1093,1097 ----
<!-- Created: Fri Aug 03 09:11:57 GMT Daylight Time 2001 -->
<!-- hhmts start -->
! Last modified: Sat Apr 13 12:52 EST 2002
<!-- hhmts end -->
</body>
|
|
From: David G. <go...@us...> - 2002-04-13 16:43:56
|
Update of /cvsroot/structuredtext/restructuredtext/restructuredtext
In directory usw-pr-cvs1:/tmp/cvs-serv8254/restructuredtext/restructuredtext
Modified Files:
states.py
Log Message:
reworked reference bookkeeping
Index: states.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/restructuredtext/states.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** states.py 16 Mar 2002 05:38:29 -0000 1.49
--- states.py 13 Apr 2002 16:43:53 -0000 1.50
***************
*** 521,525 ****
problematic = nodes.problematic(rawsource, text, refid=msgid)
prbid = self.statemachine.memo.document.set_id(problematic)
! message['refid'] = prbid
return problematic
--- 521,525 ----
problematic = nodes.problematic(rawsource, text, refid=msgid)
prbid = self.statemachine.memo.document.set_id(problematic)
! message.add_backref(prbid)
return problematic
***************
*** 1296,1323 ****
label = match.group(1)
name = normname(label)
- footnotenode = nodes.footnote('\n'.join(indented))
- if name[0] == '#':
- name = name[1:]
- footnotenode['auto'] = 1
- self.statemachine.memo.document.note_autofootnote(footnotenode)
- else:
- footnotenode += nodes.label('', label)
- if name:
- footnotenode['name'] = name
- self.statemachine.memo.document.note_explicit_target(
- footnotenode, footnotenode)
- if indented:
- self.nestedparse(indented, inputoffset=offset, node=footnotenode)
- return [footnotenode], blankfinish
-
- def footnote(self, match):
- indented, indent, offset, blankfinish = \
- self.statemachine.getfirstknownindented(match.end())
- label = match.group(1)
- name = normname(label)
footnote = nodes.footnote('\n'.join(indented))
if name[0] == '#': # auto-numbered
name = name[1:] # autonumber label
footnote['auto'] = 1
self.statemachine.memo.document.note_autofootnote(footnote)
elif name == '*': # auto-symbol
--- 1296,1305 ----
label = match.group(1)
name = normname(label)
footnote = nodes.footnote('\n'.join(indented))
if name[0] == '#': # auto-numbered
name = name[1:] # autonumber label
footnote['auto'] = 1
+ if name:
+ footnote['name'] = name
self.statemachine.memo.document.note_autofootnote(footnote)
elif name == '*': # auto-symbol
***************
*** 1327,1332 ****
else: # manually numbered
footnote += nodes.label('', label)
- if name:
footnote['name'] = name
self.statemachine.memo.document.note_explicit_target(footnote,
footnote)
--- 1309,1315 ----
else: # manually numbered
footnote += nodes.label('', label)
footnote['name'] = name
+ self.statemachine.memo.document.note_footnote(footnote)
+ if name:
self.statemachine.memo.document.note_explicit_target(footnote,
footnote)
***************
*** 1343,1346 ****
--- 1326,1330 ----
citation += nodes.label('', label)
citation['name'] = name
+ self.statemachine.memo.document.note_citation(citation)
self.statemachine.memo.document.note_explicit_target(citation, citation)
if indented:
***************
*** 1377,1382 ****
target = nodes.target(blocktext, '', refname=refname)
self.addtarget(targetmatch.group(namegroup), '', target)
! if target.has_key('name'):
! self.statemachine.memo.document.note_indirect_target(target)
return [target], blankfinish
nodelist = []
--- 1361,1365 ----
target = nodes.target(blocktext, '', refname=refname)
self.addtarget(targetmatch.group(namegroup), '', target)
! self.statemachine.memo.document.note_indirect_target(target)
return [target], blankfinish
nodelist = []
***************
*** 1410,1413 ****
--- 1393,1398 ----
target['refuri'] = refuri
self.statemachine.memo.document.note_external_target(target)
+ else:
+ self.statemachine.memo.document.note_internal_target(target)
self.statemachine.memo.document.note_explicit_target(
target, self.statemachine.node)
***************
*** 1643,1646 ****
--- 1628,1632 ----
anonymous=1)
self.statemachine.memo.document.note_anonymous_target(target)
+ self.statemachine.memo.document.note_indirect_target(target)
return [target], blankfinish
nodelist = []
|
|
From: David G. <go...@us...> - 2002-04-13 16:42:50
|
Update of /cvsroot/structuredtext/restructuredtext/spec In directory usw-pr-cvs1:/tmp/cvs-serv7876/restructuredtext/spec Modified Files: reStructuredText.txt Log Message: minor Index: reStructuredText.txt =================================================================== RCS file: /cvsroot/structuredtext/restructuredtext/spec/reStructuredText.txt,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** reStructuredText.txt 28 Mar 2002 04:28:03 -0000 1.45 --- reStructuredText.txt 13 Apr 2002 16:42:47 -0000 1.46 *************** *** 1970,1974 **** The inline markup recognition rules were devised intentionally to ! allow 90% of legitimate uses of "*", "`", "_", and "|" *without* resorting to backslashes. For 9 of the remaining 10%, use inline literals or literal blocks:: --- 1970,1974 ---- The inline markup recognition rules were devised intentionally to ! allow 90% of non-markup uses of "*", "`", "_", and "|" *without* resorting to backslashes. For 9 of the remaining 10%, use inline literals or literal blocks:: |
|
From: David G. <go...@us...> - 2002-04-13 16:28:14
|
Update of /cvsroot/structuredtext/restructuredtext/test/test_states
In directory usw-pr-cvs1:/tmp/cvs-serv3549/restructuredtext/test/test_states
Modified Files:
test_targets.py
Log Message:
updated
Index: test_targets.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/test/test_states/test_targets.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test_targets.py 28 Mar 2002 04:20:55 -0000 1.19
--- test_targets.py 13 Apr 2002 16:28:10 -0000 1.20
***************
*** 171,175 ****
Duplicate external targets (different URIs):
<target dupname="target" id="target" refuri="first">
! <system_message level="2" refid="id1" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
--- 171,175 ----
Duplicate external targets (different URIs):
<target dupname="target" id="target" refuri="first">
! <system_message backrefs="id1" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
***************
*** 188,192 ****
Duplicate external targets (same URIs):
<target dupname="target" id="target" refuri="first">
! <system_message level="1" refid="id1" type="INFO">
<paragraph>
Duplicate explicit target name: "target".
--- 188,192 ----
Duplicate external targets (same URIs):
<target dupname="target" id="target" refuri="first">
! <system_message backrefs="id1" level="1" type="INFO">
<paragraph>
Duplicate explicit target name: "target".
***************
*** 218,222 ****
<title>
Title
! <system_message level="1" refid="id1" type="INFO">
<paragraph>
Duplicate implicit target name: "title".
--- 218,222 ----
<title>
Title
! <system_message backrefs="id1" level="1" type="INFO">
<paragraph>
Duplicate implicit target name: "title".
***************
*** 241,245 ****
<title>
Title
! <system_message level="1" refid="id1" type="INFO">
<paragraph>
Duplicate implicit target name: "title".
--- 241,245 ----
<title>
Title
! <system_message backrefs="id1" level="1" type="INFO">
<paragraph>
Duplicate implicit target name: "title".
***************
*** 270,274 ****
<paragraph>
First.
! <system_message level="2" refid="id1" type="WARNING">
<paragraph>
Duplicate explicit target name: "title".
--- 270,274 ----
<paragraph>
First.
! <system_message backrefs="id1" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "title".
***************
*** 276,280 ****
<paragraph>
Second.
! <system_message level="2" refid="id2" type="WARNING">
<paragraph>
Duplicate explicit target name: "title".
--- 276,280 ----
<paragraph>
Second.
! <system_message backrefs="id2" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "title".
***************
*** 313,317 ****
<label>
target
! <system_message level="1" refid="id1" type="INFO">
<paragraph>
Duplicate implicit target name: "target".
--- 313,317 ----
<label>
target
! <system_message backrefs="id1" level="1" type="INFO">
<paragraph>
Duplicate implicit target name: "target".
***************
*** 319,328 ****
Citation target.
<footnote auto="1" dupname="target" id="id2">
! <system_message level="2" refid="id2" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
<paragraph>
Autonumber-labeled footnote target.
! <system_message level="2" refid="id3" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
--- 319,328 ----
Citation target.
<footnote auto="1" dupname="target" id="id2">
! <system_message backrefs="id2" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
<paragraph>
Autonumber-labeled footnote target.
! <system_message backrefs="id3" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
***************
*** 330,334 ****
<paragraph>
Explicit internal target.
! <system_message level="2" refid="id4" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
--- 330,334 ----
<paragraph>
Explicit internal target.
! <system_message backrefs="id4" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "target".
***************
*** 347,351 ****
<paragraph>
Anonymous external hyperlink target:
! <target anonymous="1" refuri="http://w3c.org/">
"""],
["""\
--- 347,351 ----
<paragraph>
Anonymous external hyperlink target:
! <target anonymous="1" id="id1" refuri="http://w3c.org/">
"""],
["""\
***************
*** 358,362 ****
<paragraph>
Anonymous external hyperlink target:
! <target anonymous="1" refuri="http://w3c.org/">
"""],
["""\
--- 358,362 ----
<paragraph>
Anonymous external hyperlink target:
! <target anonymous="1" id="id1" refuri="http://w3c.org/">
"""],
["""\
***************
*** 369,373 ****
<paragraph>
Anonymous indirect hyperlink target:
! <target anonymous="1" refname="reference">
"""],
["""\
--- 369,373 ----
<paragraph>
Anonymous indirect hyperlink target:
! <target anonymous="1" id="id1" refname="reference">
"""],
["""\
***************
*** 382,387 ****
<paragraph>
Anonymous indirect hyperlink targets:
! <target anonymous="1" refname="reference">
! <target anonymous="1" refname="a very long reference">
"""],
["""\
--- 382,387 ----
<paragraph>
Anonymous indirect hyperlink targets:
! <target anonymous="1" id="id1" refname="reference">
! <target anonymous="1" id="id2" refname="a very long reference">
"""],
["""\
***************
*** 404,410 ****
<paragraph>
Mixed anonymous & named indirect hyperlink targets:
! <target anonymous="1" refname="reference">
! <target anonymous="1" refname="reference">
! <target anonymous="1" refname="reference">
<target id="target1" name="target1" refname="reference">
<system_message level="2" type="WARNING">
--- 404,410 ----
<paragraph>
Mixed anonymous & named indirect hyperlink targets:
! <target anonymous="1" id="id1" refname="reference">
! <target anonymous="1" id="id2" refname="reference">
! <target anonymous="1" id="id3" refname="reference">
<target id="target1" name="target1" refname="reference">
<system_message level="2" type="WARNING">
***************
*** 414,420 ****
no blank line
<target id="target2" name="target2" refname="reference">
! <target anonymous="1" refname="reference">
! <target anonymous="1" refname="reference">
! <target anonymous="1" refname="reference">
<system_message level="2" type="WARNING">
<paragraph>
--- 414,420 ----
no blank line
<target id="target2" name="target2" refname="reference">
! <target anonymous="1" id="id4" refname="reference">
! <target anonymous="1" id="id5" refname="reference">
! <target anonymous="1" id="id6" refname="reference">
<system_message level="2" type="WARNING">
<paragraph>
|
|
From: David G. <go...@us...> - 2002-04-13 16:28:00
|
Update of /cvsroot/structuredtext/restructuredtext/test/test_states
In directory usw-pr-cvs1:/tmp/cvs-serv3441/restructuredtext/test/test_states
Modified Files:
test_inline_markup.py
Log Message:
updated
Index: test_inline_markup.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/test/test_states/test_inline_markup.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test_inline_markup.py 16 Mar 2002 05:29:19 -0000 1.18
--- test_inline_markup.py 13 Apr 2002 16:27:57 -0000 1.19
***************
*** 50,54 ****
*
emphasis without closing asterisk
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
--- 50,54 ----
*
emphasis without closing asterisk
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
***************
*** 77,81 ****
*
args' will trigger a warning and may be problematic)
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 4.
--- 77,81 ----
*
args' will trigger a warning and may be problematic)
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 4.
***************
*** 131,135 ****
**
kwargs' will trigger a warning and may be problematic)
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 3.
--- 131,135 ----
**
kwargs' will trigger a warning and may be problematic)
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 3.
***************
*** 208,212 ****
standalone TeX quotes'' will trigger a warning
and may be problematic)
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 3.
--- 208,212 ----
standalone TeX quotes'' will trigger a warning
and may be problematic)
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 3.
***************
*** 395,399 ****
`
phrase reference`_
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Mismatch: inline interpreted text start-string and role with phrase-reference end-string at line 3.
--- 395,399 ----
`
phrase reference`_
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Mismatch: inline interpreted text start-string and role with phrase-reference end-string at line 3.
***************
*** 457,461 ****
_`
this`_ is just plain confusing.
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline target start-string without end-string at line 3.
--- 457,461 ----
_`
this`_ is just plain confusing.
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline target start-string without end-string at line 3.
***************
*** 470,474 ****
<document>
<paragraph>
! <footnote_reference refname="1">
1
"""],
--- 470,474 ----
<document>
<paragraph>
! <footnote_reference id="id1" refname="1">
1
"""],
***************
*** 479,483 ****
<document>
<paragraph>
! <footnote_reference auto="1">
"""],
["""\
--- 479,483 ----
<document>
<paragraph>
! <footnote_reference auto="1" id="id1">
"""],
["""\
***************
*** 487,491 ****
<document>
<paragraph>
! <footnote_reference auto="1" refname="label">
"""],
["""\
--- 487,491 ----
<document>
<paragraph>
! <footnote_reference auto="1" id="id1" refname="label">
"""],
["""\
***************
*** 495,499 ****
<document>
<paragraph>
! <footnote_reference auto="*">
"""],
]
--- 495,499 ----
<document>
<paragraph>
! <footnote_reference auto="*" id="id1">
"""],
]
***************
*** 506,510 ****
<document>
<paragraph>
! <citation_reference refname="citation">
citation
"""],
--- 506,510 ----
<document>
<paragraph>
! <citation_reference id="id1" refname="citation">
citation
"""],
***************
*** 515,528 ****
<document>
<paragraph>
! <citation_reference refname="citation">
citation
and \n\
! <citation_reference refname="cit-ation">
cit-ation
and \n\
! <citation_reference refname="cit.ation">
cit.ation
and \n\
! <citation_reference refname="cit1">
CIT1
but not [CIT 1]_
--- 515,528 ----
<document>
<paragraph>
! <citation_reference id="id1" refname="citation">
citation
and \n\
! <citation_reference id="id2" refname="cit-ation">
cit-ation
and \n\
! <citation_reference id="id3" refname="cit.ation">
cit.ation
and \n\
! <citation_reference id="id4" refname="cit1">
CIT1
but not [CIT 1]_
|
|
From: David G. <go...@us...> - 2002-04-13 16:27:46
|
Update of /cvsroot/structuredtext/restructuredtext/test/test_states
In directory usw-pr-cvs1:/tmp/cvs-serv3358/restructuredtext/test/test_states
Modified Files:
test_footnotes.py
Log Message:
updated
Index: test_footnotes.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/test/test_states/test_footnotes.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_footnotes.py 28 Mar 2002 04:20:20 -0000 1.16
--- test_footnotes.py 13 Apr 2002 16:27:44 -0000 1.17
***************
*** 125,143 ****
<document>
<paragraph>
! <footnote_reference auto="1">
is the first auto-numbered footnote reference.
! <footnote_reference auto="1">
is the second auto-numbered footnote reference.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 1.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 2.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 3.
<paragraph>
! <footnote_reference auto="1">
is the third auto-numbered footnote reference.
"""],
--- 125,143 ----
<document>
<paragraph>
! <footnote_reference auto="1" id="id1">
is the first auto-numbered footnote reference.
! <footnote_reference auto="1" id="id2">
is the second auto-numbered footnote reference.
! <footnote auto="1" id="id3">
<paragraph>
Auto-numbered footnote 1.
! <footnote auto="1" id="id4">
<paragraph>
Auto-numbered footnote 2.
! <footnote auto="1" id="id5">
<paragraph>
Auto-numbered footnote 3.
<paragraph>
! <footnote_reference auto="1" id="id6">
is the third auto-numbered footnote reference.
"""],
***************
*** 159,163 ****
<document>
<paragraph>
! <footnote_reference auto="1" refname="third">
is a reference to the third auto-numbered footnote.
<footnote auto="1" id="first" name="first">
--- 159,163 ----
<document>
<paragraph>
! <footnote_reference auto="1" id="id1" refname="third">
is a reference to the third auto-numbered footnote.
<footnote auto="1" id="first" name="first">
***************
*** 171,179 ****
Third auto-numbered footnote.
<paragraph>
! <footnote_reference auto="1" refname="second">
is a reference to the second auto-numbered footnote.
! <footnote_reference auto="1" refname="first">
is a reference to the first auto-numbered footnote.
! <footnote_reference auto="1" refname="third">
is another reference to the third auto-numbered footnote.
<paragraph>
--- 171,179 ----
Third auto-numbered footnote.
<paragraph>
! <footnote_reference auto="1" id="id2" refname="second">
is a reference to the second auto-numbered footnote.
! <footnote_reference auto="1" id="id3" refname="first">
is a reference to the first auto-numbered footnote.
! <footnote_reference auto="1" id="id4" refname="third">
is another reference to the third auto-numbered footnote.
<paragraph>
***************
*** 209,225 ****
Mixed anonymous and labelled auto-numbered footnotes:
<paragraph>
! <footnote_reference auto="1" refname="four">
should be 4, \n\
! <footnote_reference auto="1">
should be 1,
! <footnote_reference auto="1">
should be 3, \n\
! <footnote_reference auto="1">
is one too many,
! <footnote_reference auto="1" refname="two">
should be 2, and \n\
! <footnote_reference auto="1" refname="six">
doesn't exist.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 1.
--- 209,225 ----
Mixed anonymous and labelled auto-numbered footnotes:
<paragraph>
! <footnote_reference auto="1" id="id1" refname="four">
should be 4, \n\
! <footnote_reference auto="1" id="id2">
should be 1,
! <footnote_reference auto="1" id="id3">
should be 3, \n\
! <footnote_reference auto="1" id="id4">
is one too many,
! <footnote_reference auto="1" id="id5" refname="two">
should be 2, and \n\
! <footnote_reference auto="1" id="id6" refname="six">
doesn't exist.
! <footnote auto="1" id="id7">
<paragraph>
Auto-numbered footnote 1.
***************
*** 227,231 ****
<paragraph>
Auto-numbered footnote 2.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 3.
--- 227,231 ----
<paragraph>
Auto-numbered footnote 2.
! <footnote auto="1" id="id8">
<paragraph>
Auto-numbered footnote 3.
***************
*** 236,241 ****
<paragraph>
Auto-numbered footnote 5.
! <footnote auto="1" dupname="five" id="id1">
! <system_message level="2" refid="id1" type="WARNING">
<paragraph>
Duplicate explicit target name: "five".
--- 236,241 ----
<paragraph>
Auto-numbered footnote 5.
! <footnote auto="1" dupname="five" id="id9">
! <system_message backrefs="id9" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "five".
***************
*** 266,293 ****
and labelled auto-numbered footnotes:
<paragraph>
! <footnote_reference auto="1" refname="four">
should be 4, \n\
! <footnote_reference auto="1">
should be 2,
! <footnote_reference refname="1">
1
is 1, \n\
! <footnote_reference refname="3">
3
is 3,
! <footnote_reference auto="1">
should be 6, \n\
! <footnote_reference auto="1">
is one too many,
! <footnote_reference auto="1" refname="five">
should be 5, and \n\
! <footnote_reference auto="1" refname="six">
doesn't exist.
! <footnote id="id1" name="1">
<label>
1
<paragraph>
Manually-numbered footnote 1.
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 2.
--- 266,293 ----
and labelled auto-numbered footnotes:
<paragraph>
! <footnote_reference auto="1" id="id1" refname="four">
should be 4, \n\
! <footnote_reference auto="1" id="id2">
should be 2,
! <footnote_reference id="id3" refname="1">
1
is 1, \n\
! <footnote_reference id="id4" refname="3">
3
is 3,
! <footnote_reference auto="1" id="id5">
should be 6, \n\
! <footnote_reference auto="1" id="id6">
is one too many,
! <footnote_reference auto="1" id="id7" refname="five">
should be 5, and \n\
! <footnote_reference auto="1" id="id8" refname="six">
doesn't exist.
! <footnote id="id9" name="1">
<label>
1
<paragraph>
Manually-numbered footnote 1.
! <footnote auto="1" id="id10">
<paragraph>
Auto-numbered footnote 2.
***************
*** 295,299 ****
<paragraph>
Auto-numbered footnote 4.
! <footnote id="id2" name="3">
<label>
3
--- 295,299 ----
<paragraph>
Auto-numbered footnote 4.
! <footnote id="id11" name="3">
<label>
3
***************
*** 303,313 ****
<paragraph>
Auto-numbered footnote 5.
! <footnote auto="1" dupname="five" id="id3">
! <system_message level="2" refid="id3" type="WARNING">
<paragraph>
Duplicate explicit target name: "five".
<paragraph>
Auto-numbered footnote 5 again (duplicate).
! <footnote auto="1">
<paragraph>
Auto-numbered footnote 6.
--- 303,313 ----
<paragraph>
Auto-numbered footnote 5.
! <footnote auto="1" dupname="five" id="id12">
! <system_message backrefs="id12" level="2" type="WARNING">
<paragraph>
Duplicate explicit target name: "five".
<paragraph>
Auto-numbered footnote 5 again (duplicate).
! <footnote auto="1" id="id13">
<paragraph>
Auto-numbered footnote 6.
***************
*** 321,325 ****
"""\
<document>
! <footnote auto="*">
<paragraph>
This is an auto-symbol footnote.
--- 321,325 ----
"""\
<document>
! <footnote auto="*" id="id1">
<paragraph>
This is an auto-symbol footnote.
|
|
From: David G. <go...@us...> - 2002-04-13 16:27:34
|
Update of /cvsroot/structuredtext/restructuredtext/test/test_states/test_directives
In directory usw-pr-cvs1:/tmp/cvs-serv3311/restructuredtext/test/test_states/test_directives
Modified Files:
test_contents.py
Log Message:
updated
Index: test_contents.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/test/test_states/test_directives/test_contents.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_contents.py 16 Mar 2002 05:29:09 -0000 1.1
--- test_contents.py 13 Apr 2002 16:27:30 -0000 1.2
***************
*** 28,34 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
title: None
"""],
--- 28,34 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
title: None
"""],
***************
*** 40,46 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
title:
<title>
--- 40,46 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
title:
<title>
***************
*** 55,61 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
title:
<title>
--- 55,61 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
title:
<title>
***************
*** 71,77 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
title:
<title>
--- 71,77 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
title:
<title>
***************
*** 85,91 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
title:
<title>
--- 85,91 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
title:
<title>
***************
*** 105,111 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
depth: 2
local: None
--- 105,111 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
depth: 2
local: None
***************
*** 121,127 ****
<pending>
.. internal attributes:
! pending.transform: dps.transforms.components.Contents
! pending.stage: 'last_reader'
! pending.details:
depth: 2
local: None
--- 121,127 ----
<pending>
.. internal attributes:
! .transform: dps.transforms.components.Contents
! .stage: 'last_reader'
! .details:
depth: 2
local: None
|
|
From: David G. <go...@us...> - 2002-04-13 16:27:14
|
Update of /cvsroot/structuredtext/restructuredtext/test/test_states
In directory usw-pr-cvs1:/tmp/cvs-serv3234/restructuredtext/test/test_states
Modified Files:
test_definition_lists.py
Log Message:
updated
Index: test_definition_lists.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/test/test_states/test_definition_lists.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_definition_lists.py 16 Mar 2002 05:28:33 -0000 1.8
--- test_definition_lists.py 13 Apr 2002 16:27:11 -0000 1.9
***************
*** 263,285 ****
too
<definition>
! <system_message id="id1" level="2" refid="id2" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 1.
! <system_message id="id3" level="2" refid="id4" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
! <system_message id="id5" level="2" refid="id6" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 1.
! <system_message id="id7" level="2" refid="id8" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 1.
! <system_message id="id9" level="2" refid="id10" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 1.
! <system_message id="id11" level="2" refid="id12" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
! <system_message id="id13" level="2" refid="id14" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 1.
--- 263,285 ----
too
<definition>
! <system_message backrefs="id2" id="id1" level="2" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 1.
! <system_message backrefs="id4" id="id3" level="2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
! <system_message backrefs="id6" id="id5" level="2" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 1.
! <system_message backrefs="id8" id="id7" level="2" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 1.
! <system_message backrefs="id10" id="id9" level="2" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 1.
! <system_message backrefs="id12" id="id11" level="2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 1.
! <system_message backrefs="id14" id="id13" level="2" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 1.
***************
*** 298,311 ****
**
markup errors.
! <system_message id="id15" level="2" refid="id16" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 2.
! <system_message id="id17" level="2" refid="id18" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 2.
! <system_message id="id19" level="2" refid="id20" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 2.
! <system_message id="id21" level="2" refid="id22" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 2.
--- 298,311 ----
**
markup errors.
! <system_message backrefs="id16" id="id15" level="2" type="WARNING">
<paragraph>
Inline interpreted text or phrase reference start-string without end-string at line 2.
! <system_message backrefs="id18" id="id17" level="2" type="WARNING">
<paragraph>
Inline emphasis start-string without end-string at line 2.
! <system_message backrefs="id20" id="id19" level="2" type="WARNING">
<paragraph>
Inline literal start-string without end-string at line 2.
! <system_message backrefs="id22" id="id21" level="2" type="WARNING">
<paragraph>
Inline strong start-string without end-string at line 2.
|
|
From: David G. <go...@us...> - 2002-04-13 16:27:07
|
Update of /cvsroot/structuredtext/restructuredtext/spec In directory usw-pr-cvs1:/tmp/cvs-serv3185/restructuredtext/spec Modified Files: rst-notes.txt Log Message: updated Index: rst-notes.txt =================================================================== RCS file: /cvsroot/structuredtext/restructuredtext/spec/rst-notes.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** rst-notes.txt 28 Mar 2002 04:29:06 -0000 1.40 --- rst-notes.txt 13 Apr 2002 16:27:04 -0000 1.41 *************** *** 147,150 **** --- 147,178 ---- - Add RFC-822 header parsing (for PEP, email Readers). + - Change ``.. meta::`` to use a "pending" element, only activated for + HTML writers. + + - Allow for variant styles by interpreting indented lists as if they + weren't indented? For example, currently the list below will be + parsed as a list within a block quote:: + + paragraph + + * list item 1 + * list item 2 + + But a lot of people seem to write that way, and HTML browsers make + it look as if that's the way it should be. The parser could check + the contents of block quotes, and if they contain only a single + list, remove the block quote wrapper. There would be two problems: + + 1. What if we actually *do* want a list inside a block quote? + + 2. What if such a list comes immediately after an indented + construct, such as a literal block? + + Both could be solved using empty comments (#2 already exists for a + block quote after a literal block). But that's a hack. + + See the Doc-SIG discussion starting 2001-04-18 with Ed Loper's + "Structuring: a summary; and an attempt at EBNF", item 4. + Or Not To Do? |
|
From: David G. <go...@us...> - 2002-04-13 16:26:28
|
Update of /cvsroot/structuredtext/restructuredtext/tools
In directory usw-pr-cvs1:/tmp/cvs-serv3015/restructuredtext/tools
Modified Files:
test.txt
Log Message:
added unknown references
Index: test.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/tools/test.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test.txt 28 Mar 2002 04:18:05 -0000 1.9
--- test.txt 13 Apr 2002 16:26:25 -0000 1.10
***************
*** 242,245 ****
--- 242,248 ----
.. [*] This footnote shows the next symbol in the sequence.
+ .. [4] Here's an unreferenced footnote, with a reference to a
+ nonexistent footnote: [5]_.
+
Citations
---------
***************
*** 247,250 ****
--- 250,256 ----
.. [CIT2002] Citations are text-labeled footnotes. They may be
rendered separately and differently from footnotes.
+
+ Here's a reference to the above, [CIT2002]_, and a [nonexistent]_
+ citation.
Targets
|
|
From: Richard J. <ri...@us...> - 2002-04-05 04:42:38
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv26484
Modified Files:
quickstart.txt
Log Message:
more tweaks, fixes to typos
Index: quickstart.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** quickstart.txt 4 Apr 2002 23:36:27 -0000 1.6
--- quickstart.txt 5 Apr 2002 04:42:33 -0000 1.7
***************
*** 50,54 ****
will generally be OK - ReST is pretty smart. For example, this * asterisk is
handled just fine. If you actually want text \*surrounded by asterisks* to
! **not** be italicised, then you need to indicated that the asterisk is not
special. You do this by placing a backslash just before it, like so "``\*``".
--- 50,54 ----
will generally be OK - ReST is pretty smart. For example, this * asterisk is
handled just fine. If you actually want text \*surrounded by asterisks* to
! **not** be italicised, then you need to indicate that the asterisk is not
special. You do this by placing a backslash just before it, like so "``\*``".
***************
*** 84,88 ****
I. upper-case roman numerals
! i. lower-caseroman numerals
(1) numbers again
--- 84,88 ----
I. upper-case roman numerals
! i. lower-case roman numerals
(1) numbers again
***************
*** 107,111 ****
I. upper-case roman numerals
! i. lower-caseroman numerals
(1) numbers again
--- 107,111 ----
I. upper-case roman numerals
! i. lower-case roman numerals
(1) numbers again
***************
*** 163,179 ****
text, finish the prior paragraph with "``::``". The preformatted block is
finished when the text falls back to the same indentation level as a
! paragraph prior to the preformatted block.
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
! Results in::
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
Note that if a paragraph consists only of "``::``", then it's removed
--- 163,185 ----
text, finish the prior paragraph with "``::``". The preformatted block is
finished when the text falls back to the same indentation level as a
! paragraph prior to the preformatted block. For example::
! An example::
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
! no more example
! Results in:
!
! An example::
!
! Whitespace, newlines, blank lines, and all kinds of markup (like
! *this* or \this) is preserved by literal blocks.
! Lookie here, I've dropped an indentation level (but not far enough)
!
! no more example
Note that if a paragraph consists only of "``::``", then it's removed
|
|
From: Richard J. <rj...@ek...> - 2002-04-04 23:45:52
|
On Fri, 5 Apr 2002 09:25, Richard Jones wrote:
> asterisks* to ! **not** be italicised, then you need to indicated that the
Never proofread you own material :)
Richard
|
|
From: Richard J. <ri...@us...> - 2002-04-04 23:38:03
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv27966
Modified Files:
quickstart.txt
Log Message:
More fiddling - section titles really aren't that important to be at the
top.
Index: quickstart.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** quickstart.txt 4 Apr 2002 23:25:35 -0000 1.4
--- quickstart.txt 4 Apr 2002 23:35:32 -0000 1.5
***************
*** 15,66 ****
The most basic pattern recognised is a **paragraph**. That's a chunk
of text that is separated by blank lines (one is enough). Paragraphs must
! have the same indentation - that is, line up at their left edge.
!
! To break text up into sections, you use **section headers**. These are a
! single line of text (one or more words) with an underline (and optionally
! an overline) in dashes
! "``-----``", equals "``======``", tildes "``~~~~~~``" or any of the
! non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >`` that you feel
! comfortable with. Be consistent though, since all sections marked with the
! same underline style are deemed to be at the same level::
!
! Chapter 1 Title
! ===============
!
! Section 1.1 Title
! -----------------
!
! Subsection 1.1.1 Title
! ~~~~~~~~~~~~~~~~~~~~~~
!
! Section 1.2 Title
! -----------------
! Chapter 2 Title
! ===============
! results in:
! .. sorry, I change the heading style here, but it's only an example :)
! Chapter 1 Title
! ~~~~~~~~~~~~~~~
! Section 1.1 Title
! '''''''''''''''''
! Subsection 1.1.1 Title
! """"""""""""""""""""""
! Section 1.2 Title
! '''''''''''''''''
- Chapter 2 Title
- ~~~~~~~~~~~~~~~
-
- Note that section headers are available as link targets, just using their
- name. To link to the Lists_ heading, I write "``Lists_``". If the heading
- has a space in it like `text styles`_, we need to quote the heading
- "```text styles`_``".
Text styles
--- 15,39 ----
The most basic pattern recognised is a **paragraph**. That's a chunk
of text that is separated by blank lines (one is enough). Paragraphs must
! have the same indentation - that is, line up at their left edge. Paragraphs
! that start indented will result in indented quote paragraphs. For example::
! This is a paragraph. It's quite
! short.
! This paragraph will result in an indented block of
! text, typically used for quoting other text.
! This is another one.
! Results in:
! This is a paragraph. It's quite
! short.
! This paragraph will result in an indented block of
! text, typically used for quoting other text.
! This is another one.
Text styles
***************
*** 216,218 ****
--- 189,241 ----
This is preformatted text, and the last "::" paragraph is removed
+
+ Sections
+ --------
+
+ To break longer text up into sections, you use **section headers**. These
+ are a single line of text (one or more words) with an underline (and
+ optionally an overline) in dashes
+ "``-----``", equals "``======``", tildes "``~~~~~~``" or any of the
+ non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >`` that you feel
+ comfortable with. Be consistent though, since all sections marked with the
+ same underline style are deemed to be at the same level::
+
+ Chapter 1 Title
+ ===============
+
+ Section 1.1 Title
+ -----------------
+
+ Subsection 1.1.1 Title
+ ~~~~~~~~~~~~~~~~~~~~~~
+
+ Section 1.2 Title
+ -----------------
+
+ Chapter 2 Title
+ ===============
+
+ results in:
+
+ .. sorry, I change the heading style here, but it's only an example :)
+
+ Chapter 1 Title
+ ~~~~~~~~~~~~~~~
+
+ Section 1.1 Title
+ '''''''''''''''''
+
+ Subsection 1.1.1 Title
+ """"""""""""""""""""""
+
+ Section 1.2 Title
+ '''''''''''''''''
+
+ Chapter 2 Title
+ ~~~~~~~~~~~~~~~
+
+ Note that section headers are available as link targets, just using their
+ name. To link to the Lists_ heading, I write "``Lists_``". If the heading
+ has a space in it like `text styles`_, we need to quote the heading
+ "```text styles`_``".
|
|
From: Richard J. <ri...@us...> - 2002-04-04 23:36:31
|
Update of /cvsroot/structuredtext/restructuredtext/docs In directory usw-pr-cvs1:/tmp/cvs-serv28175 Modified Files: quickstart.txt Log Message: oops Index: quickstart.txt =================================================================== RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** quickstart.txt 4 Apr 2002 23:35:32 -0000 1.5 --- quickstart.txt 4 Apr 2002 23:36:27 -0000 1.6 *************** *** 160,164 **** ---------------------------- ! Finally, to just include a chunk of preformatted, never-to-be-fiddled-with text, finish the prior paragraph with "``::``". The preformatted block is finished when the text falls back to the same indentation level as a --- 160,164 ---- ---------------------------- ! To just include a chunk of preformatted, never-to-be-fiddled-with text, finish the prior paragraph with "``::``". The preformatted block is finished when the text falls back to the same indentation level as a |
|
From: Richard J. <ri...@us...> - 2002-04-04 23:25:43
|
Update of /cvsroot/structuredtext/restructuredtext/docs In directory usw-pr-cvs1:/tmp/cvs-serv25770 Modified Files: quickstart.txt Log Message: re-wording of the escaping stuff Index: quickstart.txt =================================================================== RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** quickstart.txt 4 Apr 2002 23:18:13 -0000 1.3 --- quickstart.txt 4 Apr 2002 23:25:35 -0000 1.4 *************** *** 74,81 **** the double back-quotes - so asterisks "``*``" etc. are left alone. ! If you want to just include an asterisk as part of regular text, you'll ! need to "escape" it using a backslash. The backslash doesn't appear in the ! final text, it just means "ignore the meaning of the next character". So to ! have this \* asterisk appear, I write "``\*``" in the text. Lists --- 74,83 ---- the double back-quotes - so asterisks "``*``" etc. are left alone. ! If you find that you want to use one of the "special" characters in text, it ! will generally be OK - ReST is pretty smart. For example, this * asterisk is ! handled just fine. If you actually want text \*surrounded by asterisks* to ! **not** be italicised, then you need to indicated that the asterisk is not ! special. You do this by placing a backslash just before it, like so "``\*``". ! Lists |
|
From: Richard J. <ri...@us...> - 2002-04-04 23:18:17
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv24187
Modified Files:
quickstart.txt
Log Message:
Some more cleanups
Index: quickstart.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** quickstart.txt 3 Apr 2002 07:36:13 -0000 1.2
--- quickstart.txt 4 Apr 2002 23:18:13 -0000 1.3
***************
*** 1,2 ****
--- 1,8 ----
+ A ReStructuredText Primer
+ =========================
+
+ :Author: Richard Jones
+ :Version: $Revision$
+
Structure
---------
***************
*** 7,11 ****
"Very Structured Text" that can be used by a web browser.
! The most basic structure recognised is a **paragraph**. That's a chunk
of text that is separated by blank lines (one is enough). Paragraphs must
have the same indentation - that is, line up at their left edge.
--- 13,17 ----
"Very Structured Text" that can be used by a web browser.
! The most basic pattern recognised is a **paragraph**. That's a chunk
of text that is separated by blank lines (one is enough). Paragraphs must
have the same indentation - that is, line up at their left edge.
***************
*** 15,20 ****
an overline) in dashes
"``-----``", equals "``======``", tildes "``~~~~~~``" or any of the
! non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >``. All sections
! marked with the same underline style are deemed to be at the same level.
Note that section headers are available as link targets, just using their
--- 21,61 ----
an overline) in dashes
"``-----``", equals "``======``", tildes "``~~~~~~``" or any of the
! non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >`` that you feel
! comfortable with. Be consistent though, since all sections marked with the
! same underline style are deemed to be at the same level::
!
! Chapter 1 Title
! ===============
!
! Section 1.1 Title
! -----------------
!
! Subsection 1.1.1 Title
! ~~~~~~~~~~~~~~~~~~~~~~
!
! Section 1.2 Title
! -----------------
!
! Chapter 2 Title
! ===============
!
! results in:
!
! .. sorry, I change the heading style here, but it's only an example :)
!
! Chapter 1 Title
! ~~~~~~~~~~~~~~~
!
! Section 1.1 Title
! '''''''''''''''''
!
! Subsection 1.1.1 Title
! """"""""""""""""""""""
!
! Section 1.2 Title
! '''''''''''''''''
!
! Chapter 2 Title
! ~~~~~~~~~~~~~~~
Note that section headers are available as link targets, just using their
***************
*** 27,31 ****
Inside paragraphs and other bodies of text, you may additionally mark
! text for *italics* "``*italics``" or **bold** "``**bold**``".
If you want something to appear as a fixed-space literal, use
--- 68,72 ----
Inside paragraphs and other bodies of text, you may additionally mark
! text for *italics* with "``*italics*``" or **bold** with "``**bold**``".
If you want something to appear as a fixed-space literal, use
***************
*** 44,55 ****
**definitions**. In all list cases, you may have as many paragraphs,
sublists, etc. as you want, as long as the left-hand side of the paragraph
! or whatever aligns with the first line of text in the list item. Lists must
! always start a new paragraph - that is, they must appear after a blank
! line.
**enumerated** lists (numbers, letters or roman numerals)
Start a line off with a number or letter followed by a period ".",
! right bracket ")" or surrounded by brackets "( )". All of the
! following forms are recognised::
1. numbers
--- 85,97 ----
**definitions**. In all list cases, you may have as many paragraphs,
sublists, etc. as you want, as long as the left-hand side of the paragraph
! or whatever aligns with the first line of text in the list item.
!
! Lists must always start a new paragraph - that is, they must appear after a
! blank line.
**enumerated** lists (numbers, letters or roman numerals)
Start a line off with a number or letter followed by a period ".",
! right bracket ")" or surrounded by brackets "( )" - whatever you're
! comfortable with. All of the following forms are recognised::
1. numbers
|
|
From: David G. <go...@us...> - 2002-04-04 05:44:05
|
Update of /cvsroot/structuredtext/restructuredtext/tools
In directory usw-pr-cvs1:/tmp/cvs-serv31904/restructuredtext/tools
Modified Files:
default.css
Log Message:
Richard Jones' suggestions for literals.
Index: default.css
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/tools/default.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** default.css 28 Mar 2002 04:19:19 -0000 1.10
--- default.css 4 Apr 2002 05:44:02 -0000 1.11
***************
*** 16,19 ****
--- 16,22 ----
color: blue }
+ code {
+ background-color: #eeeeee }
+
div.abstract {
margin: 2em 5em }
***************
*** 116,120 ****
pre.literal-block, pre.doctest-block {
! margin-left: 2em }
span.classifier {
--- 119,125 ----
pre.literal-block, pre.doctest-block {
! margin-left: 2em ;
! margin-right: 2em ;
! background-color: #eeeeee }
span.classifier {
|
|
From: David G. <go...@us...> - 2002-04-04 05:42:38
|
Update of /cvsroot/structuredtext/restructuredtext/spec
In directory usw-pr-cvs1:/tmp/cvs-serv31546/restructuredtext/spec
Modified Files:
directives.txt
Log Message:
clarifications & refinements
Index: directives.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/spec/directives.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** directives.txt 16 Mar 2002 05:34:19 -0000 1.11
--- directives.txt 4 Apr 2002 05:42:35 -0000 1.12
***************
*** 174,180 ****
passes: initial parse and transform. During the initial parse, a
"pending" element is generated which acts as a placeholder, storing
! the TOC title and any attributes in a field list. At a later stage in
! the processing, the "pending" element is replaced by a "topic"
! element, a title and the table of contents proper.
The directive in its simplest form::
--- 174,180 ----
passes: initial parse and transform. During the initial parse, a
"pending" element is generated which acts as a placeholder, storing
! the TOC title and any attributes internally. At a later stage in the
! processing, the "pending" element is replaced by a "topic" element, a
! title and the table of contents proper.
The directive in its simplest form::
***************
*** 311,315 ****
=====================
! DTD element: raw.
Directive block: the directive data is interpreted as an output format
--- 311,315 ----
=====================
! DTD element: pending.
Directive block: the directive data is interpreted as an output format
***************
*** 319,338 ****
The "raw" directive indicates non-reStructuredText data that is to be
passed untouched to the Writer. The name of the output format is
! given in the directive data. The interpretation of the code is up to
! the Writer. A Writer may ignore any raw output not matching its
! format.
!
! For example, given the following input::
! .. raw:: latex
! \documentclass[twocolumn]{article}
! The following XML would be generated::
! <raw format="latex">
! \documentclass[twocolumn]{article}
! </raw>
! A LaTeX Writer could insert the raw content into its output.
--- 319,338 ----
The "raw" directive indicates non-reStructuredText data that is to be
passed untouched to the Writer. The name of the output format is
! given in the directive data. During the initial parse, a "pending"
! element is generated which acts as a placeholder, storing the format
! and raw data internally. The interpretation of the code is up to the
! Writer. A Writer may ignore any raw output not matching its format.
! For example, the following input would be passed untouched by an HTML
! Writer::
! .. raw:: html
! <hr width=50 size=10>
! A LaTeX Writer could insert the following raw content into its
! output stream::
! .. raw:: latex
! \documentclass[twocolumn]{article}
|
|
From: Richard J. <ri...@us...> - 2002-04-03 07:36:16
|
Update of /cvsroot/structuredtext/restructuredtext/docs In directory usw-pr-cvs1:/tmp/cvs-serv11026 Modified Files: quickstart.txt Log Message: missed some literals Index: quickstart.txt =================================================================== RCS file: /cvsroot/structuredtext/restructuredtext/docs/quickstart.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quickstart.txt 3 Apr 2002 05:02:59 -0000 1.1 --- quickstart.txt 3 Apr 2002 07:36:13 -0000 1.2 *************** *** 14,19 **** single line of text (one or more words) with an underline (and optionally an overline) in dashes ! "-----", equals "======", tildes "~~~~~~" or any of the ! non-alphanumeric characters = - ` : ' " ~ ^ _ * + # < >. All sections marked with the same underline style are deemed to be at the same level. --- 14,19 ---- single line of text (one or more words) with an underline (and optionally an overline) in dashes ! "``-----``", equals "``======``", tildes "``~~~~~~``" or any of the ! non-alphanumeric characters ``= - ` : ' " ~ ^ _ * + # < >``. All sections marked with the same underline style are deemed to be at the same level. |
|
From: Richard J. <ri...@us...> - 2002-04-03 05:03:01
|
Update of /cvsroot/structuredtext/restructuredtext/docs
In directory usw-pr-cvs1:/tmp/cvs-serv6907
Added Files:
quickstart.txt
Log Message:
Richard's first hack at a "quickstart" document. Sad, eh? :)
--- NEW FILE: quickstart.txt ---
Structure
---------
From the outset, let me say that "Structured Text" is probably a bit of a
misnomer. It's more like "Relaxed Text" that uses certain consistent
patterns. These patterns are interpreted by a HTML converter to produce
"Very Structured Text" that can be used by a web browser.
The most basic structure recognised is a **paragraph**. That's a chunk
of text that is separated by blank lines (one is enough). Paragraphs must
have the same indentation - that is, line up at their left edge.
To break text up into sections, you use **section headers**. These are a
single line of text (one or more words) with an underline (and optionally
an overline) in dashes
"-----", equals "======", tildes "~~~~~~" or any of the
non-alphanumeric characters = - ` : ' " ~ ^ _ * + # < >. All sections
marked with the same underline style are deemed to be at the same level.
Note that section headers are available as link targets, just using their
name. To link to the Lists_ heading, I write "``Lists_``". If the heading
has a space in it like `text styles`_, we need to quote the heading
"```text styles`_``".
Text styles
-----------
Inside paragraphs and other bodies of text, you may additionally mark
text for *italics* "``*italics``" or **bold** "``**bold**``".
If you want something to appear as a fixed-space literal, use
"````double back-quotes````". Note that no further fiddling is done inside
the double back-quotes - so asterisks "``*``" etc. are left alone.
If you want to just include an asterisk as part of regular text, you'll
need to "escape" it using a backslash. The backslash doesn't appear in the
final text, it just means "ignore the meaning of the next character". So to
have this \* asterisk appear, I write "``\*``" in the text.
Lists
-----
Lists of items come in three flavours: **enumerated**, **bulleted** and
**definitions**. In all list cases, you may have as many paragraphs,
sublists, etc. as you want, as long as the left-hand side of the paragraph
or whatever aligns with the first line of text in the list item. Lists must
always start a new paragraph - that is, they must appear after a blank
line.
**enumerated** lists (numbers, letters or roman numerals)
Start a line off with a number or letter followed by a period ".",
right bracket ")" or surrounded by brackets "( )". All of the
following forms are recognised::
1. numbers
A. upper-case letters
and it goes over many lines
with two paragraphs and all!
a. lower-case letters
3. with a sub-list starting at a different number
4. make sure the numbers are in the correct sequence though!
I. upper-case roman numerals
i. lower-caseroman numerals
(1) numbers again
1) and again
Results in (note - the different enumerated list styles are not always
supported by every web browser, so you may not get the full effect here):
1. numbers
A. upper-case letters
and it goes over many lines
with two paragraphs and all!
a. lower-case letters
3. with a sub-list starting at a different number
4. make sure the numbers are in the correct sequence though!
I. upper-case roman numerals
i. lower-caseroman numerals
(1) numbers again
1) and again
**bulleted** lists
Just like enumerated lists, start the line off with a bullet point
character - either "-", "+" or "*"::
* a bullet point using "*"
- a sub-list using "-"
+ yet another sub-list
- another item
Results in:
* a bullet point using "*"
- a sub-list using "-"
+ yet another sub-list
- another item
**definition** lists
Unlike the other two, the definition lists consist of a term, and the
definition of that term. The format of a definition list is::
what
Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
paragraphs or body elements, indented relative to the term. Blank
lines are not allowed between term and definition.
Results in:
what
Definition lists associate a term with a definition.
*how*
The term is a one-line phrase, and the definition is one or more
paragraphs or body elements, indented relative to the term. Blank
lines are not allowed between term and definition.
Preformatting (code samples)
----------------------------
Finally, to just include a chunk of preformatted, never-to-be-fiddled-with
text, finish the prior paragraph with "``::``". The preformatted block is
finished when the text falls back to the same indentation level as a
paragraph prior to the preformatted block.
An example::
Whitespace, newlines, blank lines, and all kinds of markup (like
*this* or \this) is preserved by literal blocks.
Lookie here, I've dropped an indentation level (but not far enough)
Results in::
Whitespace, newlines, blank lines, and all kinds of markup (like
*this* or \this) is preserved by literal blocks.
Lookie here, I've dropped an indentation level (but not far enough)
Note that if a paragraph consists only of "``::``", then it's removed
from the output::
::
This is preformatted text, and the last "::" paragraph is removed
Results in:
::
This is preformatted text, and the last "::" paragraph is removed
|
|
From: David G. <go...@us...> - 2002-03-28 04:29:09
|
Update of /cvsroot/structuredtext/restructuredtext/spec
In directory usw-pr-cvs1:/tmp/cvs-serv8214/restructuredtext/spec
Modified Files:
rst-notes.txt
Log Message:
updated
Index: rst-notes.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/spec/rst-notes.txt,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** rst-notes.txt 16 Mar 2002 05:35:44 -0000 1.39
--- rst-notes.txt 28 Mar 2002 04:29:06 -0000 1.40
***************
*** 109,113 ****
line as the field name.
! - Implement the HTML "imagemap" directive.
- Allow directives to be added at run-time.
--- 109,138 ----
line as the field name.
! - Implement directives:
!
! - html.imagemap
!
! - components.endnotes, .citations, .topic, .sectnum (section
! numbering; add support to .contents; could be cmdline option also)
!
! - misc.raw, .include (``#include`` one file in another; but how to
! parse wrt sections, reference names, conflicts?), .exec
! (execute Python code & insert the results; dangerous?), .eval
! (evaluate an expression & insert the text; at parse time or
! substitution time?)
!
! - block.qa (Questions & Answers; implement as a generic two-column
! marked list?)
!
! - colorize.python (Colorize Python code. Fine for HTML output, what
! about other formats? Revert to a literal block? Do we need some
! kind of "alternate" mechanism? Perhaps use a "pending" transform,
! which could switch its output based on the "format" in use. Use a
! factory function "transformFF()" which returns either
! "HTMLTransform()" instance or "GenericTransform" instance?)
!
! - text.date (for substitutions)
!
! - Combined with misc.include, implement canned macros?
- Allow directives to be added at run-time.
***************
*** 120,131 ****
references to a single footnote?
! - Add directives: components.contents (GNU-style two-way table of
! contents), components.endnotes, components.citations,
! components.topic, misc.raw.
!
! - Add support for "pending", noting pending transforms in the document
! node, as generated by directives.
!
! - Add support for topics.
--- 145,149 ----
references to a single footnote?
! - Add RFC-822 header parsing (for PEP, email Readers).
|
|
From: David G. <go...@us...> - 2002-03-28 04:28:13
|
Update of /cvsroot/structuredtext/restructuredtext/restructuredtext
In directory usw-pr-cvs1:/tmp/cvs-serv7590/restructuredtext/restructuredtext
Modified Files:
__init__.py
Log Message:
*** empty log message ***
Index: __init__.py
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/restructuredtext/__init__.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** __init__.py 11 Mar 2002 03:22:15 -0000 1.11
--- __init__.py 28 Mar 2002 04:28:10 -0000 1.12
***************
*** 60,68 ****
def parse(self, inputstring, docroot):
"""Parse `inputstring` and populate `docroot`, a document tree."""
debug = docroot.reporter[''].debug
self.statemachine = states.RSTStateMachine(
stateclasses=states.stateclasses, initialstate='Body',
debug=debug)
- self.setup_parse(inputstring, docroot)
inputlines = dps.statemachine.string2lines(
inputstring, convertwhitespace=1)
--- 60,68 ----
def parse(self, inputstring, docroot):
"""Parse `inputstring` and populate `docroot`, a document tree."""
+ self.setup_parse(inputstring, docroot)
debug = docroot.reporter[''].debug
self.statemachine = states.RSTStateMachine(
stateclasses=states.stateclasses, initialstate='Body',
debug=debug)
inputlines = dps.statemachine.string2lines(
inputstring, convertwhitespace=1)
|
|
From: David G. <go...@us...> - 2002-03-28 04:28:06
|
Update of /cvsroot/structuredtext/restructuredtext/spec
In directory usw-pr-cvs1:/tmp/cvs-serv7472/restructuredtext/spec
Modified Files:
reStructuredText.txt
Log Message:
Clarifications, updates, & fixes.
Index: reStructuredText.txt
===================================================================
RCS file: /cvsroot/structuredtext/restructuredtext/spec/reStructuredText.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** reStructuredText.txt 16 Mar 2002 05:35:29 -0000 1.44
--- reStructuredText.txt 28 Mar 2002 04:28:03 -0000 1.45
***************
*** 778,781 ****
--- 778,787 ----
Directives`_ for another.
+ Standard RFC822 headers cannot be used for this construct because they
+ are ambiguous. A word followed by a colon at the beginning of a line
+ is common in written text. However, in well-defined contexts such as
+ when a field list invariably occurs at the beginning of a document
+ (PEPs and email messages), standard RFC822 headers could be used.
+
Syntax diagram (simplified)::
***************
*** 1602,1613 ****
Directives are meant for the arbitrary processing of their contents
(the directive data & text block), which can be transformed into
! something possibly unrelated to the original text. Directives can be
! used as an extension mechanism for reStructuredText, a way of adding
support for new constructs without adding new syntax. For example,
! here's how an image could be placed::
.. image:: mylogo.png
! A figure (a graphic with a caption) could be placed like this::
.. figure:: larch.png
--- 1608,1619 ----
Directives are meant for the arbitrary processing of their contents
(the directive data & text block), which can be transformed into
! something possibly unrelated to the original text. Directives are used
! as an extension mechanism for reStructuredText, a way of adding
support for new constructs without adding new syntax. For example,
! here's how an image may be placed::
.. image:: mylogo.png
! A figure (a graphic with a caption) may placed like this::
.. figure:: larch.png
***************
*** 1736,1742 ****
.. |H| image:: /images/heart.png
! [height=11 width=11]
.. |S| image:: /images/spade.png
! [height=11 width=11]
* |Red light| means stop.
--- 1742,1750 ----
.. |H| image:: /images/heart.png
! :height: 11
! :width: 11
.. |S| image:: /images/spade.png
! :height: 11
! :width: 11
* |Red light| means stop.
***************
*** 1768,1784 ****
for plain text).
! Interpreted text is unsuitable for this purpose because the set of
! style names cannot be predefined - it is the domain of the content
! author, not the author of the parser and output formatter - and
! there is no way to associate a stylename argument with an
! interpreted text style role. Also, it may be desirable to use the
! same mechanism for styling blocks::
!
! .. style:: motto
! At Bob's Underwear Shop, we'll do anything to get in your
! pants.
! .. style:: disclaimer
! All rights reversed. Reprint what you like.
.. [#] There may be sufficient need for a "style" mechanism to
--- 1776,1794 ----
for plain text).
! .. @@@ This needs to be rethought & rewritten or removed:
! Interpreted text is unsuitable for this purpose because the set of
! style names cannot be predefined - it is the domain of the content
! author, not the author of the parser and output formatter - and
! there is no way to associate a stylename argument with an
! interpreted text style role. Also, it may be desirable to use the
! same mechanism for styling blocks::
!
! .. style:: motto
! At Bob's Underwear Shop, we'll do anything to get in your
! pants.
!
! .. style:: disclaimer
! All rights reversed. Reprint what you like.
.. [#] There may be sufficient need for a "style" mechanism to
***************
*** 1897,1903 ****
=============
! Inline markup is the markup of words or phrases within a text block.
! Inline markup cannot be nested. The text within inline markup may not
! begin or end with whitespace.
There are nine inline markup constructs. Five of the constructs use
--- 1907,1917 ----
=============
! In reStructuredText, inline markup applies to words or phrases within
! a text block. The same whitespace and punctuation that serves to
! delimit words in written text is used to delimit the inline markup
! syntax constructs. The text within inline markup may not begin or end
! with whitespace. Arbitrary character-level markup is not supported;
! it is not possible to mark up individual characters within a word.
! Inline markup cannot be nested.
There are nine inline markup constructs. Five of the constructs use
***************
*** 2281,2285 ****
----------------
! DTD element: system_message.
Markup errors are handled according to the specification in `PEP
--- 2295,2299 ----
----------------
! DTD element: system_message, problematic.
Markup errors are handled according to the specification in `PEP
***************
*** 2287,2293 ****
! .. _reStructuredText: http://structuredtext.sourceforge.net
.. _Python Docstring Processing System:
! http://docstring.sourceforge.net
.. _DPS Document Tree Structure:
http://docstring.sourceforge.net/spec/doctree.txt
--- 2301,2307 ----
! .. _reStructuredText: http://structuredtext.sourceforge.net/
.. _Python Docstring Processing System:
! http://docstring.sourceforge.net/
.. _DPS Document Tree Structure:
http://docstring.sourceforge.net/spec/doctree.txt
|
