From d56ae4d233bc34232b04ca2acd9b7c56c3926741 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Mar 2017 17:55:13 +0000 Subject: doc,sync git-svn-id: svn://tug.org/texlive/trunk@43628 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/PROJECTS | 8 +- Build/source/texk/texlive/tl_scripts/ChangeLog | 4 + Build/source/texk/texlive/tl_scripts/Makefile.am | 8 +- Build/source/texk/texlive/tl_scripts/Makefile.in | 4 + Master/texmf-dist/bibtex/bib/beebe/typeset.bib | 56 ++++++++++-- Master/texmf-dist/scripts/texlive/fmtutil.pl | 6 +- Master/texmf-dist/scripts/texlive/updmap.pl | 3 +- Master/tlpkg/doc/releng.txt | 4 +- Master/tlpkg/doc/sys-user.txt | 108 ----------------------- 9 files changed, 75 insertions(+), 126 deletions(-) delete mode 100644 Master/tlpkg/doc/sys-user.txt diff --git a/Build/source/texk/kpathsea/PROJECTS b/Build/source/texk/kpathsea/PROJECTS index 61365a78da6..4db45d395de 100644 --- a/Build/source/texk/kpathsea/PROJECTS +++ b/Build/source/texk/kpathsea/PROJECTS @@ -5,11 +5,15 @@ please send mail to tex-k@tug.org first. Kpathsea has never officially been released as a standalone library, even though in practice it is used that way by OS distributions. -Perhaps it would be good to support a standalone release. +It would be good to support a standalone release. + +It would be cleaner to always do a case-insensitive search for all +suffixes, instead explicitly listing (for example) both ".otf" and ".OTF". For multiple texmf.cnf files (or multiple dvips configuration files), replace extra :'s by the value from the next file in the path, rather -than the value from the next level. +than the value from the next level. But compatibility probably requires +that this not be done. Support runtime registration of file types to search for, not just compile-time. Either by a procedure call, or by reading a configuration diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog index e152f31dc37..ae0ef904002 100644 --- a/Build/source/texk/texlive/tl_scripts/ChangeLog +++ b/Build/source/texk/texlive/tl_scripts/ChangeLog @@ -1,3 +1,7 @@ +2017-03-28 Karl Berry + + * Makefile.am (xupdmap.1,xfmtutil.1): also make /tmp/*.html. + 2016-03-18 Karl Berry * texconfig-dialog.sh (cleanup): termCtl ctl rather than reset, diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index c4ed887e197..1773f76793c 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -101,20 +101,22 @@ dist_web2c_DATA = fmtutil.cnf ## Generate the updmap/fmtutil man page using help2man plus a bit of ## handwritten material. But don't actually update updmap/fmtutil.1, ## since we don't want to require help2man for an install. Leave that -## to be done by hand. +## to be done by hand (see tlpkg/doc/releng.txt). EXTRA_DIST += updmap.help2man fmtutil.help2man .PHONY: xmans xupdmap.1 xfmtutil.1 xmans: xupdmap.1 xfmtutil.1 Master_dir = $(top_srcdir)/../../../../Master tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive -## +# xupdmap.1: updmap.help2man $(tl_scripts_dir)/updmap.pl help2man --include=$< --source="TeX Live" --no-info \ $(tl_scripts_dir)/updmap.pl >/tmp/$@ -## + groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html +# xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl help2man --include=$< --source="TeX Live" --no-info \ $(tl_scripts_dir)/fmtutil.pl >/tmp/$@ + groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html ## diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 107e94b63c6..300e2e32883 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -865,12 +865,16 @@ uninstall-man1-links: done .PHONY: xmans xupdmap.1 xfmtutil.1 xmans: xupdmap.1 xfmtutil.1 +# xupdmap.1: updmap.help2man $(tl_scripts_dir)/updmap.pl help2man --include=$< --source="TeX Live" --no-info \ $(tl_scripts_dir)/updmap.pl >/tmp/$@ + groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html +# xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl help2man --include=$< --source="TeX Live" --no-info \ $(tl_scripts_dir)/fmtutil.pl >/tmp/$@ + groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html .PHONY: run-texlinks # diff --git a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib index fb3a7601496..000771a0824 100644 --- a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib +++ b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib @@ -2,9 +2,9 @@ %%% ==================================================================== %%% BibTeX-file{ %%% author = "Nelson H. F. Beebe", -%%% version = "2.39", -%%% date = "05 November 2016", -%%% time = "15:40:30 MDT", +%%% version = "2.40", +%%% date = "25 March 2017", +%%% time = "14:33:04 MST", %%% filename = "typeset.bib", %%% address = "University of Utah %%% Department of Mathematics, 110 LCB @@ -14,7 +14,7 @@ %%% telephone = "+1 801 581 5254", %%% FAX = "+1 801 581 4148", %%% URL = "http://www.math.utah.edu/~beebe", -%%% checksum = "01000 22416 105447 996267", +%%% checksum = "23612 22456 105660 998354", %%% email = "beebe at math.utah.edu, beebe at acm.org, %%% beebe at computer.org (Internet)", %%% codetable = "ISO/ASCII", @@ -39,7 +39,7 @@ %%% and PDF (Portable Document Format), and %%% sgml.bib covers SGML and HTML. %%% -%%% At version 2.39, the year coverage looked +%%% At version 2.40, the year coverage looked %%% like this: %%% %%% 1881 ( 1) 1927 ( 0) 1973 ( 10) @@ -74,7 +74,7 @@ %%% 1910 ( 0) 1956 ( 0) 2002 ( 12) %%% 1911 ( 0) 1957 ( 0) 2003 ( 4) %%% 1912 ( 0) 1958 ( 1) 2004 ( 0) -%%% 1913 ( 0) 1959 ( 1) 2005 ( 5) +%%% 1913 ( 0) 1959 ( 1) 2005 ( 6) %%% 1914 ( 0) 1960 ( 0) 2006 ( 2) %%% 1915 ( 0) 1961 ( 2) 2007 ( 2) %%% 1916 ( 1) 1962 ( 3) 2008 ( 0) @@ -92,7 +92,7 @@ %%% 20xx ( 2) %%% %%% Article: 320 -%%% Book: 300 +%%% Book: 301 %%% InCollection: 5 %%% InProceedings: 54 %%% Manual: 42 @@ -103,7 +103,7 @@ %%% Proceedings: 33 %%% TechReport: 31 %%% -%%% Total entries: 835 +%%% Total entries: 836 %%% %%% This bibliography has been collected from %%% bibliographies in the author's personal @@ -20928,6 +20928,46 @@ Tools for indexing", } +@Book{Perrousseaux:2005:HET, + author = "Yves Perrousseaux and Jacques Andr{\'e} and Christian + Laucou", + title = "Histoire de l'{\'e}criture typographique. ({French}) + [{History} of typographic writing]", + publisher = "Atelier Perrousseaux", + address = "M{\'e}olans-Revel, France", + year = "2005-2016", + ISBN = "2-911220-13-7 (vol. 1), 2-911220-24-2 (vol. 2, pt. 1), + 2-911220-84-6 (vol. 3), 2-911220-34-X (vol. 2/2), + 2-36765-005-5 (vol. 4/1), 2-36765-006-3 (vol. 4/2)", + ISBN-13 = "978-2-911220-13-5 (vol. 1), 978-2-911220-24-1 (vol. 2, + pt. 1), 978-2-911220-84-5 (vol. 3), 978-2-911220-34-0 + (vol. 2/2), 978-2-36765-005-0 (vol. 4/1), + 978-2-36765-006-7 (vol. 4/2)", + LCCN = "Z124 .P47 2005", + bibdate = "Sat Mar 25 12:55:11 MDT 2017", + bibsource = "fsz3950.oclc.org:210/WorldCat", + note = "Four volumes in six.", + URL = "http://tinyurl.com/ja-xxieme", + acknowledgement = ack-nhfb, + language = "French", + remark = "Volume 3 by Jacques Andr{\'e} and Christian Laucou.", + subject = "Printing; History; Books; Type and type-founding; + Imprimerie; Histoire; Livres; Caract{\`e}res + d'imprimerie; Books.; Printing.; Type and + type-founding.; Typografie.; Drukkunst.; Schrift.; + Typographie.", + tableofcontents = "[1] De Gutenberg au XVIIe si{\`e}cle \\ + [2] Le XVIIIe si{\`e}cle, tome I/II--II/II \\ + [3] Le XIXe si{\`e}cle fran{\c{c}}ais / Jacques + Andr{\'e} and Christian Laucou / pr{\'e}ambule de + Didier Barri{\`e}re \\ + [4] Le XXe si{\`e}cle. tome I/II. De 1900 {\`a}1950 / + sous la direction de Jacques Andr{\'e} / pr{\'e}face de + Alan Marshall. Tome II/II. De 1950 {\`a} 2000 / sous la + direction de Jacques Andr{\'e} / postface de Thomas + Huot-Marchand", +} + @Book{Southall:2005:PTT, author = "Richard Southall", title = "Printer's type in the twentieth century: manufacturing diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl index 3d3301c3901..8677466d416 100755 --- a/Master/texmf-dist/scripts/texlive/fmtutil.pl +++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl @@ -1266,10 +1266,10 @@ sub help { my $usage = <<"EOF"; Usage: $prg [OPTION] ... [COMMAND] or: $prg-sys [OPTION] ... [COMMAND] - or: mktexfmt FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT + or: mktexfmt FORMAT.fmt|BASE.base|FMTNAME.EXT -Rebuild and manage TeX fmts, Metafont bases and MetaPost mems, -collectively called "formats" here. +Rebuild and manage TeX fmts and Metafont bases, collectively called +"formats" here. (MetaPost no longer uses the past-equivalent "mems".) If the command name ends in mktexfmt, only one format can be created. The only options supported are --help and --version, and the command diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl index 0aad05e4748..be20d810d59 100755 --- a/Master/texmf-dist/scripts/texlive/updmap.pl +++ b/Master/texmf-dist/scripts/texlive/updmap.pl @@ -3,7 +3,7 @@ # updmap - maintain map files for outline fonts. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # -# Copyright 2011-2016 Norbert Preining +# Copyright 2011-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -2262,6 +2262,7 @@ By default, the TeX filename database (ls-R) is also updated. The updmap system is regrettably complicated, for both inherent and historical reasons. A general overview: + - updmap.cfg files are mainly about listing other files, namely the font-specific .maps, in which each line gives information about a different TeX (.tfm) font. diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index 26da961384d..2c24309d6b3 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -124,11 +124,13 @@ M. As work proceeds, update the doc: Consider updates of core man pages in Build/source/texk/web2c/man. Remake updmap,fmtutil man pages with help2man: make -C Build/source/Work/texk/texlive/tl_scripts xupdmap.1 xfmtutil.1 + They must be moved from /tmp into Master by hand. + Also update ~www/texlive/doc/*.html: groff -mandoc -Thtml fmtutil.1 Texinfo manuals from Build to Master: tl-update-txi # then commit in texmf-dist/doc Man pages from Build to Master (after doing a build): tl-update-man - # then run make in texmf/doc/man + # then run make in texmf-dist/doc/man # and check /tmp/so.rules against man1/Makefile N. Really test during pretest (really! don't leave it for knuth!): diff --git a/Master/tlpkg/doc/sys-user.txt b/Master/tlpkg/doc/sys-user.txt deleted file mode 100644 index 26e8e2255a0..00000000000 --- a/Master/tlpkg/doc/sys-user.txt +++ /dev/null @@ -1,108 +0,0 @@ -Usage and best practices for -sys and -user scripts in TeX Live - -Addition of fonts or formats to the set of TeX Live provided fonts -and formats is done by two set of programs: - updmap / updmap-sys / updmap-user - fmtutil / fmtutil-sys / fmtutil-user - -These scripts work in either one of two modes: user or sys mode. -Without any mode specification a warning is printed. - -System mode is selected by using either updmap-sys / fmtutil-sys or -specifying the -sys command line option. - -User mode is selected by using either updmap-user / fmtutil-user or -specifying the -user command line option. - -Before going into details about the differences, here some best -practices: - -Best practices -============== - Always use system mode (updmap-sys, fmtutil-sys)! -There is practically never any reason to use the -user mode, but see -below for valid use cases. - -Running *once* a program in user mode switches permanently, and all -updates on the system side will be shadowed by files generated in -the user directories. - -Think twice and read the documentation before running any of the -user scripts! - -We list some use cases together with options how to deal with them on -different setups. - -Use case 1: single user computer - add fonts --------------------------------------------- -Probably the most common case. We suggest the following: -* put the fonts into TEXMFLOCAL (following the TDS standard) -* add the font map to TEXMFLOCAL/web2c/updmap.cfg (creating if necessary) -* run once updmap-sys - -Advantages: Upgrades to new TeX Live versions will pick up the fonts -automatically. No further manual intervention. - -Use case 2: multi user computer - add system wide fonts -------------------------------------------------------- -Typical case in a department/company with cooperate fonts that all -users should have access to. - -Follow Use case 1. - -Use case 3: multi user computer - private user fonts ----------------------------------------------------- -This is the only case when user mode is required. -* put fonts into TEXMFHOME (following TDS standard) -* add the font map to TEXMFHOME/web2c/updmap.cfg (creating if necessary) -* run updmap-user -Important: changes in the font setup of the global installation -will *not* be reflected unless updmap-user is run again. -Please run updmap-user whenever you think there might be changes in -the set of installed fonts. - -Use case 4: adding formats --------------------------- -This is a very rare case, but basically follows the above layout. -In particular most formats will not be private, so adding - TEXMFLOCAL/web2c/fmtutil.cnf -with only the new formats will suffice (above use case 1&2). - - - - - - -Difference between the two modes -================================ - -There are two differences in operation: - -* location where files are generated: - user mode: TEXMFVAR - system mode: TEXMFSYSVAR - -* set of files being read - in user mode additional files are read, see updmap/fmtutil man pages - for details - -Since files in TEXMFVAR override the files in TEXMFSYSVAR, once files have -been generated in TEXMFVAR (that is in the calling user's home directory) -they will take precedence over files in TEXMFSYSVAR, which means that -changes/updates in the system wide installation will *not* be available -by the local user. - -Switching back to system mode -============================= -Switching back to system mode involves removing files in -TEXMFVAR, which normally is ~/.texliveYYYY/texmf-var - -For updmap the files in - TEXMFVAR/fonts/map -should be backuped and removed. -For fmtutil the files in - TEXMFVAR/web2c -should be backuped and removed. - -There *should*not* be any files that are not automatically generated, but -make sure that no file you have put yourself there is removed. - -- cgit v1.2.3