final % is comment-start in texfonts.map

git-svn-id: svn://tug.org/texlive/trunk@45928 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 104 insertions, 82 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 1cb0690e38c..0d57e1e1b4f 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-28  Karl Berry  <karl@tug.org>
+
+	* doc/unixtex.texi: no longer in ~ftp, etc.
+	
+	* doc/kpathsea.texi (Fontmap): clarify that it's the last %
+	on a line that starts a comment. From Doug McKenna, personal
+	email, 21nov17.
+
 2017-11-18  Karl Berry  <karl@tug.org>
 
 	* db.c (elt_in_db): protect against either argument being NULL or
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 0940712cefb..98c5bd794e1 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -1,4 +1,4 @@
-This is kpathsea.info, produced by makeinfo version 6.3 from
+This is kpathsea.info, produced by makeinfo version 6.5 from
 kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
@@ -200,31 +200,30 @@ File: kpathsea.info,  Node: unixtex.ftp,  Next: Security,  Prev: Introduction,
 2 'unixtex.ftp': Obtaining TeX
 ******************************
 
-This is <ftp://ftp.tug.org/tex/unixtex.ftp>, last updated 13 June 2010.
-Also available as <http://www.tug.org/unixtex.ftp>.  Email
-<tex-k@tug.org> with comments or questions.
+This is <https://tug.org/tex/unixtex.ftp>, last updated 28 November
+2017.  Email <tex-k@tug.org> with comments or questions.
 
    The principal free TeX distribution for Unix-like systems is TeX
 Live, on the web at <http://tug.org/texlive>.  The pages there describe
-many ways to acquire and build TeX, over the Internet or on physical
+many ways to acquire and.or build TeX, over the Internet or on physical
 media, both the sources and precompiled binaries for many systems,
 either standalone or as part of various operating system distributions.
 
-   Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+   Web2c, Kpathsea, Dvips, and Dviljk are no longer released as a
 separate packages.  Their sources are now maintained as part of TeX
 Live.
 
    The host ftp.cs.stanford.edu is the original source for the files for
 which Donald Knuth is directly responsible: 'tex.web', 'plain.tex', etc.
-However, unless you want to undertake the very significant project of
-building your TeX installation from scratch, it is far more reliable and
-less work to retrieve these files as part of a larger package
+However, unless you want to undertake the project of building your TeX
+installation from scratch, it is more reliable and less work to retrieve
+these files as part of a larger package.
 
    In any case, the Stanford ftp site is not the canonical source for
 anything except what was created as part of Knuth's original TeX, so do
 not rely on any other files available there being up-to-date.  The best
 place to check for up-to-date files is CTAN (the Comprehensive TeX
-Archive Network), <http://www.ctan.org>.
+Archive Network), <https://ctan.org>.
 
 
 File: kpathsea.info,  Node: Security,  Next: TeX directory structure,  Prev: unixtex.ftp,  Up: Top
@@ -1733,14 +1732,22 @@ found are read; earlier definitions override later ones.
 
    The format of fontmap files is straightforward:
 
-   * Comments start with '%' and continue to the end of the line.
+   * Comments start with the last '%' on a line and continue to the end
+     of the line.  (This provides for names that include a %,
+     ill-advised as that may be.)
+
    * Blank lines are ignored.
+
    * Each nonblank line is broken up into a series of "words": a
      sequence of non-whitespace characters.
+
    * If the first word is 'include', the second word is used as a
      filename, and it is searched for and read.
+
    * Otherwise, the first word on each line is the true filename;
+
    * the second word is the alias;
+
    * subsequent words are ignored.
 
    If an alias has an extension, it matches only those files with that
@@ -3142,7 +3149,7 @@ Index
                                                               (line 239)
 * fopen, redefined:                      Debugging.           (line  54)
 * format of external database:           Database format.     (line   6)
-* ftp.cs.stanford.edu:                   unixtex.ftp.         (line  20)
+* ftp.cs.stanford.edu:                   unixtex.ftp.         (line  19)
 * ftp.tug.org:                           unixtex.ftp.         (line   6)
 * fundamental purpose of Kpathsea:       Introduction.        (line   6)
 * gdb, recommended:                      Bug checklist.       (line  58)
@@ -3172,7 +3179,7 @@ Index
 * home directories in paths:             Tilde expansion.     (line   6)
 * HOME, as ~ expansion:                  Tilde expansion.     (line   6)
 * identifiers, characters valid in:      Config files.        (line  47)
-* include fontmap directive:             Fontmap.             (line  30)
+* include fontmap directive:             Fontmap.             (line  36)
 * INDEXSTYLE:                            Supported file formats.
                                                               (line  84)
 * input lines, reading:                  Calling sequence.    (line 110)
