Revise tagset.txt

* tagset.txt: Review.

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

1 files changed, 153 insertions, 149 deletions

diff --git a/webfont.txt b/webfont.txt
index d432fe5..f7423e1 100644
--- a/webfont.txt
+++ b/webfont.txt
@@ -3,163 +3,169 @@
 
 * Overview
 
-This file describes special symbols and markup entities used in the
-GNU Collaborative International Dictionary of English.
+This file describes special symbols and markup entities used in the GNU
+Collaborative International Dictionary of English.
 
 * Introduction
 
-The special characters used in the electronic version of the Webster
-1913 are required for visualizing unusual characters used in the
-etymology and pronunciation fields of the dictionary, in a form
-comparable to the way they appear in the original.
+The special characters used in the electronic version of the Webster 1913
+are required for visualizing unusual characters used in the etymology and
+pronunciation fields of the dictionary, in a form comparable to the way they
+appear in the original.
 
-The GCIDE markup provides two ways for representing such characters:
-using special "escape sequences" and using special markup entities.
-Historically, "escape sequences" were used to indicate the
-character's ordinal position in a special font, prepared by MICRA,
-Inc. to represent it on screen.  Although nowadays this method is
-obsolete, the dictionary corpus still uses these sequences.  This file
-describes their mapping to Unicode characters.
+The GCIDE markup provides two ways for representing such characters: using
+special "escape sequences" and using special markup entities.  Historically,
+"escape sequences" were used to indicate the character's ordinal position in
+a special font, prepared by MICRA, Inc. to represent it on screen.  Although
+nowadays this method is obsolete, the dictionary corpus still uses these
+sequences.  This file describes their mapping to Unicode characters.
 
 An escape sequence has the form \'xx, where "x" represent lowercase
-hexadecimal digits.  For example, \'94 stands for "o" with diaeresis.
-There are only 256 such sequences.
-
-Special markup entities are able to represent a wider range of
-characters.  A markup entity is similar to SGML one, but has a
-different format.  The traditional &xx; format was judged inconvenient
-because the ampersand is used frequently in the corpus.  Instead,
-GCIDE entities have the format <WORD/, where "<" and "/" represent the
-beginning and end of the entity and WORD represents the character
-itself.  Valid WORDs are in some cases abbreviations (for compactness)
-of the ISO 8879 recommended symbols.  Characters representable by
-escape sequences can also be represented by entities, but the reverse
-is not true, due to a limited range of the former.
-
-The Greek words appearing in the etymologies, when they are included,
-are typed in a roman-letter transcription, which is described below in
-chapter "Greek transliteration".
+hexadecimal digits.  For example, \'94 stands for "o" with diaeresis.  There
+are only 256 such sequences.
+
+Special markup entities are able to represent a wider range of characters.
+A markup entity is similar to SGML one, but has a different format.  The
+traditional &xx; format was judged inconvenient because the ampersand is
+used frequently in the corpus.  Instead, GCIDE entities have the format
+<WORD/, where "<" and "/" represent the beginning and end of the entity and
+WORD represents the character itself.  Valid WORDs are in some cases
+abbreviations (for compactness) of the ISO 8879 recommended symbols.
+Characters representable by escape sequences can also be represented by
+entities, but the reverse is not true, due to a limited range of the former.
+
+The Greek words appearing in the etymologies, when they are included, are
+typed in a roman-letter transcription, which is described below in chapter
+"Greek transliteration".
 
 * Unrecognized characters
 
 Wherever the typists did not know the character to use, they usually
 inserted a reverse-video question mark (decimal 176).  This appears in
 full-ASCII versions as <?/.  This mark was used both for characters in
-non-ASCII fonts, and for unreadable characters (i.e., characters
-smeared in the original or distorted in the copies available to the
-typists. The type in the original was in many places smeared and
-illegible at the left and right page margins; occasionally, small
-parts of words were blotted out by plain white space).
+non-ASCII fonts, and for unreadable characters (i.e., characters smeared in
+the original or distorted in the copies available to the typists. The type
+in the original was in many places smeared and illegible at the left and
+right page margins; occasionally, small parts of words were blotted out by
+plain white space).
 
 * Italics
 
 In most places, italic font is represented by the tags <it>...</it>
