Mercurial > hg > octave-lojdl
changeset 15830:5b3e56d588b1 stable
maint: Use Octave 2-space indent for helper Perl scripts.
* doc/interpreter/munge-texi.pl, scripts/mkdoc.pl: Use Octave 2-space indent
for helper Perl scripts.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Thu, 07 Jun 2012 11:08:30 -0700 |
parents | 425c075e3c70 |
children | 1cdca9bf7b7e |
files | doc/interpreter/munge-texi.pl scripts/mkdoc.pl |
diffstat | 2 files changed, 79 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/munge-texi.pl +++ b/doc/interpreter/munge-texi.pl @@ -16,29 +16,29 @@ # Load DOCSTRINGS into memory while expanding @seealso references foreach $DOCSTRING_file (@ARGV) { - open (DOCFH, $DOCSTRING_file) or die "Unable to open $DOCSTRING_file\n"; + open (DOCFH, $DOCSTRING_file) or die "Unable to open $DOCSTRING_file\n"; - # Skip comments - while (defined ($_ = <DOCFH>) and /$comment_line/o) {;} + # Skip comments + while (defined ($_ = <DOCFH>) and /$comment_line/o) {;} - # Validate DOCSTRING file format - die "invalid doc file format\n" if (! /$doc_delim/o); - - do - { - chomp; - $symbol = substr ($_,1); - $docstring = extract_docstring (); - if ($help_text{$symbol}) - { - warn "ignoring duplicate entry for $symbol\n"; - } - else - { - $help_text{$symbol} = $docstring; - } + # Validate DOCSTRING file format + die "invalid doc file format\n" if (! /$doc_delim/o); + + do + { + chomp; + $symbol = substr ($_,1); + $docstring = extract_docstring (); + if ($help_text{$symbol}) + { + warn "ignoring duplicate entry for $symbol\n"; + } + else + { + $help_text{$symbol} = $docstring; + } - } while (! eof); + } while (! eof); } @@ -50,40 +50,40 @@ TXI_LINE: while (<STDIN>) { - if (/^\s*\@DOCSTRING\((\S+)\)/) - { - $func = $1; - $docstring = $help_text{$func}; - if (! $docstring) - { - warn "no docstring entry for $func\n"; - next TXI_LINE; - } - - $func =~ s/^@/@@/; # Texinfo uses @@ to produce '@' - $docstring =~ s/^$tex_delim$/\@anchor{doc-$func}/m; - print $docstring,"\n"; - + if (/^\s*\@DOCSTRING\((\S+)\)/) + { + $func = $1; + $docstring = $help_text{$func}; + if (! $docstring) + { + warn "no docstring entry for $func\n"; next TXI_LINE; - } - if (/^\s*\@EXAMPLEFILE\((\S+)\)/) - { - $fname = "$top_srcdir/examples/$1"; - print '@verbatim',"\n"; - open (EXAMPFH, $fname) or die "unable to open example file $fname\n"; - while (<EXAMPFH>) - { - print $_; - print "\n" if (eof and substr ($_, -1) ne "\n"); - } - close (EXAMPFH); - print '@end verbatim',"\n\n"; + } + + $func =~ s/^@/@@/; # Texinfo uses @@ to produce '@' + $docstring =~ s/^$tex_delim$/\@anchor{doc-$func}/m; + print $docstring,"\n"; - next TXI_LINE; - } + next TXI_LINE; + } + if (/^\s*\@EXAMPLEFILE\((\S+)\)/) + { + $fname = "$top_srcdir/examples/$1"; + print '@verbatim',"\n"; + open (EXAMPFH, $fname) or die "unable to open example file $fname\n"; + while (<EXAMPFH>) + { + print $_; + print "\n" if (eof and substr ($_, -1) ne "\n"); + } + close (EXAMPFH); + print '@end verbatim',"\n\n"; - # pass ordinary lines straight through to output - print $_; + next TXI_LINE; + } + + # pass ordinary lines straight through to output + print $_; } @@ -92,33 +92,33 @@ ################################################################################ sub extract_docstring { - my ($docstring, $arg_list, $func_list, $repl, $rest_of_line); - - while (defined ($_ = <DOCFH>) and ! /$doc_delim/o) - { - # expand any @seealso references - if (m'^@seealso{') - { - # Join multiple lines until full macro body found - while (! /}/m) { $_ .= <DOCFH>; } + my ($docstring, $arg_list, $func_list, $repl, $rest_of_line); + + while (defined ($_ = <DOCFH>) and ! /$doc_delim/o) + { + # expand any @seealso references + if (m'^@seealso{') + { + # Join multiple lines until full macro body found + while (! /}/m) { $_ .= <DOCFH>; } - ($arg_list, $rest_of_line) = m'^@seealso{(.*)}(.*)?'s; - - $func_list = $arg_list; - $func_list =~ s/\s+//gs; - $repl = ""; - foreach $func (split (/,/, $func_list)) - { - $func =~ s/^@/@@/; # Texinfo uses @@ to produce '@' - $repl .= "\@ref{doc-$func,,$func}, "; - } - substr($repl,-2) = ""; # Remove last ', ' - $_ = "\@seealso{$repl}$rest_of_line"; + ($arg_list, $rest_of_line) = m'^@seealso{(.*)}(.*)?'s; + + $func_list = $arg_list; + $func_list =~ s/\s+//gs; + $repl = ""; + foreach $func (split (/,/, $func_list)) + { + $func =~ s/^@/@@/; # Texinfo uses @@ to produce '@' + $repl .= "\@ref{doc-$func,,$func}, "; } + substr($repl,-2) = ""; # Remove last ', ' + $_ = "\@seealso{$repl}$rest_of_line"; + } - $docstring .= $_; - } + $docstring .= $_; + } - return $docstring; + return $docstring; }
--- a/scripts/mkdoc.pl +++ b/scripts/mkdoc.pl @@ -44,11 +44,10 @@ $full_fname = $srcdir . $m_fname; next MFILE unless ( $full_fname =~ m{(.*)/(@|)([^/]*)/(.*)\.m} ); - if ($2) { - $fcn = "$2$3/$4"; - } else { - $fcn = $4; - } + if ($2) + { $fcn = "$2$3/$4"; } + else + { $fcn = $4; } @help_txt = gethelp ($fcn, $full_fname); next MFILE if ($help_txt[0] eq "");