@@ -3183,7 +3190,7 @@ Index
 * kdebug::                               Debugging.           (line 105)
 * kdefault.c:                            Default expansion.   (line  48)
 * Knuth, Donald E.:                      History.             (line   6)
-* Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  20)
+* Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  19)
 * Kpathsea config file, source for path: Path sources.        (line  17)
 * kpathsea.h:                            Programming overview.
                                                               (line  24)
@@ -3493,7 +3500,7 @@ Index
                                                               (line  24)
 * tex-k@tug.org:                         Mailing lists.       (line   6)
 * tex-k@tug.org (bug address):           Reporting bugs.      (line   6)
-* tex.web:                               unixtex.ftp.         (line  20)
+* tex.web:                               unixtex.ftp.         (line  19)
 * TEXBIB:                                Supported file formats.
                                                               (line  30)
 * TEXBIB <1>:                            Supported file formats.
@@ -3621,7 +3628,7 @@ Index
 * Weber, Olaf:                           History.             (line  73)
 * WEBINPUTS:                             Supported file formats.
                                                               (line 223)
-* whitespace, in fontmap files:          Fontmap.             (line  27)
+* whitespace, in fontmap files:          Fontmap.             (line  31)
 * whitespace, not ignored on continuation lines: Config files.
                                                               (line  37)
 * www.tug.org:                           unixtex.ftp.         (line   6)
@@ -3640,55 +3647,55 @@ Node: Top1480
 Node: Introduction2259
 Node: History4204
 Node: unixtex.ftp8801
-Node: Security10296
-Node: TeX directory structure12800
-Node: Path searching16848
-Node: Searching overview17506
-Node: Path sources20901
-Node: Config files21959
-Node: Path expansion25886
-Node: Default expansion26835
-Node: Variable expansion28905
-Node: Tilde expansion30306
-Node: Brace expansion31286
-Node: KPSE_DOT expansion32211
-Node: Subdirectory expansion32724
-Node: Filename database35078
-Node: ls-R36132
-Node: Filename aliases39027
-Node: Database format40205
-Node: Invoking kpsewhich41218
-Node: Path searching options42173
-Node: Specially-recognized files50093
-Node: Auxiliary tasks51448
-Node: Standard options53787
-Node: TeX support54143
-Node: Supported file formats55495
-Node: File lookup63160
-Node: Glyph lookup64909
-Node: Basic glyph lookup66033
-Node: Fontmap66913
-Node: Fallback font69334
-Node: Suppressing warnings70246
-Node: mktex scripts71373
-Node: mktex configuration72588
-Node: mktex script names78391
-Node: mktex script arguments79777
-Node: Programming80656
-Node: Programming overview81178
-Node: Calling sequence83875
-Node: Program-specific files90407
-Node: Programming with config files91430
-Node: Reporting bugs92742
-Node: Bug checklist93420
-Node: Mailing lists96892
-Node: Debugging97567
-Node: Logging102644
-Node: Common problems104511
-Node: Unable to find files104988
-Node: Slow path searching107398
-Node: Unable to generate fonts108773
-Node: TeX or Metafont failing111244
-Node: Index112597
+Node: Security10226
+Node: TeX directory structure12730
+Node: Path searching16778
+Node: Searching overview17436
+Node: Path sources20831
+Node: Config files21889
+Node: Path expansion25816
+Node: Default expansion26765
+Node: Variable expansion28835
+Node: Tilde expansion30236
+Node: Brace expansion31216
+Node: KPSE_DOT expansion32141
+Node: Subdirectory expansion32654
+Node: Filename database35008
+Node: ls-R36062
+Node: Filename aliases38957
+Node: Database format40135
+Node: Invoking kpsewhich41148
+Node: Path searching options42103
+Node: Specially-recognized files50023
+Node: Auxiliary tasks51378
+Node: Standard options53717
+Node: TeX support54073
+Node: Supported file formats55425
+Node: File lookup63090
+Node: Glyph lookup64839
+Node: Basic glyph lookup65963
+Node: Fontmap66843
+Node: Fallback font69372
+Node: Suppressing warnings70284
+Node: mktex scripts71411
+Node: mktex configuration72626
+Node: mktex script names78429
+Node: mktex script arguments79815
+Node: Programming80694
+Node: Programming overview81216
+Node: Calling sequence83913
+Node: Program-specific files90445
+Node: Programming with config files91468
+Node: Reporting bugs92780
+Node: Bug checklist93458
+Node: Mailing lists96930
+Node: Debugging97605
+Node: Logging102682
+Node: Common problems104549
+Node: Unable to find files105026
+Node: Slow path searching107436
+Node: Unable to generate fonts108811
+Node: TeX or Metafont failing111282
+Node: Index112635
 
 End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 11d41513ad5..47201531e5d 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -2318,16 +2318,24 @@ The format of fontmap files is straightforward:
 
 @itemize @bullet
 @cindex comments, in fontmap files
