[Gzz-commits] gzz/metacode latex2e.py mputils.py umldoc.py um...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/02/09 06:58:46

Modified files:
        metacode       : latex2e.py mputils.py umldoc.py umlrst.py 

Log message:
        Awful hackery to make use real LaTeX footnotes :-)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/latex2e.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/mputils.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umldoc.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gzz/metacode/latex2e.py
diff -u gzz/metacode/latex2e.py:1.4 gzz/metacode/latex2e.py:1.5
--- gzz/metacode/latex2e.py:1.4 Sat Feb  8 19:24:44 2003
+++ gzz/metacode/latex2e.py     Sun Feb  9 06:58:46 2003
@@ -3,8 +3,8 @@
 """
 :Author: Engelbert Gruber (hacked by the Gzz project)
 :Contact: address@hidden
-:Revision: $Revision: 1.4 $
-:Date: $Date: 2003/02/09 00:24:44 $
+:Revision: $Revision: 1.5 $
+:Date: $Date: 2003/02/09 11:58:46 $
 :Copyright: This module has been placed in the public domain.
 
 LaTeX2e document tree Writer.
@@ -759,31 +759,44 @@
 
     def visit_footnote(self, node):
         notename = node['id']
-        self.body.append('\\begin{figure}[b]')
-        self.body.append('\\hypertarget{%s}' % notename)
+        self.body.append(None)
 
     def depart_footnote(self, node):
-        self.body.append('\\end{figure}\n')
+        list = []
+        while 1:
+            el = self.body.pop()
+            if el is None: break
+            list.insert(0, el)
+
+        i = self.body.index('!footnote:%s!' % node['id'])
+        self.body[i:i+1] = ['\\footnote{'] + list[3:] + ['}']
+
+        if i>0 and self.body[i-1][-1] == ' ':
+            self.body[i-1] = self.body[i-1][:-1]
 
     def visit_footnote_reference(self, node):
         href = ''
         if node.has_key('refid'):
             href = node['refid']
-        elif node.has_key('refname'):
-            href = self.document.nameids[node['refname']]
-        format = self.settings.footnote_references
-        if format == 'brackets':
-            suffix = '['
-            self.context.append(']')
-        elif format == 'superscript':
-            suffix = '\\raisebox{.5em}[0em]{\\scriptsize'
-            self.context.append('}')
-        else:                           # shouldn't happen
-            raise AssertionError('Illegal footnote reference format.')
-        self.body.append('%s\\hyperlink{%s}{' % (suffix,href))
+
+        self.body.append('!footnote:%s!' % href)
+            
+        #elif node.has_key('refname'):
+        #    href = self.document.nameids[node['refname']]
+        #format = self.settings.footnote_references
+        #if format == 'brackets':
+        #    suffix = '['
+        #    self.context.append(']')
+        #elif format == 'superscript':
+        #    suffix = '\\raisebox{.5em}[0em]{\\scriptsize'
+        #    self.context.append('}')
+        #else:                           # shouldn't happen
+        #    raise AssertionError('Illegal footnote reference format.')
+        #self.body.append('%s\\hyperlink{%s}{' % (suffix,href))
 
     def depart_footnote_reference(self, node):
-        self.body.append('}%s' % self.context.pop())
+        self.body.pop() # remove footnote number, inserted by TeX
+        #self.body.append('}%s' % self.context.pop())
 
     def visit_generated(self, node):
         pass
Index: gzz/metacode/mputils.py
diff -u gzz/metacode/mputils.py:1.10 gzz/metacode/mputils.py:1.11
--- gzz/metacode/mputils.py:1.10        Sun Feb  9 04:06:27 2003
+++ gzz/metacode/mputils.py     Sun Feb  9 06:58:46 2003
@@ -136,9 +136,6 @@
              "--interaction nonstopmode "+\
              "%s" % prefix+".3 >/dev/null"
 
-##             "%s" % prefix+".3 >/dev/null;"+\
-##             'cp %s.1 %s.eps' % (prefix, prefix)
-
     if settings.has_key('tmpdir'):
         os.system("cd "+path+";"+syscmd)
     else:
Index: gzz/metacode/umldoc.py
diff -u gzz/metacode/umldoc.py:1.21 gzz/metacode/umldoc.py:1.22
--- gzz/metacode/umldoc.py:1.21 Sat Feb  8 18:21:25 2003
+++ gzz/metacode/umldoc.py      Sun Feb  9 06:58:46 2003
@@ -70,7 +70,7 @@
         rst2html(path)
         rst2latex(path)
     rst2xxx = rst2html
-    if path.find("manuscripts/") != -1:
+    if path.find("manuscripts/") != -1 or path.find("benja-diff-fa/") != -1:
         rst2xxx = rst2both
         
     if os.path.isdir(path):
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.29 gzz/metacode/umlrst.py:1.30
--- gzz/metacode/umlrst.py:1.29 Sun Feb  9 04:48:08 2003
+++ gzz/metacode/umlrst.py      Sun Feb  9 06:58:46 2003
@@ -86,8 +86,9 @@
         mp.close()
 
         create_diagram(name+'.gen')
-        open(dir+name+'.gen.eps', 'w').write(
-            open(dir+name+'.gen.1', 'r').read())
+        os.rename(dir+name+'.gen.1', dir+name+'.gen.eps')
+##        open(dir+name+'.gen.eps', 'w').write(
+##            open(dir+name+'.gen.1', 'r').read())
 
     add_refer_context(attributes['name'], 1)