[Python-checkins] r57139 - doctools/trunk/sphinx/builder.py doctools/trunk/sphinx/roles.py

[georg.brandl]

Author: georg.brandl
Date: Fri Aug 17 09:44:32 2007
New Revision: 57139

Modified:
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/roles.py
Log:
Two fixes.


Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Fri Aug 17 09:44:32 2007
@@ -485,7 +485,9 @@
                                                       filename[:-4] + '.html'))
             except:
                 targetmtime = 0
-            if path.getmtime(path.join(self.srcdir, filename)) > targetmtime:
+            if filename not in self.env.all_files:
+                yield filename
+            elif path.getmtime(path.join(self.srcdir, filename)) > targetmtime:
                 yield filename
 
 

Modified: doctools/trunk/sphinx/roles.py
==============================================================================
--- doctools/trunk/sphinx/roles.py	(original)
+++ doctools/trunk/sphinx/roles.py	Fri Aug 17 09:44:32 2007
@@ -20,7 +20,7 @@
 
 generic_docroles = {
     'command' : nodes.strong,
-    'dfn' : addnodes.emphasis,
+    'dfn' : nodes.emphasis,
     'guilabel' : nodes.strong,
     'kbd' : nodes.literal,
     'keyword' : nodes.literal,