Changeset 1025

Timestamp:

Jan 11, 2010, 2:19:54 AM (14 years ago)

Author:

Peter Johansson

Message:

support for png/png case, refs #279

Location:

trunk/lib

Files:

• css.cc (modified) (1 diff)
• html_utility.cc (modified) (2 diffs)

trunk/lib/css.cc

@@ -146 +146 @@
     s << " padding: 0 1em .1em 0;\n";
     s << "}\n\n";
-
+    s << "div.main img { border: 0; }\n";
 
     s << "p.plot { text-align: center; }\n";

trunk/lib/html_utility.cc

@@ -66 +66 @@
     std::ostringstream os;
     const std::string& format = Configuration::instance().image_format();
+    const std::string& anchor_format = 
+      Configuration::instance().image_anchor_format();
     if (format=="svg")
       os << "<object data='" << name << ".svg' type='image/svg+xml'"
@@ -72 +74 @@
          << " width='600' />\n"
          << "</object>\n";
-    else if (format=="png")
-      os << "<img src='" << name << ".png' alt='[plot]'/>";
+    else if (format=="png") {
+      if (anchor_format=="none")
+        os << "<img src='" << name << ".png' alt='[plot]'/>";
+      else
+        os << "<a href=\"" << name << "." << anchor_format << "\">" 
+           << "<img src='" << name << ".png' alt='[plot]'/>"
+           << "</a>";
+    }
     else if (format=="none")
       os << "<!-- no images -->";