Changeset 1066

Timestamp:

Aug 12, 2012 3:44:12 PM (11 years ago)

Author:

jemian

Message:

fixes #14

File:

• specdomain/trunk/src/specdomain/sphinxcontrib/specdomain.py (modified) (3 diffs)

specdomain/trunk/src/specdomain/sphinxcontrib/specdomain.py

@@ -210 +210 @@
             self.add_line(u'', '<autodoc>')
             self.add_line(u'.. rubric:: List of SPEC Macro Files in *%s*' % specdir, '<autodoc>')
+            self.add_line(u'', '<autodoc>')
             for filename in macrofiles:
+                # Show a bullet list at the top of the page
+                # This is an alternative to separate pages for each macro file
                 self.add_line(u'* :ref:`%s <%s>`' % (filename, filename), '<autodoc>')
+            self.add_line(u'', '<autodoc>')
             self.add_line(u'-'*15, '<autodoc>')         # delimiter
+            self.add_line(u'', '<autodoc>')
             for filename in macrofiles:
                 self.add_line(u'', '<autodoc>')
@@ -241 +246 @@
 
     def add_target_and_index(self, name, sig, signode):
-        targetname = '%s-%s' % (self.objtype, name)
+        targetname = 'macro:%s:%s:%s:%s' % (self.objtype, name, signode.source, str(signode.line))
         signode['ids'].append(targetname)
         self.state.document.note_explicit_target(signode)
@@ -316 +321 @@
         #text = u'! ' + sig      # TODO: How to use emphasized index entry in this context?
         text = name.split()[0]   # when sig = "tth    #: scattering angle"
-        targetname = '%s-%s' % (self.objtype, text)
+        targetname = 'var:%s:%s:%s:%s' % (self.objtype, text, signode.source, str(signode.line))
         signode['ids'].append(targetname)
         # TODO: role does not point back to it yet