1.1 --- a/tools/latex-to-docbook	Mon Feb 09 23:03:44 2009 -0800
     1.2 +++ b/tools/latex-to-docbook	Tue Mar 31 12:21:50 2009 -0700
     1.3 @@ -33,7 +33,7 @@
     1.4          line = (line.rstrip()
     1.5                  .replace('~', ' ')
     1.6                  .replace('&', '&')
     1.7 -                .replace('&emdash;', '&emdash;')
     1.8 +                .replace('---', '&emdash;')
     1.9                  .replace('\_', '_')
    1.10                  .replace('\{', '{')
    1.11                  .replace('\}', '}')
    1.12 @@ -83,7 +83,7 @@
    1.13          line = re.sub(r'\\filename{(?P<file>[^}]+?)}',
    1.14                        r'<filename>\g<file></filename>', line)
    1.15          line = re.sub(r'\\tildefile{(?P<file>[^}]+)}',
    1.16 -                      r'<filename role="home"> /\g<file></filename>', line)
    1.17 +                      r'<filename role="home">~/\g<file></filename>', line)
    1.18          line = re.sub(r'\\sfilename{(?P<file>[^}]+)}',
    1.19                        r'<filename role="special">\g<file></filename>', line)
    1.20          line = re.sub(r'\\sdirname{(?P<dir>[^}]+)}',
    1.21 @@ -95,7 +95,7 @@
    1.22          line = re.sub(r'\\pymod{(?P<mod>[^}]+)}',
    1.23                        r'<literal role="py-mod">\g<mod></literal>', line)
    1.24          line = re.sub(r'\\pymodclass{(?P<mod>[^}]+)}{(?P<class>[^}]+)}',
    1.25 -                      r'<literal url="py-mod-\g<mod>">\g<class></ulink>', line)
    1.26 +                      r'<literal role="py-mod-\g<mod>">\g<class></literal>', line)
    1.27          line = re.sub(r'\\url{(?P<url>[^}]+)}',
    1.28                        r'<ulink url="\g<url>">\g<url></ulink>', line)
    1.29          line = re.sub(r'\\href{(?P<url>[^}]+)}{(?P<text>[^}]+)}',
    1.30 @@ -154,7 +154,7 @@
    1.31                          inlist = 1
    1.32                  else:
    1.33                      ofp.write('</')
    1.34 -                    if env == ('itemizedlist', 'orderedlist'):
    1.35 +                    if env in ('itemizedlist', 'orderedlist'):
    1.36                          inlist = 0
    1.37                  print >> ofp, env + '>'
    1.38              else: