--- astyle_main-original.cpp Thu Apr 13 13:42:19 2000 +++ astyle_main.cpp Thu Apr 13 16:56:14 2000 @@ -30,7 +30,6 @@ #include #include - #define IS_OPTION(arg,op) ((arg).compare(op)==0) #define IS_OPTIONS(arg,a,b) (IS_OPTION((arg),(a)) || IS_OPTION((arg),(b))) @@ -469,16 +468,17 @@ (*_err) << "Artistic Style " << _version << " (http://www.bigfoot.com/~davidsont/astyle)\n"; (*_err) << " (created by Tal Davidson, davidsont@bigfoot.com)\n"; (*_err) << endl; - (*_err) << "Usage : astyle [options] < Original > Beautified\n"; - (*_err) << " astyle [options] Foo.cpp Bar.cpp [...]\n"; + (*_err) << "Usage : astyle [options] [input-file] [output-file]\n"; + (*_err) << " astyle [options] [input-file] [next input-file] [...]\n"; (*_err) << endl; - (*_err) << "When indenting a specific file, the resulting indented file RETAINS the\n"; - (*_err) << "original file-name. The original pre-indented file is renamed, with a\n"; - (*_err) << "suffix of \".orig\" added to the original filename.\n"; - (*_err) << endl; - (*_err) << "By default, astyle is set up to indent C/C++ files, with 4 spaces per\n" ; - (*_err) << "indent, a maximal indentation of 40 spaces inside continuous statements,\n"; - (*_err) << "and NO formatting.\n"; + (*_err) << "When indenting an input-file, the resulting output-file retains the\n"; + (*_err) << "input-file's filename unless otherwise specified as the output-file's\n"; + (*_err) << "name. The input-file is renamed with a suffix of '.orig' added to\n"; + (*_err) << "the input-file's filename.\n"; + (*_err) << endl; + (*_err) << "By default, astyle is set to indent C/C++ files with 4 spaces per\n" ; + (*_err) << "indent and a maximal indentation of 40 spaces inside continuous statements\n"; + (*_err) << "with no formatting.\n"; (*_err) << endl; (*_err) << "Option's Format:\n"; (*_err) << "----------------\n"; @@ -492,7 +492,7 @@ (*_err) << " ANSI style formatting/indenting.\n"; (*_err) << endl; (*_err) << " --style=kr\n"; - (*_err) << " Kernighan&Ritchie style formatting/indenting.\n"; + (*_err) << " Kernighan & Ritchie (K&R) style formatting/indenting.\n"; (*_err) << endl; (*_err) << " --style=gnu\n"; (*_err) << " GNU style formatting/indenting.\n"; @@ -501,16 +501,16 @@ (*_err) << " Java mode, with standard java style formatting/indenting.\n"; (*_err) << endl; (*_err) << " --style=linux\n"; - (*_err) << " Linux mode (i.e. 8 spaces per indent, break definition-block\n"; - (*_err) << " brackets but attach command-block brackets.\n"; + (*_err) << " Linux mode (8 spaces per indent and break definition-block\n"; + (*_err) << " brackets but attach command-block brackets).\n"; (*_err) << endl; (*_err) << "Indentation options:\n"; (*_err) << "--------------------\n"; (*_err) << " -c OR --mode=c\n"; - (*_err) << " Indent a C or C++ source file (default)\n"; + (*_err) << " Indent a C or C++ source file (default).\n"; (*_err) << endl; (*_err) << " -j OR --mode=java\n"; - (*_err) << " Indent a Java(TM) source file\n"; + (*_err) << " Indent a Java(TM) source file.\n"; (*_err) << endl; (*_err) << " -t OR -t# OR --indent=tab=#\n"; (*_err) << " Indent using tab characters, assuming that each\n"; @@ -519,11 +519,11 @@ (*_err) << endl; (*_err) << " -s OR -s# OR --indent=spaces=#\n"; (*_err) << " Indent using # spaces per indent. Not specifying #\n" ; - (*_err) << " will result in a default of 4 spacec per indent.\n" ; + (*_err) << " will result in a default of 4 spaces per indent.\n" ; (*_err) << endl; (*_err) << " -C OR --indent-classes\n"; (*_err) << " Indent 'class' blocks, so that the inner 'public:',\n"; - (*_err) << " 'protected:' and 'private: headers are indented in\n"; + (*_err) << " 'protected:' and 'private:' headers are indented in\n"; (*_err) << " relation to the class block.\n"; (*_err) << endl; (*_err) << " -S OR --indent-switches\n"; @@ -532,7 +532,7 @@ (*_err) << endl; (*_err) << " -K OR --indent-cases\n"; (*_err) << " Indent 'case XXX:' lines, so that they are flush with\n"; - (*_err) << " their bodies..\n"; + (*_err) << " their bodies.\n"; (*_err) << endl; (*_err) << " -N OR --indent-namespaces\n"; (*_err) << " Indent the contents of namespace blocks.\n"; @@ -541,7 +541,7 @@ (*_err) << " Add extra indentation to '{' and '}' block brackets.\n"; (*_err) << endl; (*_err) << " -G OR --indent-blocks\n"; - (*_err) << " Add extra indentation entire blocks (including brackets).\n"; + (*_err) << " Add extra indentation to entire blocks (including brackets).\n"; (*_err) << endl; (*_err) << " -L OR --indent-labels\n"; (*_err) << " Indent labels so that they appear one indent less than\n"; @@ -553,15 +553,15 @@ (*_err) << " belonging to a conditional header.\n"; (*_err) << endl; (*_err) << " -M# OR --max-instatement-indent=#\n"; - (*_err) << " Indent a maximal # spaces in a continuous statement,\n"; - (*_err) << " relatively to the previous line.\n"; + (*_err) << " Indent a maximal # spaces in a continuous statement\n"; + (*_err) << " relative to the previous line.\n"; (*_err) << endl; (*_err) << " -E OR --fill-empty-lines\n"; - (*_err) << " Fill empty lines with the white space of their\n"; + (*_err) << " Fill empty lines with the white space of the\n"; (*_err) << " previous lines.\n"; (*_err) << endl; (*_err) << " --indent-preprocessor\n"; - (*_err) << " Indent multi-line #define statements\n"; + (*_err) << " Indent multi-line #define statements.\n"; (*_err) << endl; (*_err) << "Formatting options:\n"; (*_err) << "-------------------\n"; @@ -580,16 +580,16 @@ (*_err) << " multiple single-statement lines.\n"; (*_err) << endl; (*_err) << " -O OR --one-line=keep-blocks\n"; - (*_err) << " Don't break blocks residing completely on one line\n"; + (*_err) << " Don't break blocks residing completely on one line.\n"; (*_err) << endl; (*_err) << " -p OR --pad=oper\n"; (*_err) << " Insert space paddings around operators only.\n"; (*_err) << endl; (*_err) << " --pad=paren\n"; - (*_err) << " Insert space paddings around parenthesies only.\n"; + (*_err) << " Insert space paddings around parentheses only.\n"; (*_err) << endl; (*_err) << " -P OR --pad=all\n"; - (*_err) << " Insert space paddings around operators AND parenthesies.\n"; + (*_err) << " Insert space paddings around operators and parentheses.\n"; (*_err) << endl; (*_err) << " --convert-tabs\n"; (*_err) << " Convert tabs to spaces.\n"; @@ -604,17 +604,17 @@ (*_err) << "Other options:\n"; (*_err) << "-------------\n"; (*_err) << " --suffix=####\n"; - (*_err) << " Append the suffix #### instead of '.orig' to original filename.\n"; + (*_err) << " Append the suffix #### instead of '.orig' to output-file.\n"; (*_err) << endl; (*_err) << " -X OR --errors-to-standard-output\n"; (*_err) << " Print errors and help information to standard-output rather than\n"; (*_err) << " to standard-error.\n"; (*_err) << endl; (*_err) << " -v OR --version\n"; - (*_err) << " Print version number\n"; + (*_err) << " Print version number.\n"; (*_err) << endl; (*_err) << " -h OR -? OR --help\n"; - (*_err) << " Print this help message\n"; + (*_err) << " Print this help message.\n"; (*_err) << endl; (*_err) << "Default options file:\n"; (*_err) << "---------------------\n"; @@ -623,11 +623,11 @@ (*_err) << " 1. The contents of the ARTISTIC_STYLE_OPTIONS environment\n"; (*_err) << " variable if it exists.\n"; (*_err) << " 2. The file called .astylerc in the directory pointed to by the\n"; - (*_err) << " HOME environment variable ( i.e. $HOME/.astylerc ).\n"; + (*_err) << " HOME environment variable (i.e. $HOME/.astylerc).\n"; (*_err) << " 3. The file called .astylerc in the directory pointed to by the\n"; - (*_err) << " HOMEPATH environment variable ( i.e. %HOMEPATH%\\.astylerc ).\n"; + (*_err) << " HOMEPATH environment variable (i.e. %HOMEPATH%/.astylerc).\n"; (*_err) << " If a default options file is found, the options in this file\n"; - (*_err) << " will be parsed BEFORE the command-line options.\n"; + (*_err) << " will be parsed before the command-line options.\n"; (*_err) << " Options within the default option file may be written without\n"; (*_err) << " the preliminary '-' or '--'.\n"; (*_err) << endl;