Revise tagset.txt

* tagset.txt: Review.

* README: Reformat.
* webfont.txt: Reformat.  Document <and/ and <or/.

3 files changed, 1385 insertions, 1337 deletions

diff --git a/README b/README
index b8d21ad..4a36e8b 100644
--- a/README
+++ b/README
@@ -8,29 +8,27 @@ The README file
     * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 * OVERVIEW
-==========
-This document describes the GNU version of the Collaborative
-International Dictionary of English.  It is organized into a series of
-chapters, introduced by headings beginning with a single asterisk.  A
-chapter may have sections, which are marked with two asterisks.  For
-those readers who use Emacs, this structure corresponds to its
-"Outline mode", which will be enabled automatically upon loading this
-file.
-
-The chapter "INTRODUCTION" describes the structure of this package.
-The chapter "STRUCTURE OF THE DICTIONARY" describes the dictionary
-structure in general.  An overview of the markup tags is provided in
-the chapter "TAGS".  A detailed information about dictionary markup
-can be obtained from a set of ancillary files included in this
-package, which are described in the chapter "ANCILLARY FILES".
-
-The chapter "DICTIONARY LOOKUP" describes how to use GNU Dico for
-reading this dictionary.  Finally, other versions of the Webster
-dictionary are listed in the chapter "OTHER VERSIONS OF THE
-DICTIONARY".
+
+This document describes the GNU version of the Collaborative International
+Dictionary of English.  It is organized into a series of chapters,
+introduced by headings beginning with a single asterisk.  A chapter may have
+sections, which are marked with two asterisks.  For those readers who use
+Emacs, this structure corresponds to its "Outline mode", which will be
+enabled automatically upon loading this file.
+
+The chapter "INTRODUCTION" describes the structure of this package.  The
+chapter "STRUCTURE OF THE DICTIONARY" describes the dictionary structure in
+general.  An overview of the markup tags is provided in the chapter "TAGS".
+A detailed information about dictionary markup can be obtained from a set of
+ancillary files included in this package, which are described in the chapter
+"ANCILLARY FILES".
+
+The chapter "DICTIONARY LOOKUP" describes how to use GNU Dico for reading
+this dictionary.  Finally, other versions of the Webster dictionary are
+listed in the chapter "OTHER VERSIONS OF THE DICTIONARY".
     
 * INTRODUCTION
-==============
+
 The dictionary was derived from the
          Webster's Revised Unabridged Dictionary
                  Version published 1913
@@ -48,18 +46,17 @@ and has been supplemented with some of the definitions from
 
 and is being proof-read and supplemented by volunteers from around the
 world.  This is an unfunded project, and future enhancement of this
-dictionary will depend on the efforts of volunteers willing to help
-build this free resource into a comprehensive body of general
-information.  New definitions for missing words or words senses and
-longer explanatory notes, as well as images to accompany the articles
-are needed.  More modern illustrative quotations giving recent
-examples of usage of the words in their various senses will be very
-helpful, since most quotations in the original 1913 dictionary are now
-well over 100 years old.
-
-This electronic version is being maintained by World Soul, a
-non-profit organization in Plainfield, NJ.  For additional information
-or if you are willing to assist construction of this data source, contact:
+dictionary will depend on the efforts of volunteers willing to help build
+this free resource into a comprehensive body of general information.  New
+definitions for missing words or words senses and longer explanatory notes,
+as well as images to accompany the articles are needed.  More modern
+illustrative quotations giving recent examples of usage of the words in
+their various senses will be very helpful, since most quotations in the
+original 1913 dictionary are now well over 100 years old.
+
+This electronic version is being maintained by World Soul, a non-profit
+organization in Plainfield, NJ.  For additional information or if you are
+willing to assist construction of this data source, contact:
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
  Patrick J. Cassidy              | TEL:          (908) 561-3416
@@ -69,40 +66,38 @@ or if you are willing to assist construction of this data source, contact:
  pc@worldsoul.org   or  cassidy@micra.com
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-GCIDE is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCIDE is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2, or (at your option) any later version.
 
-GCIDE is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCIDE is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details.
 
-You should have received a copy of the GNU General Public License
-along with this copy of GCIDE; see the file COPYING.  If not, write 
-to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along with
+this copy of GCIDE; see the file COPYING.  If not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 
 * STRUCTURE OF THE DICTIONARY
