Module Name:    src
Committed By:   martin
Date:           Tue Nov 19 13:20:08 UTC 2019

Modified Files:
        src/share/man/man7 [netbsd-9]: ascii.7

Log Message:
Pull up following revision(s) (requested by sevan in ticket #454):

        share/man/man7/ascii.7: revision 1.14
        share/man/man7/ascii.7: revision 1.15

Document standards and correct history.
via Free / OpenBSD.

Sync with FreeBSD which capitalizes the control character names, and adds
a binary set.

Add a table with the full names for the control character set.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 src/share/man/man7/ascii.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man7/ascii.7
diff -u src/share/man/man7/ascii.7:1.13 src/share/man/man7/ascii.7:1.13.6.1
--- src/share/man/man7/ascii.7:1.13	Sun Feb 11 13:31:17 2018
+++ src/share/man/man7/ascii.7	Tue Nov 19 13:20:07 2019
@@ -1,5 +1,4 @@
-.\"	$NetBSD: ascii.7,v 1.13 2018/02/11 13:31:17 wiz Exp $
-.\"
+.\" $NetBSD: ascii.7,v 1.13.6.1 2019/11/19 13:20:07 martin Exp $
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -28,23 +27,26 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ascii.7	8.1 (Berkeley) 6/5/93
+.\" $FreeBSD: head/share/man/man7/ascii.7 325217 2017-10-31 06:43:37Z eadler $
 .\"
-.Dd February 8, 2017
+.Dd November 19, 2019
 .Dt ASCII 7
 .Os
 .Sh NAME
 .Nm ascii
-.Nd octal, hexadecimal and decimal ASCII character sets
+.Nd octal, hexadecimal, decimal and binary
+.Tn ASCII
+character sets
 .Sh DESCRIPTION
 The
 .Nm octal
 set:
 .Bd -literal -offset left
-000 nul  001 soh  002 stx  003 etx  004 eot  005 enq  006 ack  007 bel
-010 bs   011 ht   012 nl   013 vt   014 np   015 cr   016 so   017 si
-020 dle  021 dc1  022 dc2  023 dc3  024 dc4  025 nak  026 syn  027 etb
-030 can  031 em   032 sub  033 esc  034 fs   035 gs   036 rs   037 us
-040 sp   041  !   042  "   043  #   044  $   045  %   046  &   047  '
+000 NUL  001 SOH  002 STX  003 ETX  004 EOT  005 ENQ  006 ACK  007 BEL
+010 BS   011 HT   012 LF   013 VT   014 FF   015 CR   016 SO   017 SI
+020 DLE  021 DC1  022 DC2  023 DC3  024 DC4  025 NAK  026 SYN  027 ETB
+030 CAN  031 EM   032 SUB  033 ESC  034 FS   035 GS   036 RS   037 US
+040 SP   041  !   042  "   043  #   044  $   045  %   046  &   047  '
 050  (   051  )   052  *   053  +   054  ,   055  -   056  .   057  /
 060  0   061  1   062  2   063  3   064  4   065  5   066  6   067  7
 070  8   071  9   072  :   073  ;   074  <   075  =   076  >   077  ?
@@ -55,18 +57,18 @@ set:
 140  `   141  a   142  b   143  c   144  d   145  e   146  f   147  g
 150  h   151  i   152  j   153  k   154  l   155  m   156  n   157  o
 160  p   161  q   162  r   163  s   164  t   165  u   166  v   167  w
-170  x   171  y   172  z   173  {   174  |   175  }   176  ~   177 del
+170  x   171  y   172  z   173  {   174  |   175  }   176  ~   177 DEL
 .Ed
 .Pp
 The
 .Nm hexadecimal
 set:
 .Bd -literal -offset left
-00 nul   01 soh   02 stx   03 etx   04 eot   05 enq   06 ack   07 bel
-08 bs    09 ht    0a nl    0b vt    0c np    0d cr    0e so    0f si
-10 dle   11 dc1   12 dc2   13 dc3   14 dc4   15 nak   16 syn   17 etb
-18 can   19 em    1a sub   1b esc   1c fs    1d gs    1e rs    1f us
-20 sp    21  !    22  "    23  #    24  $    25  %    26  &    27  '
+00 NUL   01 SOH   02 STX   03 ETX   04 EOT   05 ENQ   06 ACK   07 BEL
+08 BS    09 HT    0a LF    0b VT    0c FF    0d CR    0e SO    0f SI
+10 DLE   11 DC1   12 DC2   13 DC3   14 DC4   15 NAK   16 SYN   17 ETB
+18 CAN   19 EM    1a SUB   1b ESC   1c FS    1d GS    1e RS    1f US
+20 SP    21  !    22  "    23  #    24  $    25  %    26  &    27  '
 28  (    29  )    2a  *    2b  +    2c  ,    2d  -    2e  .    2f  /
 30  0    31  1    32  2    33  3    34  4    35  5    36  6    37  7
 38  8    39  9    3a  :    3b  ;    3c  <    3d  =    3e  >    3f  ?
@@ -77,18 +79,18 @@ set:
 60  \`    61  a    62  b    63  c    64  d    65  e    66  f    67  g
 68  h    69  i    6a  j    6b  k    6c  l    6d  m    6e  n    6f  o
 70  p    71  q    72  r    73  s    74  t    75  u    76  v    77  w
-78  x    79  y    7a  z    7b  {    7c  |    7d  }    7e  ~    7f del
+78  x    79  y    7a  z    7b  {    7c  |    7d  }    7e  ~    7f DEL
 .Ed
 .Pp
 The
 .Nm decimal
 set:
 .Bd -literal -offset left
-  0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel
-  8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si
- 16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb
- 24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us
- 32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '
+  0 NUL    1 SOH    2 STX    3 ETX    4 EOT    5 ENQ    6 ACK    7 BEL
+  8 BS     9 HT    10 LF    11 VT    12 FF    13 CR    14 SO    15 SI
+ 16 DLE   17 DC1   18 DC2   19 DC3   20 DC4   21 NAK   22 SYN   23 ETB
+ 24 CAN   25 EM    26 SUB   27 ESC   28 FS    29 GS    30 RS    31 US
+ 32 SP    33  !    34  "    35  #    36  $    37  %    38  &    39  '
  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /
  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7
  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?
@@ -99,24 +101,99 @@ set:
  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g
 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o
 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w
-120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del
+120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 DEL
+.Ed
+.Pp
+The
+.Nm binary
+set:
+.Bd -literal -offset left
+ 00     01     10     11
+
+NUL     SP      @      `     00000
+SOH      !      A      a     00001
+STX      "      B      b     00010
+ETX      #      C      c     00011
+EOT      $      D      d     00100
+ENQ      %      E      e     00101
+ACK      &      F      f     00110
+BEL      '      G      g     00111
+ BS      (      H      h     01000
+ HT      )      I      i     01001
+ LF      *      J      j     01010
+ VT      +      K      k     01011
+ FF      ,      L      l     01100
+ CR      -      M      m     01101
+ SO      .      N      n     01110
+ SI      /      O      o     01111
+DLE      0      P      p     10000
+DC1      1      Q      q     10001
+DC2      2      R      r     10010
+DC3      3      S      s     10011
+DC4      4      T      t     10100
+NAK      5      U      u     10101
+SYN      6      V      v     10110
+ETB      7      W      w     10111
+CAN      8      X      x     11000
+ EM      9      Y      y     11001
+SUB      :      Z      z     11010
+ESC      ;      [      {     11011
+ FS      <      \e\      |     11100
+ GS      =      ]      }     11101
+ RS      >      ^      -     11110
+ US      ?      _    DEL     11111
 .Ed
 .Pp
-Note that the
-.Dv nl
-and
-.Dv np
-characters in the original ASCII specification are
-.Dv lf
-and
-.Dv ff
-respectively.
+The full
+.Nm names
+of the control character set:
+.Bd -literal -offset left
+NUL      NULl
+SOH      Start Of Heading
+STX      Start Of Text
+ETX      End Of Text
+EOT      End Of Transmission
+ENQ      ENQuiry
+ACK      ACKnowledge
+BEL      BELl
+ BS      BackSpace
+ HT      Horizontal Tab
+ LF      Line Feed (new line)
+ VT      Vertical Tab
+ FF      new page Form Feed
+ CR      Carriage Return
+ SO      Shift Out
+ SI      Shift In
+DLE      Data Link Escape
+DC1      Device Control 1
+DC2      Device Control 2
+DC3      Device Control 3
+DC4      Device Control 4
+NAK      Negative AcKnowledge
+SYN      SYNchronous idle
+ETB      End of Transmission Block
+CAN      CANcel
+ EM      End of Medium
+SUB      SUBstitute
+ESC      ESCape
+ FS      File Separator
+ GS      Group Separator
+ RS      Record Separator
+ US      Unit Separator
+.Ed
 .Sh FILES
 .Bl -tag -width /usr/share/misc/ascii -compact
 .It Pa /usr/share/misc/ascii
 .El
+.Sh STANDARDS
+.Rs
+.%T Information Systems - Coded Character Sets - 7-Bit American National\
+Standard Code for Information Interchange (7-Bit ASCII)
+.%R INCITS 4-1986[R2017]
+.%Q InterNational Committee for Information Technology Standards
+.Re
 .Sh HISTORY
 An
 .Nm
 manual page appeared in
-.At v7 .
+.At v2 .

Reply via email to