--- a/libinterp/corefcn/regexp.cc	Tue Jun 21 13:08:25 2016 -0700
+++ b/libinterp/corefcn/regexp.cc	Tue Jun 21 16:07:51 2016 -0400
@@ -645,210 +645,210 @@
 }
 
 DEFUN (regexp, args, nargout,
-       "-*- texinfo -*-\n\
-@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexp (@var{str}, @var{pat})\n\
-@deftypefnx {} {[@dots{}] =} regexp (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
-Regular expression string matching.\n\
-\n\
-Search for @var{pat} in @var{str} and return the positions and substrings of\n\
-any matches, or empty values if there are none.\n\
-\n\
-The matched pattern @var{pat} can include any of the standard regex\n\
-operators, including:\n\
-\n\
-@table @code\n\
-@item .\n\
-Match any character\n\
-\n\
-@item * + ? @{@}\n\
-Repetition operators, representing\n\
-\n\
-@table @code\n\
-@item *\n\
-Match zero or more times\n\
-\n\
-@item +\n\
-Match one or more times\n\
-\n\
-@item ?\n\
-Match zero or one times\n\
-\n\
-@item @{@var{n}@}\n\
-Match exactly @var{n} times\n\
-\n\
-@item @{@var{n},@}\n\
-Match @var{n} or more times\n\
-\n\
-@item @{@var{m},@var{n}@}\n\
-Match between @var{m} and @var{n} times\n\
-@end table\n\
-\n\
-@item [@dots{}] [^@dots{}]\n\
-\n\
-List operators.  The pattern will match any character listed between \"[\"\n\
-and \"]\".  If the first character is \"^\" then the pattern is inverted and\n\
-any character except those listed between brackets will match.\n\
-\n\
-Escape sequences defined below can also be used inside list operators.  For\n\
-example, a template for a floating point number might be @code{[-+.\\d]+}.\n\
-\n\
-@item () (?:)\n\
-Grouping operator.  The first form, parentheses only, also creates a token.\n\
-\n\
-@item |\n\
-Alternation operator.  Match one of a choice of regular expressions.  The\n\
-alternatives must be delimited by the grouping operator @code{()} above.\n\
-\n\
-@item ^ $\n\
-Anchoring operators.  Requires pattern to occur at the start (@code{^}) or\n\
-end (@code{$}) of the string.\n\
-@end table\n\
-\n\
-In addition, the following escaped characters have special meaning.\n\
-\n\
-@table @code\n\
-\n\
-@item \\d\n\
-Match any digit\n\
-\n\
-@item \\D\n\
-Match any non-digit\n\
-\n\
-@item \\s\n\
-Match any whitespace character\n\
-\n\
-@item \\S\n\
-Match any non-whitespace character\n\
-\n\
-@item \\w\n\
-Match any word character\n\
-\n\
-@item \\W\n\
-Match any non-word character\n\
-\n\
-@item \\<\n\
-Match the beginning of a word\n\
-\n\
-@item \\>\n\
-Match the end of a word\n\
-\n\
-@item \\B\n\
-Match within a word\n\
-@end table\n\
-\n\
-Implementation Note: For compatibility with @sc{matlab}, escape sequences\n\
-in @var{pat} (e.g., @qcode{\"@xbackslashchar{}n\"} => newline) are expanded\n\
-even when @var{pat} has been defined with single quotes.  To disable\n\
-expansion use a second backslash before the escape sequence (e.g.,\n\
-\"@xbackslashchar{}@xbackslashchar{}n\") or use the @code{regexptranslate}\n\
-function.\n\
-\n\
-The outputs of @code{regexp} default to the order given below\n\
-\n\
-@table @var\n\
-@item s\n\
-The start indices of each matching substring\n\
-\n\
-@item e\n\
-The end indices of each matching substring\n\
-\n\
-@item te\n\
-The extents of each matched token surrounded by @code{(@dots{})} in\n\
-@var{pat}\n\
-\n\
-@item m\n\
-A cell array of the text of each match\n\
-\n\
-@item t\n\
-A cell array of the text of each token matched\n\
-\n\
-@item nm\n\
-A structure containing the text of each matched named token, with the name\n\
-being used as the fieldname.  A named token is denoted by\n\
-@code{(?<name>@dots{})}.\n\
-\n\
-@item sp\n\
-A cell array of the text not returned by match, i.e., what remains if you\n\
-split the string based on @var{pat}.\n\
-@end table\n\
-\n\
-Particular output arguments, or the order of the output arguments, can be\n\
-selected by additional @var{opt} arguments.  These are strings and the\n\
-correspondence between the output arguments and the optional argument\n\
-are\n\
-\n\
-@multitable @columnfractions 0.2 0.3 0.3 0.2\n\
-@item @tab @qcode{'start'}        @tab @var{s}  @tab\n\
-@item @tab @qcode{'end'}          @tab @var{e}  @tab\n\
-@item @tab @qcode{'tokenExtents'} @tab @var{te} @tab\n\
-@item @tab @qcode{'match'}        @tab @var{m}  @tab\n\
-@item @tab @qcode{'tokens'}       @tab @var{t}  @tab\n\
-@item @tab @qcode{'names'}        @tab @var{nm} @tab\n\
-@item @tab @qcode{'split'}        @tab @var{sp} @tab\n\
-@end multitable\n\
-\n\
-Additional arguments are summarized below.\n\
-\n\
-@table @samp\n\
-@item once\n\
-Return only the first occurrence of the pattern.\n\
-\n\
-@item matchcase\n\
-Make the matching case sensitive.  (default)\n\
-\n\
-Alternatively, use (?-i) in the pattern.\n\
-\n\
-@item ignorecase\n\
-Ignore case when matching the pattern to the string.\n\
-\n\
-Alternatively, use (?i) in the pattern.\n\
-\n\
-@item stringanchors\n\
-Match the anchor characters at the beginning and end of the string.\n\
-(default)\n\
-\n\
-Alternatively, use (?-m) in the pattern.\n\
-\n\
-@item lineanchors\n\
-Match the anchor characters at the beginning and end of the line.\n\
-\n\
-Alternatively, use (?m) in the pattern.\n\
-\n\
-@item dotall\n\
-The pattern @code{.} matches all characters including the newline character.\n\
- (default)\n\
-\n\
-Alternatively, use (?s) in the pattern.\n\
-\n\
-@item dotexceptnewline\n\
-The pattern @code{.} matches all characters except the newline character.\n\
-\n\
-Alternatively, use (?-s) in the pattern.\n\
-\n\
-@item literalspacing\n\
-All characters in the pattern, including whitespace, are significant and are\n\
-used in pattern matching.  (default)\n\
-\n\
-Alternatively, use (?-x) in the pattern.\n\
-\n\
-@item freespacing\n\
-The pattern may include arbitrary whitespace and also comments beginning\n\
-with the character @samp{#}.\n\
-\n\
-Alternatively, use (?x) in the pattern.\n\
-\n\
-@item noemptymatch\n\
-Zero-length matches are not returned.  (default)\n\
-\n\
-@item emptymatch\n\
-Return zero-length matches.\n\
-\n\
-@code{regexp ('a', 'b*', 'emptymatch')} returns @code{[1 2]} because there\n\
-are zero or more @qcode{'b'} characters at positions 1 and end-of-string.\n\
-\n\
-@end table\n\
-@seealso{regexpi, strfind, regexprep}\n\
-@end deftypefn")
+       doc: /* -*- texinfo -*-
+@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexp (@var{str}, @var{pat})
+@deftypefnx {} {[@dots{}] =} regexp (@var{str}, @var{pat}, "@var{opt1}", @dots{})
+Regular expression string matching.
+
+Search for @var{pat} in @var{str} and return the positions and substrings of
+any matches, or empty values if there are none.
+
+The matched pattern @var{pat} can include any of the standard regex
+operators, including:
+
+@table @code
+@item .
+Match any character
+
+@item * + ? @{@}
+Repetition operators, representing
+
+@table @code
+@item *
+Match zero or more times
+
+@item +
+Match one or more times
+
+@item ?
+Match zero or one times
+
+@item @{@var{n}@}
+Match exactly @var{n} times
+
+@item @{@var{n},@}
+Match @var{n} or more times
+
+@item @{@var{m},@var{n}@}
+Match between @var{m} and @var{n} times
+@end table
+
+@item [@dots{}] [^@dots{}]
+
+List operators.  The pattern will match any character listed between "["
+and "]".  If the first character is "^" then the pattern is inverted and
+any character except those listed between brackets will match.
+
+Escape sequences defined below can also be used inside list operators.  For
+example, a template for a floating point number might be @code{[-+.\d]+}.
+
+@item () (?:)
+Grouping operator.  The first form, parentheses only, also creates a token.
+
+@item |
+Alternation operator.  Match one of a choice of regular expressions.  The
+alternatives must be delimited by the grouping operator @code{()} above.
+
+@item ^ $
+Anchoring operators.  Requires pattern to occur at the start (@code{^}) or
+end (@code{$}) of the string.
+@end table
+
+In addition, the following escaped characters have special meaning.
+
+@table @code
+
+@item \d
+Match any digit
+
+@item \D
+Match any non-digit
+
+@item \s
+Match any whitespace character
+
+@item \S
+Match any non-whitespace character
+
+@item \w
+Match any word character
+
+@item \W
+Match any non-word character
+
+@item \<
+Match the beginning of a word
+
+@item \>
+Match the end of a word
+
+@item \B
+Match within a word
+@end table
+
+Implementation Note: For compatibility with @sc{matlab}, escape sequences
+in @var{pat} (e.g., @qcode{"@xbackslashchar{}n"} => newline) are expanded
+even when @var{pat} has been defined with single quotes.  To disable
+expansion use a second backslash before the escape sequence (e.g.,
+"@xbackslashchar{}@xbackslashchar{}n") or use the @code{regexptranslate}
+function.
+
+The outputs of @code{regexp} default to the order given below
+
+@table @var
+@item s
+The start indices of each matching substring
+
+@item e
+The end indices of each matching substring
+
+@item te
+The extents of each matched token surrounded by @code{(@dots{})} in
+@var{pat}
+
+@item m
+A cell array of the text of each match
+
+@item t
+A cell array of the text of each token matched
+
+@item nm
+A structure containing the text of each matched named token, with the name
+being used as the fieldname.  A named token is denoted by
+@code{(?<name>@dots{})}.
+
+@item sp
+A cell array of the text not returned by match, i.e., what remains if you
+split the string based on @var{pat}.
+@end table
+
+Particular output arguments, or the order of the output arguments, can be
+selected by additional @var{opt} arguments.  These are strings and the
+correspondence between the output arguments and the optional argument
+are
+
+@multitable @columnfractions 0.2 0.3 0.3 0.2
+@item @tab @qcode{'start'}        @tab @var{s}  @tab
+@item @tab @qcode{'end'}          @tab @var{e}  @tab
+@item @tab @qcode{'tokenExtents'} @tab @var{te} @tab
+@item @tab @qcode{'match'}        @tab @var{m}  @tab
+@item @tab @qcode{'tokens'}       @tab @var{t}  @tab
+@item @tab @qcode{'names'}        @tab @var{nm} @tab
+@item @tab @qcode{'split'}        @tab @var{sp} @tab
+@end multitable
+
+Additional arguments are summarized below.
+
+@table @samp
+@item once
+Return only the first occurrence of the pattern.
+
+@item matchcase
+Make the matching case sensitive.  (default)
+
+Alternatively, use (?-i) in the pattern.
+
+@item ignorecase
+Ignore case when matching the pattern to the string.
+
+Alternatively, use (?i) in the pattern.
+
+@item stringanchors
+Match the anchor characters at the beginning and end of the string.
+(default)
+
+Alternatively, use (?-m) in the pattern.
+
+@item lineanchors
+Match the anchor characters at the beginning and end of the line.
+
+Alternatively, use (?m) in the pattern.
+
+@item dotall
+The pattern @code{.} matches all characters including the newline character.
+ (default)
+
+Alternatively, use (?s) in the pattern.
+
+@item dotexceptnewline
+The pattern @code{.} matches all characters except the newline character.
+
+Alternatively, use (?-s) in the pattern.
+
+@item literalspacing
+All characters in the pattern, including whitespace, are significant and are
+used in pattern matching.  (default)
+
+Alternatively, use (?-x) in the pattern.
+
+@item freespacing
+The pattern may include arbitrary whitespace and also comments beginning
+with the character @samp{#}.
+
+Alternatively, use (?x) in the pattern.
+
+@item noemptymatch
+Zero-length matches are not returned.  (default)
+
+@item emptymatch
+Return zero-length matches.
+
+@code{regexp ('a', 'b*', 'emptymatch')} returns @code{[1 2]} because there
+are zero or more @qcode{'b'} characters at positions 1 and end-of-string.
+
+@end table
+@seealso{regexpi, strfind, regexprep}
+@end deftypefn */)
 {
   if (args.length () < 2)
     print_usage ();
@@ -1132,17 +1132,17 @@
 */
 
 DEFUN (regexpi, args, nargout,
-       "-*- texinfo -*-\n\
-@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexpi (@var{str}, @var{pat})\n\
-@deftypefnx {} {[@dots{}] =} regexpi (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
-\n\
-Case insensitive regular expression string matching.\n\
-\n\
-Search for @var{pat} in @var{str} and return the positions and substrings of\n\
-any matches, or empty values if there are none.  @xref{XREFregexp,,regexp},\n\
-for details on the syntax of the search pattern.\n\
-@seealso{regexp}\n\
-@end deftypefn")
+       doc: /* -*- texinfo -*-
+@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexpi (@var{str}, @var{pat})
+@deftypefnx {} {[@dots{}] =} regexpi (@var{str}, @var{pat}, "@var{opt1}", @dots{})
+
+Case insensitive regular expression string matching.
+
+Search for @var{pat} in @var{str} and return the positions and substrings of
+any matches, or empty values if there are none.  @xref{XREFregexp,,regexp},
+for details on the syntax of the search pattern.
+@seealso{regexp}
+@end deftypefn */)
 {
   if (args.length () < 2)
     print_usage ();
@@ -1332,44 +1332,44 @@
 }
 
 DEFUN (regexprep, args, ,
-       "-*- texinfo -*-\n\
-@deftypefn  {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr})\n\
-@deftypefnx {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr}, \"@var{opt1}\", @dots{})\n\
-Replace occurrences of pattern @var{pat} in @var{string} with @var{repstr}.\n\
-\n\
-The pattern is a regular expression as documented for @code{regexp}.\n\
-@xref{XREFregexp,,regexp}.\n\
-\n\
-The replacement string may contain @code{$i}, which substitutes for the ith\n\
-set of parentheses in the match string.  For example,\n\
-\n\
-@example\n\
-regexprep (\"Bill Dunn\", '(\\w+) (\\w+)', '$2, $1')\n\
-@end example\n\
-\n\
-@noindent\n\
-returns \"Dunn, Bill\"\n\
-\n\
-Options in addition to those of @code{regexp} are\n\
-\n\
-@table @samp\n\
-\n\
-@item once\n\
-Replace only the first occurrence of @var{pat} in the result.\n\
-\n\
-@item warnings\n\
-This option is present for compatibility but is ignored.\n\
-\n\
-@end table\n\
-\n\
-Implementation Note: For compatibility with @sc{matlab}, escape sequences\n\
-in @var{pat} (e.g., @qcode{\"@xbackslashchar{}n\"} => newline) are expanded\n\
-even when @var{pat} has been defined with single quotes.  To disable\n\
-expansion use a second backslash before the escape sequence (e.g.,\n\
-\"@xbackslashchar{}@xbackslashchar{}n\") or use the @code{regexptranslate}\n\
-function.\n\
-@seealso{regexp, regexpi, strrep}\n\
-@end deftypefn")
+       doc: /* -*- texinfo -*-
+@deftypefn  {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr})
+@deftypefnx {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr}, "@var{opt1}", @dots{})
+Replace occurrences of pattern @var{pat} in @var{string} with @var{repstr}.
+
+The pattern is a regular expression as documented for @code{regexp}.
+@xref{XREFregexp,,regexp}.
+
+The replacement string may contain @code{$i}, which substitutes for the ith
+set of parentheses in the match string.  For example,
+
+@example
+regexprep ("Bill Dunn", '(\w+) (\w+)', '$2, $1')
+@end example
+
+@noindent
+returns "Dunn, Bill"
+
+Options in addition to those of @code{regexp} are
+
+@table @samp
+
+@item once
+Replace only the first occurrence of @var{pat} in the result.
+
+@item warnings
+This option is present for compatibility but is ignored.
+
+@end table
+
+Implementation Note: For compatibility with @sc{matlab}, escape sequences
+in @var{pat} (e.g., @qcode{"@xbackslashchar{}n"} => newline) are expanded
+even when @var{pat} has been defined with single quotes.  To disable
+expansion use a second backslash before the escape sequence (e.g.,
+"@xbackslashchar{}@xbackslashchar{}n") or use the @code{regexptranslate}
+function.
+@seealso{regexp, regexpi, strrep}
+@end deftypefn */)
 {
   if (args.length () < 3)
     print_usage ();