diff options
| -rwxr-xr-x | doc/genps.pl | 18 | ||||
| -rw-r--r-- | doc/nasmdoc.src | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/doc/genps.pl b/doc/genps.pl index 5517d844..6447564c 100755 --- a/doc/genps.pl +++ b/doc/genps.pl @@ -217,7 +217,8 @@ sub string2array($) my($s) = @_; my(@a) = (); - $s =~ s/ \- / $charcode{'endash'} /g; # Replace " - " with en dash + $s =~ s/\B\-\-\B/$charcode{'emdash'}/g; + $s =~ s/\B\-\B/ $charcode{'endash'} /g; while ( $s =~ /^(\s+|\S+)(.*)$/ ) { push(@a, [0,$1]); @@ -594,11 +595,16 @@ unshift(@ptypes, @tocptypes); undef @tocptypes; # # Add copyright notice to the beginning # -unshift(@paras, - [[0, $charcode{'copyright'}], [0, ' '], [0,$metadata{'year'}], - [0, ' '], string2array($metadata{'author'})], - [string2array($metadata{'license'})]); -unshift(@ptypes, 'norm', 'norm'); +@copyright_page = +([[0, $charcode{'copyright'}], + [0, ' '], [0, $metadata{'year'}], + [0, ' '], string2array($metadata{'author'}), + [0, ' '], string2array($metadata{'copyright_tail'})], + [string2array($metadata{'license'})], + [string2array($metadata{'auxinfo'})]); + +unshift(@paras, @copyright_page); +unshift(@ptypes, ('norm') x scalar(@copyright_page)); $npara = scalar(@paras); diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index 81e414c9..b3eaab2d 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -3,9 +3,11 @@ \# \M{category}{Programming} \M{title}{NASM - The Netwide Assembler} -\M{year}{2009} +\M{year}{1996-2009} \M{author}{The NASM Development Team} -\M{license}{All rights reserved. This document is redistributable under the license given in the file "COPYING" distributed in the NASM archive.} +\M{copyright_tail}{-- All Rights Reserved} +\M{license}{This document is redistributable under the license given in the file "COPYING" distributed in the NASM archive.} +\M{auxinfo}{This release is dedicated to the memory of Charles A. Crayne. We miss you, Chuck.} \M{summary}{This file documents NASM, the Netwide Assembler: an assembler targetting the Intel x86 series of processors, with portable source.} \M{infoname}{NASM} \M{infofile}{nasm} |