diff options
| author | Karl Berry <karl@freefriends.org> | 2011-09-03 23:13:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-09-03 23:13:56 +0000 |
| commit | ea16ae60028a1e6e1820c3a99a66a74369259f8c (patch) | |
| tree | fde2a436c9b9a938da63173bdcee14495fe4172c | |
| parent | 320a834d2e64000bb5ba96aa67dfcc2435ad26f8 (diff) | |
morehype update (1sep11)
git-svn-id: svn://tug.org/texlive/trunk@23781 c570f23f-e606-0410-a88d-b1316a301751
23 files changed, 1365 insertions, 513 deletions
diff --git a/Master/texmf-dist/doc/latex/morehype/RELEASE.txt b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt index 571c2ba2f81..cfd6f629762 100644 --- a/Master/texmf-dist/doc/latex/morehype/RELEASE.txt +++ b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt @@ -1,7 +1,39 @@ +r0.4 2011/09/01 texlinks v0.4, +blog.sty v0.5 + support for two-column web pages +============================================================ + +A new "raw" macro file `twocolpg.sty' provides macros for +the web page style with a navigation column at the left of a +main content column with spanning header and footer - +towards a content management system for TeX addicts? +Templates (`demo') are provided, see Section `Examples' in +`blog.pdf'. + +`blog.sty' v0.5 has many more macros than v0.41, mainly +for symbols. Accented letters are near to complete, Greek +letters are complete. Documentation has been improved at +some places. I realized that ` ' allows line breaks +and therefore redefined \thinspace and \,, but this may be +difficult with certain browsers. + +`texlinks.sty' v0.4 adds HTTPS, references to CTAN +announcements, and references to the LaTeX Wikibook. +Wikipedia macros and parts of documentation have been +reworked. + +For details, always see the end of the .sty files. +Throughout, the \acro macro (known from TUGboat macros) +has been applied to the documentations. + +Moreover, the sample file `atari.fdf' for a little encoding +conversion has moved to the nicetext bundle, and the macro +it defines now is \TextCodes instead of \AtariCodes. + + r0.3 2011/02/10 texlinks v0.3 [blog], \urlpkgfoot ============================================================ -\urlpkgfoot{PKG-ID} abbreviates \urlfoot{CtanPkgRef}{PKD-ID} +\urlpkgfoot{PKG-ID} abbreviates \urlfoot{CtanPkgRef}{PKG-ID} that is needed frequently. Package option [blog] suppresses document definitions. blog.sty is updated accordingly and at the occasion. @@ -13,4 +45,4 @@ r0.2 2011/01/27 texlinks v0.2 \urlfoot in a footnote. E.g., \ukfaqref{LABEL}{TEXT} generates an URL that \urlfoot{ukfaqref}{LABEL} displays. -r0.2a 2011/01/30 makehtml.tex+texmap.tex to `doc', TDS with `source'
\ No newline at end of file +r0.2a 2011/01/30 makehtml.tex+texmap.tex to `doc', TDS with `source' diff --git a/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt b/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt index 5842aa22466..435d5110ff9 100644 --- a/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt +++ b/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt @@ -1,19 +1,21 @@ *File List* - blog.sty 2011/02/10 v0.41 simple fast HTML (UL) + blog.sty 2011/08/31 v0.5 simple fast HTML (UL) hypertoc.sty 2011/01/23 v0.1 pretty TOC links (UL) -texlinks.sty 2011/02/10 v0.3 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 +texlinks.sty 2011/08/27 v0.4 TeX-related links (UL) +twocolpg.sty 2011/09/01 2-col. page with blog.sty + lang-de.fdf 2011/05/12 German settings for blog.sty lang-en.fdf 2011/01/25 English settings for blog.sty - makedoc.cfg 2011/01/24 documentation settings + blog.tex 2011/09/01 documenting blog.sty +hypertoc.tex 2011/01/27 documenting hypertoc.sty +texlinks.tex 2011/08/27 documenting texlinks.sty + README.tex 2011/02/14 make README.pdf +niceverb.sty 2011/08/20 v0.43 minimize doc markup (UL) + makedoc.cfg 2011/08/22 documentation settings mdoccorr.cfg 2011/01/27 local typographical corrections with makedoc.sty -srcfiles.tex 2011/02/10 collect file infos +srcfiles.tex 2011/08/31 collect file infos *********** - List made at 2011/02/10, 13:19 + List made at 2011/09/01, 14:37 from script file srcfiles.tex diff --git a/Master/texmf-dist/doc/latex/morehype/blog.pdf b/Master/texmf-dist/doc/latex/morehype/blog.pdf Binary files differindex 94f5622b46a..984a812704c 100644 --- a/Master/texmf-dist/doc/latex/morehype/blog.pdf +++ b/Master/texmf-dist/doc/latex/morehype/blog.pdf diff --git a/Master/texmf-dist/doc/latex/morehype/demo/texblog/makehtml.tex b/Master/texmf-dist/doc/latex/morehype/demo/texblog/makehtml.tex new file mode 100644 index 00000000000..1ef31ba6c3d --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/demo/texblog/makehtml.tex @@ -0,0 +1,30 @@ +\def \GenDate {2011/09/01} +\ProvidesFile{makehtml.tex}[\GenDate\space HTML driver] +\RequirePackage{blog,texlinks} +\RequirePackage{dhusw} %% or from lang-de.fdf +\input{atari.fdf}\input{lang-en.fdf} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \input{jobname} %% write with "echo" +\def \htmljob +{texmap} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% {heyctan} %%% \def\pkg{\privpkgnamefmt} +% {makeshow} +% {texhax} +% {aaoe1550} +% {jobs} %%% \BlogAutoPars +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% {beobacht} \input{lang-de.fdf} +% {gtd} \input{lang-de.fdf} +% {STEUER} \input{lang-de.fdf} +% {GALLEY} \input{lang-de.fdf} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{texblog.fdf} +\ResultFile{\htmljob\htext} +\typeout{^^J\screenqtd{blog.sty} generating + \screenqtd{\htmljob\htext}} +\BlogCopyFile[\TextCodes %% was \AtariCodes until 2011/08/22 + \MakeActiveDef\"{\catchdq}% + ]{\htmljob.tex} +\CloseResultFile +\stop diff --git a/Master/texmf-dist/doc/latex/morehype/demo/texblog/texblog.fdf b/Master/texmf-dist/doc/latex/morehype/demo/texblog/texblog.fdf new file mode 100644 index 00000000000..90a42f8d01d --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/demo/texblog/texblog.fdf @@ -0,0 +1,257 @@ +\ProvidesFile{texblog.fdf}[2011/08/31 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">} +\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/}% + {VRN}} + +\renewcommand*{\vspace}[1]{% %% from "writings" 2011/08/16 + \startTable{\@height{#1}% + \@border{0}\@cellpadding{0}\@cellspacing{0}}% + \starttr<td />\endtr\endTable} +%% 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: +\newcommand*{\htext}{.htm} +\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 + +%% 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 +%% 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 + +\endinput diff --git a/Master/texmf-dist/doc/latex/morehype/texmap.tex b/Master/texmf-dist/doc/latex/morehype/demo/texblog/texmap.tex index 11776953cf2..91dc70e254e 100644 --- a/Master/texmf-dist/doc/latex/morehype/texmap.tex +++ b/Master/texmf-dist/doc/latex/morehype/demo/texblog/texmap.tex @@ -1,3 +1,5 @@ +\ProvidesFile{texmap.tex}[2011/08/18 TeX-generated: overview] + %% <- for blog/myfilist.sty 2011/02/22 \comment{ 2011/01/25 \string\endash\ -> \string\pardash\ } \comment{ 2010/12/05 \string\emdash\ -> \string\endash\ } \head \charset{ISO-8859-1} %%% {utf-8} @@ -6,22 +8,26 @@ \title{TeX-generated pages - U. L.} \body \textopofpage \heading1{Uwe Lck's \TeX-generated/related pages} -\emdash\,I'm playing with a different style of pages here. - \hrule\\ %%% \endgraf +% \emdash\,I'm playing with a different style of pages here. +% \hrule\\ %%% \endgraf The present page leads you to: -\begin{enumerate} - \item \FileRef{index.html}{\file{index}}\pardash my English main page - \item \FileRef{schreibt.html}{\file{schreibt}}\pardash my German main page -\hrule +\begin{enumerate} %% `\href' 2011/08/18: + \item \href{index.html}{\file{index}}\pardash my English main page + \item \href{schreibt.html}{\file{schreibt}}\pardash my German main page + \hrule \item \Fileref{aaoe1550}\pardash UMTS stick with Linux netbook \item \Fileref{heyctan}\pardash CTAN discoveries \item \Fileref{jobs}\pardash coaching %% explained 2010/09/24 \item \Fileref{makeshow}\pardash\TeX\ almost WYSIWYG \dots \item \Fileref{texhax}\pardash studies on texhax postings + \hrule + \item \Fileref{beobacht}~\endash\ \dedqtd{Web-Tagebuch} + \item \Fileref{gtd}~\endash\ \dedqtd{Getting Things Done} + \item \Fileref{oeffnotz}~\endash\ \dedqtd{ffentliche Notizen} %% 2011/08/16b \end{enumerate} - \hrule + \hrule \enlastrev \entotopofpage \fivebreaks \fivebreaks diff --git a/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex b/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex new file mode 100644 index 00000000000..222d7855f22 --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex @@ -0,0 +1,41 @@ +\def \GenDate {2011/08/31} +\ProvidesFile{makehtml.tex} + [\GenDate\space TeX engine for "writings"] +\RequirePackage{blog,texlinks,twocolpg} %% 2011/08/31 +\input{atari.fdf} \input{lang-en.fdf} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\def \htmljob +% {_sitemap} +% {index} \BlogAutoPars +{schreibt} \input{lang-de.fdf} \BlogAutoPars +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% {about} \BlogAutoPars +% {contact} % \tighttrue +% {kontakt} \input{lang-de.fdf} % \tighttrue +% {tutor} \input{lang-de.fdf} \BlogAutoPars \deeptrue +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% {writings} \BlogAutoPars \deeptrue +% {repres} \BlogAutoPars \deeptrue +% {critedl} \BlogAutoPars \deeptrue +% {ednworks} \BlogAutoPars +% {public} \BlogAutoPars \deeptrue +% {texproj} \BlogAutoPars % \deeptrue +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\input{writings.fdf} + +\ResultFile{\htmljob\htmakeext} +\typeout{^^J\screenqtd{blog.sty} generating + \screenqtd{\htmljob\htmakeext}} +\WriteResult\writdoctype %% TODO +\BlogCopyFile[\TextCodes + \MakeActiveDef\"{\catchdq}% %% TODO attributes!? + ]{\htmljob.tex} +\WriteResult{\PAGEFOOT} +\WriteResult{\indentii\rainermaster} +\WriteResult{\indentii\\} +\WriteResult{\indentii\ueberseeport} +\WriteResult{\PAGEEND} +\ifdeep \WriteResult{\indenti\vspace{280}} \fi +\WriteResult{\finish} +\CloseResultFile +\stop diff --git a/Master/texmf-dist/doc/latex/morehype/demo/writings/schreibt.tex b/Master/texmf-dist/doc/latex/morehype/demo/writings/schreibt.tex new file mode 100644 index 00000000000..5784f9ce74a --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/demo/writings/schreibt.tex @@ -0,0 +1,27 @@ +\ProvidesFile{schreibt.tex}[2011/08/19 f. schreibt.html] +\head \charset{ISO-8859-1} + \writrobots + \writstylesheets +\title{\Uwe\ schreibt} \body \writtopofpage +\PAGEHEAD + \headuseskiptitle{% + \timecontimgref{writings}{0}{Zeit-Logo}{Russells Zeit}% + }{10}{\Uwe\ \dqtd{schreibt}} +\PAGENAVI + \fileitem{writings}{Intervallordnungen (Mathematik~etc.)} + \fileitem{public}{Publikationen} + \hrule + \fileitem{critedltx}{Softwarepakete f\"ur kritische Editionen} + \fileitem{texproj}{TeX-Projekte} %%% Makro-Projekte} + \hrule + \fileitem{tutor}{Mathe-Tutor} + \indentii\item\href{texmap.htm}{Notizen} + \hrule + \deFIabout \deFIkontakt +\PAGEMAIN +\strong{Wissenschaft:}\enspace Diese Seiten entstanden zuerst +zur Prsentation zweier ETC. + +\rightpar{\textit{Worms-Pfeddersheim, den 19.~August 2011,\\\Uwe}} +% \rightpar{\textit{Mnchen, den 31.~Juli 2011,\\\Uwe}} + %% <- TODO VERSION diff --git a/Master/texmf-dist/doc/latex/morehype/demo/writings/writings.fdf b/Master/texmf-dist/doc/latex/morehype/demo/writings/writings.fdf new file mode 100644 index 00000000000..60a187f393d --- /dev/null +++ b/Master/texmf-dist/doc/latex/morehype/demo/writings/writings.fdf @@ -0,0 +1,128 @@ +\ProvidesFile{writings.fdf}[2011/09/01 writings blog settings] +\input{texblog.fdf} +\renewcommand*{\htext}{.html} %% vs. texblog.fdf 2011/08/31 +\newcommand*{\htmakeext}{.htm} +%% PAGE STYLE SETTINGs: +\newcommand*{\pagebgcolor}{\#f5f5f5} %% CSS whitesmoke +% \@bgcolor{\#fafafa} %% needs adjusting logos +\makeatletter %% 2011/09/01 + \newcommand*{\pagespacing}{\@cellpadding{4} \@cellspacing{7}} +\makeatother +\newcommand*{\pagenavicolwidth}{125} +\newcommand*{\pagemaincolwidth}{584} +\newcommand*{\pagewholewidth} {792} + +%% writings FIRST FILE LINEs +%% (TODO: from makehtml.tex without macros, then remove ...): +\newcommand*{\writdoctype}{% + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">} +\newcommand*{\writrobots}{\robots{index,follow,noarchive}} +\newcommand*{\writstylesheets}{% %% order 2011/04/28b + \stylesheet{all}{style_ns}^^J\stylesheet{screen}{style}} +\newcommand*{\writtopofpage}{\hanc{top}{}} + +%% font switching: +\providecommand*{\pkg}{\pkgnamefmt} %% 2011/03/05 +%% 2011/07/31: +% \newcommand*{\mystrong}{\textcolor{\#aa0000}} +% \newcommand*{\mystrong}{\textcolor{\#008000}} +% \newcommand*{\mystrong}[1]{\textbf{\textcolor{\#006600}{#1}}} +% \newcommand*{\mystrong}{\textcolor{\#882200}} +% \newcommand*{\mystrong}{\textcolor{\#008800}} +% \newcommand*{\mystrong}{\textcolor{\#118811}} %% 2011/08/01 +\renewcommand*{\mystrong}[1]{% %% vs. texblog.fdf 2011/08/31 + \textbf{\textcolor{\#008800}{#1}}} +\newcommand*{\privrem}[1]{\textcolor{\#117711}{[\,#1\,]}} + +%% writings head macros: +\newcommand*{\timecontimgref}{% + \inclgrfref{254}{94}{timecont.gif}} +\newcommand*{\nothingimgref} {% + \inclgrfref{250}{49}{nothing250.png}} +\newcommand*{\usednotimgref} {% + \inclgrfref{300}{29}{usednot300.png}} +\newcommand*{\detimefimg}{% + \timecontimgref{schreibt}{0}{Zeit-Logo}% + {Russells Zeit | zu U.L.s Homepage}} +\newcommand*{\enusednotfimg}{% + \usednotimgref{index}{0}{ednotes logo}{to U.L.'s home page}} +\newcommand*{\ennothingfimg}{% + \nothingimgref{index}{0}{ednotes sample}% + {ednotes sample | to U.L.'s home page}} +\newcommand*{\entimefimg}{% + \timecontimgref{index}{0}{time logo}% + {Russell's time | go to U.L.'s home page}} + +%% writings navigation macros: +\newcommand*{\fileitem}{\indentii\item\fileref} +\newcommand*{\deFIschreibt}{% + \fileitem{schreibt}{% +% U.L.s Schriften~\endash\ + U.L. schreibt~\endash\ + \strong{Homepage}}} +\newcommand*{\deFIabout}{% + \fileitem{about}% + {\strong{About} + myself\quad\simpleinclgrf{flag_uk.gif}}} +\newcommand*{\deFIkontakt}{% + \fileitem{kontakt}{\strong{Kontakt}}} +\newcommand*{\enFIindex}{% + \fileitem{index}{U.L.'s writings~\endash\ \strong{home}}} +\newcommand*{\enFIabout}{% + \fileitem{about}{\strong{About} myself}} +\newcommand*{\enFIcontact}{% + \fileitem{contact}{\strong{Contact} me}} +\newcommand*{\enFIcontacten}{% + \fileitem{contacten}% + {\strong{Contact} maintainers of \pkg{ednotes}}} +\newcommand*{\enFIcritedltx}{% + \fileitem{critedltx}{Packages for +% \strong{critical editions}}} + critical editions}} +\newcommand*{\enFIednworks}{% + \fileitem{ednworks}{\pkg{ednotes} works}} +\newcommand*{\enFIotherltx}{% + \fileitem{texproj}{Other \LaTeX\ packages}} +\newcommand*{\enFIpublic}{\fileitem{public}{Published}} +\newcommand*{\enFIrepres}{% + \fileitem{repres}{% + \enqtd{Representing Interval Orders + by Arbitrary Real Intervals}}} +\newcommand*{\enFItexproj}{% + \fileitem{texproj}{\strong{\TeX} macro projects}} +\newcommand*{\enFIwritings}{% + \fileitem{writings}{Scientific writings}} +\newcommand*{\enFIschreibt}{% + \item\fileref{schreibt}{\strong{deutsch}% +% \quad\simpleinclgrf{de-flk.gif}}} + \quad\simpleinclgrf{flag_de.gif}}} + +%% links to top of page: +\renewcommand*{\NRV}[1]{% + \rightpar{\ancref{#1}{[\to}|% +%% top name differs to texblog.fdf 2011/08/31: + \ancref{top}{~\uparrow~]}}% + \hrule \hanc{#1}{}\\} + +%% page bottom: +\newcommand*{\Uwe}{Uwe L\"uck} %% UWE LCK +\newcommand*{\UweNbsp}{Uwe~L\"uck} %% UWE~LCK +\newcommand*{\enLastRev}[1]{% + \rightpar{% + \textit{Last~revised~#1,\\% + \copyright~\fileref{contact}{\Uwe}}}} +%% stattdessen texblog.fdf 2011/08/31: +% \newcommand*{\delastrev}{% +% \rightpar{% +% \textit{Letzte \"Anderung~\GenDate\ +% \copyright~\fileref{kontakt.}{\Uwe}}}} + +\newcommand*{\rainermaster}{% + Webmaster: + \httpref{www.webdesign-bu.de}{Rainer L\"uck}, Gernsbach} +\newcommand*{\ueberseeport}{% + Supported by: A~la~Siesta + \httpref{www.alasiesta.com}{H\"angematten} und Kunsthandwerk, + Berlin/\httpref{www.uebersee.biz}{Wismar}} + +\endinput diff --git a/Master/texmf-dist/doc/latex/morehype/makehtml.tex b/Master/texmf-dist/doc/latex/morehype/makehtml.tex deleted file mode 100644 index 6f6e045224d..00000000000 --- a/Master/texmf-dist/doc/latex/morehype/makehtml.tex +++ /dev/null @@ -1,90 +0,0 @@ -\def \GenDate {2011/02/08} -\ProvidesFile{makehtml.tex} - [\GenDate \space- UL's TeX-generated web pages] -\RequirePackage{blog}[2011/01/24] \RequirePackage{texlinks} -\input{atari.fdf} \input{lang-en.fdf} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def \htmljob -% {texmap} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% {aaoe1550} -{heyctan} -% {jobs} %%% \BlogAutoPars -% {makeshow} -% {private} \input{lang-de.fdf} -% {README} -% {texhax} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% "CFG:" -\newcommand*{\enlastrev}{% - \rightpar{% - \textit{Last~revised~\GenDate\ - \copyright~\FileRef{contacten.html}{%% 2010/09/26 - Uwe~L\uml{u}ck}}}} -\newcommand*{\delastrev}{% - \rightpar{% - \textit{Letzte \uml{A}nderung~\GenDate\ - \copyright~\FileRef{contacten.html}{%% 2010/09/26 - Uwe~L\uml{u}ck}}}} -\newcommand*{\entotopofpage}{% - \rightpar{\ancref{top-of-page}{[\textit{\to~top~of~page}~]}}} -\newcommand*{\detotopofpage}{% - \rightpar{\ancref{top-of-page}{[\textit{\to~Seitenanfang}~]}}} -\newcommand*{\file}{\code} -\newenvironment*{itquote}{\quote<i>}{</i>\endquote} -\newcommand*{\mystrong}{\textcolor{\#aa0000}} -\newcommand*{\myalert}{\textcolor{red}} -\newcommand*{\nextview}[1]{% %% corr. 2010/09/15 - \rightpar{\ancref{#1}{[\to}|% - \ancref{top-of-page}{~\uparrow~]}}} -\newcommand*{\nextruleview}[1]{% %% 2010/09/15 - \nextview{#1}\hrule\hanc{#1}{}} -\newcommand*{\TOPref}[1]{\bytopicref{#1}{JF}} -\newcommand*{\htext}{.htm} -\newcommand*{\fivebreaks}{\\\\\\\\\\} -%% 2010/09/10: -\newcommand*{\Hrule}{\totopofpage\hrule} -%% 2010/09/15: -\renewcommand*{\body}{</head><body bgcolor="\bodybgcolor">} -% \newcommand*{\bodybgcolor}{\#ffffff} -%% <- 2010/09/16 -> -\newcommand*{\bodybgcolor}{\#ffffe7} %% 2010/11/23 -% \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}{\#fffffe} %% 2010/11/23 -%% 2010/09/11: -\newcommand*{\textopofpage}{% -% \hanc{top-of-page}{[~\code{\Fileref{texmap} > \htmljob}~]}} - \hanc{top-of-page}{% - \small - \file{uwe_lueck} - \ifx\htmljob\texmapName\else \code{>} \Fileref{texmap}\fi - \ \code{>} \file{\htmljob}}% - \endsmall} -\newcommand*{\texmapName}{texmap} -\newcommand*{\Fileref}[1]{\fileref{#1}{\file{#1}}} -\newcommand*{\texrobots}{\robots{index,follow,noarchive}} -\newcommand*{\texstylesheet}{\stylesheet{all}{plain}} -%% 2010/09/12: -\newcommand*{\prl}[1]{#1} %% prg lang, corr. 2010/12/15 -\newcommand*{\src}[1]{\STS{sup}{[#1]}} -%% 2010/11/13 TODO -- catcodes.sty!?: -{\catcode`\"\active \gdef\catchdq#1"{\dqtd{#1}}} -%% 2010/11/23: -\newcommand*{\idx}[1]{\textcolor{green}{\code{\lt#1\gt}}} -\renewcommand*{\,}{ } %% 2011/01/01 -\newcommand*{\pardash}{\,\emdash\,} %% for playing 2011/01/14 -\newcommand*{\UKFAQref}[1]{\ukfaqref{#1}{UK~FAQ}} %% 2011/01/03 - -\ResultFile{\htmljob\htext} -\typeout{^^J\screenqtd{blog.sty} generating \screenqtd{\htmljob\htext}} - \errorcontextlines=6 -% \tracingmacros=1 -\BlogCopyFile[\AtariCodes - \MakeActiveDef\"{\catchdq}% - ]{\htmljob.tex} -% \CopyFile[\BlogCodes\AtariCodes]{\htmljob.tex} -\CloseResultFile -\stop diff --git a/Master/texmf-dist/doc/latex/morehype/texlinks.pdf b/Master/texmf-dist/doc/latex/morehype/texlinks.pdf Binary files differindex 45e631e2965..c8823f9f365 100644 --- a/Master/texmf-dist/doc/latex/morehype/texlinks.pdf +++ b/Master/texmf-dist/doc/latex/morehype/texlinks.pdf diff --git a/Master/texmf-dist/source/latex/morehype/README.tex b/Master/texmf-dist/source/latex/morehype/README.tex deleted file mode 100644 index ce26748edb5..00000000000 --- a/Master/texmf-dist/source/latex/morehype/README.tex +++ /dev/null @@ -1,11 +0,0 @@ -\ProvidesFile{README.tex}[2010/11/27 make README.pdf] -\listfiles - -\documentclass[12pt]{article} -\usepackage{verbatim} -\pagestyle{empty} -\begin{document} -\vspace*{-2\baselineskip} -\enlargethispage{1\baselineskip} -\verbatiminput{README.txt} -\end{document} diff --git a/Master/texmf-dist/source/latex/morehype/blog.tex b/Master/texmf-dist/source/latex/morehype/blog.tex index cf46597d225..b97f899fecf 100644 --- a/Master/texmf-dist/source/latex/morehype/blog.tex +++ b/Master/texmf-dist/source/latex/morehype/blog.tex @@ -1,6 +1,6 @@ -\ProvidesFile{blog.tex}[2011/01/27 documenting blog.sty] +\ProvidesFile{blog.tex}[2011/09/01 documenting blog.sty] \title{\textsf{blog.sty}\\---\\% - Generating HTML Quickly with \TeX\thanks{This + Generating \acro{HTML} Quickly with \TeX\thanks{This document describes version \textcolor{blue}{\UseVersionOf{\jobname.sty}} of \textsf{\jobname.sty} as of \UseDateOf{\jobname.sty}.}} @@ -12,7 +12,6 @@ \documentclass{article}%% TODO paper dimensions!? \input{makedoc.cfg} %% shared formatting settings \ReadPackageInfos{blog} -\usepackage{color} %% \tagcode seems to be a quite recent pdfTeX primitive, %% cf. microtype.pdf ... %% 2010/11/06 \newcommand*{\xmltagcode}[1]{\texttt{<#1>}} @@ -24,9 +23,9 @@ based on processing text files using the 'fifinddo' package. Some \LaTeX\ commands %%% command names -are redefined to access their HTML +are redefined to access their \acro{HTML} equivalents, other new macro names ``quote" the names of -HTML elements. The package has evolved in several little steps +\acro{HTML} elements. The package has evolved in several little steps each aiming at getting pretty-looking ``hypertext" \textbf{notes} with little effort, where ``little effort" also has meant avoiding studying @@ -35,13 +34,13 @@ documentation of similar packages already existing. % Version v0.3 is the remainder of v0.2 after moving some stuff % to 'fifinddo.sty' (especially `\CopyFile'); % moreover, the new `\BlogCopyFile' replaces empty source lines -% by HTML's \xmltagcode{p} (starting a new paragraph).---Real +% by \acro{HTML}'s \xmltagcode{p} (starting a new paragraph).---Real % \emph{typesetting} from the same `.tex' source % (pretty printable output) has not been tried yet. %% <- 2011/01/24 -> The package %%% rather \emph{``misuses"} \TeX's macro language -for generating HTML code and entirely \emph{ignores} +for generating \acro{HTML} code and entirely \emph{ignores} \TeX's typesetting capabilities.%%%---What about % such a ``small" \TeX\ with macros only and % \emph{no} typesetting capabilities ...!? @@ -58,7 +57,7 @@ putting it somewhere where \TeX\ finds it \strong{User commands} are described near their implementation below. However, we must present an \strong{outline} of the procedure -for generating HTML files: +for generating \acro{HTML} files: At least one \strong{driver} file and one \strong{source} file are needed. @@ -72,44 +71,100 @@ and uses file handling commands from 'blog.sty' and \CtanPkgRef{nicetext}{fifinddo} (cf. `mdoccheat.pdf' from the \ctanpkgref{nicetext} bundle). It chooses \strong{source} files and the name(s) for the resulting -HTML file(s). It may also need to load local settings, such as +\acro{HTML} file(s). It may also need to load local settings, such as for the language %% modified 2011/01/25: (`lang-de.fdf', `lang-en.fdf'), and settings for converting the editor's text encoding -into the encoding that the head of the resulting HTML file advertises -(`atari.fdf'). +into the encoding that the head of the resulting \acro{HTML} file advertises +(`atari.fdf' in the 'nicetext' bundle). -The driver file can run a terminal dialogue in order to choose source +The driver file could be run a terminal dialogue in order to choose source and target files and settings. So far, I rather have programmed a dialogue just for converting UTF-8 into an encoding that my -Atari editor xEDIT can deal with -[TODO: present in 'nicetext']. %% 2011/01/24 +Atari editor \textsc{xEDIT} can deal with. +I do not present this now because it was conceptually mistaken, +I must set up this conversion from scratch some time. +% [TODO: present in 'nicetext']. %% 2011/01/24 The \strong{source} file(s) should contain user commands defined below to generate the necessary \xmltagcode{head} section and the \xmltagcode{body} tags. -\section{Example} +\section{Examples} +\subsection{A Very Plain Style} My ``\TeX-generated -pages"{\footnote{\urlhttpref{www.webdesign-bu.de/uwe\underscorechar - lueck/texmap.htm}}} +pages"{\foothttpurlref{www.webdesign-bu.de/% + uwe\string_lueck/texmap.htm}} use a \strong{driver} file `makehtml.tex'. -To choose a page to generate, I ``uncomment" just one +To choose a page to generate, I ``uncomment"ed just one of several lines that set the ``current conversion job" -from a list. I choose the example of a simple ``site map:" -`texmap.htm' is generated from \strong{source} file `texmap.tex'. +from a list (for some time). +I choose the example of a simple ``site map:" +`texmap.htm' is generated from \strong{source} file +`texmap.tex'.---More recently however, I have started to +read the job name and perhaps extra settings from a file +`jobname.tex' that is created by a Bash script. + +In order to make it easier for the reader to see what is essential, +I~have moved many `.cfg'-like extra definitions into a file +`texblog.fdf'. Some of these definitions may later move into +`blog.sty'. You should find `makehtml.tex', `texmap.tex', and +`texblog.fdf' in a directory `demo/texblog', perhaps you can use them +as templates. \begingroup \MakeOther\|\MakeOther\`\MakeOther\'\MakeOther\< \MakeActive\ \def{\"u} \hfuzz=\textwidth \advance \hfuzz by 28pt -\subsection{Driver File \texttt{makehtml.tex}} - \listinginput[5]{1}{makehtml.tex} -\subsection{Source File \texttt{texmap.tex}} - \listinginput[5]{1}{texmap.tex} +\subsubsection{Driver File `makehtml.tex'} + \listinginput[5]{1}{CTAN/morehype/demo/texblog/makehtml.tex} +\subsubsection{Source File `texmap.tex'} + \listinginput[5]{1}{CTAN/morehype/demo/texblog/texmap.tex} +\endgroup + +\subsection{A Style with a Navigation Column} +A style of web pages looking more professional than `texhax.hmt' +(while perhaps becoming outdated) has a small navigation column +on the left, side by side with a column for the main content. +Both columns are spanned by a header section above and a footer +section below. The package 'twocolpg.sty' provides commands +`\PAGEHEAD', `\PAGENAVI', `\PAGEMAIN', `\PAGEFOOT', `\PAGEEND' +(and some more) for structuring the source so that the code +following `\PAGEHEAD' generates the header, the code following +`\PAGENAVI' forms the content of the navigation column, etc. +For real professionality, somebody must add some fine \acro{CSS}, +and the macros mentioned may need to be redefined to use the `@class' +attribute. Also, I am not sure about the table macros in 'blog.sty', +so much may change later. + +With things like these, can 'blog.sty' become a part of a +``\Wikienref{content management system}" for \TeX\ addicts? +This idea rather is based on the +\wikideref{Content Management System}{\meta{German}} +Wikipedia article. + +As an example, I present parts of the source for my +``home page"{\foothttpurlref{www.webdesign-bu.de/% + uwe\string_lueck/schreibt.html}}. +As the footer is the same on all pages of this style, +it is added in the driver file `makehtml.tex'. +`schreibt.tex' is the source file for generating `schreibt.html'. +You should find \emph{this} `makehtml.tex', a cut down version of +`schreibt.tex', and `writings.fdf' with my extra macros for these pages +in a directory `demo/writings', hopefully useful as templates. + +\begingroup + \MakeOther\|\MakeOther\`\MakeOther\'\MakeOther\< + \MakeActive\ \def{\"u} + \hfuzz=\textwidth \advance \hfuzz by 10pt +\subsubsection{Driver File `makehtml.tex'} + \listinginput[5]{1}{CTAN/morehype/demo/writings/makehtml.tex} +\subsubsection{Source File `schreibt.tex'} + \listinginput[5]{1}{CTAN/morehype/demo/writings/schreibt.tex} \endgroup + \section{The Package File} \subsection{Package File Header (Legalize)} \errorcontextlines=5 @@ -123,3 +178,5 @@ HISTORY 2010/11/11 for v0.3 2011/01/23 using readprov and color 2011/01/27 using \urlfoot +2011/09/01 using new makedoc.cfg incl. \acro and \foothttp...; + extension for twocolpg.sty diff --git a/Master/texmf-dist/source/latex/morehype/makedoc.cfg b/Master/texmf-dist/source/latex/morehype/makedoc.cfg deleted file mode 100644 index 43d57ed87cc..00000000000 --- a/Master/texmf-dist/source/latex/morehype/makedoc.cfg +++ /dev/null @@ -1,40 +0,0 @@ -\ProvidesFile{makedoc.cfg}[2011/01/24 documentation settings] - -\author{Uwe L\"uck\thanks{\url{http://contact-ednotes.sty.de.vu}}} -% \author{Uwe L\"uck---{\tt http://contact-ednotes.sty.de.vu}} - -%% hyperref: -\RequirePackage{ifpdf} -\usepackage[% - \ifpdf -% bookmarks=false, %% 2010/12/22 -% bookmarksnumbered, - bookmarksopen, %% 2011/01/24!? - bookmarksopenlevel=2, %% 2011/01/23 -% pdfpagemode=UseNone, -% pdfstartpage=10, -% pdfstartview=FitH, - citebordercolor={ .6 1 .6}, - filebordercolor={1 .6 1}, - linkbordercolor={1 .9 .7}, - urlbordercolor={ .7 1 1}, %% playing 2011/01/24 - \else - draft - \fi -]{hyperref} - -\RequirePackage{niceverb}[2011/01/24] -\RequirePackage{readprov} %% 2010/12/08 -\RequirePackage{hypertoc} %% 2011/01/23 -\RequirePackage{texlinks} %% 2011/01/24 -\makeatletter - \@ifundefined{strong} - {\let\strong\textbf} %% 2011/01/24 - {} -\makeatother - -\errorcontextlines=4 -\pagestyle{headings} - -\endinput - diff --git a/Master/texmf-dist/source/latex/morehype/mdoccorr.cfg b/Master/texmf-dist/source/latex/morehype/mdoccorr.cfg deleted file mode 100644 index bbcadd90e34..00000000000 --- a/Master/texmf-dist/source/latex/morehype/mdoccorr.cfg +++ /dev/null @@ -1,51 +0,0 @@ -\ProvidesFile{mdoccorr.cfg}[2011/01/27 - local typographical corrections - with makedoc.sty] -%% ... also demonstrates 'niceverb.sty'---see the typeset -%% documentation of the present file in `makedoc.pdf'. -%% -%% |\SetPatternCodes{<commands>}| redefines -%% `\PatternCodes' to be used in parsing and replacing -%% (some ``sanitizing"). %% improved line breaks 2010/03/29 -\SetPatternCodes{\MakeOther\\\MakeOther\ } -%% |\StartPrependingChain| initializes setup of a replacement -%% chain: -\StartPrependingChain -%% |\PrependExpandableAllReplacer{<id>}{<find>}{<subst>}|: -\PrependExpandableAllReplacer{etc}{etc. }{etc.\ } -%% ... you can keep inter-sentence space after `etc.' -%% by a code line break. -\PrependExpandableAllReplacer{Cf}{Cf. }{Cf.\ } %% 2011/01/12 -\PrependExpandableAllReplacer{cf}{cf. }{cf.\ } %% corr. 2010/03/23 -%% ... but think of `cf.~'. Don't leave `cf.' at code line end! -\PrependExpandableAllReplacer{rarr}{->}{$\to$} %% 2010/11/06 -\PrependExpandableAllReplacer{larr}{<-}{$\gets$} %% 2010/11/06 -% \PrependExpandableAllReplacer{dots}{...}{$\dots$} -%% ... 2010/11/24 ``symmetric" variant of `\textellipsis': -%% allow extra space at line end. -\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{<id>}|: -\SetCorrectHookJobLast -%% -%% |\ResetPatternCodes| resets `\PatternCodes' to their default -%% value (which is `\fdPatternCodes'): -\ResetPatternCodes -%% ... restores 'fifinddo' default. -\endinput - -HISTORY -2009/04/05 with makedoc v0.2 -2010/03/11 broke some too long code lines -2010/03/16 rendered `mdoccorr.cfg' -2010/03/22 try \Prepend... -2010/03/23 corrected `cf' -2010/03/29 use \SetPatternCodes etc. -2010/11/06 <- and -> -2010/11/24 `...' ``symmetric variant" of `\textellipsis'; - \StartPrependingChain, no more \MakeExpandableAllreplacer -2011/01/27 blue "TODO" diff --git a/Master/texmf-dist/source/latex/morehype/srcfiles.tex b/Master/texmf-dist/source/latex/morehype/srcfiles.tex deleted file mode 100644 index 8e7528b2bcf..00000000000 --- a/Master/texmf-dist/source/latex/morehype/srcfiles.tex +++ /dev/null @@ -1,6 +0,0 @@ -\RequirePackage{myfilist} -\ProvidesFile{srcfiles.tex}[2011/02/10 collect file infos] -\EmptyFileList %%% [readprov.sty,myfilist.sty] -\ReadPackageInfos{blog,hypertoc,texlinks} -\ReadFileInfos{blog,hypertoc,texlinks,atari.fdf,lang-de.fdf,lang-en.fdf,makedoc.cfg,mdoccorr.cfg,srcfiles} -\ListInfos[SRCFILEs.txt] diff --git a/Master/texmf-dist/source/latex/morehype/texlinks.tex b/Master/texmf-dist/source/latex/morehype/texlinks.tex index 221c9471b60..e36bf0cc704 100644 --- a/Master/texmf-dist/source/latex/morehype/texlinks.tex +++ b/Master/texmf-dist/source/latex/morehype/texlinks.tex @@ -1,4 +1,4 @@ -\ProvidesFile{texlinks.tex}[2011/01/27 documenting texlinks.sty] +\ProvidesFile{texlinks.tex}[2011/08/27 documenting texlinks.sty] \title{\textsf{texlinks.sty}\\---\\\TeX-Related Links for \textsf{hyperref}, \textsf{blog.sty}\\ (and maybe more)\thanks{This @@ -24,16 +24,18 @@ 'texlinks.sty' provides a couple of shorthands for making hyperlinks with \ctanpkgref{hyperref}'s\urlpkgfoot{hyperref} `\href' command, linking to URLs that one often refers to in discussing \TeX-related material. -Especially, TUG material +Especially, \acro{TUG} material (including texhax postings and TUGboat articles) and -CTAN pages (package descriptions, directories, Catalogue) -are supported, also the UK~FAQ and Wikipedia +\acro{CTAN} pages (package descriptions, directories, Catalogue) +are supported, also the UK~FAQ, +the \LaTeX\ Wikibook, %% 2011/08/27 +and Wikipedia (where much \TeX-related software is described in a visually appealing manner). -However, up to now I have used them for \emph{HTML} overviews +However, up to now I have used them for \emph{\acro{HTML}} overviews generated with 'blog.sty'. They may as well be useful with better known (and better developed) -\TeX\,$\to$\,HTML software such as +\TeX\,$\to$\,\acro{HTML} software such as \ctanpkgref{tex4ht}\urlpkgfoot{tex4ht} or \CtanPkgRef{latex2html}{LaTeX2HTML}\urlpkgfoot{latex2html} (I don't know). @@ -65,3 +67,5 @@ VERSION HISTORY 2011/01/24 for v0.1, very first 2011/01/27 for v0.2, use \urlfoot{ukfaq} +2011/07/23 using \acro +2011/08/27 mentioning LaTeX Wikibook in abstract diff --git a/Master/texmf-dist/tex/latex/morehype/atari.fdf b/Master/texmf-dist/tex/latex/morehype/atari.fdf deleted file mode 100644 index 70274c832ca..00000000000 --- a/Master/texmf-dist/tex/latex/morehype/atari.fdf +++ /dev/null @@ -1,8 +0,0 @@ -\ProvidesFile{atari.fdf}[2010/08/24 Atari to ISO-8859-1 with blog.sty] -\newcommand*{\AtariCodes}{% - \MakeActiveDef{Ä}\MakeActiveDef{Ö}\MakeActiveDef{Ü}% - \MakeActiveDef{ä}\MakeActiveDef{ö}\MakeActiveDef{ü}% - \MakeActiveDef{ß}% -} -\endinput - diff --git a/Master/texmf-dist/tex/latex/morehype/blog.sty b/Master/texmf-dist/tex/latex/morehype/blog.sty index 83fcf4dca4c..6ff50a8ab58 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/02/10 v0.41 simple fast HTML (UL)] +\ProvidesPackage{blog}[2011/08/31 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. @@ -18,12 +18,15 @@ %% == Processing == %% We are building on the 'fifinddo' package: \RequirePackage{fifinddo} +%% |\CLBrk| is a \emph{code line break} +%% (also saving subsequent comment mark): +\newcommand*{\CLBrk}{^^J} %% |\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 -%% HTML tag \xmltagcode{p} for starting a new paragraph. +%% \acro{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, @@ -40,7 +43,10 @@ \ProcessOptions \MakeOther\< \MakeOther\> %% TODO ... \newcommand*{\BlogCopyFile}[2][]{% - \ProcessFileWith[\BlogCodes #1]{#2}{% + \ProcessFileWith[\BlogCodes + \let\ProvidesFile\BlogProvidesFile %% 2011/02/24 + \let\protect\@empty %% 2011/03/24 + #1]{#2}{% \IfFDinputEmpty {\IfFDpreviousInputEmpty \relax @@ -55,9 +61,34 @@ \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 HTML's ` '! -%% -%% == General HTML Matters == +%% use it for abbreviating \acro{HTML}'s ` '! +%% +%% %% 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 +%% |\BlogProvidesFile| (for the time being, 2011/02/22): +\@ifdefinable\BlogProvidesFile{% + \def\BlogProvidesFile#1[#2]{% + \comment{ generated from\CLBrk\CLBrk + \ \ \ \ \ \ \ \ \ #1, #2,\CLBrk\CLBrk + \ \ \ \ \ with blog.sty, + \GenDate\ }}} %% TODO predefine? +%% %% changes 2011/02/24: +%% (TODO: customizable style.)---Due to the limitations +%% of the approach reading the source file +%% line by line, the ``optional argument" `[<file-info>]' +%% of `\ProvidesFile' must appear in the same line as +%% the closing brace of its mandatory argument. +%% The feature may require inserting +%% \[`\let\ProvidesFile\BlogProvidesFile'\] +%% somewhere, e.g., in `\BlogCopyFile'. +%% +%% \pagebreak[3] %% 2011/05/11 +%% == General \acro{HTML} Matters == %% The following stuff is required for any web page %% (or hardly evitable). %% === General Tagging === @@ -68,7 +99,7 @@ %% 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 HTML code). +%% spans lines (as readable \acro{HTML} code). %% We will handle the latter kind of elements %% using \LaTeX's idea of ``environments." %% `\TagSurr' also inserts specifications of element @@ -82,13 +113,13 @@ \newcommand*{\STS}{} \let\STS\SimpleTagSurr %% 2010/05/23 \newcommand*{\TagSurr}[3]{<#1 #2>#3</#1>} %% -%% === Attributes === +%% === Attributes === %%% (General) %%% %% Inspired by the common way to use `@' for referring %% to element attributes---i.e., `@<attr>' refers to attribute -%% `<attr>'---in HTML/XML documentation, we often use +%% `<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 HTML element. +%% within the starting tag of an \acro{HTML} element. %% This does not really %% make typing easier or improve readability, %% it rather saves \TeX's memory by using a single token @@ -109,12 +140,19 @@ %% |@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 -% \expandafter\show\csname @href\endcsname -%% |@bgcolor| and other attributes following are especially used -%% in formatting \textbf{tables}: +\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} +%% +%% %%% Attributes (Tables) %%% %% Of course, conflicts may occur, as the form %% `\@<ASCII-chars>' of macro names is used for internal %% (La)\TeX\ macros. @@ -132,13 +170,17 @@ \let\@height\relax \declareHTMLattrib{height} %% 2010/07/24 %% We can enumerate the specifications allowed for -%% |@align| ... actually it isn't used/introduced here ... -%% we just abbreviate (indeed!) entire attribute specifications: -\newcommand*{\@align@c}{align="center"} %% 2010/08/03 -\newcommand*{\@align@l}{align="left"} %% 2010/07/17 -\newcommand*{\@align@r}{align="right"} +%% |@align|: %% reimpl. 2011/04/24 +\newcommand*{\@align@c}{\@align{center}} +\newcommand*{\@align@l}{\@align{left}} +\newcommand*{\@align@r}{\@align{right}} +\newcommand*{\@align}[1]{align="#1"} +%% |@valign@t|: +\newcommand*{\@valign@t}{v\@align{top}} %% 2011/04/24 %% Some other uses of `\declareHTMLattrib' essential for -%% tables: +%% \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 @@ -151,30 +193,28 @@ %% well, not so bad, as the main purpose of this namespace %% is saving tokens \emph{in macros.} %% -%% === HTML's Special Symbols === -%% |#| is needed for numerical specifications in HTML, +%% === \acro{HTML}'s Special Symbols === +%% |#| is needed for numerical specifications in \acro{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 HTML meaning.---I \textbf{wonder} +%% in order to refer to their \acro{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 HTML symbols, `&' is simply +%% with calling special \acro{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 HTML's ampersand symbol. +%% for calling \acro{HTML}'s ampersand symbol. {\catcode`\&=12 \catcode`\#=12 \gdef\AmpMark{&} \gdef\#{#}} %% ... `\CompWordMark' etc.? %% %% === Head === -%% |\head| produces the first two tags that an HTML file must start -%% with (we sometimes use `^^J' for line breaks in the HTML file -%% to get some readibility of the generated code): +%% |\head| produces the first two tags that an \acro{HTML} file must start: \newcommand*{\head}{<html><head>} %% ^^J rm 2010/10/10 %% |\MetaTag{<inside>}| and |\ContentAtt{<value>}| %% are internal shortcuts: @@ -186,8 +226,9 @@ %% |\description{<text>}| for web searches (I think): \newcommand*{\description}[1]{% \MetaTag{\@name{description} \ContentAtt{#1}}} -%% ... an outright \textbf{mistake!} The definition is overridden -%% to get the HTML equivalent to \LaTeX's `description' environment. +%% ... an outright \textbf{mistake!} TODO %% todo 2011/07/25 +%% The definition is overridden +%% to get the \acro{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! @@ -195,7 +236,10 @@ %% |\robots{<instructions>}|: \newcommand*{\robots}[1]{%% juergenf: index, follow, noarchive \MetaTag{\@name{robots} \ContentAtt{#1}}} -%% |\stylesheet{<media>}{<css>}| !? +%% |\norobots| for privacy: %% 2011/03/16 +\newcommand*{\norobots}{\robots{noarchive,nofollow,noindex}} +%% |\stylesheet{<media>}{<css>}| uses <css>`.css' for +%% `media="<media>"': \newcommand*{\stylesheet}[2]{% \space\space %% 2010/09/10 <link rel="stylesheet" media="#1" type="text/css" \@href{#2.css}>} @@ -216,12 +260,13 @@ %% %% == Fonts == %% |\heading{<level>}{<text>}| prints <text> with size dependent -%% on <level>. The latter may be one out of `1', `2', `3', `4' -%% (I think). +%% on <level>. The latter may be one out of +%% `1', `2', `3', `4', `5', `6'. %% 2011/05/12 \newcommand*{\heading}[1]{\SimpleTagSurr{h#1}} %% ... I might use `\section' etc. one day, I made `\heading' %% when I could not control the sizes of the section titles %% properly and decided first to experiment with the level numbers. +%% %% <- TODO re-order alltogether, cf. SelfHTML 2011/05/12 %% %% We ``re-use" some \LaTeX\ commands for specifying font attributes, %% rather than (re)defining macros `\i', `\b', `\tt', ... @@ -231,17 +276,19 @@ \renewcommand*{\textit}{\SimpleTagSurr i} %% etc. for |\textbf|, |\texttt| ...: \renewcommand*{\textbf}{\SimpleTagSurr b} -\renewcommand*{\texttt}{\SimpleTagSurr{tt}} %% 2010/06/07 +\renewcommand*{\texttt}{\SimpleTagSurr{tt}} %% 2010/06/07 +%% |\textsf{<text>}| TODO (see some `makehtml.tex') %% 2011/05/11 +%% %% |\textcolor| is from \LaTeX's 'color' package -%% that we won't load for generating HTML, +%% that we won't load for generating \acro{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"}} -%% |\code{<text>}| is different than the former font commands, -%% it is \emph{not} a standard \LaTeX\ macro. -%% It is similar to `\verb', which however doesn't work with -%% a pair of curly braces. The macro name rather is derived -%% from the HTML element name `code': +%% +%% == Logical Markup == +%% |\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 %% |\emph{<text>}| is \LaTeX's command again, but somewhat abused, %% expanding to \lq\xmltagcode{em}<text>\xmltagcode{/em}\rq: @@ -249,9 +296,12 @@ %% ... 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 HTML element. +%% |\strong{<text>}| again just calls an \acro{HTML} element. %% It may behave like `\textbf{<text>}', or ... I don't know ... \newcommand*{\strong} {\SimpleTagSurr{strong}} +%% %% 2011/03/09: +%% |\var{<symbol(s)>}| accesses the \xmltagcode{var} element: +\newcommand*{\var}{\SimpleTagSurr{var}} %% %% == Environments == %% We reduce \LaTeX's |\begin| and |\end| to their most primitive @@ -267,7 +317,7 @@ %% 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 HTML elements +%% `\begin' and `\end' just represent \acro{HTML} elements %% (their starting/ending tags) %% that typically have ``long" content. %% (We might ``intercept" `\begin' and `\end' before @@ -281,16 +331,16 @@ %% %% As formerly with ``fonts," we have \emph{two} policies for %% \textbf{choosing macro names}: -%% (i)~using an \emph{existing} HTML element name, +%% (i)~using an \emph{existing} \acro{HTML} element name, %% (ii)~using a \LaTeX\ command name for accessing a somewhat -%% similar HTML element having a \emph{different} name. +%% 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 HTML's <el-name> element +%% \LaTeX's <ltx-env> environment to use \acro{HTML}'s <el-name> element %% according to policy~(ii): \newcommand*{\renderHTMLelement}[2]{% \renewenvironment*{#1}{<#2>}{</#2>}} @@ -316,8 +366,8 @@ %% 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 HTML code +\renderHTMLelement{quote}{blockquote} +%% For list |\item|s, I tried to get readable \acro{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'. @@ -338,10 +388,10 @@ %% == Links == %% === Basic Link Macros === %% |\hanc{<id>}{<text>}| makes <text> an anchor with -%% HTML label <id> (like 'hyperref''s `\hypertarget'): +%% \acro{HTML} label <id> (like 'hyperref''s `\hypertarget'): \newcommand*{\hanc}[1]{\TagSurr a{\@name{#1}}} %% |\hancref{<id>}{<url>}{<text>}| makes <text> an anchor with -%% HTML label <id> and at the same time a link to <url>: +%% \acro{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}}} @@ -379,20 +429,21 @@ %% using $$|\fileref{<filename-base>}|.$$ I have used %% extension `.htm' to avoid disturbing my Atari %% editor 'xEDIT' or the the Atari emulator (Hatari). -%% I could switch to `.html' some time using symbolic links. +%% %% rm. 2011/08/18: +%% % I could switch to `.html' some time using symbolic links. %% The extension I actually use is stored as macro %% |\htext| in a more local file (e.g., `.cfg').---Later %% I realized that I may want to refer to local files %% other than web pages, and therefore I introduced a more -%% general |\FileRef{<filename>}|. -%% \textbf{Only now (v0.2) I realize} -%% it's just the same as |\href|! -\newcommand*{\FileRef}[1]{\TagSurr a{\@href{#1}}} -%% <- 2010/09/11 -> -\newcommand*{\fileref}[1]{\FileRef{#1\htext}} +%% %% mod. 2011/08/18: +%% general `\FileRef{<filename>}|', overlooking +%% that it was the same as |\href|. +% \newcommand*{\FileRef}[1]{\TagSurr a{\@href{#1}}} +\newcommand*{\fileref}[1]{\href{#1\htext}} % \newcommand*{\emfileref}[2]{\fileref{#1}{\emph{#2}}} \newcommand*{\itfileref}[2]{\fileref{#1}{\textit{#2}}} -%% |\fileancref{<file>}{<anchor>}| links to +%% |\fileancref{<file>}{<anchor>}{<text>}| links to +%% %% <- `text' added 2011/03/19 %% anchor <anchor> on web page <file>: \newcommand*{\fileancref}[2]{% \TagSurr a{\@href{#1\htext\##2}}} @@ -421,46 +472,116 @@ %% 'texlinks' sometimes uses a ``permanent alias" %% |\NormalHTTPref| of `\httpref': \@ifdefinable \NormalHTTPref {\let\NormalHTTPref\httpref} +%% |\httpsref| is the analogue of `\httpref' for `https://': +\newcommand*{\httpsref}[1]{% %% 2011/06/27 + \TagSurr a{\@href{https://#1" target="_blank}}} %% %% -%% == Symbols == -%% |&| is made `other' for using it to call HTML's ``character -%% entities". +%% == Symbols == %% ordering 2011/02/25 +%% === Basic Preliminaries === +%% |&| is made `other' for using it to call \acro{HTML}'s +%% ``character entities." %% dot inside 2011/02/25 \@makeother\& %% Again we have the two policies about choosing macro names %% and respectively two new definition commands. %% |\declareHTMLsymbol{<name>}| defines a macro `\<name>' %% expanding to `&<name>;'. Checking for prior definedness -%% hasn't been implemented yet. (TODO) +%% hasn't been implemented yet. +%% (TODO; but sometimes redefining ...) %% 2011/02/26 \newcommand*{\declareHTMLsymbol}[1]{\@namedef{#1}{}} %% |\renderHTMLsymbol{<macro>}{<name>}| \emph{redefines} %% macro <macro> to expand to `&<name>;': \newcommand*{\renderHTMLsymbol} [2]{\renewcommand*{#1}{}} -%% These auxilaries applied: |\ccedil| (TODO re-order) ... -\declareHTMLsymbol{ccedil} %% 2010/08/17 +%% Redefinitions of |\&| and |\%| +%% (well, `\PercentChar' is 'fifinddo''s %% add. apostroph 2011/07/22 +%% version of \LaTeX's `\@percentchar'): +\renderHTMLsymbol{\&}{amp} +\let\%\PercentChar +%% +%% === Diacritics === %% changed 2011/03/04 +%% For the difference between \dqtd{diacritic} and +%% \dqtd{accent,} see \wikienref{Diacritic}{Wikipedia}. +%% +%% |\ccedil|: %%%, |\eacute|, |\ocirc| (``r\^ole") +\declareHTMLsymbol{ccedil} +%% %% 2011/03/04: +%% \acro{HTML} entities |é|, |ô| etc. can be accessed +%% by \TeX's accent commands |\'|, |\^|, |\`|, |\"|: +% \declareHTMLsymbol{eacute} +% \declareHTMLsymbol{ocirc} +\renewcommand*{\'}[1]{acute;} +\renewcommand*{\^}[1]{circ;} +\renewcommand*{\`}[1]{grave;} +\renewcommand*{\"}[1]{uml;} +%% |\uml{<char>}| % yields the umlaut for <char> +%% may have been overestimated: +%% % (useful in macro definitions): %% 2010/11/13 +% \newcommand* {\uml}[1] {uml;} %% 2010/08/24 +%% +%% === Greek === %% 2011/02/26 +\declareHTMLsymbol{Alpha} +\declareHTMLsymbol{alpha} +\declareHTMLsymbol{Beta} +\declareHTMLsymbol{beta} +\declareHTMLsymbol{Gamma} +\declareHTMLsymbol{gamma} +\declareHTMLsymbol{Delta} +\declareHTMLsymbol{delta} +\declareHTMLsymbol{Epsilon} +\declareHTMLsymbol{epsilon} +\declareHTMLsymbol{Zeta} +\declareHTMLsymbol{zeta} +\declareHTMLsymbol{Eta} +\declareHTMLsymbol{eta} +\declareHTMLsymbol{Theta} +\declareHTMLsymbol{theta} +\declareHTMLsymbol{Iota} +\declareHTMLsymbol{iota} +\declareHTMLsymbol{Kappa} +\declareHTMLsymbol{kappa} +\declareHTMLsymbol{Lambda} +\declareHTMLsymbol{lambda} +\declareHTMLsymbol{My} +\declareHTMLsymbol{my} +\declareHTMLsymbol{Ny} +\declareHTMLsymbol{ny} +\declareHTMLsymbol{Xi} +\declareHTMLsymbol{xi} +\declareHTMLsymbol{Omikron} +\declareHTMLsymbol{omikron} +\declareHTMLsymbol{Pi} +\declareHTMLsymbol{pi} +\declareHTMLsymbol{Rho} +\declareHTMLsymbol{rho} +\declareHTMLsymbol{Sigma} +\declareHTMLsymbol{sigma} +\declareHTMLsymbol{sigmaf} +\declareHTMLsymbol{Tau} +\declareHTMLsymbol{tau} +\declareHTMLsymbol{Upsilon} +\declareHTMLsymbol{upsilon} +\declareHTMLsymbol{Phi} +\declareHTMLsymbol{phi} +\declareHTMLsymbol{Chi} +\declareHTMLsymbol{chi} +\declareHTMLsymbol{Psi} +\declareHTMLsymbol{psi} +\declareHTMLsymbol{Omega} %% render -> declare 2011/02/26 +\declareHTMLsymbol{omega} +\declareHTMLsymbol{thetasym} +\declareHTMLsymbol{upsih} +\declareHTMLsymbol{piv} +%% +%% === Arrows === %% Arrows: |\gets|, |\to|, |\uparrow|, |\downarrow| ... \renderHTMLsymbol {\gets} {larr} \renderHTMLsymbol {\to} {rarr} \renderHTMLsymbol {\uparrow} {uarr} %% 2010/09/15 \renderHTMLsymbol {\downarrow}{darr} %% 2010/09/15 -%% \verb+>+ and \verb+<+: |\gt|, |\lt| ... -\declareHTMLsymbol{gt} %% greater than 2010/06/13 -\declareHTMLsymbol{lt} %% less than 2010/06/13 -%% Redefinitions of |\&| and |\%| -%% (well, `\PercentChar' is 'fifinddo's version of -%% \LaTeX's `\@percentchar'): -\renderHTMLsymbol {\&} {amp} -\let\%\PercentChar %% 2010/07/01 -%% Horizontal ellipsis: |\dots| ... -\renderHTMLsymbol {\dots} {hellip} -%% The tilde |~| is used for its wonderful purpose, -%% by analogy to \TeX: -\renderHTMLsymbol {~} {nbsp} -%% But now we need a replacement |\tilde| for URLs involving -%% home directories of institution members: -{\@makeother\~ \gdef\tilde{~}} +%% +%% === Dashes === %% The ligatures `--' and `---' for en~dash and em~dash -%% don't work in our expanding mode. Now, HTML's policy +%% don't work in our expanding mode. Now, \acro{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 @@ -469,21 +590,36 @@ %% |\endash|, |\emdash| ... \def \endash {–} %% \end... illegal \newcommand*{\emdash} {—} -%% ``Math" spaces |\enspace|, |\quad|, |\qquad|: -\renderHTMLsymbol{\enspace} {ensp} -\renderHTMLsymbol{\quad} {emsp} -\renewcommand* {\qquad} {\quad\quad} -%% Quotes: |\lq|, |\rq| ... (TODO own subsection) +%% +%% === Spaces === +%% ``Math" (not only!)\ spaces |\,|, |\enspace|, |\quad|, |\qquad|: +%% %% <- 2011/04/26 +\renderHTMLsymbol{\enspace}{ensp} +\renderHTMLsymbol{\quad} {emsp} +\renewcommand* {\qquad} {\quad\quad} +%% 2011/07/22: ` ' allows line breaks, +%% so we introduce |\thinsp| to access ` ', +%% while |\thinspace| and |\,| use Unicode "Narrow No-Break Space" +%% (`U+202F', see \meta{Wikipedia \Wikienref{Space (punctuation)}}; +%% browser support?): +% \renderHTMLsymbol{\thinspace}{thinsp} +% \renderHTMLsymbol{\,} {thinsp} +\declareHTMLsymbol{thinsp} +\renderHTMLsymbol{\thinspace}{\#8239} +\renderHTMLsymbol{\,} {\#8239} +%% +%% === Quotes, Apostrophe, Prime === +%% |\lq|, |\rq| \renderHTMLsymbol{\lq} {lsquo} % \newcommand* {\rsquo} {’} %% removed 2010/04/26 \renderHTMLsymbol{\rq} {rsquo} -%% In order to use the right single quote for the HTML apostrophe, +%% In order to use the right single quote for the \acro{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 -%% for URLs (TODO which? Wikipedia?): +%% for \acro{URL}s of Wikipedia articles: %% 2011/08/31 \newcommand*{\screenqtd}[1]{`#1'} -\newcommand*{\urlapostr} {'} %% 2010/09/10 +\newcommand*{\urlapostr} {'} %% 2010/09/10 %% Here finally is the change of |'|: \MakeActiveDef\'{’} %% ... TODO \verb+\MakeActiveLet\'\rq+! @@ -494,7 +630,7 @@ %% |\ldquo|, |\rdquo|, |\sbquo|, |\prime|, |\Prime| ... \declareHTMLsymbol{ldquo} \declareHTMLsymbol{rdquo} -\declareHTMLsymbol{sbquo} %% 2010/07/01 +\declareHTMLsymbol{sbquo} %% 2010/07/01 \renewcommand*{\prime}{′} \declareHTMLsymbol{Prime} % \newcommand*{\Prime}{″} @@ -504,30 +640,95 @@ \def\endqtd#1{\ldquo#1\rdquo} %% \newcommand: "\end" \newcommand*\enqtd[1]{\lq#1\rq} %% 2010/09/08, \new... 2010/11/08 \newcommand*{\dedqtd}[1]{„#1\ldquo} -%% ... TODO `\bdquo'!? %% 2010/11/08 -%% -%% Some more letters: |\eacute|, |\ocirc| (``r\^ole"), -%% |\Omega| ... -\declareHTMLsymbol{eacute} -\declareHTMLsymbol{ocirc} -\renderHTMLsymbol{\Omega} {Omega} %% 2010/08/24 -%% |\uml{<char>}| yields the umlaut for <char> -%% (useful in macro definitions): %% 2010/11/13 -\newcommand* {\uml}[1] {uml;} %% 2010/08/24 -%% |\copyright|: -\renderHTMLsymbol{\copyright}{copy} %% 2010/08/24 -%% Curly braces |\{| and |\}|: %% 2010/09/10 +\newcommand*{\deqtd}[1]{‚#1‘} %% corr. 2011/05/14 +%% ... TODO `\bdquo'!? %% 2010/11/08 +%% +%% === Math === +%% %% doc. extended 2011/05/08: +%% Because \verb+<+ and \verb+>+ are used for \acro{HTML}'s +%% element notation, we provide aliases |\gt|, |\lt| +%% for mathematical $\lt$ and $\gt$: +\declareHTMLsymbol{gt} +\declareHTMLsymbol{lt} +%% |\ge|, |\le|, and |\ne| for $\geq$, $\leq$, and $\neq$ resp.: +\declareHTMLsymbol{ge} +\declareHTMLsymbol{le} +\declareHTMLsymbol{ne} +%% We also provide their \TeX\ aliases +%% |\geq|, |\leq|, |\neq|: %% 2011/05/11 +\let\geq\ge +\let\leq\le +\let\neq\ne +%% Angle braces |\langle| and |\rangle|: +\renderHTMLsymbol{\langle}{lang} +\renderHTMLsymbol{\rangle}{rang} +%% The one-argument macro |\angled{<angled>}| +%% allows better readable code %% TODO: +%% (\textcolor{red}{should be in a more general package}): +\newcommand*{\angled}[1]{\langle#1\rangle} +%% Curly braces |\{| and |\}| \textcolor{red}{\dots}: \begingroup \Delimiters\[\] \gdef\{[{] \gdef\}[}] \endgroup +%% \TeX's |\ast| corresponds to the ``lower" version +%% of the asterisk: +\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}: +\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 +%% and |\times|: +\declareHTMLsymbol{cap} %% 2011/04/04 +\declareHTMLsymbol{cup} %% 2011/04/04 +\declareHTMLsymbol{times} %% 2011/04/04 +%% We stick to \TeX's |\emptyset| %% 2011/05/08 +\renderHTMLsymbol{\emptyset}{empty} %% 2011/04/14 +%% 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 `ˆ' to get \TeX's \cs{circ} +%% (i.e., $\circ$; %% 2011/05/08: +%% \textcolor{red}{but I cannot see it +%% on my own pages!?}): +\renderHTMLsymbol{\circ}{\#x2218} %% 2011/04/28 +\renderHTMLsymbol{\cdot}{middot} %% 2011/05/07 +%% |\sdot| generates `&sdot,', a variant of of `·' +%% reserved for the \Wikienref{dot product} according to +%% the \wikideref{Malzeichen\#Skalarprodukt}: +\declareHTMLsymbol{sdot} %% 2011/05/08 %% -%% %% Problem: line-wise approach requires that all macro arguments -%% %% are in the same line. Otherwise the lines must be enclosed -%% %% in curly braces. Or split single arguments. %% 2010/04/11 -%% % <- rm 2010/11/08 +%% === Other === +%% The tilde |~| is used for its wonderful purpose, +%% by analogy to \TeX: +\renderHTMLsymbol{~}{nbsp} +%% But now we need a replacement |\tilde| for URLs involving +%% home directories of institution members +%% (should better be |\tildechar| or `\TildeChar', +%% cf.~'fifinddo'): %% 2011/04/29 +{\@makeother\~ \gdef\tilde{~} \gdef\tildechar{~}} +%% % <- more elegant macro %% 2011/05/18 +%% % \newcommand*{\StoreOtherCharAs}[2]{% +%% % \edef#2{\expandafter\@gobble\string#1}} +%% Horizontal ellipsis: |\dots| ... +\renderHTMLsymbol {\dots} {hellip} +%% +%% |\copyright|: +\renderHTMLsymbol{\copyright}{copy} +%% |\bullet| %% 2011/03/29 +\renderHTMLsymbol{\bullet}{bull} +%% |\euro|: %% 2011/05/09 +\declareHTMLsymbol{euro} +%% \LaTeX's |\S| prints the \dqtd{\Wikienref{section sign}} +%% \qtd{\S}. In \acro{HTML}, the latter accessed by `§', +%% we \dqtd{redirect} `\S' to this: %% 2011/05/18 +\renderHTMLsymbol{\S}{sect} %% -%% \pagebreak[3] -%% == \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 === @@ -555,54 +756,54 @@ %% |\texcs{\<tex-cmd-name>}| or `\texcs\<tex-cmd-name>' %% (care for spacing yourself): \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 %% %% == Tables == -%% These macros have proved somewhat bad. It may be better to -%% re-implement tables support alltogether. -%% +%% %% 2011/04/24: rm. remark on doubtful stability, ordered +%% === Indenting === %% There are three levels of indenting: %% $$|\indenti|, \quad %% |\indentii|,\quad \mbox{and}\quad %% |\indentiii|.$$ -%% The intention for these was to get readable HTML code. Not sure ... +%% The intention for these was to get readable \acro{HTML} code. Not sure ... {\catcode`\ =12%% 2010/05/19 \gdef\indenti{ }\gdef\indentii{ }\gdef\indentiii{ }} +%% +%% === Starting/Ending Tables === %% 2010/07/17: \newcommand*{\startTable}[1]{<table #1>} \def\endTable{</table>} -%% 2010/07/18: -\newcommand*{\starttr}{<tr>} -\def\endtr{</tr>} -\newcommand*{\startTd}[1]{<td #1>} -\def\endTd{</td>} -\newcommand*{\simplecell}{\SimpleTagSurr{td}} \newcommand*{\@frame@box}{\@frame{box}} \newcommand*{\@frame@groups}{\@frame{groups}} \newenvironment{allrulestable}[2] {\startTable{\@cellpadding{#1} \@width{#2} - \@frame@box rules="all"}^^J% + \@frame@box rules="all"}\CLBrk \indenti<tbody>} - {\indenti</tbody>^^J\endTable} + {\indenti</tbody>\CLBrk\endTable} +%% === Rows === %% I first thought it would be good for readability if -%% some HTML comments explain nesting or briefly describe +%% some \acro{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 ... -\newenvironment*{TableRow}[2]{%% weniger ^^J 2010/05/18 -% \indenti\ \comment{ #1 }^^J% -%% <- 2010/05/23 -> -% \ \comment{ #1 }^^J% -%% <- 2010/07/18 -> - \indenti \comment{ #1 }^^J% - \indentii<tr #2>% +\newenvironment*{TableRow}[2]{%% lesser indentation 2011/04/25 + \ \comment{ #1 }\CLBrk + \indenti<tr #2>% }{% - \indentii</tr>} + \indenti</tr>} \newenvironment{tablecoloredrow}[2] {\TableRow{#1}{\@bgcolor{#2}}} {\endTableRow} %% "top" 2010/05/18: -\newenvironment{tablerow}[1]{\TableRow{#1}{valign="top"}} +\newenvironment{tablerow}[1]{\TableRow{#1}{\@valign@t}} {\endTableRow} +%% 2010/07/18: +\newcommand*{\starttr}{<tr>} +\def\endtr{</tr>} +%% +%% === Cells === +\newcommand*{\simplecell}{\SimpleTagSurr{td}} %% 2010/07/18 % \newcommand*{\TableCell}[2]{\indentiii<td #1>#2</td>} % \newcommand*{\TableCell}[2]{\indentiii\TagSurr{td}{#1}{#2}} %% <- 2010/07/18 -> @@ -617,10 +818,20 @@ \newenvironment{bigtablecell}[1]{\BigTableCell{#1}{}} {\endBigTableCell} % {\ifx\\#1\\% %% 2010/05/30 -% \indentii\ \comment{#1}^^J% +% \indentii\ \comment{#1}\CLBrk % \fi % \indentiii<td>} % {\indentii</td>} %% !? 2010/05/23 +%% 2010/06/05: +\newenvironment{BigTableCell}[2] + {\ifx\\#1\\\indentii\ \comment{#1}\CLBrk\fi + \indentiii\startTd{#2}} + {\indentii\endTd} %% TODO indent? 2010/07/18 +%% 2010/07/18: +\newcommand*{\startTd}[1]{<td #1>} +\def\endTd{</td>} +%% +%% === Filling a Row with Dummy Cells === %% Generalization 2010/06/28: % \newcommand*{\FillRow}[2]{% %% broke line 2011/01/24 % \indentiii\TagSurr{td}{\@colspan{#1} #2}{}} @@ -628,18 +839,13 @@ \newcommand*{\FillRow}[2]{\indentiii\startTd{\@colspan{#1} #2}\endTd} \newcommand*{\fillrow}[1]{\FillRow{#1}{}} \newcommand*{\fillrowcolor}[2]{\FillRow{#1}{\@bgcolor{#2}}} -%% 2010/06/05: -\newenvironment{BigTableCell}[2] - {\ifx\\#1\\\indentii\ \comment{#1}^^J\fi - \indentiii\startTd{#2}} - {\indentii\endTd} %% TODO indent? 2010/07/18 %% %% == Misc == -%% |\comment{<comment>}| produces a one-line HTML comment. +%% |\comment{<comment>}| produces a one-line \acro{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 HTML comments ...) +%% code (unless the latter contains other \acro{HTML} comments ...) %% where <comment> is a \emph{comment} for explaining what is %% commented out. %% 2010/11/14 \newcommand*{\comment}[1]{<!--#1-->} @@ -649,10 +855,10 @@ {<!--#1} {-->} %% \TeX's |\hrule| (rather deprecated in \LaTeX) is redefined -%% to produce an HTML horizontal line: +%% to produce an \acro{HTML} horizontal line: \renewcommand*{\hrule}{<hr>} %% Redefining |\ | to be the same as `\space' may be helpful -%% for manual indenting or spacing of HTML code. +%% for manual indenting or spacing of \acro{HTML} code. %% Or better (just now remembering): I used it for making %% ``ASCII trees" with the \xmltagcode{pre} element %% (redefined `verbatim'). @@ -674,6 +880,10 @@ %% I have used this for \qtd{Last revised \dots} and for placing %% navigation marks. \newcommand*{\rightpar}{\TagSurr p\@align@r} %% 2010/06/17 +%% %% 2011/04/29: +%% Often I use `\rightpar' with \textit{italics}, +%% now there is |\rightitpar{<text>}| for this purpose: +\newcommand*{\rightitpar}[1]{\rightpar{\textit{#1}}} %% For references, there were % \catcode`\^=\active % \def^#1{\SimpleTagSurr{sup}{#1}} @@ -710,3 +920,39 @@ 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 +v0.5 2011/02/22 \BlogProvidesFile + 2011/02/24 ... in \BlogCopyFile + 2011/02/25 ordering symbols + 2011/02/26 subsection Greek; note on \declareHTMLsymbol + 2011/03/04 diacritics + 2011/03/06 \cs + 2011/03/09 \var + 2011/03/16 \robots + 2011/03/19 doc. \fileancref arg.s corr. + 2011/03/29 \Sigma, ... + 2011/03/31 \minus + 2011/04/04 \times, \sub, \delta + 2011/04/11 Greek completed + 2011/04/14 \emptyset + 2011/04/22 \deqtd + 2011/04/24 doc.: folding, \stylesheet, ordered "tables"; + @border, @align, @valign + 2011/04/25 lesser indentation with TableRow + 2011/04/26 \,, \thinspace, \@title; doc. \@name + 2011/04/28 [\circ] PROBLEM still + 2011/04/29 \rightitpar + 2011/05/07 \cdot + 2011/05/08 extended doc. on math symbols; \sdot; + \ast replaces \lowast; \subset, \subseteq; + \angled + 2011/05/09 \euro + 2011/05/11 |\geq| etc.; new section "logical markup" + 2011/05/12 corr. doc. \heading + 2011/05/14 right mark of \deqtd was rsquo instead of lsquo! + 2011/05/18 \S and note on \StoreOtherCharAs + 2011/06/27 \httpsref; doc: \acro + 2011/07/22 \thinspace vs. \thinsp; 'fifinddo''s + 2011/07/25 "todo" on \description + 2011/08/18f.removing \FileRef, 0.42-> 0.5 + 2011/08/31 clarified use of \urlapostr diff --git a/Master/texmf-dist/tex/latex/morehype/lang-de.fdf b/Master/texmf-dist/tex/latex/morehype/lang-de.fdf index 52ea2b6eb5c..922fcff3451 100644 --- a/Master/texmf-dist/tex/latex/morehype/lang-de.fdf +++ b/Master/texmf-dist/tex/latex/morehype/lang-de.fdf @@ -1,6 +1,7 @@ -\ProvidesFile{lang-de.fdf}[2011/01/25 German settings for blog.sty] +\ProvidesFile{lang-de.fdf}[2011/05/12 German settings for blog.sty] \def\dqtd {\dedqtd} \def\qtd {\deqtd} +\def\pardash {\depardash} %% 2011/05/12 \def\lastrev {\delastrev} \def\totopofpage{\detotopofpage} \endinput diff --git a/Master/texmf-dist/tex/latex/morehype/lang-en.fdf b/Master/texmf-dist/tex/latex/morehype/lang-en.fdf index b000e0f2bb2..22600f7d61a 100644 --- a/Master/texmf-dist/tex/latex/morehype/lang-en.fdf +++ b/Master/texmf-dist/tex/latex/morehype/lang-en.fdf @@ -1,6 +1,7 @@ \ProvidesFile{lang-en.fdf}[2011/01/25 English settings for blog.sty] \def\dqtd {\endqtd} \def\qtd {\enqtd} +\def\pardash {\enpardash} %% 2011/05/12 \def\lastrev {\enlastrev} \def\totopofpage{\entotopofpage} \endinput diff --git a/Master/texmf-dist/tex/latex/morehype/texlinks.sty b/Master/texmf-dist/tex/latex/morehype/texlinks.sty index 04659d34509..32f3b9c2cab 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/02/10 v0.3 TeX-related links (UL)] +\ProvidesPackage{texlinks}[2011/08/27 v0.4 TeX-related links (UL)] %% copyright (C) 2011 Uwe Lueck, %% http://www.contact-ednotes.sty.de.vu %% -- author-maintained in the sense of LPPL below. @@ -16,29 +16,31 @@ %% http://www.contact-ednotes.sty.de.vu %% %% == Outline == -%% All the link macros of 'texlinks' are based on a macro -%% |\httpref|. For use of 'texlinks' with 'blog.sty', -%% the latter provides a definition of `\httpref' -%% suitable for HTML, where a choice of opening a new +%% % Almost %% 2011/07/23 +%% % all the %% including https 2011/08/27 +%% The link macros of 'texlinks' are based on macros +%% |\httpref| and |\httpsref|. For use of 'texlinks' with 'blog.sty', +%% the latter provides definitions of `\httpref' and `\httpsref' +%% suitable for \acro{HTML}, where a choice of opening a new %% tab or window---or not---is relevant. %% %% For use with 'hyperref' (or ...?), 'texlinks' may -%% provide a definition of `\httpref' based on `\href'. -%% The decision to do so or not may happen at -%% `\begin{document}'. 'blog.sty' generates HTML without +%% provide definitions of `\httpref' and `\httpsref' +%% based on `\href'. The decision to do so or not may happen at +%% `\begin{document}'. 'blog.sty' generates \acro{HTML} without %% using the `{document}' environment, so we might assume %% that when `\begin{document}' is found, we are running %% 'hyperref', or just \emph{something} that provides a %% useful `\href'. We might then execute a definition of %% `\httpref' in terms of `\href'. Well, not sure ... %% -%% Moreover, a PDF file with links may be \emph{printed}, +%% Moreover, a \acro{PDF} file with links may be \emph{printed}, %% and klicking the links on the paper may fail. -%% URLs in main text, on the other hand, sometimes are +%% \acro{URL}s in main text, on the other hand, sometimes are %% 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 +%% links with their \acro{URL} as the displayed text in \emph{footnotes} +%% (or endnotes). It may even be useful with \acro{HTML} to present +%% the \acro{URL}s displayed in some %% 2011/01/27: %% ``appendix."---This idea has been resumed in v0.2 only, %% |\urlfoot|. @@ -59,33 +61,39 @@ %% useful for different purposes than running 'blog.sty'. \ProcessOptions %% -%% == Providing &\httpref == +%% \pagebreak +%% %% moving \httpsref 2011/08/27: +%% == Providing &\httpref\ and &\httpsref == %% \kern-\baselineskip %% \[|\httpref{<host-path[#frag]>}{<text>}|\] %% should display <text> -%% as a link to `http://<host-path[#frag]>'. -%% \ +%% as a link to `http://<host-path[#frag]>'; +%% \[|\httpsref{<host-path[#frag]>}{<text>}|\] +%% is the obvious analogue for `https:' \acro{URL}s. %% In case `\begin{document}' is found with a definition of -%% `\href' present, we provide a definition of `\httpref' -%% in terms of `\href' there: +%% `\href' present, we provide definitions of `\httpref' +%% and `\httpsref' in terms of `\href' there: \AtBeginDocument{% \@ifundefined{href}{% % \PackageError ... TODO!? 2011/01/24 - }{\newcommand*{\httpref}[1]{\href{http://#1}}}} + }{\newcommand*{\httpref} [1]{\href {http://#1}}% + \newcommand*{\httpsref}[1]{\href{https://#1}}}} %% -%% == Variants of &\httpref == +%% == Variants of &\httpref\ and &\httpsref == %% |\NormalHTTPref| may be used as an alias for `\httpref' -%% in situations where the latter has been redefined: %% v0.2 +%% in situations where the latter has been redefined %% v0.2 +%% (as in Section~\ref{sec:urlfoot}): \AtBeginDocument{%% TODO: options, guarded \let (mine, HO) \@ifdefinable\NormalHTTPref{\let\NormalHTTPref\httpref}} %% |\ithttpref{<url>}{<text>}| displays <text> in italics: \newcommand*{\ithttpref}[2]{\NormalHTTPref{#1}{\textit{#2}}} -%% With |\urlhttpref{<url>}|, that URL is displayed: +%% === \acro{URL}s as Links === +%% With |\urlhttpref{<url>}|, that \acro{URL} <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 +%% \acro{URL} should include `http://'. I choose as default what was default %% in 'blog.sty' %% (i.e., ``don't include"): %% add. 2011/01/27 \@ifdefinable\httpprefix{\let\httpprefix\@empty} %% TODO cf. above @@ -104,19 +112,24 @@ %% In 'blog.sty' (as of 2010/05/26), there was a command %% `\urlref' instead of `\urlhttpref'. It did not provide `\urlfmt'. %% +%% With |\urlhttpsref{<url>}|, we \emph{force} displaying \qtd{`https://'}: +\newcommand*{\urlhttpsref}[1]{\httpsref{#1}{\urlfmt{https://#1}}} +%% +%% === Linking \acro{URL}s in Footnotes === %% 2011/08/27 +%% \label{sec:urlfoot} %% |\foothttpurlref{<url>}| just is like %% `\footnote{\urlhttpref{<url>}}': \newcommand*{\foothttpurlref}[1]{\footnote{\urlhttpref{#1}}} %% |\urlfoot{<short>}{<id>}| %% redefines `\httpref' so that you can use all the shorthand -%% macros based on `\httpref' to get the according URL +%% macros based on `\httpref' to get the according \acro{URL} %% display (as provided by `\urlhttpref') %% in a footnote without the need to include the -%% entire URL in your source code. `\urlfoot' is available +%% entire \acro{URL} in your source code. `\urlfoot' is available %% with <short> and <id> %% when a shorthand |\<short>{<id>}{<text>}| has been defined %% where `\<short>' is the macro name and <id> is the target -%% identifier (usually part of the URL generated from <id>) +%% identifier (usually part of the \acro{URL} generated from <id>) %% according to the syntax declaration of `\<short>'. \newcommand*{\urlfoot}[2]{{% \let\httpref\foothttpurlref @@ -136,10 +149,10 @@ %% \item try `ctanpkgref' \emph{here}: \ctanpkgref{morehype},\\ %% for the \emph{footnote} try %% `\urlfoot{ctanpkgref}{morehype}'.%%% -%% \urlfoot{ctanpkgref}{morehype} +%% \urlfoot{ctanpkgref}{morehype} %% \end{itemize} -%% The lonely \qtd{\pkgnamefmt{morehype}} demonstrates that -%% it doesn't work with `ctanpkgref' because +%% The lonely \qtd{\pkgnamefmt{morehype}} you see there above +%% demonstrates that it doesn't work with `ctanpkgref' because %% `\ctanpkgref' doesn't have separate arguments for %% <id> and <text>, it actually doubles <id>. %% A local `\let\ctanpkgref\CtanPkgRef' could help, @@ -153,87 +166,126 @@ \newcommand* {\urlpkgfoot} {\urlfoot{CtanPkgRef}} %% %% == Wikipedia == +%% %% TODO separate wikilink.sty? https:!? +%% === Backbones === +%% As of v0.4, we have a \dqtd{backbone} macro +%% \[|\wikiref{<language-code>}{<lemma>}{<text>}|\] +%% for links to Wikipedia. <language-code> consists of +%% two characters like \lq`de'\rq\ for German Wikipedia articles +%% or \lq`en'\rq\ for English ones. <lemma> is the identifier of +%% the article, and <text> is displayed as the link: +\newcommand*{\wikiref}[2]{\httpref{#1.wikipedia.org/wiki/#2}} +%% There is |\Wikiref{<language-code>}{<lemma>}| +%% for the case that <lemma> and <text> are the same: +\newcommand*{\Wikiref}[2]{\wikiref{#1}{#2}{#2}} +%% We could have `\wikiref{<lang>}[<id>]{<text>}' instead, then +%% `\Wikiref' would not be needed; however, the present code is to +%% work with 'blog.sty', where optional arguments fail.%%%--- +%% +%% Quite often, programs share their names with movies, +%% biological species, etc., then lemma disambiguation is required. +%% Usually, we don't want to display the disambiguation. +%% \[|\Wikidisambref{<language-code>}{<term>}{<suffix>}|\] +%% will link to +%% \[`http://en.wikipedia.org/wiki/<term>_(<suffix>)'\] +\newcommand*{\Wikidisambref}[3]{\wikiref{#1}{#2 (#3)}{#2}} +%% There %% was `Their' 2011/07/23 +%% was something like a more general variant |\wikidisambref|, +%% now I doubt its usefulness and \textcolor{blue}{omit} it +%% in order to see where it occurs (2011/05/13). +%% +%% For \strong{anchors}, \qtd{&#} can be used with 'blog.sty'---and +%% even with 'hyperref'. +%% \par\smallskip\noindent +%% \strong{Example:}\quad +%% `\wikienref{TeX#History}{\TeX}' +%% \ for \ +%% \wikienref{TeX#History}{\TeX}. +%% +%% === English and German === +%% The next macros just save you from typing braces around +%% the language codes for English and German: +%% |\wikienref{<lemma>}{<text>}| refers to the English Wikipedia, +%% |\wikideref{<lemma>}{<text>}| refers to the German one. +\newcommand*{\wikideref}{\wikiref{de}} +\newcommand*{\wikienref}{\wikiref{en}} %% |\Wikideref{<lemma>}| refers to article <lemma> in the German -%% Wikipedia. (The next considerations apply to English -%% etc. as well!) With umlauts etc., -%% |\wikideref{<wiki-id>}{<lemma>}| may be needed. -%% For this form, sometimes using \qtd{&_} seemed to be needed. -%% In 'blog.sty', there was `\catcode`\_=12'. -%% This was no problem there, as the underscore was not needed -%% for math there. (For some time I thought of making it `\active' -%% for a shorthand for \xmltagcode{sub} elements ...) -%% But I could not find out whether it was needed or avoidable. -%% I leave this matter open here (for 'hyperref') ... -%% [2011/01/24, TODO, maybe solved there] -\newcommand*{\wikideref}[1]{\httpref{de.wikipedia.org/wiki/#1}} -\newcommand*{\Wikideref}[1]{\wikideref{#1}{#1}} -%% Anyway, |\underscorechar| seems to be useful in our macro -%% definitions. The name is inspired by \LaTeX's -%% `\@backslashchar' and `\@percentchar': -\newcommand \underscorechar {} -{\@makeother\_ \gdef\underscorechar{_}} -%% \strong{Note:} It would be natural to replace `\Wikideref' -%% by equipping `\wikideref' with an optional argument---with -%% \LaTeX. With 'blog.sty' however, where this code is now -%% taken from, optional arguments didn't work. -%% Later we might indeed in a similar manner to dealing -%% with 'hyperref' at `\begin{document}' introduce optional -%% arguments for the case of typesetting.---Analogues apply -%% in the sequel again. [2011/01/24, TODO] +%% Wikipedia and displays <lemma> as <text>: +\newcommand*{\Wikideref}{\Wikiref{de}} +%% |\Wikienref{<lemma>}| is `\Wikideref''s analogue for English: +\newcommand*{\Wikienref}{\Wikiref{en}} +%% |\Wikidedisambref{<lemma>}{<suffix>}| chooses a disambiguation +%% according to <suffix> for the German Wikipedia, +%% |\Wikiendisambref{<lemma>}{<suffix>}| for the English one: +\newcommand*{\Wikidedisambref}{\Wikidisambref{de}} +\newcommand*{\Wikiendisambref}{\Wikidisambref{en}} +%% +%% === Blanks and Umlauts in \acro{URL}s and Anchors === +%% %% <- renamed 2011/05/17 reworked: +%% |\underscorechar| seemed to be useful in macro +%% definitions. The name was inspired by \LaTeX's +%% `\@backslashchar' and `\@percentchar'. +%% However, I am now trying what happens without it. +%% It occurred in `blog.tex' for the documentation of +%% the 'blog' package, but `\string_' seems to be a good +%% replacement. +% \newcommand \underscorechar {} +% {\@makeother\_ \gdef\underscorechar{_}} +%% Anyway, in my notes I have a more elegant macro for +%% providing ``other" versions of special characters. %% +%% Guessing what `\underscorechar' was good for (2011-05-17): +%% Wikipedia lemmas and anchors often or even \emph{typically} +%% contain \emph{blank spaces}. +%% The Wikipedia software usually converts them into +%% underscore characters. Blank spaces in \emph{lemmas} +%% seem \emph{not} to need treatment here in 'texlinks'. +%% However, Wikipedia also creates \emph{anchors} from +%% \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} +%% generated from \emph{section headings} are different. +%% While umlauts in \emph{lemmas} are represented by sequences +%% starting with a \emph{percent} character, the anchors +%% use a \emph{dot} instead of the percent character. +%% Therefore now |\ancuml{<char>}| is provided: +\newcommand*{\ancuml}[1]{\csname ancuml:#1\endcsname} +\@namedef{ancuml:a}{.C3.A4} +\@namedef{ancuml:o}{.C3.B6} +\@namedef{ancuml:u}{.C3.BC} +\@namedef{ancuml:s}{.C3.9F} +%% What you read in the rest of the section is +%% \textcolor{blue}{wrong}, the commands are +%% \textcolor{blue}{dropped} for testing as of 2011/05/13. %% |\itwikideref| is an italic variant of `\wikideref': -\newcommand*{\itwikideref}[2]{\wikideref{#1}{\textit{#2}}} -%% |\wikienref{<wiki-id>}{<lemma>}| refers to the English Wikipedia: -\newcommand*{\wikienref}[1]{\httpref{en.wikipedia.org/wiki/#1}} +% \newcommand*{\itwikideref}[2]{\wikideref{#1}{\textit{#2}}} %% By analogy to `\Wikideref', -%% |\Wikienref{<lemma>}| saves you from repeating <lemma>: -%% %% abbreviates `\wikienref{<lemma>}{<lemma>}': -\newcommand*{\Wikienref}[1]{\wikienref{#1}{#1}} -%% Quite often, programs share their names with movies, -%% biological species, etc., -%% then disambiguation is required. Usually, the movie is irrelevant -%% and we don't want to display the disambiguation. %% The following macros save you from typing the underscore %% (didn't spaces suffice sometimes?) %% TODO 2011/01/24 %% and the round parantheses. -%% |\wikiendisambref{<term>}{<suffix>}{<text>}| -%% links to -%% \[`http://en.wikipedia.org/wiki/<term>_(<suffix>)'\] -%% while displaying <text> as link text only: -\newcommand*{\wikiendisambref}[2]{% - \wikienref{#1\underscorechar (#2)}} -%% |\Wikiendisambref{<term>}{<suffix>}| -%% does the same when <text> is the same as <term>: -\newcommand*{\Wikiendisambref}[2]{% - \wikienref{#1\underscorechar (#2)}{#1}} %% Italic variant |\itwikienref| of `\wikienref' %% ('blog.sty' had `\emwikienref' instead): -\newcommand*{\itwikienref}[2]{\wikienref{#1}{\textit{#2}}} +% \newcommand*{\itwikienref}[2]{\wikienref{#1}{\textit{#2}}} %% |\urluml{<ascii-char>}| as of 2010/05/25 %% (not sure if it ever worked or was actually needed): -\newcommand*{\urluml}[1]{\csname urluml:#1\endcsname} -\@namedef{urluml:a}{\#C3\#A4} -\@namedef{urluml:o}{\#C3\#B6} -\@namedef{urluml:u}{\#C3\#BC} -\@namedef{urluml:s}{\#C3\#9F} %% 2010/08/09 -%% For \strong{anchors}, \qtd{&#} can be used with 'blog.sty'---and -%% even with 'hyperref'. -%% \par\smallskip\noindent -%% \strong{Example:}\quad -%% `\wikienref{TeX#History}{\TeX}' -%% \ for \ -%% \wikienref{TeX#History}{\TeX}. +% \newcommand*{\urluml}[1]{\csname urluml:#1\endcsname} +% \@namedef{urluml:a}{\#C3\#A4} +% \@namedef{urluml:o}{\#C3\#B6} +% \@namedef{urluml:u}{\#C3\#BC} +% \@namedef{urluml:s}{\#C3\#9F} %% 2010/08/09 %% -%% == \TeX-related == %% 2010/08/24 -%% === CTAN === +%% == \TeX-related == %% 2010/08/24 +%% === \acro{CTAN} === %% |\bytopicref{<anchor>}{<text>}| %% makes <text> a link to <anchor> of J\"urgen Fenn's %% Topical Index of the \TeX\ Catalogue. You find the <anchor> %% by clicking at the respective TOC entry on top of the page -%% and then read the URL from the browser's navigation display. +%% and then read the \acro{URL} from the browser's navigation display. \newcommand*{\bytopicref}[1]{% \httpref{mirror.ctan.org/help/Catalogue/bytopic.html\##1}} -%% (Example:\quad `\bytopicref{html}{HTML}' \ for \ \bytopicref{html}{HTML}.) +%% (Example:\quad `\bytopicref{html}{\acro{HTML}}' \ for \ \bytopicref{html}{\acro{HTML}}.) %% %% % `\newcommand*{\ctanref}[1]{\httpref{ctan.org/#1}}' %% % once was replaced in 'blog.sty' by what will now be @@ -244,8 +296,9 @@ \httpref{tug.ctan.org/tex-archive/#1}} %% %% corr. 2010/11/23: %% $|\ctanpkgref{<pkg-name>}|$ -%% makes <text> a link to the CTAN package info page for -%% the package <pkg-name>. $|\CtanPkgRef{<name>}{<Name>}|$ +%% makes <text> a link to the \acro{CTAN} package info page for +%% the package <pkg-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') @@ -267,18 +320,46 @@ \@ifdefinable\pkgnamefmt {\let\pkgnamefmt\@firstofone} \AtBeginDocument {\let\pkgnamefmt\textsf} %% -%% === TUG === +%% === \acro{CTAN} Announcements === %% 2011/06/27 +%% |\ctanannref{<id>}{<text>}| makes <text> a link +%% to the DANTE web page displaying a \acro{CTAN} +%% announcement. You find <id> by searching +%% \[\texttt{https://lists.dante.de/pipermail/ctan-ann/}\] +%% and then reading the \acro{URL}. +%% <id> is composed as `<year>-<month>/<6-digits>.html'. +\newcommand*{\ctanannref}[1]{% + \httpsref{lists.dante.de/pipermail/ctan-ann/#1}} +%% |\ctanannpref{<id-code>}{<text>}| is a variant +%% of `\ctanannref' where in place of <id> +%% you only type the third and fourth digit of the +%% year, then a `-', then the (arabic) number of +%% the month, then another `-', and then the actual +%% internal identifier +%% (a number of six digits preceding `.html' of the \acro{URL}). +\newcommand*{\ctanannpref}[1]{% + \ctanannref{\TL@piper@parse#1/.html}} +\def\TL@piper@parse#1-#2-#3/{% + #1-% + \ifcase #2\or + January\or February\or March\or April\or + May\or June\or July\or August\or + September\or October\or November\or December% 2010/12/23 + \fi + /#3} +%% +%% === \acro{TUG} === %% |\tugref{<path>}{<text>}| makes <text> a link %% to <path> on domain `tug.org': \newcommand*{\tugref}[1]{\httpref{tug.org/#1}} %% ==== texhax ==== %% |\texhaxref{<id>}{<text>}| makes <text> a link -%% to the TUG web page displaying +%% to the \acro{TUG} web page displaying %% a texhax posting. You find <id> by searching -%% `tug.org/pipermail/texhax/' and then reading the URL. +%% `tug.org/pipermail/texhax/' and then reading the \acro{URL}. +%% <id> is composed as `<year>-<month>/<6-digits>.html'. +\newcommand*{\texhaxref}[1]{\tugref{pipermail/texhax/#1}} %% |\THref{<id>}| saves you from choosing <text> %% and uses `texhax' instead. -\newcommand*{\texhaxref}[1]{\tugref{pipermail/texhax/#1}} \newcommand*{\THref}[1]{\texhaxref{#1}{texhax}} %% (It was `\prg{texhax}' in 'blog.sty', to have something %% logo-like, without a good idea how to implement it.) @@ -287,38 +368,43 @@ %% of `\texhaxref' where in place of <id> %% you only type the third and fourth digit of the %% year, then a `-', then the (arabic) number of -%% the month, then another `-', and then actual +%% the month, then another `-', and then the actual %% internal identifier -%% (a number of six digits preceding `.html' of the URL). +%% (a number of six digits preceding `.html' of the \acro{URL}). %% I made this macro because I prefer typing to copying -%% from the URL. -\newcommand*{\texhaxpref}[1]{% %% 2010/09/07 - \texhaxref{20\@texhax@parse#1/.html}} -\def\@texhax@parse#1-#2-#3/{% - #1-% - \ifcase #2\or - January\or February\or March\or April\or - May\or June\or July\or August\or - September\or October\or November\or December% 2010/12/23 - \fi - /#3} +%% from the \acro{URL}. +\newcommand*{\texhaxpref}[1]{% %% 2010/09/07 + \texhaxref{20\TL@piper@parse#1/.html}} %% 2011/05/03 %% TODO: `\texhaxPref#1' searches list of offsets %% to determine year/month from id %% -%% ==== Other ==== -%% |\tugbartref{<filename-base>}{<text>}| makes <text> -%% a link to the TUGboat article `<filename-base>.pdf': -\newcommand*{\tugbartref}[1]{\tugref{TUGboat/Articles/#1.pdf}} +%% ==== Other ==== +%% %% 2011/04/27 corr. doc. vol/issue +%% |\tugbartref{tb<vol>-<issue>/<filename-base>}{<text>}| +%% makes <text> a link to the TUGboat article +%% `<filename-base>.pdf' in vol.~<vol> and issue~<issue>: +% \newcommand*{\tugbartref}[1]{\tugref{TUGboat/Articles/#1.pdf}} +\newcommand*{\tugbartref}[1]{\tugref{TUGboat/#1.pdf}} +%% %% <- 2011/04/30 %% |\TUGIref{<anchor>}{<text>}| makes text a link to an <anchor> -%% on the TUG web page entitled \qtd{TeX Resources on the Web} +%% on the \acro{TUG} web page entitled \qtd{TeX Resources on the Web} %% (e.g., \TUGIref{web}{\qtd{Web Projects}}): \newcommand*{\TUGIref}[1]{\tugref{interest.html\##1}} %% -%% === UK FAQ === +%% === \acro{UK FAQ} === %% |\ukfaqref{<label>}{<text>}| makes <text> a link to %% the UK~\TeX~FAQ page with ``label"~= <label>: \newcommand*{\ukfaqref}[1]{\httpref{% www.tex.ac.uk/cgi-bin/texfaq2html?label=#1}} +%% === Wikibooks === +%% |\wikibooks{<language-code>}{<file>}{<text>}|: +\newcommand*{\wikibooksref}[2]{\httpref{#1.wikibooks.org/wiki/#2}} +%% |\wikibooks{<file>}{<subject>}{<text>}| refers to the +%% (English) \LaTeX\ Wikibook: +\newcommand*{\latexwikibookref}[1]{\wikibooksref{en}{LaTeX/#1}} +%% The German +%% \wikibooksref{de}{LaTeX-Kompendium}{\dqtd{\LaTeX-Kompendium}} +%% is somewhat difficult, I leave it for now~... %% %% == Leaving == %% 2011/01/24 \endinput @@ -330,3 +416,13 @@ v0.2 2011/01/27 \urlfoot, \NormalHTTPref, \foothttpurlref, more consistent use of \newcommand and \@ifdefinable (TODO: guarded \let) v0.3 2011/02/10 [blog]; \urlpkgfoot +v0.4 2011/04/27 doc. \tugbartref\ corrected + 2011/04/30 shortened link in \tugbartref + 2011/05/03 \TL@piper@parse, tried \ctanannref + 2011/05/13 reworking Wikipedia, arbitrary languages + 2011/06/27 doc.: \acro; \httpsref, \ctanannref + 2011/07/23 doc.: typo \acro{TUG}, `Almost all', page breaks; + \Wikidisambref: different order of arg.s + 2011/08/18 doc.: \acro with UK; wikibooks + 2011/08/27 doc. \acro with URL and PDF; + more doc and code changes for https diff --git a/Master/texmf-dist/tex/latex/morehype/twocolpg.sty b/Master/texmf-dist/tex/latex/morehype/twocolpg.sty new file mode 100644 index 00000000000..f3d2711836c --- /dev/null +++ b/Master/texmf-dist/tex/latex/morehype/twocolpg.sty @@ -0,0 +1,130 @@ +\ProvidesPackage{twocolpg}[2011/09/01 2-col. page with blog.sty] +%% +%% 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 +%% +\RequirePackage{blog} + +\newif\iftight \newif\ifdeep %% 2011/04/29 +%% 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: +\newenvironment{spancolscell}[2]{% + \starttr\startTd{\@colspan{#1} #2 % + \@width{100\%}}% %% TODO works? + }{\endTd\endtr} +\newenvironment{hiddencells} + {\startTable{}\starttr} + {\endtr\endTable} +\newenvironment{pagehiddencells} + {\indentii\hiddencells} + {\indentii\endhiddencells} +\newenvironment{FixedWidthCell}[2] + {\startTd{#2}\startTable{\@width{#1}}% + \starttr\startTd{}} + {\endTd\endtr\endTable\endTd} +\newcommand*{\tablehspace}[1]{\startTd{\@width{#1} /}} +%% <img>: +\newcommand*{\simpleinclgrf}[1]{\IncludeGrf{alt="" \@border{0}}% + {#1}} +\newcommand*{\IncludeGrf}[2]{<img #1 src="#2">} +\newcommand*{\includegraphic}[6]{% + \IncludeGrf{% + \@width{#1} \@height{#2} %% data; presentation: + \@border{#4} + alt="#5" \@title{#6}}% + {#3}} +\newcommand*{\insertgraphic}[9]{% %% TODO cf. ... + \IncludeGrf{% + \@width{#1} \@height{#2} %% data; presentation: + \@border{#4} + align="#5" hspace="#6" vspace="#8" + alt="#8" \@title{#9}}% + {#3}} +\newcommand*{\inclgrfref}[7]{% + \fileref{#4}{\includegraphic{#1}{#2}{#3}% + {#5}{#6}{#7}}} + +%% HTTP/Wikipedia tooltips: +\newcommand*{\httptipref}[2]{% + \TagSurr a{\@title{#1}\@href{http://#2}\@target@blank}} +%% TODO \@title bad with pdfLaTeX. +\newcommand*{\@target@blank}{target="blank"} +\newcommand*{\wikitipref}[2]{% + \httptipref{Wikipedia}{#1.wikipedia.org/wiki/#2}} +\renewcommand*{\wikideref}{\wikitipref{de}} +\renewcommand*{\wikienref}{\wikitipref{en}} + + +%% PAGE STRUCTURE: +\newcommand*{\PAGEHEAD}{% + \startTable{% + \@align@c\ + \@bgcolor{\pagebgcolor}% + \@border{0}%% %% TODO local + \pagespacing + \iftight \else \@width\pagewholewidth \fi + }\CLBrk + %% omitting <tbody> + \ \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*{\headgrfskiptitle}[3]{% +% \pagehiddencells +% \headgrf{#1}\CLBrk +% \headskip{#2}\CLBrk +% \headtitle1{#3}\CLBrk +% \endpagehiddencells} +\newcommand*{\headuseskiptitle}[3]{% + \pagehiddencells\CLBrk + \indentiii\simplecell{#1}\CLBrk + \headskip{#2}\CLBrk + \headtitle1{#3}\CLBrk + \endpagehiddencells} + +\newcommand*{\PAGENAVI}{% + \indenti\endspancolscell\CLBrk + \indenti\starttr\CLBrk + \ \comment{NAVIGATION COL}\CLBrk + \indentii\FixedWidthCell\pagenavicolwidth + {\@class{paper} \@valign@t} +%% %% omitting `\@height{100\%}' + \itemize} +\newcommand*{\PAGEMAINvar}[1]{% + \indentii\enditemize\ \endFixedWidthCell\CLBrk + \ \comment{ MAIN COL }\CLBrk + \indentii\FixedWidthCell{#1}{}} +\newcommand*{\PAGEMAIN}{\PAGEMAINvar\pagemaincolwidth} +\newcommand*{\PAGEFOOT}{% + \indentii\endFixedWidthCell\CLBrk +% \indentii\tablehspace{96}\CLBrk %% vs. \pagemaincolwidth + %% <- TODO margin right of foot + \indenti\endtr\CLBrk + \ \comment{ FOOT ROW / }\CLBrk + \indenti\spancolscell{2}{\@class{paper} \@align@c}% +} +\newcommand*{\PAGEEND}{\indenti\endspancolscell\endTable} + +\endinput |