Changeset 986 for trunk

Timestamp:

Dec 13, 2009, 9:41:15 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #405. added suopport to set image format in config file.

Location:

trunk/lib

Files:

• Configuration.cc (modified) (4 diffs)
• Configuration.h (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -122 +122 @@
     return str=="true" || str=="True" || str=="TRUE" ||
       str=="yes" || str=="Yes" || str=="YES";
+  }
+
+
+  const std::string& Configuration::image_format(void) const
+  {
+    return image_format_;
   }
 
@@ -282 +288 @@
         }
       } 
+      else if (section == "image") {
+        if (lhs == "format") {
+          if (rhs!="none" && rhs!="png" && rhs!="svg") {
+            throw Config_error(line, "unknown format: " + rhs);
+          }
+          image_format_ = rhs;
+        }
+      }
     }
     validate_dictionary();
@@ -422 +436 @@
 
     dictionary_ = VectorPair(1, std::make_pair("*.in", "$1"));
+    image_format_ = "png";
   }
 
@@ -480 +495 @@
       os << i->first << " = " << i->second.name() << "\n";
     }
+
+    os << "\n"
+       << "### Section for images\n"
+       << "[image]\n"
+       << "format = " << conf.image_format() << "\n";
+
 
     os << "\n"

trunk/lib/Configuration.h

@@ -70 +70 @@
     ///
     const std::map<std::string, Alias>& copyright_alias(void) const;
+
+    /**
+       \return png, none, svg, or svgz
+     */
+    const std::string& image_format(void) const;
 
     /// 
@@ -143 +148 @@
 
     VectorPair dictionary_;
-
+    std::string image_format_;
     std::string trac_root_;
   };