Mercurial > hg > octave-nkf > gnulib-hg
changeset 12513:cf6ad3a90b8b
pmccabe2html: emit consistent FSF copyright; remove trailing blanks
* build-aux/pmccabe2html: Insert comma before "Inc." in emitted
FSF copyright line. Remove trailing blanks.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Mon, 28 Dec 2009 11:46:43 +0100 |
parents | 558cae4c8f2d |
children | db9473a84ec3 |
files | ChangeLog build-aux/pmccabe2html |
diffstat | 2 files changed, 42 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-28 Jim Meyering <meyering@redhat.com> + + pmccabe2html: emit consistent FSF copyright; remove trailing blanks + * build-aux/pmccabe2html: Insert comma before "Inc." in emitted + FSF copyright line. Remove trailing blanks. + 2009-12-28 Eric Blake <ebb9@byu.net> test-dup2: reduce dependencies
--- a/build-aux/pmccabe2html +++ b/build-aux/pmccabe2html @@ -64,7 +64,7 @@ html_prolog = "<a href=\"" url "\">Back to " package_name " Homepage</a><br/><br/>" } html_epilog = "<hr color=\"black\" size=\"2\"/> \ -Copyright (c) 2007, 2008 Free Software Foundation Inc." +Copyright (c) 2007, 2008 Free Software Foundation, Inc." html_doctype = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \ \"http://www.w3.org/TR/html401/loose.dtd\">" html_comment = "<!-- Generated by gnulib's pmccabe2html at " systime() " -->" @@ -135,22 +135,22 @@ { print "<caption class=\"function_table_caption\">" caption "</caption>" } - html_fnc_header(fname_p, - mcyclo_p, - cyclo_p, - num_statements_p, - num_lines_p, - first_line_p, + html_fnc_header(fname_p, + mcyclo_p, + cyclo_p, + num_statements_p, + num_lines_p, + first_line_p, file_p) for (nfnc = 1; nfnc < nfuncs; nfnc++) { html_fnc(nfnc, - fname_p, - mcyclo_p, - cyclo_p, - num_statements_p, - num_lines_p, - first_line_p, + fname_p, + mcyclo_p, + cyclo_p, + num_statements_p, + num_lines_p, + first_line_p, file_p) } print "</table>" @@ -307,7 +307,7 @@ if (mcyclo[nfun] > cyclo_high_max) { trclass="function_entry_untestable" - } + } else if (mcyclo[nfun] > cyclo_moderate_max) { trclass="function_entry_high" @@ -391,7 +391,7 @@ { print file[nfun] } - + print "</td>" @@ -409,7 +409,7 @@ if (num_lines_p) { num_columns++ } if (first_line_p) { num_columns++ } if (file_p) { num_columns++ } - + print "<td colspan=\"" num_columns "\" height=\"0\">" print "<div id=\"" fname "_src\" class=\"function_src\" style=\"position: relative; display: none;\">" print "<pre class=\"function_src\">" @@ -419,7 +419,7 @@ sub(/\\</, "<", codeline) sub(/\\>/, ">", codeline) sub(/&/, "&", codeline) - + print codeline } close(fname nfun "_fn.txt") @@ -517,7 +517,7 @@ print "Simple module, without much risk" print "</td>" print "</tr>" - # Moderate + # Moderate print "<tr>" print "<td class=\"ranges_entry_moderate\">" print " " @@ -589,7 +589,7 @@ print "==Details for all functions==" print "Used ranges:" - + print "{| class =\"cyclo_ranges_table\"" print "|-" print "| class=\"cyclo_ranges_header_entry\" | " @@ -646,22 +646,22 @@ { print "|+" caption } - wiki_fnc_header(fname_p, - mcyclo_p, - cyclo_p, - num_statements_p, - num_lines_p, - first_line_p, + wiki_fnc_header(fname_p, + mcyclo_p, + cyclo_p, + num_statements_p, + num_lines_p, + first_line_p, file_p) for (nfnc = 1; nfnc < nfuncs; nfnc++) { wiki_fnc(nfnc, - fname_p, - mcyclo_p, - cyclo_p, - num_statements_p, - num_lines_p, - first_line_p, + fname_p, + mcyclo_p, + cyclo_p, + num_statements_p, + num_lines_p, + first_line_p, file_p) } print "|}" @@ -724,7 +724,7 @@ if (mcyclo[nfnc] > cyclo_high_max) { trclass="cyclo_function_entry_untestable" - } + } else if (mcyclo[nfnc] > cyclo_moderate_max) { trclass="cyclo_function_entry_high" @@ -773,7 +773,7 @@ href = source_file_link_tmpl sub(/%FILENAME%/, file[nfnc], href) } - + # Source file print "| class=\"cyclo_function_entry_filename\" |" \ ((href != "") ? "[" href " " file[nfnc] "]" : "[" file[nfnc] "]") @@ -838,7 +838,7 @@ } # Print prolog - if ((output_lang == "html") && + if ((output_lang == "html") && (html_prolog != "")) { print html_prolog @@ -884,9 +884,9 @@ wiki_function_cyclo() } } - + # Print epilog - if ((output_lang == "html") && + if ((output_lang == "html") && (html_epilog != "")) { print html_epilog