From d0522ea72b45ab54197018f29942546d27495f96 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Jan 2011 23:14:19 +0000 Subject: morehype 0.2 (28jan11) git-svn-id: svn://tug.org/texlive/trunk@21211 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/morehype/FileList.txt | 12 +-- Master/texmf-dist/doc/latex/morehype/RELEASE.txt | 4 + Master/texmf-dist/doc/latex/morehype/blog.pdf | Bin 248093 -> 248134 bytes .../texmf-dist/doc/latex/morehype/docsrc/blog.tex | 6 +- .../doc/latex/morehype/docsrc/hypertoc.tex | 6 +- .../doc/latex/morehype/docsrc/makehtml.tex | 6 +- .../doc/latex/morehype/docsrc/mdoccorr.cfg | 6 +- .../doc/latex/morehype/docsrc/texlinks.tex | 9 ++- Master/texmf-dist/doc/latex/morehype/hypertoc.pdf | Bin 129758 -> 129709 bytes Master/texmf-dist/doc/latex/morehype/texlinks.pdf | Bin 194137 -> 199484 bytes Master/texmf-dist/tex/latex/morehype/texlinks.sty | 86 +++++++++++++++++---- 11 files changed, 99 insertions(+), 36 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/morehype/RELEASE.txt diff --git a/Master/texmf-dist/doc/latex/morehype/FileList.txt b/Master/texmf-dist/doc/latex/morehype/FileList.txt index eebc06a955c..176fa4aee7c 100644 --- a/Master/texmf-dist/doc/latex/morehype/FileList.txt +++ b/Master/texmf-dist/doc/latex/morehype/FileList.txt @@ -2,18 +2,18 @@ *File List* blog.sty 2011/01/24 v0.4 simple fast HTML (UL) hypertoc.sty 2011/01/23 v0.1 pretty TOC links (UL) -texlinks.sty 2011/01/24 v0.1 TeX-related links (UL) - blog.tex 2011/01/25 documenting blog.sty -hypertoc.tex 2011/01/24 documenting hypertoc.sty -texlinks.tex 2011/01/24 documenting texlinks.sty +texlinks.sty 2011/01/27 v0.2 TeX-related links (UL) + blog.tex 2011/01/27 documenting blog.sty +hypertoc.tex 2011/01/27 documenting hypertoc.sty +texlinks.tex 2011/01/27 documenting texlinks.sty atari.fdf 2010/08/24 Atari to ISO-8859-1 with blog.sty lang-de.fdf 2011/01/25 German settings for blog.sty lang-en.fdf 2011/01/25 English settings for blog.sty makedoc.cfg 2011/01/24 documentation settings -mdoccorr.cfg 2011/01/12 local typographical corrections with makedoc.sty +mdoccorr.cfg 2011/01/27 local typographical corrections with makedoc.sty gather.tex 2011/01/25 collect file infos *********** - List made at 2011/01/25, 08:48 + List made at 2011/01/28, 00:14 from script file gather.tex diff --git a/Master/texmf-dist/doc/latex/morehype/RELEASE.txt b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt new file mode 100644 index 00000000000..3721f420937 --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt @@ -0,0 +1,4 @@ +r0.2 2011/01/27 texlinks v0.2 \urlfoot +\urlfoot displays the URL that some shorthand generates +in a footnote. E.g., \ukfaqref{LABEL}{TEXT} generates +an URL that \urlfoot{ukfaqref}{LABEL} displays. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/morehype/blog.pdf b/Master/texmf-dist/doc/latex/morehype/blog.pdf index e1573ddf79b..0266f6c32c9 100644 Binary files a/Master/texmf-dist/doc/latex/morehype/blog.pdf and b/Master/texmf-dist/doc/latex/morehype/blog.pdf differ diff --git a/Master/texmf-dist/doc/latex/morehype/docsrc/blog.tex b/Master/texmf-dist/doc/latex/morehype/docsrc/blog.tex index f4a499d471c..cf46597d225 100644 --- a/Master/texmf-dist/doc/latex/morehype/docsrc/blog.tex +++ b/Master/texmf-dist/doc/latex/morehype/docsrc/blog.tex @@ -1,4 +1,4 @@ -\ProvidesFile{blog.tex}[2011/01/25 documenting blog.sty] +\ProvidesFile{blog.tex}[2011/01/27 documenting blog.sty] \title{\textsf{blog.sty}\\---\\% Generating HTML Quickly with \TeX\thanks{This document describes version @@ -53,7 +53,7 @@ The file 'blog.sty' is provided ready, \strong{installation} only requires putting it somewhere where \TeX\ finds it (which may need updating the filename data - base).\footnote{\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}} + base).\urlfoot{ukfaqref}{inst-wlcf} \strong{User commands} are described near their implementation below. @@ -122,4 +122,4 @@ HISTORY 2010/11/05 for v0.2 2010/11/11 for v0.3 2011/01/23 using readprov and color - +2011/01/27 using \urlfoot diff --git a/Master/texmf-dist/doc/latex/morehype/docsrc/hypertoc.tex b/Master/texmf-dist/doc/latex/morehype/docsrc/hypertoc.tex index 0ba18188ef6..bd5091f3f5c 100644 --- a/Master/texmf-dist/doc/latex/morehype/docsrc/hypertoc.tex +++ b/Master/texmf-dist/doc/latex/morehype/docsrc/hypertoc.tex @@ -1,4 +1,4 @@ -\ProvidesFile{hypertoc.tex}[2011/01/24 documenting hypertoc.sty] +\ProvidesFile{hypertoc.tex}[2011/01/27 documenting hypertoc.sty] \title{\textsf{hypertoc.sty}\\---\\Decent Links in Tables of Contents\thanks{This document describes version @@ -52,7 +52,7 @@ It would be nice if this could be integrated here later. The file 'hypertoc.sty' is provided ready, installation only requires putting it somewhere where \TeX\ finds it (which may need updating the filename data - base).\footnote{\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}} + base).\urlfoot{ukfaqref}{inst-wlcf} %% 2011/01/27 Below the `\documentclass' line(s) and above `\begin{document}', you load 'hypertoc.sty' (as usually) by @@ -76,4 +76,4 @@ VERSION HISTORY 2011/01/23 for v0.1, very first 2011/01/24 \ProvidesFile date corrected - +2011/01/27 uses \urlfoot diff --git a/Master/texmf-dist/doc/latex/morehype/docsrc/makehtml.tex b/Master/texmf-dist/doc/latex/morehype/docsrc/makehtml.tex index 4daf3fe5ea5..8c19929f374 100644 --- a/Master/texmf-dist/doc/latex/morehype/docsrc/makehtml.tex +++ b/Master/texmf-dist/doc/latex/morehype/docsrc/makehtml.tex @@ -1,11 +1,11 @@ -\def \GenDate {2011/01/25} +\def \GenDate {2011/01/26} \ProvidesFile{makehtml.tex} [\GenDate \space- UL's TeX-generated web pages] \RequirePackage{blog}[2011/01/24] \input{atari.fdf} \input{lang-en.fdf} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def \htmljob -{texmap} %% 2011/01/25 +% {texmap} %% 2011/01/25 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % {aaoe1550} %% 2010/09/14 % {heyctan} @@ -13,7 +13,7 @@ % {makeshow} % {private} \input{lang-de.fdf} % {README} -% {texhax} +{texhax} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% "CFG:" \newcommand*{\enlastrev}{% diff --git a/Master/texmf-dist/doc/latex/morehype/docsrc/mdoccorr.cfg b/Master/texmf-dist/doc/latex/morehype/docsrc/mdoccorr.cfg index 6ffa27f1ff2..bbcadd90e34 100644 --- a/Master/texmf-dist/doc/latex/morehype/docsrc/mdoccorr.cfg +++ b/Master/texmf-dist/doc/latex/morehype/docsrc/mdoccorr.cfg @@ -1,4 +1,4 @@ -\ProvidesFile{mdoccorr.cfg}[2011/01/12 +\ProvidesFile{mdoccorr.cfg}[2011/01/27 local typographical corrections with makedoc.sty] %% ... also demonstrates 'niceverb.sty'---see the typeset @@ -26,6 +26,7 @@ \newcommand*{\PXAR}{\PrependExpandableAllReplacer} \PXAR{dots}{...}{.\kern\fontdimen3\font.\kern\fontdimen3\font.} \PXAR{dots }{... }{.\kern\fontdimen3\font.\kern\fontdimen3\font.\ } +\PXAR{TODO}{TODO}{\textcolor{blue}{TODO}} %% 2011/01/27 %% ... chain starts here, and here |\MakeDocCorrectHook| (silently) %% enters through a default variant |\SetCorrectHookJobLast| %% of |\SetCorrectHookJob{}|: @@ -46,4 +47,5 @@ HISTORY 2010/03/29 use \SetPatternCodes etc. 2010/11/06 <- and -> 2010/11/24 `...' ``symmetric variant" of `\textellipsis'; - \StartPrependingChain, no more \MakeExpandableAllreplacer + \StartPrependingChain, no more \MakeExpandableAllreplacer +2011/01/27 blue "TODO" diff --git a/Master/texmf-dist/doc/latex/morehype/docsrc/texlinks.tex b/Master/texmf-dist/doc/latex/morehype/docsrc/texlinks.tex index 05605bd6c26..5ea979d5de0 100644 --- a/Master/texmf-dist/doc/latex/morehype/docsrc/texlinks.tex +++ b/Master/texmf-dist/doc/latex/morehype/docsrc/texlinks.tex @@ -1,4 +1,4 @@ -\ProvidesFile{texlinks.tex}[2011/01/24 documenting texlinks.sty] +\ProvidesFile{texlinks.tex}[2011/01/27 documenting texlinks.sty] \title{\textsf{texlinks.sty}\\---\\\TeX-Related Links for \textsf{hyperref}, \textsf{blog.sty}\\ (and maybe more)\thanks{This @@ -44,7 +44,8 @@ They may as well be useful with better known (and better developed) The file 'texlinks.sty' is provided ready, installation only requires putting it somewhere where \TeX\ finds it (which may need updating the filename data - base).\footnote{\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}} + base).\urlfoot{ukfaqref}{inst-wlcf} + % \footnote{\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}} Below the `\documentclass' line(s) and above `\begin{document}', you load 'texlinks.sty' (as usually) by @@ -54,7 +55,7 @@ you load 'texlinks.sty' (as usually) by Package options and user commands are described near their definitions below in the implementation section. -\section{Package File Header} +\section{Package File Header (Legalize)} \input{texlinks.doc} \end{document} @@ -62,4 +63,4 @@ below in the implementation section. VERSION HISTORY 2011/01/24 for v0.1, very first - +2011/01/27 for v0.2, use \urlfoot{ukfaq} diff --git a/Master/texmf-dist/doc/latex/morehype/hypertoc.pdf b/Master/texmf-dist/doc/latex/morehype/hypertoc.pdf index 521071ec8e4..aa05f9de40e 100644 Binary files a/Master/texmf-dist/doc/latex/morehype/hypertoc.pdf and b/Master/texmf-dist/doc/latex/morehype/hypertoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/morehype/texlinks.pdf b/Master/texmf-dist/doc/latex/morehype/texlinks.pdf index bb483ae9ba7..d51056bd2b7 100644 Binary files a/Master/texmf-dist/doc/latex/morehype/texlinks.pdf and b/Master/texmf-dist/doc/latex/morehype/texlinks.pdf differ diff --git a/Master/texmf-dist/tex/latex/morehype/texlinks.sty b/Master/texmf-dist/tex/latex/morehype/texlinks.sty index 6ab5bca6b06..ed9bbf1a58a 100644 --- a/Master/texmf-dist/tex/latex/morehype/texlinks.sty +++ b/Master/texmf-dist/tex/latex/morehype/texlinks.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] %% \newcommand* etc. -\ProvidesPackage{texlinks}[2011/01/24 v0.1 TeX-related links (UL)] +\ProvidesPackage{texlinks}[2011/01/27 v0.2 TeX-related links (UL)] %% copyright (C) 2011 Uwe Lueck, %% http://www.contact-ednotes.sty.de.vu %% -- author-maintained in the sense of LPPL below. @@ -38,11 +38,14 @@ %% troublesome. I consider it a good idea to present %% links with their URL as the displayed text in \emph{footnotes} %% (or endnotes). It may even be useful with HTML to present -%% the URLs displayed in some "appendix". -%% -%% I tend to introduce something for this ... and there might be a -%% package option forcing `\httpref' to use this style. -%% Well, better \emph{not today} ... [2011/01/24, TODO] +%% the URLs displayed in some +%% 2011/01/27: +%% ``appendix."---This idea has been resumed in v0.2 only, +%% |\urlfoot|. +%% % +%% % I tend to introduce something for this ... and there might be a +%% % package option forcing `\httpref' to use this style. +%% % Well, better \emph{not today} ... [2011/01/24, TODO] %% %% == Package Options == %% Somebody may want to suppress a definition of `\httpref' @@ -63,29 +66,78 @@ }{\newcommand*{\httpref}[1]{\href{http://#1}}}} %% %% == Variants of &\httpref == +%% |\NormalHTTPref| may be used as an alias for `\httpref' +%% in situations where the latter has been redefined: %% v0.2 +\AtBeginDocument{%% TODO: options, guarded \let (mine, HO) + \@ifdefinable\NormalHTTPref{\let\NormalHTTPref\httpref}} %% |\ithttpref{}{}| displays in italics: -\newcommand*{\ithttpref}[2]{\httpref{#1}{\textit{#2}}} %% 2010/12/03 -%% With |\urlhttpref{}|, that URL -%% is displayed: -\newcommand* \urlhttpref [1] {\httpref{#1}{\urlfmt{\httpprefix#1}}} +\newcommand*{\ithttpref}[2]{\NormalHTTPref{#1}{\textit{#2}}} +%% With |\urlhttpref{}|, that URL is displayed: +\newcommand*{\urlhttpref}[1]{% + \NormalHTTPref{#1}{\urlfmt{\httpprefix#1}}} %% |\httpprefix| is an idea that was missing in 'blog.sty' up to v0.3. %% It may be used to determine generally whether a display of an %% URL should include `http://'. I choose as default what was default -%% in 'blog.sty': -\newcommand\httpprefix{} \let\httpprefix\@empty +%% in 'blog.sty' +%% (i.e., ``don't include"): %% add. 2011/01/27 +\@ifdefinable\httpprefix{\let\httpprefix\@empty} %% TODO cf. above %% `\let\httpprefix\relax' would be bad for 'blog.sty' %% (would display `\relax'), %% while it would be somewhat more efficient.%%%---%%% %% %% Now you may customize `\httpprefix' by -%% \[`\renewcommand{\httpprefix}{http://}'.\] -%% +%% \[`\renewcommand{\httpprefix}{http://}'\] +%% %% v0.2: +%% ---or by `\let\httpprefix'|\theHTTPprefix|: +\newcommand*{\theHTTPprefix}{http://} %% |\urlfmt{}| is chosen as `\texttt' here and may be %% customized, e.g., with the 'breakurl' package. -\newcommand* \urlfmt [1] {} \let\urlfmt\texttt +\@ifdefinable\urlfmt{\let\urlfmt\texttt} %% In 'blog.sty' (as of 2010/05/26), there was a command %% `\urlref' instead of `\urlhttpref'. It did not provide `\urlfmt'. %% +%% |\foothttpurlref{}| just is like +%% `\footnote{\urlhttpref{}}': +\newcommand*{\foothttpurlref}[1]{\footnote{\urlhttpref{#1}}} +%% |\urlfoot{}{}| +%% redefines `\httpref' so that you can use all the shorthand +%% macros based on `\httpref' to get the according URL +%% display (as provided by `\urlhttpref') +%% in a footnote without the need to include the +%% entire URL in your source code. `\urlfoot' is available +%% with and +%% when a shorthand |\{}{}| has been defined +%% where `\' is the macro name and is the target +%% identifier (usually part of the URL generated from ) +%% according to the syntax declaration of `\'. +\newcommand*{\urlfoot}[2]{{% + \let\httpref\foothttpurlref + \let\httpprefix\theHTTPprefix %% TODO customizable!? + \csname #1\endcsname{#2}{}}} +%% \strong{Example:} +%% \[`\CtanPkgRef{morehype}{MoreHype}' +%% \mbox{\quad and\quad } `\ctanpkgref{morehype}'\] +%% are provided below for linking to +%% `http://ctan.org/pkg/morehype'. +%% \begin{itemize} +%% \item Try `CtanPkgRef' \emph{here}: +%% \CtanPkgRef{morehype}{MoreHype},\\ +%% for the \emph{footnote} try +%% `\urlfoot{CtanPkgRef}{morehype}';%%% +%% \urlfoot{CtanPkgRef}{morehype} +%% \item try `ctanpkgref' \emph{here}: \ctanpkgref{morehype},\\ +%% for the \emph{footnote} try +%% `\urlfoot{ctanpkgref}{morehype}'.%%% +%% \urlfoot{ctanpkgref}{morehype} +%% \end{itemize} +%% The lonely \qtd{\pkgnamefmt{morehype}} demonstrates that +%% it doesn't work with `ctanpkgref' because +%% `\ctanpkgref' doesn't have separate arguments for +%% and , it actually doubles . +%% A local `\let\ctanpkgref\CtanPkgRef' could help, +%% but right now I prefer waiting for a better idea. +%% [TODO] %% 2011/01/27 +%% %% == Wikipedia == %% |\Wikideref{}| refers to article in the German %% Wikipedia. (The next considerations apply to English @@ -259,3 +311,7 @@ %% %% == VERSION HISTORY == v0.1 2011/01/24 new file, code from blog.sty v0.3 +v0.2 2011/01/27 \urlfoot, \NormalHTTPref, \foothttpurlref, + "outline" adjusted; + more consistent use of \newcommand and + \@ifdefinable (TODO: guarded \let) -- cgit v1.2.3