-=============================
-When the archive is unpacked, the main dictionary text of the GCIDE
-will be found in 26 files named "CIDE.*", where the asterisk indicates
-which letter of the alphabet begins the words in each file.  For
-example, file "CIDE.B" contains words beginning with the letter "B".
-Additional information about the tagging conventions and special
-character symbols are contained in ancillary files in this directory
-(see below the section entitled "ANCILLARY FILES").  The main body of
-the 1913 dictionary was essentially identical to the edition published
-in 1890, and was republished in 1913 with an appendix containing "New
-Words".  The new words of that appendix have been integrated into the
-main file in this version.  However, it is important to keep in mind
-that the definitions in this dictionary are in most cases over 100
+
+When the archive is unpacked, the main dictionary text of the GCIDE will be
+found in 26 files named "CIDE.*", where the asterisk indicates which letter
+of the alphabet begins the words in each file.  For example, file "CIDE.B"
+contains words beginning with the letter "B".  Additional information about
+the tagging conventions and special character symbols are contained in
+ancillary files in this directory (see below the section entitled "ANCILLARY
+FILES").  The main body of the 1913 dictionary was essentially identical to
+the edition published in 1890, and was republished in 1913 with an appendix
+containing "New Words".  The new words of that appendix have been integrated
+into the main file in this version.  However, it is important to keep in
+mind that the definitions in this dictionary are in most cases over 100
 years old.  Use them with caution!
 
-At the bottom of each paragraph in this dictionary, there is a
-bracketed and tagged "source" indicated.  This tells from where the
-definition or other text in that paragraph came, as follows:
+At the bottom of each paragraph in this dictionary, there is a bracketed and
+tagged "source" indicated.  This tells from where the definition or other
+text in that paragraph came, as follows:
 
 [<source>1913 Webster</source>]
   =  From the original 1890 dictionary.
@@ -117,46 +112,42 @@ definition or other text in that paragraph came, as follows:
 [<source>XXX</source>]
    = Added by one of the volunteers.
 
-The original definitions have been tagged and in some cases
-reformatted or slightly rearranged.  If substantive information is
-added from a second source, usually the additional source is also
-noted, as in:
+The original definitions have been tagged and in some cases reformatted or
+slightly rearranged.  If substantive information is added from a second
+source, usually the additional source is also noted, as in:
 
 [<source>Webster 1913 Suppl.</source> + <source>WordNet 1.5</source>]
 
-This version is tagged with SGML-like tags of the form <pos>...</pos> 
-so that the original typography (italics, bold, block quotes) can be
-reproduced.  A list of the most important tags for fields in the
-dictionary is given below.  The tags also serve the more important
-function of allowing the information content to be conveniently
-imported into computer programs or databases.  The set of tags used is
-described in the accompanying file "tagset.txt".  ***NOTE*** the
-paragraph tags <p>...</p> do *not* always nest properly with certain
-other tags, such as <note> and <cs> ("collocation section"), which in
-some cases span multiple paragraphs.  If you are using a tag parser
-which detects improper nesting, you should first either delete the
-paragraph tags or convert them to non-tag symbols, or, if possible,
-set the parser to ignore the <p>...</p> tags.
-
-The unusual characters (such as Greek or the European accented
-characters, as well as special characters used in the pronunciations)
-are described in the accompanying file "webfont.txt".  Some
-information on the pronunciation system used may be found by viewing
-the file "pronunc.jpg", and additional explanations of pronunciation
-are in the file "pronunc.txt".
-
-Each paragraph of the original text is enclosed within tags of the
-form <p> . . . </p>.  Within these paragraphs there are no line
-breaks, and some of the paragraphs are over 12,000 characters long,
-which may prove too long to be handled by some editors.  At some
-points, embedded line breaks within a "paragraph" are marked by a <br/
-"entity".  The file can therefore be converted, if necessary, to a
-form with shorter lines, and subsequently reconverted back to the form
-having one line per paragraph.
-
-If additional line breaks are added, then in order to remove the line
-breaks and reconstruct the original paragraphs, so that the page width
-can be adjusted, perform the following manipulations:
+This version is tagged with SGML-like tags of the form <pos>...</pos> so
+that the original typography (italics, bold, block quotes) can be
+reproduced.  A list of the most important tags for fields in the dictionary
+is given below.  The tags also serve the more important function of allowing
+the information content to be conveniently imported into computer programs
+or databases.  The set of tags used is described in the accompanying file
+"tagset.txt".  ***NOTE*** the paragraph tags <p>...</p> do *not* always nest
+properly with certain other tags, such as <note> and <cs> ("collocation
+section"), which in some cases span multiple paragraphs.  If you are using a
+tag parser which detects improper nesting, you should first either delete
+the paragraph tags or convert them to non-tag symbols, or, if possible, set
+the parser to ignore the <p>...</p> tags.
+
+The unusual characters (such as Greek or the European accented characters,
+as well as special characters used in the pronunciations) are described in
+the accompanying file "webfont.txt".  Some information on the pronunciation
+system used may be found by viewing the file "pronunc.jpg", and additional
+explanations of pronunciation are in the file "pronunc.txt".
+
+Each paragraph of the original text is enclosed within tags of the form <p>
+. . . </p>.  Within these paragraphs there are no line breaks, and some of
+the paragraphs are over 12,000 characters long, which may prove too long to
+be handled by some editors.  At some points, embedded line breaks within a
+"paragraph" are marked by a <br/ "entity".  The file can therefore be
+converted, if necessary, to a form with shorter lines, and subsequently
+reconverted back to the form having one line per paragraph.
+
+If additional line breaks are added, then in order to remove the line breaks
+and reconstruct the original paragraphs, so that the page width can be
+adjusted, perform the following manipulations:
 
   (1) convert each line break to a space.
   (2) convert the string "</p>  " (</p> followed by two spaces)
@@ -164,46 +155,43 @@ can be adjusted, perform the following manipulations:
   (3) convert the string "<br/ " (<br/ followed by one space)
      to <br/ followed by one line break.
      
-A more sophisticated formatting of spaces within paragraphs may
-require the use of the fully-tagged master files.  If you have a need
-for these files, contact Patrick Cassidy: cassidy@micra.com. 
-
-The approximate beginning of each page is marked by an SGML comment of
-the form <-- p. 345 -->.  (The exact beginning was in some cases in
-the middle of a paragraph, which we decided was not a good location
-for these page-number comments, so the page number was usually moved
+A more sophisticated formatting of spaces within paragraphs may require the
+use of the fully-tagged master files.  If you have a need for these files,
+contact Patrick Cassidy: cassidy@micra.com.
+
+The approximate beginning of each page is marked by an SGML comment of the
+form <-- p. 345 -->.  (The exact beginning was in some cases in the middle
+of a paragraph, which we decided was not a good location for these
+page-number comments, so the page number was usually moved to the next