From 5d3c138f1e0130260df2854f9c75cbae0020d43c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Mar 2013 22:25:53 +0000 Subject: latex-tds (10mar13) git-svn-id: svn://tug.org/texlive/trunk@29325 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/latex-tds/README-docinfo.html | 2 + .../source/latex/latex-tds/README.asciidoc | 71 ++++++++++++++-------- Master/texmf-dist/source/latex/latex-tds/build.pl | 46 +++++++++----- .../source/latex/latex-tds/tex/latex-tds.ini | 52 ---------------- 4 files changed, 78 insertions(+), 93 deletions(-) create mode 100644 Master/texmf-dist/source/latex/latex-tds/README-docinfo.html delete mode 100644 Master/texmf-dist/source/latex/latex-tds/tex/latex-tds.ini (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/latex-tds/README-docinfo.html b/Master/texmf-dist/source/latex/latex-tds/README-docinfo.html new file mode 100644 index 00000000000..7fb83f76a96 --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/README-docinfo.html @@ -0,0 +1,2 @@ + + diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc index 1c76ff763d9..ae64653cc22 100644 --- a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc +++ b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc @@ -1,11 +1,20 @@ README for project latex-tds ============================ :author: Heiko Oberdiek -:revdate: 2013/02/26 +:revdate: 2013/03/10 :lang: en :toc: :numbered: +:docinfo: :ctan: http://mirror.ctan.org/ +:asciidoc: http://www.methods.co.nz/asciidoc/[AsciiDoc] +:colon: : +// Description is taken from the TeX Catalogue +:description: Bundle `latex-tds' provides a set of ZIP file + + modules containing TDS-compliant trees for items of the + + LaTeX distribution (both the base system and required packages), + + together with `user-friendly' documentation (PDF + + files with navigation support using bookmarks and links). // This file is formatted in the text document format AsciiDoc. @@ -13,7 +22,21 @@ README for project latex-tds Project latex-tds ----------------- -Version: {revdate} +[abstract] +-- +{description} +-- + +Version{colon}:: + {revdate} +Author{colon}:: + {author} +Email and bug report address{colon}:: + heiko.oberdiek at googlemail.com +CTAN home page with distribution files{colon}:: + {ctan}macros/latex/contrib/latex-tds/[CTAN:macros/latex/contrib/latex-tds/] +Source repository (without distribution files){colon}:: + https://github.com/oberdiek/latex-tds How it has started ~~~~~~~~~~~~~~~~~~ @@ -43,6 +66,8 @@ In the following I will use the term `module' for a package bundle. Module list ~~~~~~~~~~~ +The link addresses are the sources for the modules. + *base*:: {ctan}macros/latex/base.zip[CTAN:macros/latex/base.zip] + {ctan}macros/latex/doc.zip[CTAN:macros/latex/doc.zip] + @@ -50,13 +75,10 @@ Module list http://www.latex-project.org/guides/lgc2.err + http://www.latex-project.org/guides/manual.err + http://www.latex-project.org/guides/tlc2.err + - *tools*:: {ctan}macros/latex/required/tools[CTAN:macros/latex/required/tools.zip] - *cyrillic*:: {ctan}macros/latex/required/cyrillic.zip[CTAN:macros/latex/required/cyrillic.zip] - *amslatex*:: {ctan}install/macros/latex/required/amslatex/amscls.tds.zip[CTAN:install/macros/latex/required/amslatex/amscls.tds.zip] + {ctan}install/macros/latex/required/amslatex/math.tds.zip[CTAN:install/macros/latex/required/amslatex/math.tds.zip] + @@ -84,22 +106,6 @@ Module list *etex*:: {ctan}systems/e-tex/v2.1/etex_doc.zip[CTAN:systems/e-tex/v2.1/etex_doc.zip] -Author -~~~~~~ -{author} - -Home -~~~~ -CTAN home with distribution files: -____ -{ctan}macros/latex/contrib/latex-tds/[CTAN:macros/latex/contrib/latex-tds/] -____ - -Source repository (without distribution files): -____ -https://github.com/oberdiek/latex-tds -____ - Abbreviations, Glossary ----------------------- @@ -214,13 +220,15 @@ Copyright, License Copyright (C) 2006-2013 Heiko Oberdiek. -License is LPPL 1.3c: +License is **LPPL 1.3c**: This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in +---- http://www.latex-project.org/lppl.txt +---- and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. @@ -242,7 +250,11 @@ Documentation ~~~~~~~~~~~~~ [cols=".3literal,.7", frame="topbot", grid="rows"] |=== -|README |this file +|README |plain text file +|README.html |standalone HTML file +|README.pdf |PDF version +|README.asciidoc |main source code in text document format {AsciiDoc} +|README-docinfo.html |source code, read by asciidoc to generate +README.html+ |=== Licenses @@ -274,10 +286,10 @@ Configuration |tex/errata.cfg |for errata lists of latex/base |tex/hyperref.cfg |hyperref configuration file |tex/ltnews.cfg |for LaTeX News of latex/base +|tex/ltugboat.cls |setup for class ltugboat |tex/ltxdoc.cfg |setup for class ltxdoc |tex/ltxguide.cfg |setup for the guide manuals in latex/base and required/psnfss -|tex/ltugboat.cls |setup for class ltugboat |tex/lualatex-tds.ini |init file for format generation for LuaTeX |tex/lualatex-tds2.ini |init file for LuaTeX format without LM Math |tex/manual.cfg |setup for errata list of the LaTeX manual @@ -323,8 +335,8 @@ Patches |patch/logmac.tex.diff |knuth/errata/logmac.tex |patch/source2e.tex.diff |base/source2e.tex |patch/tlc2.err.diff |base/tlc2.err -|patch/tripman.tex.diff |knuth/tex/tripman.tex |patch/trapman.tex.diff |knuth/mf/trapman.tex +|patch/tripman.tex.diff |knuth/tex/tripman.tex |patch/utf8ienc.dtx.diff |base/utf8ienc.dtx |patch/webman.tex.diff |knuth/web/webman.tex |=== @@ -681,9 +693,16 @@ History * Module amsfonts added. 2013/02/25:: * Patch file +lb2.err.diff+ removed by call of sed inside +build.pl+. - * +README+ rewritten in text document format http://www.methods.co.nz/asciidoc/[AsciiDoc] + * +README+ rewritten in text document format {AsciiDoc} and added as HTML and PDF files. * +README.asciidoc+ updated. * +Makefile+: Target `check-links' added. 2013/02/26:: * +README+ generated from +README.asciidoc+ via +README.html+. +2013/02/27:: + * +README.asciidoc+: Additions and updates. + * +README.pdf+ generated by wkhtmltopdf via +README.html+. +2013/03/07:: + * Update of amslatex (amsrefs 2013/03/06 v2.13). +2013/03/10:: + * Update of amslatex (amsrefs 2013/03/07 v2.14). diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl index 3f18b34a211..12baa7748bc 100755 --- a/Master/texmf-dist/source/latex/latex-tds/build.pl +++ b/Master/texmf-dist/source/latex/latex-tds/build.pl @@ -4,8 +4,8 @@ $^W=1; my $prj = 'latex-tds'; my $file = 'build.pl'; -my $version = '1.178'; -my $date = '2013-02-26'; +my $version = '1.180'; +my $date = '2013-03-01'; my $author = 'Heiko Oberdiek'; my $copyright = "Copyright 2006-2013 $author"; chomp(my $license = <<"END_LICENSE"); @@ -76,7 +76,20 @@ my $dir_patch = 'patch'; my $dir_distrib = 'distrib'; my $dir_texmf = 'texmf'; chomp(my $cwd = `pwd`); -my $dir_cache = "$cwd/cache"; + +# cache directory +use File::HomeDir; +my $homedir = File::HomeDir->my_home; +my $dir_cache; +if ($homedir && -d "$homedir/.cache") { + $dir_cache = "$homedir/.cache/latex-tds"; + -d $dir_cache or mkdir $dir_cache + or die "$error Cannot make directory `$dir_cache'!\n"; + symlink $dir_cache, "$cwd/cache"; +} +else { + $dir_cache = "$cwd/cache"; +} my $jar_pdfbox_rewrite = "$cwd/$dir_lib/pdfbox-rewrite.jar"; my $jar_multivalent = "$cwd/$dir_lib/Multivalent20060102.jar"; @@ -124,6 +137,7 @@ my $prg_unzip = 'unzip'; my $prg_w3m = 'w3m'; my $prg_weave = 'weave'; my $prg_wget = 'wget'; +my $prg_wkhtmltopdf = 'wkhtmltopdf'; # with patched qt my $prg_zip = 'zip'; my $prg_ziptimetree = $file_ziptimetree; @@ -1809,7 +1823,7 @@ if ($modules{'source'}) { my $file_readme = 'README'; my $file_readme_html = 'README.html'; my $file_readme_pdf = 'README.pdf'; - my $file_readme_notoc_html = "$dir_build_source/README-notoc.html"; + # my $file_readme_notoc_html = "$dir_build_source/README-notoc.html"; my $file_readme_w3m_txt = "$dir_build_source/README-w3m.txt"; ensure_directory($dir_build_source); @@ -1818,17 +1832,18 @@ if ($modules{'source'}) { run("$prg_asciidoc --backend=xhtml11 README.asciidoc"); # generate README.pdf - run("$prg_asciidoc --out-file=$file_readme_notoc_html" - . " --backend=xhtml11" - . " -a disable-javascript" - . " -a toc!" - . " README.asciidoc" - ); - run("$prg_lowriter --invisible --convert-to odt " - . "--outdir $dir_build_source $file_readme_notoc_html"); - run("$prg_lowriter --invisible --convert-to pdf " - . "--outdir $dir_build_source $dir_build_source/README-notoc.odt"); - run("$prg_cp -p $dir_build_source/README-notoc.pdf $file_readme_pdf"); + # run("$prg_asciidoc --out-file=$file_readme_notoc_html" + # . " --backend=xhtml11" + # . " -a disable-javascript" + # . " -a toc!" + # . " README.asciidoc" + # ); + # run("$prg_lowriter --invisible --convert-to odt " + # . "--outdir $dir_build_source $file_readme_notoc_html"); + # run("$prg_lowriter --invisible --convert-to pdf " + # . "--outdir $dir_build_source $dir_build_source/README-notoc.odt"); + # run("$prg_cp -p $dir_build_source/README-notoc.pdf $file_readme_pdf"); + run("$prg_wkhtmltopdf $file_readme_html $file_readme_pdf"); # run("$prg_cp -p README.asciidoc $dir_build_source/README"); run("$prg_w3m -dump README.html>$file_readme_w3m_txt"); @@ -1880,6 +1895,7 @@ if ($modules{'source'}) { install $dir_dest, qw[ build.pl README.asciidoc + README-docinfo.html ]; install "$dir_dest/tex", glob("$dir_tex/*.*"); diff --git a/Master/texmf-dist/source/latex/latex-tds/tex/latex-tds.ini b/Master/texmf-dist/source/latex/latex-tds/tex/latex-tds.ini deleted file mode 100644 index cccf672e6d1..00000000000 --- a/Master/texmf-dist/source/latex/latex-tds/tex/latex-tds.ini +++ /dev/null @@ -1,52 +0,0 @@ -% latex-tds.ini -% 2008/08/08 v1.1 -% Copyright 2007, 2008 Heiko Oberdiek -% -% This file is part of project `latex-tds'. -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Heiko Oberdiek. -% -% See `readme.txt' for a list of all files belonging to the -% project `latex-tds' and additional information. -% -% 2007/10/17 v1.0 -% 2008/08/08 v1.1: Packages `ifvtex', `ifxetex', and `pdfescape' added. -% -\input pdftexconfig % -\pdfoutput=1 % -\scrollmode -\let\SavedDump\dump -\let\dump\relax -\input latex.ltx % -\errorcontextlines=\maxdimen -\RequirePackage{keyval} -\RequirePackage{url} -\RequirePackage{infwarerr}[2007/09/09] -\RequirePackage{atbegshi}[2007/09/09] -\RequirePackage{auxhook}[2007/04/06] -\RequirePackage{etexcmds}[2007/09/09] -\RequirePackage{ifpdf}[2007/09/09] -\RequirePackage{ifvtex}[2007/09/09] -\RequirePackage{ifxetex} -\RequirePackage{intcalc}[2007/09/27] -\RequirePackage{bigintcalc}[2007/09/27] -\RequirePackage{kvoptions}[2007/10/11] -\RequirePackage{kvsetkeys}[2007/09/29] -\RequirePackage{bitset}[2007/09/28] -\RequirePackage{refcount}[2006/02/20] -\RequirePackage{pdfescape}[2007/11/11] -\expandafter\def\csname ver@thumbpdf.sty\endcsname{0000/00/00} -\let\dump\SavedDump -\let\SavedDump\UNDEFINED -\dump -\endinput -- cgit v1.2.3