From 36652261b786d6a6134577abf73551c9b8053d48 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Sep 2011 00:15:06 +0000 Subject: morehype (4sep11) git-svn-id: svn://tug.org/texlive/trunk@23811 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/morehype/RELEASE.txt | 17 ++- Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt | 8 +- Master/texmf-dist/doc/latex/morehype/blog.pdf | Bin 436307 -> 436523 bytes .../doc/latex/morehype/demo/writings/makehtml.tex | 4 +- Master/texmf-dist/source/latex/morehype/blog.tex | 9 +- Master/texmf-dist/tex/latex/morehype/lnavicol.sty | 136 +++++++++++++++++++++ Master/texmf-dist/tex/latex/morehype/twocolpg.sty | 130 -------------------- 7 files changed, 159 insertions(+), 145 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/morehype/lnavicol.sty delete mode 100644 Master/texmf-dist/tex/latex/morehype/twocolpg.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/morehype/RELEASE.txt b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt index cfd6f629762..11e3e10cb91 100644 --- a/Master/texmf-dist/doc/latex/morehype/RELEASE.txt +++ b/Master/texmf-dist/doc/latex/morehype/RELEASE.txt @@ -1,6 +1,10 @@ - -r0.4 2011/09/01 texlinks v0.4, -blog.sty v0.5 + support for two-column web pages +r0.41 2011/09/02 web pages with blog.sty +============================================================ +- `twocolpg.sty' renamed `lnavicol.sty' +- typo fixes in `blog.tex'/`blog.pdf' + +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 @@ -31,7 +35,7 @@ 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 +r0.3 2011/02/10 texlinks v0.3 [blog], \urlpkgfoot ============================================================ \urlpkgfoot{PKG-ID} abbreviates \urlfoot{CtanPkgRef}{PKG-ID} that is needed frequently. @@ -39,10 +43,11 @@ Package option [blog] suppresses document definitions. blog.sty is updated accordingly and at the occasion. README points to morehype.tds.zip -r0.2 2011/01/27 texlinks v0.2 \urlfoot +r0.2 2011/01/27 texlinks v0.2 \urlfoot ============================================================ \urlfoot displays the URL that some shorthand generates in a footnote. E.g., \ukfaqref{LABEL}{TEXT} generates an URL that \urlfoot{ukfaqref}{LABEL} displays. -r0.2a 2011/01/30 makehtml.tex+texmap.tex to `doc', TDS with `source' +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 435d5110ff9..70262047674 100644 --- a/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt +++ b/Master/texmf-dist/doc/latex/morehype/SRCFILEs.txt @@ -3,19 +3,19 @@ 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/08/27 v0.4 TeX-related links (UL) -twocolpg.sty 2011/09/01 2-col. page with blog.sty +lnavicol.sty 2011/09/02 left navigation col. 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 - blog.tex 2011/09/01 documenting blog.sty + blog.tex 2011/09/02 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/08/31 collect file infos +srcfiles.tex 2011/09/02 collect file infos *********** - List made at 2011/09/01, 14:37 + List made at 2011/09/02, 18:39 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 index 984a812704c..80909d14d09 100644 Binary files a/Master/texmf-dist/doc/latex/morehype/blog.pdf and b/Master/texmf-dist/doc/latex/morehype/blog.pdf differ diff --git a/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex b/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex index 222d7855f22..5889dcf2eb3 100644 --- a/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex +++ b/Master/texmf-dist/doc/latex/morehype/demo/writings/makehtml.tex @@ -1,7 +1,7 @@ -\def \GenDate {2011/08/31} +\def \GenDate {2011/09/02} \ProvidesFile{makehtml.tex} [\GenDate\space TeX engine for "writings"] -\RequirePackage{blog,texlinks,twocolpg} %% 2011/08/31 +\RequirePackage{blog,texlinks,lnavicol} %% 2011/09/02 \input{atari.fdf} \input{lang-en.fdf} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def \htmljob diff --git a/Master/texmf-dist/source/latex/morehype/blog.tex b/Master/texmf-dist/source/latex/morehype/blog.tex index b97f899fecf..31f95d86470 100644 --- a/Master/texmf-dist/source/latex/morehype/blog.tex +++ b/Master/texmf-dist/source/latex/morehype/blog.tex @@ -1,4 +1,4 @@ -\ProvidesFile{blog.tex}[2011/09/01 documenting blog.sty] +\ProvidesFile{blog.tex}[2011/09/02 documenting blog.sty] \title{\textsf{blog.sty}\\---\\% Generating \acro{HTML} Quickly with \TeX\thanks{This document describes version @@ -124,11 +124,12 @@ as templates. \endgroup \subsection{A Style with a Navigation Column} -A style of web pages looking more professional than `texhax.hmt' +A style of web pages looking more professional than +`texmap.htm' %% was `texhax.hmt' 2011/09/02 (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 +section below. The package 'lnavicol.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 @@ -180,3 +181,5 @@ HISTORY 2011/01/27 using \urlfoot 2011/09/01 using new makedoc.cfg incl. \acro and \foothttp...; extension for twocolpg.sty +with morehype release r0.4 +2011/09/02 twocolpg.sty renamed into lnavicol.sty, typo fixes diff --git a/Master/texmf-dist/tex/latex/morehype/lnavicol.sty b/Master/texmf-dist/tex/latex/morehype/lnavicol.sty new file mode 100644 index 00000000000..030a7822e07 --- /dev/null +++ b/Master/texmf-dist/tex/latex/morehype/lnavicol.sty @@ -0,0 +1,136 @@ +\ProvidesPackage{lnavicol}[2011/09/02 + left navigation column 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} /}} +%% : +\newcommand*{\simpleinclgrf}[1]{\IncludeGrf{alt="" \@border{0}}% + {#1}} +\newcommand*{\IncludeGrf}[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 + \ \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 + +HISTORY + +2011/09/01 to CTAN as `twocolpg.sty' +2011/09/02 renamed diff --git a/Master/texmf-dist/tex/latex/morehype/twocolpg.sty b/Master/texmf-dist/tex/latex/morehype/twocolpg.sty deleted file mode 100644 index f3d2711836c..00000000000 --- a/Master/texmf-dist/tex/latex/morehype/twocolpg.sty +++ /dev/null @@ -1,130 +0,0 @@ -\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} /}} -%% : -\newcommand*{\simpleinclgrf}[1]{\IncludeGrf{alt="" \@border{0}}% - {#1}} -\newcommand*{\IncludeGrf}[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 - \ \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 -- cgit v1.2.3