-surrounding the italic text, or by some other tag which also implies
-italic font.  In the pronunciations, however, where italicized vowels
-are used among non-italic and other special characters to indicate
-pronunciation, the special codes <ait/, <eit/, <iit/, <oit/, <uit/,
-are also used to indicate the italicized vowel.
+surrounding the italic text, or by some other tag which also implies italic
+font.  In the pronunciations, however, where italicized vowels are used
+among non-italic and other special characters to indicate pronunciation, the
+special codes <ait/, <eit/, <iit/, <oit/, <uit/, are also used to indicate
+the italicized vowel.
 
 * Diacritics
 
-Vowels with a circle above (as in Swedish) are coded <xring/ (x with a
-ring, or "degrees" mark over it); vowels with tilde over them are
-represented by <xtil/, where "x" is the vowel, as in <etil/ (<atil/ 
-also has code 238); letters with a dot above are represented by <xdot/
--- letter with a dot below are represented by <xsdot/ ("subdot");
-vowels with the semi-long mark (a macron with a short perpendicular
-vertical stroke attached above) are represented by <xsl/; the
-circumflex vowels have codes on this list, but may also be represented
-as <xcir/; vowels with macrons above are <xmac/ (including <oomac/,
-the "oo" with an unbroken macron above the two letters, <aemac/ = the
-ligature ae with a macron [also 214 = \'d6], and <oemac/ the ligature
-oe with a macron [also 215 = \'d7]); vowels with umlauts or a crescent
-(breve) above have codes in this list, but may also be represented by
-<xum/ and <xcr/ respectively.  There is an occasional hacek or caron
-mark (an inverted circumflex) in the original; such letters are coded
-<xcar/.  The o with a caron has code 213, but no other letter with a
-caron is representable by an escape sequence.
-
-The diaeresis is treated typographically as identical to the umlaut.
-A special modification, used only for poetry (see entry "saturnian
-verse" under "saturnian") is a vowel with a macron, in which the
-macron is lighter than the usual macron, signifying a stressed
-syllable which has a short vowel sound.  This is represented by
-<xsmac/ ("short mac").
-
-Another special character used in pronunciations is an "n" with an
-underline (like a macron, but below the letter), used to represent the
-"ng" sound.  This is coded <nsm/ ("n sub-macron").  The ligated th
-used in pronunciations to depict the "th" sound of "the" is coded as
-<th/.
+Vowels with a circle above (as in Swedish) are coded <xring/ (x with a ring,
+or "degrees" mark over it); vowels with tilde over them are represented by
+<xtil/, where "x" is the vowel, as in <etil/ (<atil/ also has code 238);
+letters with a dot above are represented by <xdot/ -- letter with a dot
+below are represented by <xsdot/ ("subdot"); vowels with the semi-long mark
+(a macron with a short perpendicular vertical stroke attached above) are
+represented by <xsl/; the circumflex vowels have codes on this list, but may
+also be represented as <xcir/; vowels with macrons above are <xmac/
+(including <oomac/, the "oo" with an unbroken macron above the two letters,
+<aemac/ = the ligature ae with a macron [also 214 = \'d6], and <oemac/ the
+ligature oe with a macron [also 215 = \'d7]); vowels with umlauts or a
+crescent (breve) above have codes in this list, but may also be represented
+by <xum/ and <xcr/ respectively.  There is an occasional hacek or caron mark
+(an inverted circumflex) in the original; such letters are coded <xcar/.
+The o with a caron has code 213, but no other letter with a caron is
+representable by an escape sequence.
+
+The diaeresis is treated typographically as identical to the umlaut.  A
+special modification, used only for poetry (see entry "saturnian verse"
+under "saturnian") is a vowel with a macron, in which the macron is lighter
+than the usual macron, signifying a stressed syllable which has a short
+vowel sound.  This is represented by <xsmac/ ("short mac").
+
+Another special character used in pronunciations is an "n" with an underline
+(like a macron, but below the letter), used to represent the "ng" sound.
+This is coded <nsm/ ("n sub-macron").  The ligated th used in pronunciations
+to depict the "th" sound of "the" is coded as <th/.
 
 NOTE: the letter combinations "fi" and "fl" are invariably printed as the
-ligatures &filig; and &fllig;, but these ligatures are not marked as such
-in this transcription, and the two letters are left as individuals.
+ligatures &filig; and &fllig;, but these ligatures are not marked as such in
+this transcription, and the two letters are left as individuals.
 
 * Special symbols
 
-The dagger <dag/, double dagger <ddag/, and paragraph mark <para/ are
-rarely used.
+The dagger <dag/, double dagger <ddag/, and paragraph mark <para/ are rarely
+used.
 
-The double prime, or "seconds" of a degree is sometimes represented by
-a double "light accent" (code 183 = \'b7).  In other places, and in
-later versions, it is represented by <sec/ = \'a9.
+The double prime, or "seconds" of a degree is sometimes represented by a
+double "light accent" (code 183 = \'b7).  In other places, and in later
+versions, it is represented by <sec/ = \'a9.
 
-The symbols "greater than" <gt/ and "less than" are encountered only
-once, but are distinguished from the right- and left-angle brackets (>
-and <) because of possible typographical differences in some fonts.
+The symbols "greater than" <gt/ and "less than" are encountered only once,
+but are distinguished from the right- and left-angle brackets (> and <)
+because of possible typographical differences in some fonts.
 
-The schwa is symbolized by <schwa/.  It is not used in the
-pronunciations, but is mentioned as a symbol.  The right-pointing
-arrow is <rarr/, consistent with ISO 8879.
+The schwa is symbolized by <schwa/.  It is not used in the pronunciations,
+but is mentioned as a symbol.  The right-pointing arrow is <rarr/,
+consistent with ISO 8879.
+
+Two special entities <and/ and <or/ represent words "and" and "or" in
+italics font.
 
 * Symbol summary
 
-Below is a complete list of the symbols used in the Webster, together
-with their "webfont" number (escape sequence), corresponding markup
-entity, and corresponding symbols in ISO 8879 and Tex coding.  Much of
-this table was prepared by Rik Faith, to whom we express our
-appreciation.
+Below is a complete list of the symbols used in the Webster, together with
+their "webfont" number (escape sequence), corresponding markup entity, and
+corresponding symbols in ISO 8879 and Tex coding.  Much of this table was
+prepared by Rik Faith, to whom we express our appreciation.
 
-The "Uc" column gives the Unicode representation of the character.
-The "nearest ASCII" equivalents are given for those who want to
-display the data as best one can in 7-bit simple ASCII symbols without 
-using the "entity" symbols.
+The "Uc" column gives the Unicode representation of the character.  The
+"nearest ASCII" equivalents are given for those who want to display the data
+as best one can in 7-bit simple ASCII symbols without using the "entity"
+symbols.
 
 Comments: 
-  (1) The symbol in the "entity" column is the SGML-like symbol used in
-      the present Webster files; the symbol in the "ISO 8879" column is
-      the symbol for the same character given in "The user's guide to
-      ISO 8879" by Smith and Stutely.
-  (2) An asterisk "*" in the "entity" column means that this symbol and 
-code value is not used in any form in GCIDE.
-  (3)  If no asterisk is in the "entity" column, and no other symbol is 
+  (1) The symbol in the "entity" column is the SGML-like symbol used in the
+      present Webster files; the symbol in the "ISO 8879" column is the
+      symbol for the same character given in "The user's guide to ISO 8879"
+      by Smith and Stutely.
+      
+  (2) An asterisk "*" in the "entity" column means that this symbol and code
+value is not used in any form in GCIDE.
+
+  (3) If no asterisk is in the "entity" column, and no other symbol is
 there, this means that in the Webster, only the hexadecimal representation
-was used (e.g. for \'d8, \'bd, and  \'b8).
-  (4) \'b6 and \'b7, the heavy and light "accents", are never above a
-letter (these are not diacritical marks), but in-between letters, as the
+was used (e.g. for \'d8, \'bd, and \'b8).
+
+  (4) \'b6 and \'b7, the heavy and light "accents", are never above a letter