From 8b748eafd74f968357fed1f759b7020a5a2fe9ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Jan 2015 23:39:20 +0000 Subject: dtxgen (20jan15) git-svn-id: svn://tug.org/texlive/trunk@36108 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/dtxgen/dtxgen | 28 ++++++++++----------- .../texk/texlive/linked_scripts/texlive/updmap.pl | 14 +++++------ Master/texmf-dist/doc/support/dtxgen/README | 23 +++++++++-------- Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf | Bin 43081 -> 42592 bytes Master/texmf-dist/scripts/dtxgen/dtxgen | 28 ++++++++++----------- 5 files changed, 48 insertions(+), 45 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen b/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen index dcb384e6948..965e81b9cf7 100755 --- a/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen +++ b/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen @@ -1,6 +1,6 @@ #!/bin/bash -version=1.04 +version=1.05 myname=$(basename $0) <<'DOC' @@ -12,10 +12,10 @@ dtxgen [options] basename.[sty,cls] = Description dtxgen creates a template for a self-extracting .dtx file, based on the model described by U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for -those who plan to create a new Documented LaTeX Source (.dtx) file. +those who plan to create a new Documented LaTeX Source (.dtx) file. Usage example: - + dtxgen -n 'your name' -m 'your@email.ad' myclass.cls The script takes some variables such as: @@ -35,7 +35,7 @@ NAME and EMAIL, you could simply type: dtxgen myclass.cls -and you would end up with five files: |myclass.dtx|, |myclass.cls|, +and you would end up with five files: |myclass.dtx|, |myclass.cls|, |myclass.pdf|, |README|, and |Makefile|. = Options @@ -65,7 +65,7 @@ dtxgen recognizes the following options: -q,--quiet Run quietly -V,--version - Prints the script's version and exits. + Prints the script's version and exits. -h,--help Prints help information and exits. -H,--Help @@ -84,9 +84,9 @@ install install in the local TeX tree (uses sudo) zip produce a zip file ready for upload to CTAN = Changes -Changes with respect version 1.03: -- Clearer comments -- scripts' README information incorporated in the documentation. +Changes with respect version 1.04: +- mktemp now works for Mac/BSD too +- don't include .cls/.sty file in zip = Author and copyright Author Wybo Dekker @@ -98,7 +98,7 @@ DOC help() { sed -n '/^= Synopsis/,/^= /p' $0|sed '1s/.*/Usage:/;/^= /d'; exit; } helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' $0|sed -n '1d;$d;p'|less; exit; } version() { echo $version; exit; } -install() { which instscript>&/dev/null && instscript -zp $myname; exit; } +install() { which instscript>&/dev/null && instscript --zip --pdf --markdown $myname; exit; } Nor='\e[0m' # reset color ] Err='\e[31;1m' # light red ] @@ -163,8 +163,8 @@ case "$ext" in (try the --help option)" esac -# The short description may contain TeX commands, but then we need -# a version without them at some places; note that this removes only +# The short description may contain TeX commands, but then we need +# a version without them at some places; note that this removes only # simple contructs: shrt=$(sed 's/\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\//g' <<<$short) @@ -191,7 +191,7 @@ exit 0 NAME = %base% SHELL = bash PWD = $(shell pwd) -TEMP := $(shell mktemp -d) +TEMP := $(shell mktemp -d -t dtxgen.XXXXXXXXXX) TDIR = $(TEMP)/$(NAME) VERS = $(shell ltxfileinfo -v $(NAME).dtx) LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) @@ -220,7 +220,7 @@ install: all sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME) zip: all mkdir $(TDIR) - cp $(NAME).{pdf,%ext%,dtx} README $(TDIR) + cp $(NAME).{pdf,dtx} README $(TDIR) cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME) Makefile @@ -332,7 +332,7 @@ Running "make install" installs the files in the local TeX tree. % \GetFileInfo{\jobname.dtx} % \DoNotIndex{\newcommand,\newenvironment} % -%\title{\textsf{%base%} --- %short%\thanks{This file +%\title{\textsf{%base%} --- %short%\thanks{This file % describes version \fileversion, last revised \filedate.} %} %\author{%name%\thanks{E-mail: %mail%}} diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl index ac9a605f966..efb27280117 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: updmap.pl 35597 2014-11-17 19:13:51Z karl $ +# $Id: updmap.pl 36067 2015-01-16 00:02:11Z karl $ # updmap - maintain map files for outline fonts. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -14,24 +14,24 @@ # the original versions were licensed under the following agreement: # Anyone may freely use, modify, and/or distribute this file, without -my $svnid = '$Id: updmap.pl 35597 2014-11-17 19:13:51Z karl $'; +my $svnid = '$Id: updmap.pl 36067 2015-01-16 00:02:11Z karl $'; my $TEXMFROOT; BEGIN { - $^W=1; + $^W = 1; $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; if ($?) { - print_error("Cannot find TEXMFROOT, aborting!\n"); + warn "updmap.pl: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; exit 1; } chomp($TEXMFROOT); - unshift (@INC, "$TEXMFROOT/tlpkg"); + unshift(@INC, "$TEXMFROOT/tlpkg"); } -my $lastchdate = '$Date: 2014-11-17 20:13:51 +0100 (Mon, 17 Nov 2014) $'; +my $lastchdate = '$Date: 2015-01-16 01:02:11 +0100 (Fri, 16 Jan 2015) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 35597 $'; +my $svnrev = '$Revision: 36067 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "svn$svnrev ($lastchdate)"; diff --git a/Master/texmf-dist/doc/support/dtxgen/README b/Master/texmf-dist/doc/support/dtxgen/README index 453f96ec282..ce71e4fbe7a 100644 --- a/Master/texmf-dist/doc/support/dtxgen/README +++ b/Master/texmf-dist/doc/support/dtxgen/README @@ -1,15 +1,18 @@ - script: dtxgen - generate template for LaTeX self-extracting .dtx file - type: bash - author: Wybo Dekker - email: wybo@dekkerdocumenten.nl -version: 1.04 -license: Released under the GNU General Public License --------------------------------------------------------------------------------- +| +-------:|:-------------------------------------- + script:| dtxgen - generate template for LaTeX self-extracting .dtx file + type:| bash + author:| Wybo Dekker + email:| wybo@dekkerdocumenten.nl +version:| 1.05 +license:| Released under the GNU General Public License + dtxgen creates a template for a self-extracting .dtx file, based on the model described by U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for those who plan to create a new Documented LaTeX Source (.dtx) file. -Changes with respect version 1.03: -- Clearer comments -- scripts' README information incorporated in the documentation. +Recent changes: +Changes with respect version 1.04: +- mktemp now works for Mac/BSD too +- don't include .cls/.sty file in zip diff --git a/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf b/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf index 42c9d51efdf..4b3cfbca137 100644 Binary files a/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf and b/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf differ diff --git a/Master/texmf-dist/scripts/dtxgen/dtxgen b/Master/texmf-dist/scripts/dtxgen/dtxgen index dcb384e6948..965e81b9cf7 100755 --- a/Master/texmf-dist/scripts/dtxgen/dtxgen +++ b/Master/texmf-dist/scripts/dtxgen/dtxgen @@ -1,6 +1,6 @@ #!/bin/bash -version=1.04 +version=1.05 myname=$(basename $0) <<'DOC' @@ -12,10 +12,10 @@ dtxgen [options] basename.[sty,cls] = Description dtxgen creates a template for a self-extracting .dtx file, based on the model described by U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for -those who plan to create a new Documented LaTeX Source (.dtx) file. +those who plan to create a new Documented LaTeX Source (.dtx) file. Usage example: - + dtxgen -n 'your name' -m 'your@email.ad' myclass.cls The script takes some variables such as: @@ -35,7 +35,7 @@ NAME and EMAIL, you could simply type: dtxgen myclass.cls -and you would end up with five files: |myclass.dtx|, |myclass.cls|, +and you would end up with five files: |myclass.dtx|, |myclass.cls|, |myclass.pdf|, |README|, and |Makefile|. = Options @@ -65,7 +65,7 @@ dtxgen recognizes the following options: -q,--quiet Run quietly -V,--version - Prints the script's version and exits. + Prints the script's version and exits. -h,--help Prints help information and exits. -H,--Help @@ -84,9 +84,9 @@ install install in the local TeX tree (uses sudo) zip produce a zip file ready for upload to CTAN = Changes -Changes with respect version 1.03: -- Clearer comments -- scripts' README information incorporated in the documentation. +Changes with respect version 1.04: +- mktemp now works for Mac/BSD too +- don't include .cls/.sty file in zip = Author and copyright Author Wybo Dekker @@ -98,7 +98,7 @@ DOC help() { sed -n '/^= Synopsis/,/^= /p' $0|sed '1s/.*/Usage:/;/^= /d'; exit; } helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' $0|sed -n '1d;$d;p'|less; exit; } version() { echo $version; exit; } -install() { which instscript>&/dev/null && instscript -zp $myname; exit; } +install() { which instscript>&/dev/null && instscript --zip --pdf --markdown $myname; exit; } Nor='\e[0m' # reset color ] Err='\e[31;1m' # light red ] @@ -163,8 +163,8 @@ case "$ext" in (try the --help option)" esac -# The short description may contain TeX commands, but then we need -# a version without them at some places; note that this removes only +# The short description may contain TeX commands, but then we need +# a version without them at some places; note that this removes only # simple contructs: shrt=$(sed 's/\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\//g' <<<$short) @@ -191,7 +191,7 @@ exit 0 NAME = %base% SHELL = bash PWD = $(shell pwd) -TEMP := $(shell mktemp -d) +TEMP := $(shell mktemp -d -t dtxgen.XXXXXXXXXX) TDIR = $(TEMP)/$(NAME) VERS = $(shell ltxfileinfo -v $(NAME).dtx) LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) @@ -220,7 +220,7 @@ install: all sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME) zip: all mkdir $(TDIR) - cp $(NAME).{pdf,%ext%,dtx} README $(TDIR) + cp $(NAME).{pdf,dtx} README $(TDIR) cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME) Makefile @@ -332,7 +332,7 @@ Running "make install" installs the files in the local TeX tree. % \GetFileInfo{\jobname.dtx} % \DoNotIndex{\newcommand,\newenvironment} % -%\title{\textsf{%base%} --- %short%\thanks{This file +%\title{\textsf{%base%} --- %short%\thanks{This file % describes version \fileversion, last revised \filedate.} %} %\author{%name%\thanks{E-mail: %mail%}} -- cgit v1.2.3