fix & problem.

diff --git a/markupper.py b/markupper.py
index 945e8d3..666aad6 100755 (executable)
--- a/markupper.py
+++ b/markupper.py
@@ -248,7 +248,7 @@ class Markupper(object):
         pass
 
     def _escape(self, line):
-        line = re.sub(ur"&", ur"&amp", line)
+        line = re.sub(ur"&", ur"&", line)
         line = re.sub(ur"<", ur"&lt;", line)
         line = re.sub(ur">", ur"&gt;", line)
         return line
@@ -439,12 +439,6 @@ class Markupper(object):
     </table>
     """ % (cap)
 
-    def _fig(self, line):
-        if self._release == 1:
-            self._fig_release(line)
-        else:
-            self._fig(line)
-
     def _get_png_geom(self, filepath):
         desc = deterfile.file(filepath)
         try:
@@ -486,6 +480,7 @@ class Markupper(object):
             imgname = match_o2.group(1)
             imgname = os.path.join(self._image_dir, imgname)
             imgname_s = match_o2.group(2)
+            imgname_s = os.path.join(self._image_dir, imgname_s)
 
         geom = self._get_png_geom(imgname_s)
         if geom: