summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeorg.brandl <devnull@localhost>2007-08-17 07:44:32 +0000
committergeorg.brandl <devnull@localhost>2007-08-17 07:44:32 +0000
commitbb369a0e09c543e61e8e23a1b8a19c51480dbe4a (patch)
treebbebf75be41ed4b587e7b429f5e5cc1cc5a16923
parent6062e212e7ee0b07d7f793631f8dcbb0769f1e9f (diff)
downloadsphinx-bb369a0e09c543e61e8e23a1b8a19c51480dbe4a.tar.gz
Two fixes.
-rw-r--r--sphinx/builder.py4
-rw-r--r--sphinx/roles.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 8ec87f84..d4f6b278 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -485,7 +485,9 @@ class StandaloneHTMLBuilder(Builder):
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
diff --git a/sphinx/roles.py b/sphinx/roles.py
index 6aefee04..e7dda55a 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -20,7 +20,7 @@ ws_re = re.compile(r'\s+')
generic_docroles = {
'command' : nodes.strong,
- 'dfn' : addnodes.emphasis,
+ 'dfn' : nodes.emphasis,
'guilabel' : nodes.strong,
'kbd' : nodes.literal,
'keyword' : nodes.literal,