From 35d9668e90e60a09d1a46cf77165d9aa301abe7e Mon Sep 17 00:00:00 2001
From: John Hewson <john@jahewson.com>
Date: Mon, 28 Jan 2013 22:26:07 +0000
Subject: [PATCH] pdftohtml/pdftocairo/etc style usage defaults

---
 src/util/ArgParser.cc |  2 +-
 src/util/ArgParser.h  | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/util/ArgParser.cc b/src/util/ArgParser.cc
index 04381e6..de3b270 100644
--- a/src/util/ArgParser.cc
+++ b/src/util/ArgParser.cc
@@ -164,6 +164,6 @@ ArgParser::ArgEntryBase::ArgEntryBase(const char * name, const char * descriptio
     }
 }
 
-const int ArgParser::arg_col_width = 40;
+const int ArgParser::arg_col_width = 31;
 
 } // namespace pdf2htmlEX
diff --git a/src/util/ArgParser.h b/src/util/ArgParser.h
index 432ec59..24a7db9 100644
--- a/src/util/ArgParser.h
+++ b/src/util/ArgParser.h
@@ -162,12 +162,6 @@ void ArgParser::ArgEntry<T, Tv>::show_usage(std::ostream & out) const
     if(need_arg)
     {
         sout << " <arg>";
-        if(!dont_show_default)
-        {
-            sout << " (=";
-            dump_value(sout, default_value);
-            sout << ")";
-        }
     }
 
     std::string s = sout.str();
@@ -175,8 +169,17 @@ void ArgParser::ArgEntry<T, Tv>::show_usage(std::ostream & out) const
 
     for(int i = s.size(); i < arg_col_width; ++i)
         out << ' ';
-
-    out << " " << description << std::endl;
+    
+    out << " " << description;
+    
+    if(need_arg && !dont_show_default)
+    {
+        out << " (default is ";
+        dump_value(out, default_value);
+        out << ")";	
+    }
+    
+    out << std::endl;
 }
 
 } // namespace ArgParser