Changeset 1155

Timestamp:

Aug 9, 2010, 5:41:59 AM (11 years ago)

Author:

Peter Johansson

Message:

new config option: tab_size. fixes #229

Location:

trunk/lib

Files:

• Configuration.cc (modified) (5 diffs)
• Configuration.h (modified) (2 diffs)
• HtmlBuf.cc (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -31 +31 @@
 #include <algorithm>
 #include <cassert>
+#include <cstdlib>
 #include <fstream>
 #include <map>
@@ -216 +217 @@
           else {
             throw Config_error(line, "");
+          }
+        }
+        else if (lhs=="tab_size") {
+          tab_size_ = strtoul(rhs.c_str(), NULL, 10);
+          if (tab_size_==0) {
+            throw Config_error(line, 
+                          "invalid value: tab_size must be a positive integer");
+          }
+          else if (tab_size_ == ULONG_MAX) {
+            throw Config_error(line, "invalid value: out of range");
           }
         }
@@ -482 +493 @@
     missing_copyright_warning_=false;
     trac_root_ = "";
+    tab_size_ = 2;
 
     add_codon("*.ac", "#", "\n");
@@ -561 +573 @@
 
 
+  size_t Configuration::tab_size(void) const
+  {
+    return tab_size_;
+  }
+
+
   std::string Configuration::trac_root(void) const
   {
@@ -602 +620 @@
     else
       os << "no\n";
+    os << "# svndigest uses this value to replace tabs "
+       << "with spaces in blame output\n"
+       << "tab_size = " << conf.tab_size() << "\n";
+
 
     os << "\n### Section for setting behaviour of copyright update\n"

trunk/lib/Configuration.h

@@ -128 +128 @@
     const std::map<std::string, std::string>& 
     svn_properties(const std::string& filename) const;
+
+    /**
+       \return size of a tab, i.e., how many spaces are ued to display
+       a space (in blame output)
+     */
+    size_t tab_size(void) const;
 
     ///
@@ -209 +215 @@
     bool output_file_;
     std::string trac_root_;
+    size_t tab_size_;
 
     typedef std::map<std::string, std::string> str_map;

trunk/lib/HtmlBuf.cc

@@ -23 +23 @@
 #include "HtmlBuf.h"
 
+#include "Configuration.h"
+
 #include <cstdio>
 #include <iostream>
@@ -40 +42 @@
     map_['&']=std::string("&amp;");
     map_[' ']=std::string("&nbsp;");
-    // This should be configurable, but for now indentation is two spaces.
-    map_['\t']=std::string("&nbsp;&nbsp;");
+    std::string str;
+    for (size_t i=0; i<Configuration::instance().tab_size(); ++i)
+      str += "&nbsp;";
+    map_['\t']=str;
   }