re-enabled inner links for STXNG documents

d13f7c7b · Andreas Jung · eb2681a0 · d13f7c7b · d13f7c7b · d13f7c7b
Commit d13f7c7b authored Oct 25, 2001 by Andreas Jung
9 changed files
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -6,6 +6,8 @@ Zope Changes

    Features Added

+     - re-enabled inner links for STXNG documents.
+
     - Zope installations upgraded from pre-2.4 installations
       did not show the WebDAV LockManager entry in the control panel.


--- a/lib/python/StructuredText/DocumentClass.py
+++ b/lib/python/StructuredText/DocumentClass.py
@@ -367,7 +367,9 @@ class DocumentClass:
    #'doc_named_link',
    #'doc_underline'
    text_types = [
-        'doc_sgml',
+        'doc_sgml', 
+        'doc_inner_link',
+        'doc_named_link',
        'doc_href1',
        'doc_href2',
        'doc_strong',

--- a/lib/python/StructuredText/regressions/Acquisition.ref
+++ b/lib/python/StructuredText/regressions/Acquisition.ref
@@ -253,7 +253,7 @@
    lookups. For example, in the expression: <code>a.b.c.x.foo</code>, the object
    <code>a</code> is searched no more than once, even though it is wrapped three
    times.</p>
-<p>.. <a href="#1">[1]</a> Gil, J., Lorenz, D., 
+<p><a name="1">[1]</a> Gil, J., Lorenz, D., 
   <a href="http://www.bell-labs.com/people/cope/oopsla/Oopsla96TechnicalProgramAbstracts.html#GilLorenz">Environmental Acquisition--A New Inheritance-Like Abstraction Mechanism</a>, 
   OOPSLA '96 Proceedings, ACM SIG-PLAN, October, 1996</p>
 </body>

--- a/lib/python/StructuredText/regressions/ExtensionClass.ref
+++ b/lib/python/StructuredText/regressions/ExtensionClass.ref
@@ -597,18 +597,18 @@
    Workshop <a href="#4">[4]</a>.  It is hoped that this will spur research in improved
    and specialized models for class implementation in Python.</p>
 <p>  References</p>
-<p>.. <a href="#1">[1]</a> Fulton, J., <a href="http://www.digicool.com/papers/Persistence.html">Providing Persistence for World-Wide-Web Applications</a>,
+<p><a name="1">[1]</a> Fulton, J., <a href="http://www.digicool.com/papers/Persistence.html">Providing Persistence for World-Wide-Web Applications</a>,
 Proceedings of the 5th Python Workshop.</p>
-<p>.. <a href="#2">[2]</a> Page, R. and Cropper, S., <a href="http://www.digicool.com/papers/DocumentTemplate.html">Document Template</a>,
+<p><a name="2">[2]</a> Page, R. and Cropper, S., <a href="http://www.digicool.com/papers/DocumentTemplate.html">Document Template</a>,
 Proceedings of the 5th Python Workshop.</p>
-<p>.. <a href="#3">[3]</a> Beaudry, D., <a href="http://www.python.org/workshops/1994-11/BuiltInClasses/BuiltInClasses_1.html">Deriving Built-In Classes in Python</a>,
+<p><a name="3">[3]</a> Beaudry, D., <a href="http://www.python.org/workshops/1994-11/BuiltInClasses/BuiltInClasses_1.html">Deriving Built-In Classes in Python</a>,
 Proceedings of the First International Python Workshop.</p>
-<p>.. <a href="#4">[4]</a> Van Rossum, G., <a href="http://www.python.org/workshops/1996-06/notes/thursday.html">Don Beaudry Hack - MESS</a>,
+<p><a name="4">[4]</a> Van Rossum, G., <a href="http://www.python.org/workshops/1996-06/notes/thursday.html">Don Beaudry Hack - MESS</a>,
 presented in the Developer's Future Enhancements session of the 
 4th Python Workshop. </p>
-<p>.. <a href="#5">[5]</a> Fulton, J., <a href="http://www.digicool.com/jim/MetaType.c">Meta-Type Object</a>,
+<p><a name="5">[5]</a> Fulton, J., <a href="http://www.digicool.com/jim/MetaType.c">Meta-Type Object</a>,
 This is a small proposal, the text of which is contained in a 
 sample implementation source file,  </p>
-<p>.. <a href="#6">[6]</a> Beaudry, D., and Ascher, D., <a href="http://starship.skyport.net/~da/mess/">The Meta-Extension Set</a>.</p>
+<p><a name="6">[6]</a> Beaudry, D., and Ascher, D., <a href="http://starship.skyport.net/~da/mess/">The Meta-Extension Set</a>.</p>
 </body>
 </html>
--- a/lib/python/StructuredText/regressions/InnerLinks.ref
+++ b/lib/python/StructuredText/regressions/InnerLinks.ref
+<html>
+<head>
+<title>This is the InnerLinkTest</title>
+</head>
+<body>
+<h1>This is the InnerLinkTest</h1>
+<p>  see also <a href="#1">[1]</a> and <a href="#2">[2]</a></p>
+<p>  <a name="1">[1]</a> "Zope Book" by Amos Lattmeier and Michel Pelletier</p>
+<p>  <a name="2">[2]</a> "Python Book" by Guido van Rossum</p>
+</body>
+</html>
+
--- a/lib/python/StructuredText/regressions/InnerLinks.stx
+++ b/lib/python/StructuredText/regressions/InnerLinks.stx
+This is the InnerLinkTest
+
+
+  see also [1] and [2]
+
+
+  .. [1] "Zope Book" by Amos Lattmeier and Michel Pelletier
+
+  .. [2] "Python Book" by Guido van Rossum
+  
--- a/lib/python/StructuredText/regressions/create_referencesfiles.py
+++ b/lib/python/StructuredText/regressions/create_referencesfiles.py
@@ -84,12 +84,15 @@
 ##############################################################################


-import os
+import os,sys
 from StructuredText.StructuredText import HTML


-files = os.listdir('.')
-files = filter(lambda x: x.endswith('.stx'), files)
+if len(sys.argv)>1:
+    files = sys.argv[1:]
+else:
+    files = os.listdir('.')
+    files = filter(lambda x: x.endswith('.stx'), files)


 for f in files:

--- a/lib/python/StructuredText/regressions/examples.ref
+++ b/lib/python/StructuredText/regressions/examples.ref
@@ -28,7 +28,7 @@
 </p></li>

 </ul>
-<p>.. <a href="#1">[1]</a> (The referring text should be a paragraph, not a header, and
+<p><a name="1">[1]</a> (The referring text should be a paragraph, not a header, and
 should contain a reference to this footnote, footnote "<a href="#1">[1]</a>".)<p>  Some hrefs, in a definition list:</p>
 <dl>
 <dt>  _Regular_</dt>

--- a/lib/python/StructuredText/tests/testStructuredText.py
+++ b/lib/python/StructuredText/tests/testStructuredText.py
@@ -105,7 +105,7 @@ regressions=os.path.join(package_dir, 'regressions')

 files = ['index.stx','Acquisition.stx','ExtensionClass.stx',
        'MultiMapping.stx','examples.stx','Links.stx','examples1.stx',
-        'table.stx']
+        'table.stx','InnerLinks.stx']

 def readFile(dirname,fname):