summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-19 22:30:41 +0000
committerKarl Berry <karl@freefriends.org>2008-05-19 22:30:41 +0000
commita27656dee171ae94012a73bf3933e7d138347c4f (patch)
treea8b8048d8263eae8f4e9f5d84bc2113fdcaad24b
parent1f2a8f123983d4c33360a062dfda1a974d3049e5 (diff)
rm wordcount and bin-wordcount, nonfree and we have texcount
git-svn-id: svn://tug.org/texlive/trunk@8240 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/ChangeLog6
-rw-r--r--Build/source/texk/texlive/Makefile.in2
-rw-r--r--Build/source/texk/texlive/wordcount.sh72
-rw-r--r--Master/bin/i386-linux/wordcount.sh72
-rwxr-xr-xMaster/bin/i386-solaris/wordcount.sh72
-rw-r--r--Master/texmf-dist/tex/latex/wordcount/wordcount.tex191
-rw-r--r--Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/wordcount.tlpsrc3
10 files changed, 7 insertions, 417 deletions
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 42a0c18a9da..e97b984e6b9 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-20 Karl Berry <karl@tug.org>
+
+ * wordcount.sh: remove, since we have texcount (TeXcount.pl)
+ and the license of wordcount.sh is problematic.
+ * Makefile.in (LIVESCRIPTS): remove wordcount.sh
+
2008-05-19 Karl Berry <karl@tug.org>
* Makefile.in (LIVESCRIPTS): remove pdfthumb, we want the one in
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index ee7fe164d1f..09b2bbb85cf 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -7,7 +7,7 @@ kpse_include ../make/paths.mk
kpse_include ../make/common.mk
kpse_include ../make/programs.mk
-LIVESCRIPTS = simpdftex ebong giftopng wordcount.sh
+LIVESCRIPTS = simpdftex ebong giftopng
# These scripts do not exist here in /source/ at all, the instances
# in texmf are the masters (except when it is CTAN).
diff --git a/Build/source/texk/texlive/wordcount.sh b/Build/source/texk/texlive/wordcount.sh
deleted file mode 100644
index 91252791a53..00000000000
--- a/Build/source/texk/texlive/wordcount.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# wordcount.sh 1.2 Copyright 2000/02/21 Michael John Downes
-# This script has no restrictions on its use, distribution, or sale.
-#
-# This is a Unix Bourne shell script that counts the characters and
-# spaces in a LaTeX document by running it through LaTeX using
-# wordcount.tex, and then counting the lines in the resulting
-# wordcount.log file that match a special pattern. It assumes that you
-# have a program "grep" with a -c option meaning "Report the number of
-# matching lines". To use perl or some other tool instead of grep,
-# redefine $COUNT in some suitable way, below.
-#
-# The characters that are counted with this method are actual font
-# characters in the page body (excluding running heads): in math, each
-# subscript and superscript character is counted separately, even when
-# they appear one over the other; and so are the separate combining
-# pieces used to make large delimiters. Interword spaces are counted as
-# separate characters, and so are the spaces around mathrel symbols in
-# math formulas (equal signs and the like)---but not the spaces around
-# mathbin symbols (plus, minus, and the like).
-#
-# You can count words by dividing the character count by 5 (or
-# whatever), or by counting the occurrences of interword spaces. The
-# latter method (illustrated here) is highly accurate at counting the
-# actual number of words---until tables or math formulas enter the
-# picture. In the case of tables, the number of words will tend to be
-# overestimated because tabskip glue, counted as an interword space,
-# appears on both sides of each table cell. (Not counting the tabskip
-# glue at all would result in an underestimate, and the underestimate
-# would tend to be slightly less accurate than the overestimate that we
-# have chosen to do.)
-#
-# And of course, in the case of math formulas, how do you define what is
-# a "word"?
-
-SCRIPT=`basename $0`
-LOGFILE=wordcount.log
-COUNT="grep -c"
-LATEX=latex
-
-die () {
- echo "$@ was apparently unsuccessful."
- exit 1
-}
-
-no_files_msg () {
- echo "$SCRIPT: At least one file name must be supplied" \
- "on the command line."
- exit 1
-}
-
-case X$1 in
- X) no_files_msg ;;
- *) : ;;
-esac
-
-for f in "$@"
-do
- # Since \? is not defined by LaTeX itself, this use via \csname causes
- # it to be defined as \relax, and it then serves as a filename
- # terminator. And within wordcount.tex if \? is found to be no longer
- # undefined, certain messages are suppressed.
- echo "$f" | $LATEX 'wordcount.tex\csname ?\endcsname' || die "LaTeX run"
- # Count interword spaces and end-of-paragraph spaces
- words=`$COUNT '3[.]0863[35]' $LOGFILE` || die "Log search"
- # Count nonspace characters and interword spaces
- chars=`$COUNT '3[.]0863[23]' $LOGFILE` || die "Log search"
- # If you want to see what the log file looks like, comment out the
- # following line:
- rm $LOGFILE
- echo "$f contains $chars characters and $words words."
-done
diff --git a/Master/bin/i386-linux/wordcount.sh b/Master/bin/i386-linux/wordcount.sh
deleted file mode 100644
index 95a89023f9e..00000000000
--- a/Master/bin/i386-linux/wordcount.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/sh
-# wordcount.sh 1.2 Copyright 2000/02/21 Michael John Downes
-# This script has no restrictions on its use, distribution, or sale.
-#
-# This is a Unix Bourne shell script that counts the characters and
-# spaces in a LaTeX document by running it through LaTeX using
-# wordcount.tex, and then counting the lines in the resulting
-# wordcount.log file that match a special pattern. It assumes that you
-# have a program "grep" with a -c option meaning "Report the number of
-# matching lines". To use perl or some other tool instead of grep,
-# redefine $COUNT in some suitable way, below.
-#
-# The characters that are counted with this method are actual font
-# characters in the page body (excluding running heads): in math, each
-# subscript and superscript character is counted separately, even when
-# they appear one over the other; and so are the separate combining
-# pieces used to make large delimiters. Interword spaces are counted as
-# separate characters, and so are the spaces around mathrel symbols in
-# math formulas (equal signs and the like)---but not the spaces around
-# mathbin symbols (plus, minus, and the like).
-#
-# You can count words by dividing the character count by 5 (or
-# whatever), or by counting the occurrences of interword spaces. The
-# latter method (illustrated here) is highly accurate at counting the
-# actual number of words---until tables or math formulas enter the
-# picture. In the case of tables, the number of words will tend to be
-# overestimated because tabskip glue, counted as an interword space,
-# appears on both sides of each table cell. (Not counting the tabskip
-# glue at all would result in an underestimate, and the underestimate
-# would tend to be slightly less accurate than the overestimate that we
-# have chosen to do.)
-#
-# And of course, in the case of math formulas, how do you define what is
-# a "word"?
-
-SCRIPT=`basename $0`
-LOGFILE=wordcount.log
-COUNT="grep -c"
-LATEX=latex
-
-die () {
- echo "$@ was apparently unsuccessful."
- exit 1
-}
-
-no_files_msg () {
- echo "$SCRIPT: At least one file name must be supplied" \
- "on the command line."
- exit 1
-}
-
-case X$1 in
- X) no_files_msg ;;
- *) : ;;
-esac
-
-for f in "$@"
-do
- # Since \? is not defined by LaTeX itself, this use via \csname causes
- # it to be defined as \relax, and it then serves as a filename
- # terminator. And within wordcount.tex if \? is found to be no longer
- # undefined, certain messages are suppressed.
- echo "$f" | $LATEX 'wordcount.tex\csname ?\endcsname' || die "LaTeX run"
- # Count interword spaces and end-of-paragraph spaces
- words=`$COUNT '3[.]0863[35]' $LOGFILE` || die "Log search"
- # Count nonspace characters and interword spaces
- chars=`$COUNT '3[.]0863[23]' $LOGFILE` || die "Log search"
- # If you want to see what the log file looks like, comment out the
- # following line:
- rm $LOGFILE
- echo "$f contains $chars characters and $words words."
-done
diff --git a/Master/bin/i386-solaris/wordcount.sh b/Master/bin/i386-solaris/wordcount.sh
deleted file mode 100755
index 91252791a53..00000000000
--- a/Master/bin/i386-solaris/wordcount.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# wordcount.sh 1.2 Copyright 2000/02/21 Michael John Downes
-# This script has no restrictions on its use, distribution, or sale.
-#
-# This is a Unix Bourne shell script that counts the characters and
-# spaces in a LaTeX document by running it through LaTeX using
-# wordcount.tex, and then counting the lines in the resulting
-# wordcount.log file that match a special pattern. It assumes that you
-# have a program "grep" with a -c option meaning "Report the number of
-# matching lines". To use perl or some other tool instead of grep,
-# redefine $COUNT in some suitable way, below.
-#
-# The characters that are counted with this method are actual font
-# characters in the page body (excluding running heads): in math, each
-# subscript and superscript character is counted separately, even when
-# they appear one over the other; and so are the separate combining
-# pieces used to make large delimiters. Interword spaces are counted as
-# separate characters, and so are the spaces around mathrel symbols in
-# math formulas (equal signs and the like)---but not the spaces around
-# mathbin symbols (plus, minus, and the like).
-#
-# You can count words by dividing the character count by 5 (or
-# whatever), or by counting the occurrences of interword spaces. The
-# latter method (illustrated here) is highly accurate at counting the
-# actual number of words---until tables or math formulas enter the
-# picture. In the case of tables, the number of words will tend to be
-# overestimated because tabskip glue, counted as an interword space,
-# appears on both sides of each table cell. (Not counting the tabskip
-# glue at all would result in an underestimate, and the underestimate
-# would tend to be slightly less accurate than the overestimate that we
-# have chosen to do.)
-#
-# And of course, in the case of math formulas, how do you define what is
-# a "word"?
-
-SCRIPT=`basename $0`
-LOGFILE=wordcount.log
-COUNT="grep -c"
-LATEX=latex
-
-die () {
- echo "$@ was apparently unsuccessful."
- exit 1
-}
-
-no_files_msg () {
- echo "$SCRIPT: At least one file name must be supplied" \
- "on the command line."
- exit 1
-}
-
-case X$1 in
- X) no_files_msg ;;
- *) : ;;
-esac
-
-for f in "$@"
-do
- # Since \? is not defined by LaTeX itself, this use via \csname causes
- # it to be defined as \relax, and it then serves as a filename
- # terminator. And within wordcount.tex if \? is found to be no longer
- # undefined, certain messages are suppressed.
- echo "$f" | $LATEX 'wordcount.tex\csname ?\endcsname' || die "LaTeX run"
- # Count interword spaces and end-of-paragraph spaces
- words=`$COUNT '3[.]0863[35]' $LOGFILE` || die "Log search"
- # Count nonspace characters and interword spaces
- chars=`$COUNT '3[.]0863[23]' $LOGFILE` || die "Log search"
- # If you want to see what the log file looks like, comment out the
- # following line:
- rm $LOGFILE
- echo "$f contains $chars characters and $words words."
-done
diff --git a/Master/texmf-dist/tex/latex/wordcount/wordcount.tex b/Master/texmf-dist/tex/latex/wordcount/wordcount.tex
deleted file mode 100644
index 8e2d3e978ac..00000000000
--- a/Master/texmf-dist/tex/latex/wordcount/wordcount.tex
+++ /dev/null
@@ -1,191 +0,0 @@
-\ProvidesFile{wordcount.tex}[2000/09/27 v1.5 Michael Downes]
-% Copyright 2000 Michael John Downes
-% This file has no restrictions on its use, distribution, or sale.
-%
-% If you run LaTeX on wordcount.tex it will prompt you for the name of a
-% document to be counted. For most people, however, it will be more
-% convenient to run the shell script wordcount.sh, giving the document
-% name as the first argument. The comments in wordcount.sh
-% give further information about the usage and limitations of this tool.
-
-% The fundamental idea is to mark each character and interword space
-% with a unique tag that will show up in TeX "showbox" output. Then
-% arrange to make the output routine trigger a TeX overfull vbox message
-% for the page box so that everything gets reported in the TeX log.
-% Then run grep -c (or an equivalent text search utility, e.g., perl) on
-% the log file to count the occurrences.
-%
-% In showbox output, a character is typically represented by a line of
-% the form
-%
-% ...\T1/cmr/m/n/10 e
-%
-% where "\T1/cmr/m/n/10" is the font name. We arrange things so that all
-% characters are typeset in a font named "\3.08632". Furthermore, for
-% interword spaces, which are normally represented in the output as
-% something like
-%
-% ...\glue 3.33333 plus 1.66666 minus 1.11111
-%
-% we use \spaceskip to ensure that it always appears as
-%
-% ...\glue(\spaceskip) 3.08633 plus 9.0
-%
-% Then to count characters (including word spaces) we can
-% grep for lines matching "3.0863", while to count words we
-% count the number of lines in the log that match "3.08633" but not
-% "3.08632".
-%
-% For an accurate count in multi-line paragraphs we also need
-% to set rightskip to the flag value, since interword spaces are
-% discarded at line breaks; and on the presumption that hyphenated
-% compounds like "steady-state" should be counted as two words, we set
-% \exhyphenpenalty to a value that ensures a line break at *every*
-% explicit hyphen---then we will get a rightskip glue node between the
-% two parts. (How about em-dashes? you may ask. Answer: it works all
-% right, try it and see.)
-
-\ifx\relax\?\def\wcQUIET{TT}\else\def\wcQUIET{TF}\fi
-
-% We want accented letters to be represented by a single font char, to
-% the extent possible:
-\RequirePackage[T1]{fontenc}
-\makeatletter
-\thickmuskip=5.55555mu plus5.55555mu minus 2.22222mu
-\let\@@thickmuskip\thickmuskip \newmuskip\thickmuskip
-\let\@@spaceskip\spaceskip \xspaceskip=0pt
-\newskip\@charfontname
-% Ensure that these cannot be overridden.
-\let\spaceskip\@charfontname \let\xspaceskip\spaceskip
-\def\FreezeSpaces{%
- \setbox\z@\hbox{\mathsurround=\z@ $\mkern\@@thickmuskip$}%
- \@@spaceskip=\wd\z@ plus 9pt\relax
- % Setting rightskip to a slightly different value means that
- % end-of-line spaces can be distinguished if desired. (By default,
- % they are not.) Using fil units means there won't be any hyphenation
- % except for explicit hyphens.
- \dimen@\@@spaceskip \advance\dimen@ 1sp\relax
- \rightskip\z@ plus\strip@pt\dimen@ fil\relax
- % Prevent any further changes to \rightskip.
- \let\rightskip\spaceskip
- \@charfontname=\wd\z@ \advance\@charfontname -1sp\relax
- % Cancel all non-1000 sfcodes, which might otherwise affect the value
- % of inter-sentence spaces and keep them from being counted as
- % interword spaces.
- \def\do{\sfcode\fam\@m \advance\fam\@ne
- \ifnum\fam>\@cclv\expandafter\@gobble\fi \do
- }%
- \fam\z@ \do
- \let\frenchspacing\relax \let\nonfrenchspacing\relax
-}
-\def\DashPatch{%
- \exhyphenpenalty=-\@M \let\exhyphenpenalty\count@
- \hyphenpenalty\@M \let\hyphenpenalty\count@
- % LaTeX bug? Default definitions for these don't have \exhyphenpenalty
- % built in. Change them to just print a hyphen so that the penalties
- % will work.
- \def\textemdash{-}\def\textendash{-}%
-}
-% Here we set the font to ptmr8t (a T1 encoded font for which most
-% people are likely to have a tfm file) and then make it difficult for
-% the font to be changed ever again. We use two names for the font,
-% \ptmr and \3.08632, the former being easier to use when resetting math
-% fonts. The name that is defined last when TeX processes a document is
-% the one that will be used in the log file.
-\def\FreezeFont{%
- \expandafter\font
- \csname\strip@pt\@charfontname\endcsname
- =ptmr8t \relax
- \ptmr
- \check@mathfonts \let\check@mathfonts\relax
- \def\do{%
- \textfont\fam=\ptmr\scriptfont\fam=\ptmr\scriptscriptfont\fam=\ptmr
- \advance\fam\@ne \ifnum\fam<\sixt@@n \else\expandafter\@gobble\fi
- \do
- }%
- \fam=0 \do
-}
-\font\ptmr=ptmr8t \relax
-\fontdimen22\ptmr=1sp % to permit use as math font 2
-\let\selectfont\relax
-\let\fontshape\@gobble \let\fontseries\@gobble \let\fontfamily\@gobble
-\let\fontencoding\@gobble \let\fontsize\@gobbletwo
-\let\linespread\@gobble
-\let\try@load@fontshape\relax
-\@namedef{U/msa/m/n}{}% disable special test in AMS documentclasses
-\def\define@newfont{\expandafter\let\font@name=\ptmr}
-\let\@@hfuzz\hfuzz \let\@@vfuzz\vfuzz
-\newdimen\hfuzz \let\vfuzz\hfuzz
-\def\QuietBoxes{%
- \@@hfuzz\maxdimen \@@vfuzz\maxdimen
-}
-\AtBeginDocument{\FreezeSpaces \FreezeFont \DashPatch \QuietBoxes}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Halign patches
-\def\ialign{\everycr{}\tabskip\@@spaceskip\halign} % initialized \halign
-\def\extracolsep#1{\tabskip\@@spaceskip}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\nofiles \let\makeindex\@empty % work-around for a natbib problem
-% Seize control of the output routine to avoid extra clutter of dvi
-% files. Handling \AtBeginDVI would take some extra work--for now I
-% won't bother.
-\def\showpagebox{%
- \showboxbreadth\maxdimen\showboxdepth99
- % This is a devious way of getting the box contents into the log file
- % without actually using \showbox (which typically results in a
- % nonzero exit code from the TeX run).
- \@@vfuzz\z@
- \setbox\z@\vbox to\z@{\box\@outputbox}%
- \setbox\z@\box\voidb@x
- \global \@colht \textheight
- \stepcounter{page}%
- \let\firstmark\botmark
-}
-\AtBeginDocument{\def\@outputpage{\showpagebox}}
-\if\wcQUIET\else
-\begingroup \def\msg^^J#1]^^J{\endgroup\message{#1]^^J^^J}}
-\endlinechar=`\^^J \catcode`\ =12 \msg
-
-The 'wordcount' utility provides a way of estimating the number of
-words in a LaTeX document.
-
-[Warning: The counting method uses a large log file as an intermediate
-step. If your disk space is extremely low the counting process
-may end prematurely for lack of space.]
-
-\fi
-
-% \typein has extraneous blank lines and slightly idiosyncratic prompt.
-\begingroup \endlinechar=-1
-\message{File name [press RETURN to cancel]: }
-\def\do{%
- \let\do\@makeother \dospecials
- \global\read-1 to\wcFileName
- \endgroup
-}
-\do
-
-\ifx\@empty\wcFileName
- \typeout{No file name given; quitting.}\expandafter\@@end\fi
-
-\expandafter\filename@parse\expandafter{\wcFileName}
-\edef\jobname{\filename@base}
-
-\if\wcQUIET
- \message{\wcFileName}
-\else
-\typeout{^^JTo get a count of characters, run^^J^^J \space
-%
- grep -c '3[.]0863[23]' wordcount.log^^J^^J%
-%
-or equivalent when processing is finished.^^J%
-}
-\fi
-
-\typeout{Processing \wcFileName...^^J}
-
-\IfFileExists{\wcFileName}{\batchmode}{\nonstopmode}
-\edef\@tempa{\noexpand\makeatother
- \noexpand\input{\wcFileName}\noexpand\stop
-}
-\@tempa
diff --git a/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc b/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc
deleted file mode 100644
index 91d397ecdee..00000000000
--- a/Master/tlpkg/tlpsrc/bin-wordcount.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-name bin-wordcount
-category TLCore
-binpattern f bin/${ARCH}/wordcount.sh
-depend wordcount
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 1a78817b84a..356c54953ce 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -7,7 +7,6 @@ longdesc programming, patgen, etc.
depend collection-basic
depend a2ping
depend bin-bibtex8
-depend bin-wordcount
depend bin-ctie
depend bin-cweb
depend bin-detex
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 1e6c7433781..beea602a37e 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -559,7 +559,6 @@ depend warning
depend warpcol
depend was
depend williams
-depend wordcount
depend wordlike
depend wrapfig
depend xargs
diff --git a/Master/tlpkg/tlpsrc/wordcount.tlpsrc b/Master/tlpkg/tlpsrc/wordcount.tlpsrc
deleted file mode 100644
index f53b87a8587..00000000000
--- a/Master/tlpkg/tlpsrc/wordcount.tlpsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-name wordcount
-category Package
-depend bin-wordcount