Merge pull request #174 from craigsapp/patch-1

Patch 1
rism-digital · Feb 9, 2016 · ae75099 · ae75099
2 parents d82c0a2 + 15624b9
commit ae75099
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
@@ -172,7 +172,7 @@ bool Toolkit::SetFormat( std::string const &informat )
     else if(informat == "musicxml")
         m_format = MUSICXML;
     else {
-        LogError("Input format can only be: mei, pae, xml or darms");
+        LogError("Input format can only be: mei, pae, musicxml or darms");
         return false;
     }
     return true;

diff --git a/tools/main.cpp b/tools/main.cpp
@@ -85,7 +85,7 @@ void display_usage() {
 
     cerr << " -b, --border=BORDER        Add border (default is " << DEFAULT_PAGE_LEFT_MAR << ")" << endl;
 
-    cerr << " -f, --format=INPUT_FORMAT  Select input format: darms, mei, pae, xml (default is pae)" << endl;
+    cerr << " -f, --format=INPUT_FORMAT  Select input format: darms, mei, pae, musicxml (default is pae)" << endl;
 
     cerr << " -h, --page-height=HEIGHT   Specify the page height (default is " << DEFAULT_PAGE_HEIGHT << ")" << endl;