diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-28 23:18:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-28 23:18:30 +0000 |
commit | f5e7ac879be880f67746b785fa8060fcc0e4d8d9 (patch) | |
tree | 5e3bd27e7b20d54a4451a47f667cabae1e1aed13 /Master/texmf-dist/doc/latex/ctable | |
parent | 6b81c4307611bdb01ffbced307b4b29133f2fbf0 (diff) |
sansmathfonts (28apr13)
git-svn-id: svn://tug.org/texlive/trunk@30147 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/ctable')
-rw-r--r-- | Master/texmf-dist/doc/latex/ctable/01b | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctable/09b | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctable/README | 14 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctable/ctable.pdf | bin | 815944 -> 823338 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/ctable/doit | 6 | ||||
-rwxr-xr-x | Master/texmf-dist/doc/latex/ctable/inst | 188 |
6 files changed, 142 insertions, 70 deletions
diff --git a/Master/texmf-dist/doc/latex/ctable/01b b/Master/texmf-dist/doc/latex/ctable/01b index 3ae87b4c718..7bc0415c6fb 100644 --- a/Master/texmf-dist/doc/latex/ctable/01b +++ b/Master/texmf-dist/doc/latex/ctable/01b @@ -9,4 +9,4 @@ ]{H{.4}H{.6}}{}{\FL \F{penguin}& \F{lion}\LL } -$Id: 01b,v 1.3 2009-12-18 16:49:34 wybo Exp $ +$Id: 01b,v 1.3 2009/12/18 16:49:34 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/ctable/09b b/Master/texmf-dist/doc/latex/ctable/09b index 0ada9052991..0ea2cc41f90 100644 --- a/Master/texmf-dist/doc/latex/ctable/09b +++ b/Master/texmf-dist/doc/latex/ctable/09b @@ -5,4 +5,4 @@ framesep=10pt ]{c}{}{\FL Table's first row\LL} -$Id: 09b,v 1.1 2007-07-22 15:30:56 wybo Exp $ +$Id: 09b,v 1.1 2007/07/22 15:30:56 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README index 09d8a1315c3..101ff9a5046 100644 --- a/Master/texmf-dist/doc/latex/ctable/README +++ b/Master/texmf-dist/doc/latex/ctable/README @@ -1,4 +1,4 @@ -This is version 1.23 of the ctable package +This is version 1.24 of the ctable package License: LPPL ctable.sty provides commands to easily typeset centered or left or @@ -8,11 +8,9 @@ first is optional and is used for key,value pairs generating variations on the defaults and offering a route for future extensions. -changes of v1.23 relative to v1.22: -- added the footerwidth option +changes of v1.24 relative to v1.23: +- require xcolor instead of color +- added option bgopacity +- added option sidecap (for memoir only) -changes of v1.22 relative to v1.21: -- allow empty lines in last (tabular) argument -- corrected error from hyperref's nameref calls (thanks Marco Daniel!) - -$Id: README,v 1.13 2012/05/28 12:52:08 wybo Exp $ +$Id: README,v 1.14 2013/04/28 11:59:49 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf Binary files differindex 433a00b7d0a..8ce4db996a4 100644 --- a/Master/texmf-dist/doc/latex/ctable/ctable.pdf +++ b/Master/texmf-dist/doc/latex/ctable/ctable.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/doit b/Master/texmf-dist/doc/latex/ctable/doit index b2da791d8a9..341824cb629 100644 --- a/Master/texmf-dist/doc/latex/ctable/doit +++ b/Master/texmf-dist/doc/latex/ctable/doit @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby require 'erb' require 'scriptingutils' @@ -61,7 +61,7 @@ set.each do |j| sys("pdfcrop #{f}.pdf #{f}.pdf") end end -# $Id: doit,v 1.8 2010-06-26 21:09:37 wybo Exp $ +# $Id: doit,v 1.9 2012/08/17 18:03:20 wybo Exp $ __END__ \documentclass{article} \usepackage[a4paper,margin=20mm,noheadfoot]{geometry} @@ -73,7 +73,7 @@ __END__ \documentclass[twoside]{article} <% if j =~ /[k-z]$/ %> -\usepackage[papersize={65mm,40mm},showframe,margin=5mm,noheadfoot]{geometry} +\usepackage[papersize={65mm,40mm},showframe,margin=1mm,noheadfoot]{geometry} <% end %> \usepackage{ctable} \usepackage{txfonts} diff --git a/Master/texmf-dist/doc/latex/ctable/inst b/Master/texmf-dist/doc/latex/ctable/inst index 01656d9325e..7c5a60a8651 100755 --- a/Master/texmf-dist/doc/latex/ctable/inst +++ b/Master/texmf-dist/doc/latex/ctable/inst @@ -1,6 +1,8 @@ #!/bin/bash NAME=ctable +LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'`/tex/latex/$NAME + # this script generates NAME's documentation into NAME.pdf # and then installs (unless the environment variable NOINSTALL is not empty) # NAME in TEXMFLOCAL @@ -8,71 +10,143 @@ NAME=ctable # inst with the --Clean option, then run inst without options. function die { - echo -e "$1" - exit 1 + echo -e "$*" + exit 1 } -LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'`/tex/latex/$NAME -CLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex} -ALLCLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex,sty,cls,pdf} +function help { + cat <<-EOD + Usage: inst [option] + Options: + -h, --help Print this help + -c, --clean Clean up, but keep $NAME.{sty,pdf} + -C, --Clean Clean up all files that can be regenerated + -z, --zip Create zip for CTAN (developer only) + EOD + exit +} function clean { - eval "rm -f $NAME.$CLEAN doc/*.$CLEAN" + rm -f {$NAME,doc/*}.{aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex} + rm -f doc/*.pdf } function Clean { - eval "rm -f $NAME.$ALLCLEAN doc/*.$ALLCLEAN" + clean + rm -f {$NAME,doc/*}.{sty,cls,pdf} +} + +function makeall { + echo y |tex $NAME.ins >/dev/null + ( # recompile example graphics if any is missing: + cd doc + ln -sf ../$NAME.sty || exit 1 # use the $NAME.sty version to be installed + for i in [0-9][0-9]?; do + if [ ! -f $i.pdf -o ! -f s$i.pdf ]; then + echo Creating example graphics + ./doit || exit 1 + ./doit -c + break + fi + done + rm $NAME.sty + cd .. + + echo Creating documentation + pdflatex --recorder --interaction=batchmode $NAME.dtx || die "`texlog_extract $NAME.log`" + if [ -f $NAME.glo ]; then + makeindex -q -s gglo.ist -o $NAME.gls $NAME.glo || echo makeindex-error + fi + if [ -f $NAME.idx ]; then + makeindex -q -s gind.ist -o $NAME.ind $NAME.idx || exit 1 + fi + pdflatex --recorder --interaction=nonstopmode $NAME.dtx > /dev/null || exit 1 + + # set environment variable NOINSTALL to skip installation in your textree + if [ "$NOINSTALL" = "" ]; then + echo Installing $NAME.{dtx,sty,pdf} + rm -rf $LOCAL + mkdir -p $LOCAL + cp $NAME.{dtx,sty,pdf} $LOCAL || exit 1 + fi + sudo -i mktexlsr $LOCAL + exit 0 + ) + if [ $? != 0 ]; then + echo errors detected, see $NAME.log + else + echo $NAME successfully installed + fi + texlog_extract $NAME } -case "$1" -in --c|--clean) clean; exit;; --C|--Clean) Clean; exit;; --h|--help) echo 'Usage: ./inst [-c|C|h]'; exit;; -?*) echo 'Illegal argument(s): use -c|-C|-h|--clean|--Clean|--help'; exit;; -esac +function mkzip { + # is cvs up to date? + cvs -Q status 2>&1 |grep Status:|grep -v Up-to-date + if [ $? -eq 0 ]; then + echo -n 'Still go on (y/N) ' + read yn + if [[ ! $yn =~ ^[yY] ]]; then echo Quitting...; exit 1; fi + fi + + # create sty and pdf if need so: + NOINSTALL=true ./inst || echo die Problems creating sty and pdf files + + files=( $NAME/{README,inst} $NAME/$NAME.{dtx,ins,sty,pdf} $NAME/doc/{[0-9][0-9][a-z],doit,lion.png,penguin.jpg}) + cd .. + for i in ${files[@]}; do + test -e $i || die File $i does not exist + done + cd ctable + + # check for equal dates and warn if different: + dateexp='[0-9][0-9][0-9][0-9]\/[0-9][0-9]\/[0-9][0-9]' + versexp='[0-9]\+\.[0-9]\+[a-z]*' + read packdate version cvsdate <<<`sed -n " + s/.Id: .*\($dateexp\).*/\1/p + s/.*\($dateexp\) v\($versexp\).*/\1 \2/p + " $NAME.dtx` + cat <<-EOD + packagedate: $packdate + version: $version + cvs-date: $cvsdate + EOD + + # is README updated? + grep "v$version relative to" README >/dev/null || die README not updated - quitting... + + # normally packdate and cvsdate are equal, because I make the zip right after updating CVS: + if [ $packdate != $cvsdate ]; then + echo package and cvs dates differ + echo -n 'Still go on (y/N) ' + read yn + if [[ ! $yn =~ ^[yY] ]]; then echo Quitting...; exit 1; fi + fi + + # make the zip + cd .. + zip=$NAME-$version.zip + zip -Dqr $NAME/$zip ${files[@]} + echo " created: $zip" + +} + +if ! options=$(getopt -o hcCz \ + -l help,clean,Clean,zip -- "$@"); then exit 1; fi +eval set -- "$options" + +while [ $# -gt 0 ]; do + case $1 in + -c|--clean) clean; exit;; + -C|--Clean) Clean; exit;; + -z|--zip) makeall; mkzip; exit;; + -h|--help) help;; + (--) shift; break;; + (*) break;; + esac + shift +done -echo y |tex $NAME.ins >/dev/null -( - # recompile example graphics if any is missing: - cd doc - ln -sf ../$NAME.sty || exit 1 # use the $NAME.sty version to be installed - for i in [0-9][0-9]?; do - if [ ! -f $i.pdf -o ! -f s$i.pdf ]; then - echo Creating example graphics - ./doit || exit 1 - ./doit -c - break - fi - done - rm $NAME.sty - cd .. - - echo Creating documentation - pdflatex --recorder --interaction=batchmode $NAME.dtx || die "`texlog_extract $NAME.log`" - if [ -f $NAME.glo ]; then - makeindex -q -s gglo.ist -o $NAME.gls $NAME.glo || echo makeindex-error - fi - if [ -f $NAME.idx ]; then - makeindex -q -s gind.ist -o $NAME.ind $NAME.idx || exit 1 - fi - pdflatex --recorder --interaction=nonstopmode $NAME.dtx > /dev/null || exit 1 - - # set environment variable NOINSTALL to skip installation in your textree - if [ "$NOINSTALL" = "" ]; then - echo Installing $NAME.{dtx,sty,pdf} - rm -rf $LOCAL - mkdir -p $LOCAL - cp $NAME.{dtx,sty,pdf} $LOCAL || exit 1 - fi - sudo -i mktexlsr $LOCAL - exit 0 -) -if [ $? != 0 ]; then - echo errors detected, see $NAME.log -else - echo $NAME successfully installed -fi -texlog_extract $NAME +makeall -# $Id: inst,v 1.28 2012/05/28 12:53:17 wybo Exp $ +# $Id: inst,v 1.31 2013/04/28 12:25:00 wybo Exp $ |