-@item Comments start with @samp{%} and continue to the end of the line.
+@item Comments start with the last @samp{%} on a line and continue to
+the end of the line. (This provides for names that include a %,
+ill-advised as that may be.)
+
 @cindex whitespace, in fontmap files
 @item Blank lines are ignored.
+
 @item Each nonblank line is broken up into a series of @dfn{words}:
   a sequence of non-whitespace characters.
+
 @findex include @r{fontmap directive}
 @item If the first word is @samp{include}, the second word is used as
   a filename, and it is searched for and read.
+
 @item Otherwise, the first word on each line is the true filename;
+
 @item the second word is the alias;
+
 @item subsequent words are ignored.
 @end itemize
 
diff --git a/Build/source/texk/kpathsea/doc/unixtex.texi b/Build/source/texk/kpathsea/doc/unixtex.texi
index a0c0a15874f..e9c1ea1fe45 100644
--- a/Build/source/texk/kpathsea/doc/unixtex.texi
+++ b/Build/source/texk/kpathsea/doc/unixtex.texi
@@ -17,18 +17,17 @@ This
 @iftex
 chapter
 @end iftex
-is @uref{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 13 June
-2010.  Also available as @uref{http://www.tug.org/unixtex.ftp}.  Email
-@email{tex-k@@tug.org} with comments or questions.
+is @uref{https://tug.org/tex/unixtex.ftp}, last updated 28 November
+2017.  Email @email{tex-k@@tug.org} with comments or questions.
 
 The principal free @TeX{} distribution for Unix-like systems is @TeX{}
 Live, on the web at @url{http://tug.org/texlive}.  The pages there
-describe many ways to acquire and build @TeX{}, over the Internet or
-on physical media, both the sources and precompiled binaries for many
-systems, either standalone or as part of various operating system
+describe many ways to acquire and.or build @TeX{}, over the Internet
+or on physical media, both the sources and precompiled binaries for
+many systems, either standalone or as part of various operating system
 distributions.
 
-Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+Web2c, Kpathsea, Dvips, and Dviljk are no longer released as a
 separate packages.  Their sources are now maintained as part of @TeX{}
 Live.
 
@@ -37,14 +36,14 @@ Live.
 @cindex Knuth, Donald E., archive of programs by
 The host @t{ftp.cs.stanford.edu} is the original source for the files
 for which Donald Knuth is directly responsible: @file{tex.web},
-@file{plain.tex}, etc. However, unless you want to undertake the very
-significant project of building your @TeX{} installation from scratch,
-it is far more reliable and less work to retrieve these files as part
-of a larger package
+@file{plain.tex}, etc. However, unless you want to undertake the
+project of building your @TeX{} installation from scratch, it is more
+reliable and less work to retrieve these files as part of a larger
+package.
 
 In any case, the Stanford ftp site is not the canonical source for
 anything except what was created as part of Knuth's original @TeX{},
 so do not rely on any other files available there being up-to-date.
 The best place to check for up-to-date files is CTAN (the
-Comprehensive @TeX{} Archive Network), @url{http://www.ctan.org}.
+Comprehensive @TeX{} Archive Network), @url{https://ctan.org}.
 
diff --git a/Master/texmf-dist/fonts/map/fontname/texfonts.map b/Master/texmf-dist/fonts/map/fontname/texfonts.map
index ceed2efa9dd..6dd102a5ecf 100644
--- a/Master/texmf-dist/fonts/map/fontname/texfonts.map
+++ b/Master/texmf-dist/fonts/map/fontname/texfonts.map
@@ -5,8 +5,8 @@
 % @mapfile{
 %   license = "public domain",
 %   email = "tex-fonts@tug.org",
-%   date = "4may10",
-%   url = "http://tug.org/fontname/texfonts.map",
+%   date = "27nov17",
+%   url = "https://tug.org/fontname/texfonts.map",
 %   docstring = "Define aliases for font names in TeX."
 %   supported = "yes",
 % }
@@ -14,7 +14,7 @@
 % First column is real filename; second is alias; others are ignored.
 % Spaces and/or tabs separate columns.
 % Blank lines are ignored.
-% Comments (obviously) start with %.
+% Comments start with the last % on a line and continue to the end of the line.
 %
 % Null bytes will confuse the programs, and a CR at the end of a line is
 % removed for DOS's sake, but any other characters will be considered