summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/morehype
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-11 22:54:02 +0000
committerKarl Berry <karl@freefriends.org>2011-10-11 22:54:02 +0000
commitf5d5dc04a3a9336da726ed2dcf9bcb741f8dad4b (patch)
tree7e40e516d0eaf09e1ae5e6474326a08ea152be78 /Master/texmf-dist/tex/latex/morehype
parent662cda48313c1615e5b117f827f245bd4a4fc22a (diff)
morehype (11oct11)
git-svn-id: svn://tug.org/texlive/trunk@24269 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/morehype')
-rw-r--r--Master/texmf-dist/tex/latex/morehype/blog.sty287
-rw-r--r--Master/texmf-dist/tex/latex/morehype/blogdot.css41
-rw-r--r--Master/texmf-dist/tex/latex/morehype/blogdot.sty200
-rw-r--r--Master/texmf-dist/tex/latex/morehype/lang-de.fdf4
-rw-r--r--Master/texmf-dist/tex/latex/morehype/lnavicol.sty141
-rw-r--r--Master/texmf-dist/tex/latex/morehype/texblog.fdf283
-rw-r--r--Master/texmf-dist/tex/latex/morehype/texlinks.sty39
7 files changed, 849 insertions, 146 deletions
diff --git a/Master/texmf-dist/tex/latex/morehype/blog.sty b/Master/texmf-dist/tex/latex/morehype/blog.sty
index 6ff50a8ab58..5ff71be95e2 100644
--- a/Master/texmf-dist/tex/latex/morehype/blog.sty
+++ b/Master/texmf-dist/tex/latex/morehype/blog.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01] %% \newcommand* etc.
-\ProvidesPackage{blog}[2011/08/31 v0.5 simple fast HTML (UL)]
+\ProvidesPackage{blog}[2011/10/10 v0.5 simple fast HTML (UL)]
%% copyright (C) 2010 2011 Uwe Lueck,
%% http://www.contact-ednotes.sty.de.vu
%% -- author-maintained in the sense of LPPL below.
@@ -21,12 +21,17 @@
%% |\CLBrk| is a \emph{code line break}
%% (also saving subsequent comment mark):
\newcommand*{\CLBrk}{^^J}
+%% |\htmakeext| is the extension of the generated file.
+%% Typically it should be `.html', as set here,
+%% but my Atari emulator needs `.htm'
+%% (see `texblog.fdf'):
+\newcommand*{\htmakeext}{.html}
%% |\BlogCopyFile[<changes>]{<src-file>}|
%% ``copies" the \TeX\ source file <src-file>
%% into the file specified by `\ResultFile'.
%% As in \TeX\ an empty line starts a new paragraph,
%% we ``interpret" an empty source line as
-%% \acro{HTML} tag \xmltagcode{p} for starting a new paragraph.
+%% \HTML\ tag \xmltagcode{p} for starting a new paragraph.
%% Empty source lines following some first empty source
%% line immediately are ignored
%% (``compression" of empty lines).---However,
@@ -43,6 +48,8 @@
\ProcessOptions
\MakeOther\< \MakeOther\> %% TODO ...
\newcommand*{\BlogCopyFile}[2][]{%
+ \typeout{^^J\screenqtd{blog.sty} generating %% 2011/10/05
+ \screenqtd{\htmljob\htmakeext}}%
\ProcessFileWith[\BlogCodes
\let\ProvidesFile\BlogProvidesFile %% 2011/02/24
\let\protect\@empty %% 2011/03/24
@@ -61,15 +68,15 @@
\newcommand*{\BlogCodes}{% %% 2010/09/07
\endlinechar`\ \catcode`\~\active \BasicNormalCatCodes}
%% The tilde is active as in Plain~TeX too, it is so natural to
-%% use it for abbreviating \acro{HTML}'s `&nbsp;'!
+%% use it for abbreviating \HTML's `&nbsp;'!
%%
%% %% v0.42:
%% |\ProvidesFile{<file-name>.tex}[<file-info>]| \ is supported
%% for use with the \CtanPkgRef{morehype}{myfilist}
%% package %% TODO \urlpkgfoot!? 2011/02/22
%% to get a list of source file infos.
-%% In generating the \acro{HTML} file, the file infos are transformed
-%% into an \acro{HTML} comment. Actually it is
+%% In generating the \HTML\ file, the file infos are transformed
+%% into an \HTML\ comment. Actually it is
%% |\BlogProvidesFile| (for the time being, 2011/02/22):
\@ifdefinable\BlogProvidesFile{%
\def\BlogProvidesFile#1[#2]{%
@@ -87,19 +94,20 @@
%% \[`\let\ProvidesFile\BlogProvidesFile'\]
%% somewhere, e.g., in `\BlogCopyFile'.
%%
-%% \pagebreak[3] %% 2011/05/11
-%% == General \acro{HTML} Matters ==
+%% \pagebreak %% 2011/10/10
+%% == General \HTML\ Matters ==
%% The following stuff is required for any web page
%% (or hardly evitable).
%% === General Tagging ===
-%% $$|\TagSurr{<el-name>}{<attr>}{<content>}|$$
+%% %% $$ -> \[ ... 2011/10/10:
+%% \[|\TagSurr{<el-name>}{<attr>}{<content>}|\]
%% (I hoped this way code would be more readable
%% than with `\TagSurround' ...)
-%% and $$|\SimpleTagSurr{<el-name>}{<content>}|$$
+%% and \[|\SimpleTagSurr{<el-name>}{<content>}|\]
%% are used to avoid repeating element names <el-name> in
%% definitions of \TeX\ macros that refer to ``entire"
%% elements---as opposed to elements whose content often
-%% spans lines (as readable \acro{HTML} code).
+%% spans lines (as readable \HTML\ code).
%% We will handle the latter kind of elements
%% using \LaTeX's idea of ``environments."
%% `\TagSurr' also inserts specifications of element
@@ -116,10 +124,10 @@
%% === Attributes === %%% (General) %%%
%% Inspired by the common way to use `@' for referring
%% to element attributes---i.e., `@<attr>' refers to attribute
-%% `<attr>'---in \acro{HTML}/\acro{XML} documentation, we often use
-%% $$`\@<attr>{<value>}' \qquad
-%% \mbox{to ``abbreviate"}\qquad `<attr>="<value>"'$$
-%% within the starting tag of an \acro{HTML} element.
+%% `<attr>'---in \HTML/\acro{XML} documentation, we often use
+%% \[`\@<attr>{<value>}' \qquad
+%% \mbox{to ``abbreviate"}\qquad `<attr>="<value>"'\]
+%% within the starting tag of an \HTML\ element.
%% This does not really
%% make typing easier or improve readability,
%% it rather saves \TeX's memory by using a single token
@@ -130,24 +138,32 @@
\newcommand*{\declareHTMLattrib}[1]{%
\def\reserved@a{@#1}%
\@ifundefined{@#1}%
-% {\@namedef{@#1}##1{ #1="##1"}}%
{\@namedef{@#1}##1{#1="##1"}}%
\@notdefinable}
%% So after `\declareHTMLattrib{<attr>}', `\@<attr>' is a
%% \TeX\ macro expecting one parameter for the specification.
%%
%% A few frequent attributes are declared this way here.
+%% %% 2011/09/27:
+%% |@class|, |@id|, |@style|, |@title|, |@lang|, and |@dir|
+%% are the ones named on
+%% \wikienref{HTML\#Attributes}{\meta{Wikipedia}}:
+\let\@class\relax %% for tab/arr in latex.ltx
+\declareHTMLattrib{class}
+\declareHTMLattrib{id}
+\declareHTMLattrib{style}
+\let\@title\relax %% for \title in latex.ltx
+\declareHTMLattrib{title} %% 2011/04/26
+\declareHTMLattrib{lang}
+\declareHTMLattrib{dir}
+%% |@type| is quite frequent too: %% doc. 2011/09/27
+\declareHTMLattrib{type}
%% |@href| is most important for that ``hyper-text:"
\declareHTMLattrib{href}
%% ... and |@name| (among other uses) is needed for
%% |@name| for %% 2011/04/26
%% hyper-text anchors:
\declareHTMLattrib{name} %% 2010/11/06
-%% Many elements have the |@type| attribute: %% 2011/08/01
-\declareHTMLattrib{type}
-%% |@title| for tooltips: %% 2011/04/26
-\let\@title\relax
-\declareHTMLattrib{title} %% 2011/04/26
%% |@bgcolor| is used in tables as well as
%% for the appearance of the entire page:
\declareHTMLattrib{bgcolor}
@@ -180,7 +196,6 @@
%% Some other uses of `\declareHTMLattrib' essential for
%% \emph{tables:} %% emph 2011/04/24
\declareHTMLattrib{border} %% 2011/04/24
-\declareHTMLattrib{class} %% 2011/04/24
\declareHTMLattrib{cellpadding} %% 2010/07/18
\declareHTMLattrib{cellspacing} %% 2010/07/18
\declareHTMLattrib{colspan} %% 2010/07/17
@@ -193,28 +208,28 @@
%% well, not so bad, as the main purpose of this namespace
%% is saving tokens \emph{in macros.}
%%
-%% === \acro{HTML}'s Special Symbols ===
-%% |#| is needed for numerical specifications in \acro{HTML},
+%% === \HTML's Special Symbols ===
+%% |#| is needed for numerical specifications in \HTML,
%% especially colors and Unicode symbols,
%% while it plays a different (essential) role in our
%% definitions of \TeX\ macros here.
%% We redefine \LaTeX's |\#|
%% for a kind of ``quoting" `#' in macro definitions
-%% in order to refer to their \acro{HTML} meaning.---I \textbf{wonder}
+%% in order to refer to their \HTML\ meaning.---I \textbf{wonder}
%% what I had in mind with the |&| things here.
%% I cannot find any use of |\AmpMark| in my code
%% (including my web pages). There is no real problem
-%% with calling special \acro{HTML} symbols, `&' is simply
+%% with calling special \HTML\ symbols, `&' is simply
%% made `other' already here for macros calling those symbols
%% (below), and in processing source files, it is as well
%% `other' by default. The symbols section, however, redefines |\&|
-%% for calling \acro{HTML}'s ampersand symbol.
+%% for calling \HTML's ampersand symbol.
{\catcode`\&=12 \catcode`\#=12
\gdef\AmpMark{&} \gdef\#{#}}
%% ... `\CompWordMark' etc.?
%%
%% === Head ===
-%% |\head| produces the first two tags that an \acro{HTML} file must start:
+%% |\head| produces the first two tags that an \HTML\ file must start:
\newcommand*{\head}{<html><head>} %% ^^J rm 2010/10/10
%% |\MetaTag{<inside>}| and |\ContentAtt{<value>}|
%% are internal shortcuts:
@@ -224,14 +239,14 @@
\newcommand*{\charset}[1]{%
\MetaTag{http-equiv="Content-Type" \ContentAtt{text/html; #1}}}
%% |\description{<text>}| for web searches (I think):
-\newcommand*{\description}[1]{%
- \MetaTag{\@name{description} \ContentAtt{#1}}}
-%% ... an outright \textbf{mistake!} TODO %% todo 2011/07/25
+% \newcommand*{\description}[1]{%
+% \MetaTag{\@name{description} \ContentAtt{#1}}}
+%% ... an outright \textbf{mistake!} %% commented out 2011/10/05
%% The definition is overridden
-%% to get the \acro{HTML} equivalent to \LaTeX's `description' environment.
+%% to get the \HTML\ equivalent to \LaTeX's `description' environment.
%% `\newcommand' did not warn here because we don't load any \LaTeX\
%% class for text-processing macros and code generation.---And so
-%% some |\MetaDescr| should be defined---and used finally!
+%% some |\MetaDescr| should be defined---and used finally! TODO
%%
%% |\robots{<instructions>}|:
\newcommand*{\robots}[1]{%% juergenf: index, follow, noarchive
@@ -242,7 +257,16 @@
%% `media="<media>"':
\newcommand*{\stylesheet}[2]{%
\space\space %% 2010/09/10
- <link rel="stylesheet" media="#1" type="text/css" \@href{#2.css}>}
+ <link rel="stylesheet" media="#1"
+ \@type{text/css} %% \@type 2011/10/05
+ \@href{#2.css}>}
+%% %% 2011/10/05:
+%% Alternatively, style declarations may occur in the
+%% \xmltagcode{style} element. It can be accessed by the
+%% |{style}| environment (cf. Sec.~\ref{sec:env}):
+\newenvironment*{style}[1]
+ {<style \@type{text/css} media="#1">}
+ {</style>}
%% With |\title{<text>}|, <text> heads %% grammar? TODO 2010/04/08
%% the browser window:
\renewcommand*{\title}[1]{\space\space<title>#1</title>}
@@ -270,9 +294,9 @@
%%
%% We ``re-use" some \LaTeX\ commands for specifying font attributes,
%% rather than (re)defining macros `\i', `\b', `\tt', ...
-%% $$|\textit{<text>}| \qquad
+%% \[|\textit{<text>}| \qquad
%% \mbox{just expands to}\qquad
-%% \xmltagcode{i}<text>\xmltagcode{/i}$$
+%% \xmltagcode{i}<text>\xmltagcode{/i}\]
\renewcommand*{\textit}{\SimpleTagSurr i}
%% etc. for |\textbf|, |\texttt| ...:
\renewcommand*{\textbf}{\SimpleTagSurr b}
@@ -280,7 +304,7 @@
%% |\textsf{<text>}| TODO (see some `makehtml.tex') %% 2011/05/11
%%
%% |\textcolor| is from \LaTeX's 'color' package
-%% that we won't load for generating \acro{HTML},
+%% that we won't load for generating \HTML,
%% so it is ``new" here, it is just natural to use it
%% for colored text (2010/05/15):
\newcommand*{\textcolor}[1]{\TagSurr{font}{color="#1"}}
@@ -289,21 +313,26 @@
%% |\code{<text>}| marks <text> as ``code,"
%% just accessing te \xmltagcode{code} element,
%% while standard \LaTeX\ does not provide a `\code' command:
-\newcommand*{\code} {\SimpleTagSurr{code}} %% 2010/04/27
+\newcommand*{\code}{\SimpleTagSurr{code}} %% 2010/04/27
%% |\emph{<text>}| is \LaTeX's command again, but somewhat abused,
%% expanding to \lq\xmltagcode{em}<text>\xmltagcode{/em}\rq:
\renewcommand*{\emph} {\SimpleTagSurr{em}}
%% ... Note that \LaTeX's `\emph' feature of switching to `up'
%% when `\emph' appears in an italic context doesn't work here ...
%%
-%% |\strong{<text>}| again just calls an \acro{HTML} element.
+%% |\strong{<text>}| again just calls an \HTML\ element.
%% It may behave like `\textbf{<text>}', or ... I don't know ...
-\newcommand*{\strong} {\SimpleTagSurr{strong}}
+\newcommand*{\strong}{\SimpleTagSurr{strong}}
%% %% 2011/03/09:
%% |\var{<symbol(s)>}| accesses the \xmltagcode{var} element:
\newcommand*{\var}{\SimpleTagSurr{var}}
+%% |\acronym{<chars>}| ... there is `\acro' in the TUGboat
+%% macros, while \HTML\ provides an \xmltagcode{acronym}
+%% environment ... %% 2011/09/21
+\newcommand*{\acronym}{\SimpleTagSurr{acronym}}
%%
%% == Environments ==
+%% \label{sec:env}
%% We reduce \LaTeX's |\begin| and |\end| to their most primitive
%% core.
%% \begin{description}
@@ -317,81 +346,81 @@
%% does not allow any assignments while ``copying"
%% the \TeX\ source into the `.htm'.
%% There even is no check for proper nesting.
-%% `\begin' and `\end' just represent \acro{HTML} elements
+%% `\begin' and `\end' just represent \HTML\ elements
%% (their starting/ending tags)
%% that typically have ``long" content.
%% (We might ``intercept" `\begin' and `\end' before
%% copying for executing some assignments in a future version.)
\let\begin\@nameuse
\def\end#1{\csname end#1\endcsname}
-%% |{center}|---TODO cf. \xmltagcode{center} 2010/07/18:
-\renewenvironment*{center}{<p align="center">}{</p>}
%% ... moving |{english}| to `xmlprint.cfg'
%% 2010/05/22 ...%% doc 2010/11/06
%%
%% As formerly with ``fonts," we have \emph{two} policies for
%% \textbf{choosing macro names}:
-%% (i)~using an \emph{existing} \acro{HTML} element name,
+%% (i)~using an \emph{existing} \HTML\ element name,
%% (ii)~using a \LaTeX\ command name for accessing a somewhat
-%% similar \acro{HTML} element having a \emph{different} name.
-%%
-%% |\declareHTMLelement{<el-name>}| creates a \emph{new}
-%% <el-name> ``environment" according to policy~(i):
-\newcommand*{\declareHTMLelement}[1]{%
- \newenvironment*{#1}{<#1>}{</#1>}}
-%% |\renderHTMLelement{<ltx-env>}{<el-name>}| \emph{redefines}
-%% \LaTeX's <ltx-env> environment to use \acro{HTML}'s <el-name> element
-%% according to policy~(ii):
-\newcommand*{\renderHTMLelement}[2]{%
- \renewenvironment*{#1}{<#2>}{</#2>}}
-%% Applying former auxiliaries:
-%%
-%% `\small' is a \LaTeX\ command from a \emph{class}---that
-%% we won't load, therefore we can create a \emph{new}
-%% |{small}| environment using \xmltagcode{small} according to
-%% policy~(i):
-\declareHTMLelement{small}
+%% similar \HTML\ element having a \emph{different} name.
+%% [\,2011/10/05: so what? TODO\,]
+%%
+%% New 2011/10/05:
+%% With |\useHTMLelement{<ltx-env>}{<html-el>}|,
+%% you can access the \xmltagcode{<html-el>} element
+%% by the `<ltx-env>' environment.
+%% The ``starred" form is for ``list" environments
+%% where I observed around 2011/10/01 that certain links
+%% (with Mozilla Firefox) need \xmltagcode{/li}:
+\newcommand*{\useHTMLelement}{%
+ \@ifstar{\@useHTMLelement[</li>]}{\@useHTMLelement}}
+\newcommand*{\@useHTMLelement}[3][]{%
+ \@namedef{#2}{<#3>}%
+ \@namedef{end#2}{#1</#3>}}
+%% Applications:
+%%
+%% \acro{CARE:} |{small}| is an environment here,
+%% it is not in \LaTeX:
+\useHTMLelement{small}{small}
+%% |{center}|: %% TODO von 2010/07/18, weiter oben
+% \renewenvironment*{center}{<p align="center">}{</p>}
+% \renewenvironment*{center}{<p \@align@c>}{</p>}
+\useHTMLelement{center}{center}
%% The next definitions for |{enumerate}|, |{itemize}|,
%% `{verbatim}' follow policy~(ii):
-\renderHTMLelement{enumerate}{ol}
-\renderHTMLelement{itemize} {ul}
+\useHTMLelement*{enumerate}{ol}
+\useHTMLelement*{itemize} {ul}
%% %% 2010/11/16:
%% With 'blog.sty', |{verbatim}| really doesn't work much
%% like its original \LaTeX\ variant. \TeX\ macros inside
%% still are expanded, and you must care yourself for
%% wanted \dqtd{quoting}:
-\renderHTMLelement{verbatim} {pre} %% 2010/09/10
-%%
-%% |{quote}| is defined in \LaTeX\ classes only again.
-%% To use it for policy~(ii), we give it a dummy definition
-%% so `\render'... won't complain:
-\let\quote\empty
-\renderHTMLelement{quote}{blockquote}
-%% For list |\item|s, I tried to get readable \acro{HTML} code
+\useHTMLelement{verbatim} {pre}
+%% |{quote}|:
+\useHTMLelement{quote}{blockquote}
+%% For list |\item|s, I tried to get readable \HTML\ code
%% using `\indenti'. This fails with nested lists.
%% The indent could be increased for nested lists
%% if we supported assignments with `\begin' and `\end'.
+%% 2011/10/04 including \xmltagcode{</li>},
+%% repairs more links in \acro{DANTE} talk:
\renewcommand*{\item}{\indenti<li>}
-%% <- 2010/05/23, 2010/06/10 ->
-% \renewcommand*{\item}{<li>}
%% \LaTeX's |{description}| environment redefines the
%% label format for the optional argument of `\item'.
%% Again, \emph{we} cannot do this here
%% (we even cannot use optional arguments,
%% at least not easily).
%% Instead we define a different |\ditem{<term>}|
-%% having a \emph{mandatory} argument.
-%% %% 2010/07/05:
-\renderHTMLelement{description}{dl}
+%% having a \emph{mandatory} argument
+%% (TODO star?). %% 2011/10/05
+\useHTMLelement{description}{dl}
\newcommand*{\ditem}[1]{\indenti<dt>\strong{#1}<dd>}
%%
%% == Links ==
%% === Basic Link Macros ===
%% |\hanc{<id>}{<text>}| makes <text> an anchor with
-%% \acro{HTML} label <id> (like 'hyperref''s `\hypertarget'):
+%% \HTML\ label <id> (like 'hyperref''s `\hypertarget'):
\newcommand*{\hanc}[1]{\TagSurr a{\@name{#1}}}
%% |\hancref{<id>}{<url>}{<text>}| makes <text> an anchor with
-%% \acro{HTML} label <id> and at the same time a link to <url>:
+%% \HTML\ label <id> and at the same time a link to <url>:
\newcommand*{\hancref}[2]{\TagSurr a{\@name{#1} \@href{#2}}}
%% |\href{<id>}{<text>}| makes <text> a link to <url>:
\newcommand*{\href}[1]{\TagSurr a{\@href{#1}}}
@@ -426,7 +455,7 @@
%%
%% === Built Macros for Links to Local Files ===
%% Originally, I wanted to refer to my web pages only,
-%% using $$|\fileref{<filename-base>}|.$$ I have used
+%% using \[|\fileref{<filename-base>}|.\] I have used
%% extension `.htm' to avoid disturbing my Atari
%% editor 'xEDIT' or the the Atari emulator (Hatari).
%% %% rm. 2011/08/18:
@@ -439,6 +468,7 @@
%% general `\FileRef{<filename>}|', overlooking
%% that it was the same as |\href|.
% \newcommand*{\FileRef}[1]{\TagSurr a{\@href{#1}}}
+\newcommand*{\htext}{.htm} %% 2011/10/05
\newcommand*{\fileref}[1]{\href{#1\htext}}
% \newcommand*{\emfileref}[2]{\fileref{#1}{\emph{#2}}}
\newcommand*{\itfileref}[2]{\fileref{#1}{\textit{#2}}}
@@ -477,9 +507,9 @@
\TagSurr a{\@href{https://#1" target="_blank}}}
%%
%%
-%% == Symbols == %% ordering 2011/02/25
+%% == Characters/Symbols == %% `Symbols' until 2011/09/25
%% === Basic Preliminaries ===
-%% |&| is made `other' for using it to call \acro{HTML}'s
+%% |&| is made `other' for using it to call \HTML's
%% ``character entities." %% dot inside 2011/02/25
\@makeother\&
%% Again we have the two policies about choosing macro names
@@ -498,6 +528,7 @@
\renderHTMLsymbol{\&}{amp}
\let\%\PercentChar
%%
+%% \pagebreak %% output routine problem 2011/10/05
%% === Diacritics === %% changed 2011/03/04
%% For the difference between \dqtd{diacritic} and
%% \dqtd{accent,} see \wikienref{Diacritic}{Wikipedia}.
@@ -505,7 +536,7 @@
%% |\ccedil|: %%%, |\eacute|, |\ocirc| (``r\^ole")
\declareHTMLsymbol{ccedil}
%% %% 2011/03/04:
-%% \acro{HTML} entities |&eacute;|, |&ocirc;| etc. can be accessed
+%% \HTML\ entities |&eacute;|, |&ocirc;| etc. can be accessed
%% by \TeX's accent commands |\'|, |\^|, |\`|, |\"|:
% \declareHTMLsymbol{eacute}
% \declareHTMLsymbol{ocirc}
@@ -581,7 +612,7 @@
%%
%% === Dashes ===
%% The ligatures `--' and `---' for en~dash and em~dash
-%% don't work in our expanding mode. Now, \acro{HTML}'s policy
+%% don't work in our expanding mode. Now, \HTML's policy
%% for choosing names often prefers shorter names than
%% are recommended for (La)\TeX, so here I adopt a \emph{third}
%% police besides (i) and (ii) earlier; cf. \LaTeX's
@@ -599,7 +630,7 @@
\renewcommand* {\qquad} {\quad\quad}
%% 2011/07/22: `&thinsp;' allows line breaks,
%% so we introduce |\thinsp| to access `&thinsp;',
-%% while |\thinspace| and |\,| use Unicode "Narrow No-Break Space"
+%% while |\thinspace| and |\,| use Unicode ``Narrow No-Break Space"
%% (`U+202F', see \meta{Wikipedia \Wikienref{Space (punctuation)}};
%% browser support?):
% \renderHTMLsymbol{\thinspace}{thinsp}
@@ -607,13 +638,15 @@
\declareHTMLsymbol{thinsp}
\renderHTMLsymbol{\thinspace}{\#8239}
\renderHTMLsymbol{\,} {\#8239}
+%% |\figurespace| %% 2011/09/25
+%% (U+2007, cf.~\wikienref{Figure space}{\meta{Wikipedia}}):
+\newcommand*{\figurespace}{&\#8199;}
%%
%% === Quotes, Apostrophe, Prime ===
%% |\lq|, |\rq|
\renderHTMLsymbol{\lq} {lsquo}
-% \newcommand* {\rsquo} {&rsquo;} %% removed 2010/04/26
\renderHTMLsymbol{\rq} {rsquo}
-%% In order to use the right single quote for the \acro{HTML} apostrophe,
+%% In order to use the right single quote for the \HTML\ apostrophe,
%% we must save other uses before.
%% |\screentqtd{<text>}| is used for screen messages,
%% and |\urlapostr| is the version of the right single quote
@@ -627,7 +660,8 @@
%% save `\screenqtd'! Tilde likwise!?
%% ... TODO change `\catcode`\`'!? 2010/04/26
%%
-%% |\ldquo|, |\rdquo|, |\sbquo|, |\prime|, |\Prime| ...
+%% |\bdquo|, |\ldquo|, |\rdquo|, |\sbquo|, |\prime|, |\Prime| ...
+\declareHTMLsymbol{bdquo} %% 2011/09/23
\declareHTMLsymbol{ldquo}
\declareHTMLsymbol{rdquo}
\declareHTMLsymbol{sbquo} %% 2010/07/01
@@ -637,15 +671,15 @@
%% |\endqtd{<text>}| quotes in the English style using double quote
%% marks, |\enqtd{<text>}| uses single quote marks instead, and
%% |\dedqtd{<text>}| quotes in German style:
-\def\endqtd#1{\ldquo#1\rdquo} %% \newcommand: "\end"
+\def\endqtd#1{\ldquo#1\rdquo} %% \newcommand: ``\end"
\newcommand*\enqtd[1]{\lq#1\rq} %% 2010/09/08, \new... 2010/11/08
-\newcommand*{\dedqtd}[1]{&bdquo;#1\ldquo}
+\newcommand*{\dedqtd}[1]{\bdquo#1\ldquo}
\newcommand*{\deqtd}[1]{&sbquo;#1&lsquo;} %% corr. 2011/05/14
-%% ... TODO `\bdquo'!? %% 2010/11/08
+%% TODO `\glqq' from 'german.sty' etc. %% 2011/09/22
%%
%% === Math ===
%% %% doc. extended 2011/05/08:
-%% Because \verb+<+ and \verb+>+ are used for \acro{HTML}'s
+%% Because \verb+<+ and \verb+>+ are used for \HTML's
%% element notation, we provide aliases |\gt|, |\lt|
%% for mathematical $\lt$ and $\gt$:
\declareHTMLsymbol{gt}
@@ -675,12 +709,12 @@
\renderHTMLsymbol{\ast}{lowast} %% 2011/03/29
%% Besides \TeX's |\subset| and |\subseteq|,
%% we provide short versions |\sub| and |\sube| %% 2011/05/08
-%% inspired by \acro{HTML}:
+%% inspired by \HTML:
\declareHTMLsymbol{sub} %% 2011/04/04
\let\subset\sub %% 2011/05/08
\declareHTMLsymbol{sube} %% 2011/03/29
\let\subseteq\sube %% 2011/05/08
-%% \TeX\ and \acro{HTML} agree on |\cap|, |\cup|, %% 2011/05/08
+%% \TeX\ and \HTML\ agree on |\cap|, |\cup|, %% 2011/05/08
%% and |\times|:
\declareHTMLsymbol{cap} %% 2011/04/04
\declareHTMLsymbol{cup} %% 2011/04/04
@@ -690,7 +724,8 @@
%% We need |\minus| since math mode switching is
%% not supported by 'blog': %% 2011/05/08
\declareHTMLsymbol{minus} %% 2011/03/31
-%% We override \acro{HTML}'s `&circ;' to get \TeX's \cs{circ}
+%% We override \HTML's \lq`&circ;'\rq\ %% \lq\rq 2011/09/08
+%% to get \TeX's \cs{circ}
%% (i.e., $\circ$; %% 2011/05/08:
%% \textcolor{red}{but I cannot see it
%% on my own pages!?}):
@@ -698,8 +733,14 @@
\renderHTMLsymbol{\cdot}{middot} %% 2011/05/07
%% |\sdot| generates `&sdot,', a variant of of `&middot;'
%% reserved for the \Wikienref{dot product} according to
-%% the \wikideref{Malzeichen\#Skalarprodukt}:
+%% the \wikideref{Malzeichen\#Skalarprodukt}
+%% {German \meta{Wikipedia}} %% 2011/09/08!
\declareHTMLsymbol{sdot} %% 2011/05/08
+%% I provide |\degrees| for the degree symbol.
+%% \LaTeX\ already has `\deg' as an operator,
+%% therefore I do not want to use `\declareHTMLsymbol'
+%% here.
+\newcommand*{\degrees}{&deg;}
%%
%% === Other ===
%% The tilde |~| is used for its wonderful purpose,
@@ -723,12 +764,15 @@
%% |\euro|: %% 2011/05/09
\declareHTMLsymbol{euro}
%% \LaTeX's |\S| prints the \dqtd{\Wikienref{section sign}}
-%% \qtd{\S}. In \acro{HTML}, the latter accessed by `&sect;',
+%% \qtd{\S}. In \HTML, the latter accessed by `&sect;',
%% we \dqtd{redirect} `\S' to this: %% 2011/05/18
\renderHTMLsymbol{\S}{sect}
+%% |\dagger|, |\ddagger|: %% 2011/10/01
+\renderHTMLsymbol{\dagger}{dagger}
+\renderHTMLsymbol{\ddagger}{Dagger}
%%
%%
-%% == \TeX-related == %% 2010/08/24
+%% == \TeX-related == %% 2010/08/24
%% Somebody actually using 'blog.sty' must have a need to put down
%% notes about \TeX\ for her own private purposes at least---I expect.
%% === Logos ===
@@ -750,23 +794,25 @@
\newcommand*{\XeTeX}{\prg{XeTeX}} %% 2010/10/09
\newcommand*{\TeXbook}{TeXbook} %% 2010/09/13
%%
-%% === Else ===
+%% === Describing Macros ===
%% With v0.4, \TeX-related \emph{links} are moved to 'texlinks.sty'.
%%
%% |\texcs{\<tex-cmd-name>}| or `\texcs\<tex-cmd-name>'
%% (care for spacing yourself):
-\newcommand*{\texcs}[1]{\code{\string#1}} %% 2010/11/13
+\newcommand*{\texcs}[1]{\code{\string#1}} %% 2010/11/13
%% Good old |\cs{<tex-cmd-name>}| may be preferable:
-\def\cs#1{\code{\BackslashChar#1}} %% 2011/03/06
+\def\cs#1{\code{\BackslashChar#1}} %% 2011/03/06
+%% |\metavar{<name>}|: %% 2011/09/22
+\newcommand*{\metavar}[1]{\angled{\meta{#1}}}
%%
%% == Tables ==
%% %% 2011/04/24: rm. remark on doubtful stability, ordered
%% === Indenting ===
%% There are three levels of indenting:
-%% $$|\indenti|, \quad
+%% \[|\indenti|, \quad
%% |\indentii|,\quad \mbox{and}\quad
-%% |\indentiii|.$$
-%% The intention for these was to get readable \acro{HTML} code. Not sure ...
+%% |\indentiii|.\]
+%% The intention for these was to get readable \HTML\ code. Not sure ...
{\catcode`\ =12%% 2010/05/19
\gdef\indenti{ }\gdef\indentii{ }\gdef\indentiii{ }}
%%
@@ -783,7 +829,7 @@
{\indenti</tbody>\CLBrk\endTable}
%% === Rows ===
%% I first thought it would be good for readability if
-%% some \acro{HTML} comments explain nesting or briefly describe
+%% some \HTML\ comments explain nesting or briefly describe
%% the content of some column, row, or cell.
%% But this is troublesome when you want to comment out
%% an entire table ...
@@ -795,7 +841,7 @@
\newenvironment{tablecoloredrow}[2]
{\TableRow{#1}{\@bgcolor{#2}}}
{\endTableRow}
-%% "top" 2010/05/18:
+%% ``top" 2010/05/18:
\newenvironment{tablerow}[1]{\TableRow{#1}{\@valign@t}}
{\endTableRow}
%% 2010/07/18:
@@ -830,6 +876,7 @@
%% 2010/07/18:
\newcommand*{\startTd}[1]{<td #1>}
\def\endTd{</td>}
+\newcommand*{\emptycell}{<td />} %% 2011/10/07
%%
%% === Filling a Row with Dummy Cells ===
%% Generalization 2010/06/28:
@@ -841,11 +888,12 @@
\newcommand*{\fillrowcolor}[2]{\FillRow{#1}{\@bgcolor{#2}}}
%%
%% == Misc ==
-%% |\comment{<comment>}| produces a one-line \acro{HTML} comment.
+%% |\comment{<comment>}| produces a one-line \HTML\ comment.
%% By contrast, there is an environment
%% |{commentlines}{<comment>}|
-%% for mult-line comments. It is convenient for ``commenting out"
-%% code (unless the latter contains other \acro{HTML} comments ...)
+%% for multi-line comments. %% was mult-l... 2011/09/08
+%% It is convenient for ``commenting out"
+%% code (unless the latter contains other \HTML\ comments ...)
%% where <comment> is a \emph{comment} for explaining what is
%% commented out. %% 2010/11/14
\newcommand*{\comment}[1]{<!--#1-->}
@@ -855,10 +903,10 @@
{<!--#1}
{-->}
%% \TeX's |\hrule| (rather deprecated in \LaTeX) is redefined
-%% to produce an \acro{HTML} horizontal line:
+%% to produce an \HTML\ horizontal line:
\renewcommand*{\hrule}{<hr>}
%% Redefining |\ | to be the same as `\space' may be helpful
-%% for manual indenting or spacing of \acro{HTML} code.
+%% for manual indenting or spacing of \HTML\ code.
%% Or better (just now remembering): I used it for making
%% ``ASCII trees" with the \xmltagcode{pre} element
%% (redefined `verbatim').
@@ -920,7 +968,7 @@ v0.3 2010/11/10 removed ^^J from \head
v0.4 2011/01/24 moving links to texlinks.sty
v0.41 2011/02/07 \NormalHTTPref
2011/02/10 refined call of `texlinks'
- PART OF CTAN RELEASE r0.3
+part of MOREHYPE RELEASE r0.3
v0.5 2011/02/22 \BlogProvidesFile
2011/02/24 ... in \BlogCopyFile
2011/02/25 ordering symbols
@@ -956,3 +1004,20 @@ v0.5 2011/02/22 \BlogProvidesFile
2011/07/25 "todo" on \description
2011/08/18f.removing \FileRef, 0.42-> 0.5
2011/08/31 clarified use of \urlapostr
+part of MOREHYPE RELEASE r0.4
+v0.6 2011/09/08 doc. uses \HTML, \lq/\rq with &circ;,
+ doc. fix `mult-'; \degrees
+ 2011/09/21 \acronym
+ 2011/09/22 \metavar; TODO \glqq...
+ 2011/09/23 \bdquo
+ 2011/09/25 doc. `Characters/Symbols'; \figurespace
+ 2011/09/27 "universal" attributes completed, reworked doc.
+ 2011/09/30 end lists with </li>
+ 2011/10/01 \dagger, \ddagger
+ 2011/10/04 \item includes </li>
+ 2011/10/05 {style}; doc. \acronym -> \acro, \pagebreak,
+ rm. \description; {center} accesses <center>,
+ \useHTMLenvironment replaces \declareHTMLelement
+ and \renderHTMLelement, message "generating"
+ 2011/10/07 \emptycell
+ 2011/10/10 doc.: page breaks, $$->\[/\]
diff --git a/Master/texmf-dist/tex/latex/morehype/blogdot.css b/Master/texmf-dist/tex/latex/morehype/blogdot.css
new file mode 100644
index 00000000000..31f8e9ddeed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/morehype/blogdot.css
@@ -0,0 +1,41 @@
+/* blogdot.css for blogdot.sty (morehype bundle) 2011/10/05 */
+/* (C) 2011 Uwe Lueck www.contact.uwe.lueck.de.vu */
+/* 2011/09/21 aus blog/plain.css, 2011/09/26 gekürzt, Versuche, Umbau */
+/*
+b, h1, h2, h3, h4, div, p, td, th, body, span, table, ol, li, a, ul {
+font-family:Arial,Verdana,"Lucinda Sans",sans-serif;
+color:#000000;
+font-size:21px;
+}
+*/
+
+h1 { font-size: 42px; margin-bottom: 21px }
+h2 { font-size: 30px; margin-bottom: 21px }
+h3 { font-size: 24px; }
+h4 { font-size: 21px; }
+
+/* body, td, th, div, p, ul, li, em, strong */
+td {
+font-family:Arial,Verdana,"Lucinda Sans",sans-serif;
+color:#000000;
+font-size: 21px
+}
+
+p { margin-bottom:0px }
+dl, ol, ul {
+/* padding-left: 18px; */
+padding-left: 1em;
+margin-left: 1em; margin-top: 18px; margin-bottom: 18px;
+vertical-align: middle;
+}
+dt { margin: 0px; margin-top: 18px; margin-bottom: 9px; padding: 0px }
+li { margin: 0px; margin-top: 9px; margin-bottom: 9px; padding: 0px }
+blockquote { margin-left: 2em }
+pre { margin-left:2em; margin-top:0px }
+
+/* table { margin: 0px; margin-top: 9px; margin-bottom: 18px; padding: 0px} */
+
+a:link { color:#0000d0; text-decoration:none; }
+a:visited { color:purple; text-decoration:none; }
+a:hover { color:blue; text-decoration:underline; }
+a:active { color:blue; text-decoration:underline; }
diff --git a/Master/texmf-dist/tex/latex/morehype/blogdot.sty b/Master/texmf-dist/tex/latex/morehype/blogdot.sty
new file mode 100644
index 00000000000..08f4779a099
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/morehype/blogdot.sty
@@ -0,0 +1,200 @@
+\NeedsTeXFormat{LaTeX2e}[1994/12/01] %% \newcommand* etc.
+\ProvidesPackage{blogdot}[2011/10/10 v0.2 HTML presentations (UL)]
+%% copyright (C) 2011 Uwe Lueck,
+%% http://www.contact-ednotes.sty.de.vu
+%% -- author-maintained in the sense of LPPL below.
+%%
+%% This file can be redistributed and/or modified under
+%% the terms of the LaTeX Project Public License; either
+%% version 1.3c of the License, or any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% We did our best to help you, but there is NO WARRANTY.
+%%
+%% Please report bugs, problems, and suggestions via
+%%
+%% http://www.contact-ednotes.sty.de.vu
+%%
+%% == 'blog' Required ==
+%% 'blogdot' is an extension of 'blog'
+%% (but what about options? TODO):
+\RequirePackage{blog}
+%% == Size Parameters ==
+%% \label{sec:dot-size}
+%% I assume that it is clear what the following
+%% six page dimension parameters
+%% \begin{quote}
+%% |\leftpagemargin|, |\rightpagemargin|,
+%% |\upperpagemargin|,\\|\lowerpagemargin|,
+%% |\typeareawidth|, |\typeareaheight|
+%% \end{quote}
+%% mean.
+%% The choices are what I thought should work best
+%% on my 1024$\times$600 screen; but I had to optimize
+%% the left and right margins experimentally
+%% (with Mozilla Firefox~3.6.22 for Ubuntu canonical~-~1.0);
+%% see `blogdot.cfg':
+\newcommand*{\leftpagemargin}{192}
+\newcommand*{\rightpagemargin}{\leftpagemargin}
+%% So |\rightpagemargin| ultimately is the same as
+%% |\leftpagemargin| as long as you don't redefine it,
+%% and it suffices to `\renewcommand' `\leftpagemargin'
+%% in order to get a horizontically centered type area
+%% with user-defined margin widths.---Something analogous
+%% applies to |\upperpagemargin| and |\lowerpagemargin|:
+\newcommand*{\upperpagemargin}{80}
+\newcommand*{\lowerpagemargin}{\upperpagemargin}
+%% A difference to the ``horizontal" parameters is
+%% (I expect) that the position of the type area on the
+%% screen is affected by |\upperpagemargin| only,
+%% and you may choose |\lowerpagemargin| just large enough
+%% that the next slide won't be visible on any computer screen
+%% you can think of.
+\newcommand*{\typeareawidth}{640}
+\newcommand*{\typeareaheight}{440}
+%% Centering with respect to web page body may work better on
+%% different screens (2011/10/03), but it doesn't work here
+%% (2011/10/04).
+% \renewcommand*{\body}{%
+% </head>\CLBrk
+% <body \@bgcolor{\bodybgcolor} \@align@c>}
+%%
+%% == (Backbone for) Starting a ``Slide" ==
+%% \label{sec:dot-start}
+%% |\startscreenpage{<style>}{<anchor-name>}|
+\newcommand*{\startscreenpage}[2]{%% 0 2011/09/25!?:
+ \startTable{%
+ \@cellpadding{0} \@cellspacing{0}%
+ \maybe@showmargins
+ }%
+ \CLBrk %% 2011/10/03
+ \starttr
+%% First cell determines both
+%% height of upper page margin |\upperpagemargin|
+%% and
+%% width of left page margin |\leftpagemargin|:
+ \startTd{\@width {\leftpagemargin }%
+ \@height{\upperpagemargin}}%
+% \textcolor{\bodybgcolor}{XYZ}%
+ \endTd
+%% Using |\typeareawidth|:
+% \startTd{\@width{\typeareawidth}}\endTd
+ \simplecell{%
+ \CLBrk
+ \hanc{#2}{\hvspace{\typeareawidth}%
+ {\upperpagemargin}}%
+ \CLBrk
+ }%
+%% Final cell of first row determines right margin width:
+ \startTd{\@width{\leftpagemargin}}\endTd
+ \endtr
+% \tablerow{#1}%
+ \starttr
+ \emptycell\startTd{\@height{\typeareaheight}#1}%
+}
+%% |\ShowBlogDotMargins| shows borders of the page margins:
+%% %% 2011/10/03
+\let\maybe@showmargins\@empty
+\newcommand*{\ShowBlogDotMargins}{%
+ \def\maybe@showmargins{\@frame@box rules="all"}}
+%% However, the rules seem to affect horizontal positions ...
+%%
+%% |\titlescreenpage| (`\STARTscreenpage' TODO?) %% 2011/10/03
+%% opens the title page (I thought). To get it to your screen,
+%% (make and) click a link like
+%% \[`\ancref{START}{start presentation}':\]
+\newcommand*{\titlescreenpage}{%
+ \startscreenpage{\@align@c}{START}}
+%%
+%% == Finishing a ``Slide" and ``Restart" (Backbone) ==
+%% \label{sec:dot-fin}
+%% |\screenbottom{<next-anchor>}| finishes the current slide
+%% and links to the <next-anchor>, the anchor of a slide opened by
+%% \[`\startscreenpage{<style>}{<next-anchor>}'.\]
+%% More precisely, the margin below the type area is that link.
+%% The corner at its right is a link to the anchor to whose name
+%% |\BlogDotRestart| expands.
+\newcommand*{\screenbottom}[1]{%
+ \endTd\emptycell
+ \endtr
+ \CLBrk
+ \starttr
+ \emptycell
+ \CLBrk
+ \simplecell{\ancref{#1}%
+ {\hvspace{\typeareawidth}%
+ {\lowerpagemargin}}}%
+ \CLBrk
+ \simplecell{\ancref{\BlogDotRestart}%
+ {\hvspace{\rightpagemargin}%
+ {\lowerpagemargin}}}%
+ \endtr
+ \CLBrk
+ \endTable
+}
+%% The default for |\BlogDotRestart| is |START|---the title page.
+%% You can `\renew'\-`command' it so you get to a slide
+%% containing an overview of the presentation.
+\newcommand*{\BlogDotRestart}{START}
+%%
+%% == Moving to Next ``Slide" (User Level) ==
+%% \label{sec:dot-next}
+%% |\nextscreenpage{<style>}{<anchor-name>}|
+%% puts closing the previous slide and opening the next
+%% one---having anchor name `<anchor-name>'---together.
+%% <style> is for style settings for the next page,
+%% made here for choosing between centering the page/slide content
+%% and aligning it flush left.
+\newcommand*{\nextscreenpage}[2]{%
+ \screenbottom{#2}\CLBrk
+ \hrule \CLBrk
+ \startscreenpage{#1}{#2}}
+%% |\nextcenterscreenpage{<anchor-name>}| chooses centering
+%% the slide content:
+\newcommand*{\nextcenterscreenpage}{\nextscreenpage{\@align@c}}
+%% |\nextnormalscreenpage{<anchor-name>}| chooses flush left
+%% on the type area determined by |\typeareawidth|:
+\newcommand*{\nextnormalscreenpage}{\nextscreenpage{}}
+%%
+%% == Constructs for Type Area ==
+%% \label{sec:dot-type}
+%% If you want to get centered titles with \xmltagcode{h2} etc.,
+%% you should declare this in `.css' files. But you may consider
+%% this way too difficult, and you may prefer to declare this
+%% right in the \HTML\ code. That's what I do! I use
+%% |\cheading{<digit>}{<text>}| for this purpose.
+\newcommand*{\cheading}[1]{\TagSurr{h#1}{\@align@c}}
+%% |\begin{textblock}{<width>}| opens a |{textblock}|
+%% environment. The latter will contain text that will be flush left
+%% in a narrower text area---of width <width>---than the one
+%% determined by |\typeareawidth|. It may be used on
+%% "centered" slides. It is made for lists whose entries are
+%% so short that the page would look unbalanced under a
+%% centered title with the list adjusted to the left
+%% of the entire type area. (Thinking of standard \LaTeX,
+%% it is almost the `{minipage}' environment, however lacking
+%% the footnote feature, in that respect it is rather
+%% similar to `\parbox' which however is not an environment.)
+\newenvironment*{textblock}[1]
+ {\startTable{\@width{#1}}\starttr\startTd{}}
+ {\endTd\endtr\endTable}
+%%
+%% == Test for `blogdot.cfg' ==
+\InputIfFileExists{blogdot.cfg}{%
+ \typeout{
+ * Using local settings from \string`blogdot.cfg\string' *}%
+}{}
+%% == The End ==
+\endinput
+%%
+%% == VERSION HISTORY ==
+v0.1 2011/09/21f. started
+ 2011/09/25 spacing/padding off
+ 2011/09/27 \CLBrk
+ 2011/09/30 \BlogDotRestart
+v0.2 2011/10/03 four possibly independent page margin
+ parameters; \hvspace moves to texblog.fdf
+ 2011/10/04 renewed \body commented out
+ 2011/10/07 documentation
+ 2011/10/08 added some labels
+ 2011/10/10 v etc. in \ProvidesPackage
diff --git a/Master/texmf-dist/tex/latex/morehype/lang-de.fdf b/Master/texmf-dist/tex/latex/morehype/lang-de.fdf
index 922fcff3451..b211f6c130b 100644
--- a/Master/texmf-dist/tex/latex/morehype/lang-de.fdf
+++ b/Master/texmf-dist/tex/latex/morehype/lang-de.fdf
@@ -1,8 +1,10 @@
-\ProvidesFile{lang-de.fdf}[2011/05/12 German settings for blog.sty]
+\ProvidesFile{lang-de.fdf}[2011/09/24 German settings for blog.sty]
+%% previous: 2011/05/12
\def\dqtd {\dedqtd}
\def\qtd {\deqtd}
\def\pardash {\depardash} %% 2011/05/12
\def\lastrev {\delastrev}
\def\totopofpage{\detotopofpage}
+\RequirePackage{dhua} %% 2011/09/24
\endinput
diff --git a/Master/texmf-dist/tex/latex/morehype/lnavicol.sty b/Master/texmf-dist/tex/latex/morehype/lnavicol.sty
index 030a7822e07..6648814f3bc 100644
--- a/Master/texmf-dist/tex/latex/morehype/lnavicol.sty
+++ b/Master/texmf-dist/tex/latex/morehype/lnavicol.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{lnavicol}[2011/09/02
+\ProvidesPackage{lnavicol}[2011/10/10
left navigation column with blog.sty]
%%
%% Copyright (C) 2011 Uwe Lueck,
@@ -16,65 +16,122 @@
%%
%% http://www.contact-ednotes.sty.de.vu
%%
+%% == 'blog.sty' Required ==
+%% ---but what about options (TODO)? %% 2011/10/09
\RequirePackage{blog}
-
-\newif\iftight \newif\ifdeep %% 2011/04/29
-%% PAGE STYLE SETTINGs (to be set locally):
+%%
+%% == Switches ==
+%% %% introduced 2011/04/29, it seems
+%% There is a ``standard" page width and a ``tight one"
+%% (the latter for contact forms)---|\iftight|:
+\newif\iftight
+%% In order to move an anchor to the \emph{top} of the screen
+%% when the anchor is near the page end, the page must get
+%% some extra length by adding empty space at its
+%% bottom---|\ifdeep|:
+\newif\ifdeep
+%%
+%% == Page Style Settings (to be set locally) ==
% \newcommand*{\pagebgcolor}{\#f5f5f5} %% CSS whitesmoke
% \newcommand*{\pagespacing}{\@cellpadding{4} \@cellspacing{7}}
% \newcommand*{\pagenavicolwidth}{125}
% \newcommand*{\pagemaincolwidth}{584}
% \newcommand*{\pagewholewidth} {792}
-
-%% possible ADDITIONS to blog.sty:
+%% == Possible Additions to 'blog.sty' ==
+%% === Tables ===
+%% |\begin{spancolscell}{<number>}{<style>}|
+%% opens an environment that contains a row and a single cell
+%% that will span <number> table cells and have style <style>:
\newenvironment{spancolscell}[2]{%
\starttr\startTd{\@colspan{#1} #2 %
\@width{100\%}}% %% TODO works?
}{\endTd\endtr}
+%% The |{hiddencells}| einvironment contains cells that do not align
+%% with other cells in the surrounding table. The purpose is using
+%% cells for horizontal spacing.
\newenvironment{hiddencells}
{\startTable{}\starttr}
{\endtr\endTable}
+%% |{pagehiddencells}| is like `{hiddencells}' except that
+%% the \HTML\ code is indented:
\newenvironment{pagehiddencells}
{\indentii\hiddencells}
{\indentii\endhiddencells}
+%% |\begin{FixedWidthCell}{<width>}{<style>}| \ opens the
+%% `{FixedWidthCell}' environment. The content will form a cell
+%% of width <width>. <style> are additional formatting parameters:
\newenvironment{FixedWidthCell}[2]
{\startTd{#2}\startTable{\@width{#1}}%
\starttr\startTd{}}
{\endTd\endtr\endTable\endTd}
+%% |\tablehspace{<width>}| is a variant of \LaTeX's `\hspace{<glue>}'.
+%% It may appear in a table row:
\newcommand*{\tablehspace}[1]{\startTd{\@width{#1} /}}
-%% <img>:
+%%
+%% === Graphics ===
+%% The command names in this section are inspired by the names
+%% in the standard \LaTeX\ \ctanpkgref{graphics} package.
+%% (They may need some re-organization TODO.)
+%%
+%% |\simpleinclgrf{<file>}| embeds a graphic file <file> without
+%% the tricks of the remaining commands.
\newcommand*{\simpleinclgrf}[1]{\IncludeGrf{alt="" \@border{0}}%
{#1}}
+%% |\IncludeGrf{<style>}{<file>}| embeds a graphic file <file>
+%% with style settings <style>:
\newcommand*{\IncludeGrf}[2]{<img #1 src="#2">}
+%% |\includegraphic{<width>}{<height>}{<file>}{<border>}{<alt>}{<tooltip>}|
+%% ...\,:
\newcommand*{\includegraphic}[6]{%
\IncludeGrf{%
\@width{#1} \@height{#2} %% data; presentation:
\@border{#4}
alt="#5" \@title{#6}}%
{#3}}
-\newcommand*{\insertgraphic}[9]{% %% TODO cf. ...
+%% |\insertgraphic{<wd>}{<ht>}{<f>}{<b>}{<align>}{<hsp>}{<vsp>}{<alt>}{<t>}|
+%% \\adds <hsp> for the `@hspace' and <vsp> for the `@vspace'
+%% attribute:
+\newcommand*{\insertgraphic}[9]{%
\IncludeGrf{%
\@width{#1} \@height{#2} %% data; presentation:
\@border{#4}
align="#5" hspace="#6" vspace="#8"
alt="#8" \@title{#9}}%
{#3}}
+%% |\includegraphic{<wd>}{<ht>}{<file>}{<anchor>}{<border>}{<alt>}{<tooltip>}|
+%% \\uses an image with `\includegraphic' parameters as a link to
+%% <anchor>:
\newcommand*{\inclgrfref}[7]{%
\fileref{#4}{\includegraphic{#1}{#2}{#3}%
{#5}{#6}{#7}}}
-
-%% HTTP/Wikipedia tooltips:
+%%
+%% === \acro{HTTP}/Wikipedia tooltips ===
+%% |\httptipref{<tip>}{<www>}{<text>}| \ works like \
+%% `\httpref{<www>}{<text>}' except that <tip> appears as ``tooltip":
\newcommand*{\httptipref}[2]{%
\TagSurr a{\@title{#1}\@href{http://#2}\@target@blank}}
-%% TODO \@title bad with pdfLaTeX.
-\newcommand*{\@target@blank}{target="blank"}
+%% |\@target@blank| abbreviates the `@target' setting for
+%% opening the target in a new window or tab:
+\newcommand*{\@target@blank}{target="_blank"}
+%% % |\wikitipref{<language-code>}{<lemma>}{<text>}| \
+%% |\wikitipref{<lc>}{<lem>}{<text>}|
+%% works like
+%% % \\
+%% % `\wikiref{<language-code>}{<lemma>}{<text>}'
+%% `\wikiref{<lc>}{<lem>}{<text>}'
+%% except that
+%% ``Wikipedia" appears as ``tooltip".
+%% |\wikideref| and |\wikienref| are redefined to use it:
\newcommand*{\wikitipref}[2]{%
\httptipref{Wikipedia}{#1.wikipedia.org/wiki/#2}}
\renewcommand*{\wikideref}{\wikitipref{de}}
\renewcommand*{\wikienref}{\wikitipref{en}}
-
-
-%% PAGE STRUCTURE:
+%%
+%% == Page Structure ==
+%% The body of the page is a table of three rows and two columns.
+%% === Page Head Row ===
+%% |\PAGEHEAD| opens the head row and a single cell that will span
+%% the two columns of the second row.
\newcommand*{\PAGEHEAD}{%
\startTable{%
\@align@c\
@@ -84,40 +141,64 @@
\iftight \else \@width\pagewholewidth \fi
}\CLBrk
%% omitting <tbody>
- \ \comment{ HEAD ROW / }\CLBrk
+ \ \comment{ HEAD ROW }\CLBrk
\indenti\spancolscell{2}{}%
}
-%% general head macros:
-\newcommand*{\headgrf} [1]{%
- \indentiii\simplecell{\simpleinclgrf{#1}}}
-\newcommand*{\headskip} {\indentiii\tablehspace}
-\newcommand*{\headtitle}[2]{\indentiii\simplecell{\heading#1{#2}}}
+% \newcommand*{\headgrf} [1]{% %% rm. 2011/10/09
+% \indentiii\simplecell{\simpleinclgrf{#1}}}
% \newcommand*{\headgrfskiptitle}[3]{%
% \pagehiddencells
% \headgrf{#1}\CLBrk
% \headskip{#2}\CLBrk
% \headtitle1{#3}\CLBrk
% \endpagehiddencells}
+%% |\headuseskiptitle{<grf>}{<skip>}{<title>}|
+%% first places <grf>, then skips horizontally by <skip>,
+%% and then prints the page title as \xmltagcode{h1}:
\newcommand*{\headuseskiptitle}[3]{%
\pagehiddencells\CLBrk
\indentiii\simplecell{#1}\CLBrk
\headskip{#2}\CLBrk
\headtitle1{#3}\CLBrk
\endpagehiddencells}
-
+%% |\headskip{<skip>}| is like `\tablehspace{<skip>}'
+%% except that the \HTML\ code gets an indent.
+\newcommand*{\headskip} {\indentiii\tablehspace}
+%% Similarly, |\headtitle{<digit>}{<text>}| is like
+%% `\heading<digit>{<text>}' apart from an indent and
+%% being put into a cell:
+\newcommand*{\headtitle}[2]{\indentiii\simplecell{\heading#1{#2}}}
+%%
+%% === Navigation and Main Row ===
+%% |\PAGENAVI| closes the head row and opens the ``navigation"
+%% column, actually including an `{itemize}' environment.
+%% Accordingly, `writings.fdf' has a command `\fileitem'.
+%% But it seems that I have not been sure ...
\newcommand*{\PAGENAVI}{%
\indenti\endspancolscell\CLBrk
\indenti\starttr\CLBrk
\ \comment{NAVIGATION COL}\CLBrk
\indentii\FixedWidthCell\pagenavicolwidth
- {\@class{paper} \@valign@t}
-%% %% omitting `\@height{100\%}'
+ {\@class{paper}
+%% <- using `@class'=`paper' here is my brother's idea,
+%% not sure about it ...
+ \@valign@t}
+ %% omitting `\@height{100\%}'
\itemize}
+%% |\PAGEMAINvar{<width>}| closes the navigation column
+%% and opens the ``main content" column. The latter gets
+%% width <width>:
\newcommand*{\PAGEMAINvar}[1]{%
\indentii\enditemize\ \endFixedWidthCell\CLBrk
\ \comment{ MAIN COL }\CLBrk
\indentii\FixedWidthCell{#1}{}}
+%% ... The width may be specified as |\pagemaincolwidth|,
+%% then |\PAGEMAIN| works like `\PAGEMAINvar{\pagemaincolwidth}':
\newcommand*{\PAGEMAIN}{\PAGEMAINvar\pagemaincolwidth}
+%%
+%% === Footer Row ===
+%% |\PAGEFOOT| closes the ``main content" column as well as
+%% the second row, and opens the footer row:
\newcommand*{\PAGEFOOT}{%
\indentii\endFixedWidthCell\CLBrk
% \indentii\tablehspace{96}\CLBrk %% vs. \pagemaincolwidth
@@ -125,12 +206,18 @@
\indenti\endtr\CLBrk
\ \comment{ FOOT ROW / }\CLBrk
\indenti\spancolscell{2}{\@class{paper} \@align@c}%
+%% <- again class ``paper"!?
}
+%% |\PAGEEND| closes the footer row and provides all the rest
+%% ... needed?
\newcommand*{\PAGEEND}{\indenti\endspancolscell\endTable}
-
+%%
+%% == The End and HISTORY ==
\endinput
HISTORY
-2011/09/01 to CTAN as `twocolpg.sty'
-2011/09/02 renamed
+2011/04/29 started (? \if...)
+2011/09/01 to CTAN as `twocolpg.sty'
+2011/09/02 renamed
+2011/10/09f. documentation more serious
diff --git a/Master/texmf-dist/tex/latex/morehype/texblog.fdf b/Master/texmf-dist/tex/latex/morehype/texblog.fdf
new file mode 100644
index 00000000000..c58dc4b65d0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/morehype/texblog.fdf
@@ -0,0 +1,283 @@
+\ProvidesFile{texblog.fdf}[2011/10/08 extra blog settings]
+%%
+%% macros I use for my note pages
+%% -- Uwe Lueck, www.contact-ednotes.sty.de.vu
+%%
+%% page head:
+\newcommand*{\texrobots}{\robots{index,follow,noarchive}}
+\newcommand*{\texstylesheet}{\stylesheet{all}{plain}}
+%% 2011/04/24:
+\newcommand*{\TeXtopofpage}{%% 2011/06/19:
+ \topofpageline{\code{uwe_lueck} \code{>} }{\texmapName}}
+\newcommand*{\texmapName}{texmap}
+%% 2011/05/17:
+\newcommand*{\reloadTeXtopofpage}[2]{%
+ \TeXtopofpage{\pardash\fileref\htmljob{\meta{#1}}}\pardash#2}
+\newcommand*{\deTeXtopofpage}{\reloadTeXtopofpage{neu~laden}}
+\newcommand*{\enTeXtopofpage}{\reloadTeXtopofpage{reload}}
+\newcommand*{\textopofpage}{\TeXtopofpage{}}
+% \newcommand*{\enreloadthis}{% %% 2011/05/14
+% \pardash\fileref{\htmljob}{reload}}
+%% 2011/06/19:
+\newcommand*{\topofpageline}[3]{%
+ \hanc{top-of-page}{%
+ \begin{small}%
+ #1%
+ \ifx\htmljob#2\else
+ \Fileref{#2} \code{>} \fi
+ \file\htmljob#3%
+ \end{small}}}
+\newcommand*{\privtopofpage}[1]{%
+ \topofpageline{}{\privmapName}%
+ {\depardash\fileref{\htmljob}{\textit{neu~laden}}%
+ \depardash#1}}
+\newcommand*{\privmapName}{privmap}
+
+%% body colors (started 2010/09/15):
+\renewcommand*{\body}{%
+ </head><body \@bgcolor{\bodybgcolor}>} %% \@bgcolor 2011/10/03
+\newcommand*{\bodybgcolor}{\#fffff0} %% CSS ivory 2011/08/03
+% \newcommand*{\bodybgcolor}{\#ffffe7} %% 2010/11/23 2011/06/29
+% \newcommand*{\bodybgcolor}{\#f5f5dc} %% CSS beige 2011/07/31
+% \newcommand*{\bodybgcolor}{\#f8f8ff} %% CSS ghostwhite 2011/07/31
+% \newcommand*{\bodybgcolor}{\#f0ffff} %% CSS azure 2011/08/01
+% \newcommand*{\bodybgcolor}{\#fdf5e6} %% CSS oldlace 2011/08/01
+% \newcommand*{\bodybgcolor}{\#fffafa} %% CSS snow 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fafad2} %% CSS lightgol... 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fffaf0} %% CSS floralwhite 2011/07/31
+% \newcommand*{\bodybgcolor}{\#ffffe0} %% CSS lightyellow 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fbfff0} %% 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fdffee} %% 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fefedd} %% 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fcfffc} %% 2011/07/31
+% \newcommand*{\bodybgcolor}{\#fbffff} %% 2011/07/30
+% \newcommand*{\bodybgcolor}{\#fffded} %% 2011/06/29
+% \newcommand*{\bodybgcolor}{\#fcffef} %% 2011/06/28
+% \newcommand*{\bodybgcolor}{\#ffffef} %% 2011/06/27
+% \newcommand*{\bodybgcolor}{\#ffffff}
+% \newcommand*{\bodybgcolor}{\#ffffdd} %% 2010/11/17
+% \newcommand*{\bodybgcolor}{\#faffe7} %% 2010/11/17
+% \newcommand*{\bodybgcolor}{\#fcffe7} %% 2010/11/23
+% \newcommand*{\bodybgcolor}{\#fbfff0} %% 2010/11/23
+% \newcommand*{\bodybgcolor}{\#fbfffe} %% 2010/11/23
+
+%% internal navigation:
+\renewcommand*{\autref}[1]{\ancref{#1}{\code{#1}}} %% 2011/05/16
+% \renewcommand*{\autref}[1]{\ancref{#1}{\code{#1}}} %% 2011/05/16
+% \renewcommand*{\autref}[1]{\ancref{\lowercase{#1}}{#1}}
+ %% <- does not expand 2011/05/10
+\newcommand*{\Autref}[1]{\ancref{#1}{#1}} %% 2011/08/16
+%% click to move to top of window: %% 2011/07/25
+\newcommand*{\ancandref}[1]{\hancref{#1}{\##1}} %% 2011/07/04
+% \newcommand*{\lineanc}[1]{\TagSurr a{\@name{#1}}}
+\newcommand*{\lineanc} [1]{\hanc{#1}{}} %% 2011/07/20
+%% TODO: one anchor element with more
+%% than one name!? %% 2011/08/31
+
+\newcommand*{\entotopofpage}{%
+ \rightpar{\ancref{top-of-page}{[\textit{\to~top~of~page}~]}}}
+\newcommand*{\detotopofpage}{%
+ \rightpar{\ancref{top-of-page}{[\textit{\to Seitenanfang}\,]}}}
+\newcommand*{\nextview}[1]{% %% corr. 2010/09/15
+ \rightpar{\ancref{#1}{[\to}|%
+ \ancref{top-of-page}{~\uparrow~]}}}
+\newcommand*{\Nextview}[1]{% %% 2011/05/12
+ \nextview{#1}\hanc{#1}{}}
+\newcommand*{\nextruleview}[1]{% %% 2010/09/15
+ \nextview{#1}\hrule\hanc{#1}{}}
+\newcommand*{\NRV}{\nextruleview} %% 2011/03/15
+%% Diary date sections:
+\newcommand*{\datepar}[1]{%
+% \endgraf\hanc{#1}{\latexdatepar#1\latexdatepar}}%% 2011/08/12:
+ \vspace{3} %%% 2011/08/16 \\%
+ \lineanc{\isodateplus#1\isodateplus}%
+ \lineanc{#1}%
+ \heading4{\isodateplus#1\isodateplus}}
+%% #5 allows modifications like time, `b', `f.':
+% \def\latexdatepar#1/#2/#3#4#5\latexdatepar{%
+% \endgraf\heading4{#1-#2-#3#4#5}}
+\def\isodateplus#1/#2/#3#4#5\isodateplus{% %% 2011/08/15
+ #1-#2-#3#4#5}
+\def\isodate#1/#2/#3#4{#1-#2-#3#4}
+\newcommand*{\Isodate}{\expandafter\isodate} %% 2011/08/21
+\newcommand*{\isodateref}[1]{% %% 2011/08/19
+ \ancref{#1}{\isodateplus#1\isodateplus}}
+%% "kw" is "Kalenderwoche" (English term?)
+\newcommand*{\kwsec}[1]{% %% 2011/08/24
+% \heading4{%
+ \endgraf
+ \vspace{9}\endgraf
+ \strong{%
+ \hanc{kw#1}%
+ {KW#1\quad\ancref{kw#1}{\gets}}}%
+% \endgraf
+}
+\newcommand*{\kwrule}[1]{% %% 2011/08/27
+ \nextview{kw#1}\hrule
+ \hanc{kw#1}{\SimpleTagSurr{big}{KW#1}}%
+}
+%% 2011/08/18 [private - 2011/08/26]:
+\newcommand*{\geldpref}{\ancref{geld}{\euro}}
+\newcommand*{\jobspref}{\autref{jobs}}
+
+%% internal/external 2011/08/17f.:
+% \newcommand*{\emailpref}{\ancref{email}{E-M@il}}
+\newcommand*{\emailpref}{%
+ \ancref{email}{@\,}|\httpref{web.de/fm}{\,fm}}
+\newcommand*{\ausflwpref}{%
+ \autref{ausfl-w}\pardash\wetterwpref
+%% 2011/08/22:
+ \pardash\vrnpref}
+\newcommand*{\vrnpref}{%
+% \httpref{www.vrn.de/vrn/einfach-ankommen/fahrplanauskunft/}%
+ \httpref{www.vrn.de}% %% 2011/09/08
+ {VRN}}
+
+\makeatletter %% 2011/09/21
+\newcommand*{\hvspace}[2]{% %% from blogdot.sty 2011/10/03
+ \CLBrk
+ \startTable{\@width{#1} \@height{#2}
+ \@border{0}
+ \@cellpadding{0} \@cellspacing{0}}%
+ \starttr\emptycell\endtr\endTable %% 2011/10/08 \emptycell
+ \CLBrk}
+\renewcommand*{\vspace}[1]{\hvspace{}{#1}}
+% \makeatother
+%% page bottom:
+\newcommand*{\enlastrev}{%
+ \rightpar{%
+% \textit{Last~revised~\GenDate\
+% \textit{Last~generated~\GenDate\
+ \textit{Last~generated~\Isodate\GenDate\ %% 2011/08/21
+ \copyright~\href{contact.html}{% %% \href rm. `en' 2011/08/18
+ Uwe~L\"uck}}}} %% \uml -> u 2011/03/04
+\newcommand*{\delastrev}{%
+ \rightpar{%
+% \textit{Zuletzt neu erzeugt~\GenDate\
+ \textit{Zuletzt neu erzeugt~\Isodate\GenDate\ %% 2011/08/21
+ \copyright~\href{kontakt.html}{% %% \href, filename 2011/08/18
+ Uwe~L\"uck}}}} %% \uml -> u 2011/03/04
+\newcommand*{\Hrule}{\totopofpage\hrule}
+\newcommand*{\fivebreaks}{\\\\\\\\\\} %% TODO \vspace
+
+%% external navigation:
+\renewcommand*{\htmakeext}{.htm} %% 2011/10/05
+\newcommand*{\Fileref}[1]{\fileref{#1}{\file{#1}}} %% 2010/09/10
+\newcommand*{\urlhref}[1]{\href{#1}{\urlfmt{#1}}} %% 2011/08/19
+\newcommand*{\siehewiki}[1]{% %% 2011/05/06
+ \to\wikideref{#1}{\textit{Wikipedia}}}
+\newcommand*{\wormsmusref}[1]{% %% 2011/04/30
+ \httpref{www.worms.de/deutsch/kultur/museen/#1}}
+%% 2011/08/18:
+\newcommand*{\facebookpref}{%
+ \httpref{de-de.facebook.com}{facebook}}
+\newcommand*{\wetterwpref}{%
+% \hanc{wetter}{\mystrong{Wetter:}}
+% \Endash \httpref{www.wetteronline.de/Rheinland-Pfalz/Worms.htm%
+% }{\code{www.wetteronline.de}}
+% \Endash \httpref{m.wetter.net/1686/Worms}{\code{m.wetter.net}}
+% \Endash \httpref{www.wetteronline.de/dldlsat.htm%
+% }{Satellitenbild}
+ \httpref{www.wetteronline.de/Rheinland-Pfalz/Worms.htm}{%
+ \code{wol} }|
+ \httpref{m.wetter.net/1686/Worms}{\code{mww} }|
+ \httpref{www.wetteronline.de/dldlsat.htm}{\code{sat}}
+}
+%% 2011/08/19:
+\newcommand*{\webdesignref}[1]{%
+ \httpref{www.webdesign-bu.de/uwe_lueck/#1}}
+\newcommand*{\webdesignurlref}[1]{%
+ \webdesignref{#1}%
+ {\urlfmt{www.webdesign-bu.de/uwe_lueck/#1}}}
+%% TeX links:
+\newcommand*{\CPR}{\ctanpkgref} %% 2011/03/15
+\newcommand*{\THPR}{\texhaxpref} %% 2011/03/15
+\newcommand*{\THpref}[1]{\texhaxpref{#1}{texhax}} %% 2011/03/24
+\newcommand*{\TOPref}[1]{\bytopicref{#1}{JF\##1}} %% 2011/04/22
+\newcommand*{\todobytopic}[1]{% %% 2011/04/22
+ \myalert{\to\ \TOPref{#1}}}
+\newcommand*{\UKFAQref}[1]{\ukfaqref{#1}{UK~FAQ}} %% 2011/01/03
+
+%% font switching (logical):
+\renewcommand*{\textsf}{% %% 2011/05/12
+ \TagSurr{span}%
+ {style="font-size:82\%;
+ font-family:sans-serif"}}
+\providecommand*{\file}{\code} %% provide 2011/03/07
+\newenvironment*{itquote}{\quote<i>}{</i>\endquote}
+\newcommand*{\mystrong}{\textcolor{\#aa0000}}
+\providecommand*{\myalert}{\textcolor{red}}
+\newcommand*{\prl}[1]{#1} %% prg lang, corr. 2010/12/15
+\providecommand*{\pkg}{\pkgnamefmt} %% 2011/03/05
+\newcommand*{\privpkgnamefmt}[1]{% %% 2011/05/14
+ \textcolor{\#006600}{\textsf{#1}}}
+\newcommand*{\meta}{\textit} %% 2011/05/16
+% \newcommand*{\acro}[1]{\small#1\endsmall} %% 2011/06/19
+\newcommand*{\acro}[1]{#1} %% 2011/06/19
+
+%% involving font switching for special purposes: %% 2011/07/25
+\newcommand*{\src}[1]{\STS{sup}{[#1]}} %% 2010/09/12
+\newcommand*{\idx}[1]{% %% 2010/11/23:
+ \textcolor{green}{\code{\lt#1\gt}}}
+\providecommand*{\cb}[1]{\code{{#1}}} %% 2011/03/13
+\newcommand*{\itqtd}[1]{\textit{\dqtd{#1}}} %% 2011/05/03
+\newcommand*{\ancstrong}[2]{\hanc{#1}{\strong{#2}}} %% 2011/05/05
+% \newcommand*{\answer}[1]{[\textcolor{\#006600}{#1}]}
+\newcommand*{\answer}[1]{\textcolor{\#006600}{[#1]}}%% 2011/07/19
+\newcommand*{\Answer}[1]{\answer{\,#1\,}} %% 2011/08/25
+\newcommand*{\planh}[1]{\answer{#1\,h}} %% 2011/08/18
+\newcommand*{\TODO}{\myalert{TODO}} %% 2011/05/07
+%% 2011/09/22:
+\newcommand*{\HTML}{\acronym{HTML}}
+\newcommand*{\PDF} {\acronym{PDF}}
+
+%% dashes:
+% \newcommand*{\enpardash}{\,\emdash\,} %% 2011/05/12
+\newcommand*{\enpardash}{\thinsp\Enpardash} %% 2011/07/28
+\newcommand*{\Enpardash}{\emdash\thinsp} %% 2011/07/28
+% \newcommand*{\depardash}{~\endash\ } %% 2011/05/12
+\newcommand*{\depardash}{\ \Endash} %% 2011/07/28
+\newcommand*{\Endash}{\endash\ } %% starting new line (German)
+ %% 2011/05/26
+\newcommand*{\enpardashed}[1]{% %% 2011/07/28
+ \thinsp\emdash\,#1\,\Enpardash}
+\newcommand*{\depardashed}[1]{% %% 2011/07/28
+ \ \endash~#1~\Endash}
+\def\endashed#1{\endash~#1~\endash} %% 2011/08/20
+
+%% 2010/11/13 TODO -- catcodes.sty!?:
+{\catcode`\"\active \gdef\catchdq#1"{\dqtd{#1}}} %% 2010/11/13
+\newcommand*{\Euro}{\,\euro} %% mod. 2011/05/25 2011/09/08
+\newcommand*{\degC}{\,\degrees C} %% 2011/09/20
+%% avoiding spaces at code line breaks:
+\newcommand*{\bcmt}{<!-- } \newcommand*{\ecmt}{-->} %% 2011/05/02
+\newcommand*{\nix}[1]{} %% join lines without space 2011/07/24
+\newcommand*{\onehtmlline}[1]{#1} %% 2011/08/25
+%%
+%% enumeration styles:
+\makeatletter %% 2011/08/01
+ \newenvironment{enumtype}[1]{<ol \@type{#1}}{</ol>}
+\makeatother
+\newenvironment{enumerate-a}{\enumtype a}% %% 2011/08/15
+ {\endenumtype}
+\newenvironment{enumerate-i}{\enumtype i}% %% 2011/08/17
+ {\endenumtype}
+
+\newenvironment{done}{<s>}{</s>} %% 2011/08/15
+\newcommand*{\Dots}{~\dots\ } %% 2011/08/24
+%% table rows: %% 2011/09/24
+\newcommand*{\rowoftwocells}[2]{%
+ \starttr
+ \simplecell{#1}\simplecell{#2}%
+ \endtr}
+\newcommand*{\rowofthreecells}[3]{%
+ \starttr
+ \simplecell{#1}\simplecell{#2}\simplecell{#3}%
+ \endtr}
+\newcommand*{\rowoffourcells}[4]{%
+ \starttr
+ \simplecell{#1}\simplecell{#2}%
+ \simplecell{#3}\simplecell{#4}%
+ \endtr}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/morehype/texlinks.sty b/Master/texmf-dist/tex/latex/morehype/texlinks.sty
index 32f3b9c2cab..9423dfef4df 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/08/27 v0.4 TeX-related links (UL)]
+\ProvidesPackage{texlinks}[2011/10/10 v0.41 TeX-related links (UL)]
%% copyright (C) 2011 Uwe Lueck,
%% http://www.contact-ednotes.sty.de.vu
%% -- author-maintained in the sense of LPPL below.
@@ -64,7 +64,7 @@
%% \pagebreak
%% %% moving \httpsref 2011/08/27:
%% == Providing &\httpref\ and &\httpsref ==
-%% \kern-\baselineskip
+%% %% rm. \kern-\baselineskip 2011/10/10
%% \[|\httpref{<host-path[#frag]>}{<text>}|\]
%% should display <text>
%% as a link to `http://<host-path[#frag]>';
@@ -244,8 +244,9 @@
%% \emph{section headings}, which typically contain blank spaces.
%% This has been more difficult ...
%%
-%% Likewise with umlauts: text encoding suffices for \emph{lemmas.}
-%% I made `\urluml' for lemmas. But umlauts in \emph{anchors}
+%% Likewise with umlauts: text encoding suffices for \emph{lemmas}
+%% (my `\urluml' is not needed for this purpose).
+%% But umlauts in \emph{anchors}
%% generated from \emph{section headings} are different.
%% While umlauts in \emph{lemmas} are represented by sequences
%% starting with a \emph{percent} character, the anchors
@@ -294,11 +295,30 @@
%% to a \TeX~Archive directory or file <path>:
\newcommand*{\tugctanref}[1]{%
\httpref{tug.ctan.org/tex-archive/#1}}
-%% %% corr. 2010/11/23:
-%% $|\ctanpkgref{<pkg-name>}|$
+%% Alternatively, you can refer to an (automatically chosen)
+%% \acro{CTAN} \emph{mirror}
+%% using
+%% \[|\mirrorctanref{<path>}{<text>}|:\] %% 2011/10/10
+\newcommand*{\mirrorctanref}[1]{\httpref{mirror.ctan.org/#1}}
+%% You may actually want to ``open" a file <file-name> in <path>
+%% on \acro{CTAN}, either by
+%% \[|\tugctanfileref{<path>}{<file-name>}|\] %% 2011/10/10
+%% or (for a mirror) by
+%% \[|\mirrorctanfileref{<path>}{<file-name>}|.\] %% 2011/10/10
+%% The file name format |\file{<file-name>}|
+%% that is used in the definitions must be provided
+%% elsewhere. %% 2011/10/06; TODO provlast
+\newcommand*{\tugctanfileref}[2]{%
+ \tugctanref{#1/#2}{\file{#2}}}
+\newcommand*{\mirrorctanfileref}[2]{%
+ \mirrorctanref{#1/#2}{\file{#2}}}
+%% Typically, \LaTeX\ macro packages in \file{macros/latex/contrib/}
+%% are discussed, so here is |\ltxcontrib| saving a few characters:
+\newcommand*{\ltxcontrib}{macros/latex/contrib/}
+%% |\ctanpkgref{<pkg-name>}|
%% makes <text> a link to the \acro{CTAN} package info page for
%% the package <pkg-name>.
-%% $|\CtanPkgRef{<name>}{<Name>}|$
+%% |\CtanPkgRef{<name>}{<Name>}|
%% is a variant for the cases where authors have a special idea
%% <Name> using some capital letters when they describe their packages
%% (ASCII versions of ``Logos" such as `BibTeX')
@@ -426,3 +446,8 @@ v0.4 2011/04/27 doc. \tugbartref\ corrected
2011/08/18 doc.: \acro with UK; wikibooks
2011/08/27 doc. \acro with URL and PDF;
more doc and code changes for https
+uploaded with MOREHYPE r0.4 (not touched by r0.41)
+v0.41 2011/09/03 doc.: more specific on \urluml/Wikipedia
+ 2011/10/06 \mirrorctanref, \tugctanfileref,
+ \mirrorctanfileref, \ltxcontrib
+ 2011/10/10 doc. formatting of previous