From e09950f439263dd3649fc0d9bf357b0f124d247c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Dec 2012 23:32:22 +0000 Subject: morehype (21dec12) git-svn-id: svn://tug.org/texlive/trunk@28610 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/morehype/blog.tex | 36 ++++++++++- .../texmf-dist/source/latex/morehype/blogdot.css | 41 ++++++++++++ .../texmf-dist/source/latex/morehype/blogexec.tex | 4 +- .../texmf-dist/source/latex/morehype/fdatechk.tex | 17 ++--- .../texmf-dist/source/latex/morehype/srcfiles.tex | 7 +- .../texmf-dist/source/latex/morehype/texlinks.tex | 75 +++++++++++++++------- 6 files changed, 144 insertions(+), 36 deletions(-) create mode 100644 Master/texmf-dist/source/latex/morehype/blogdot.css (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/morehype/blog.tex b/Master/texmf-dist/source/latex/morehype/blog.tex index aacfd541094..71487ed57b4 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}[2012/11/30 documenting blog.sty] +\ProvidesFile{blog.tex}[2012/12/20 documenting blog.sty] \title{\textsf{blog.sty}\\---\\% Generating \HTML\ Quickly with \TeX\thanks{This document describes version @@ -26,6 +26,7 @@ \documentclass[fleqn]{article}%% TODO paper dimensions!? \sfcode`-=1001 %% 2011/10/15 \input{makedoc.cfg} %% shared formatting settings +\usepackage{filesdo} \MDfinaldatechecks %% 2012/12/20 \ReadPackageInfos{blog} %% \tagcode seems to be a quite recent pdfTeX primitive, %% cf. microtype.pdf ... %% 2010/11/06 @@ -33,6 +34,7 @@ \newcommand*{\HTML}{\acro{HTML}} %% 2011/09/08 \newcommand*{\CSS}{\acro{CSS}} %% 2011/11/09 \newcommand*{\secref}[1]{Sec.~\ref{sec:#1}} %% 2011/11/23 +\providecommand*{\LuaTeX}{Lua\TeX} %% 2012/12/20 \sloppy \begin{document} \maketitle @@ -232,6 +234,7 @@ See below for what is offered. \section{Wiki Markup by 'markblog.sty'} %% 2012/11/29 \label{sec:mark} +\subsection{Introduction} %% 2012/12/20 \AddQuotes This is the code and documentation of the package mentioned in Sec.~\ref{sec:ligs}, loadable by option |[mark]|. @@ -239,7 +242,35 @@ See below for what is offered. You should also find a file `markblog.htm' that sketches it. Moreover, `texlinks.pdf' describes in detail to what extent Wikipedia's ``\wikiref{Help:Links#Piped_links}{piped links}" -with `[[wikipedia-link]]' is supported. +with `[[]]' is supported. %% <...> 2012/12/20 + +\subsection{Similar Packages} %% 2012/12/20 +'wiki.sty' from the \ctanpkgdref{nicetext} bundle has offered +some Wikipedia-like markup as a front-end for ordinary +typesetting with \LaTeX\ (for \acro{DVI}/\acro{PDF}), +implemented in a way very different from what is going on here, +rather converting markup sequences \emph{during} typesetting. + +More similar to the present approach is the way how +Wikipedia section titles in package documentation +is implemented by 'makedoc' from the 'nicetext' bundle, +based on \strong{preprocessing} by 'fifinddo'. + +In general, John MacFarlane's +\httpref{johnmacfarlane.net/pandoc}{\pkg{pandoc}} +(cf.~\wikideref{pandoc}{German Wikipedia}) +converts between wiki-like (simplified) markup and +\LaTeX\ markup. (It deals with rather fixed +markup rules, while we here process markup sequences +independently of an entire markup \emph{language}.) + +Another straightforward and well-documented way to +\emph{preprocess} source files for converting simplified +markup into \TeX\ markup is \ctanpkgauref{isambert}{Paul Isambert}'s +\ctanpkgref{interpreter}. It relies on \wikiref{LuaTeX}{\LuaTeX} +where Lua does the preprocessing. + +\subsection{Package File Header} %% 2012/12/20 \ResetCodeLineNumbers \input{markblog.doc} \DontAddQuotes @@ -442,3 +473,4 @@ with morehype RELEASE r0.4 2012/10/05 adjusted \HeaderLines (differ!) 2012/11/29 adding `blogligs' and `markblog' 2012/11/30 hello world, texblog sample removed, url foots +2012/12/20 filedate checks, doc. more about `markblog' diff --git a/Master/texmf-dist/source/latex/morehype/blogdot.css b/Master/texmf-dist/source/latex/morehype/blogdot.css new file mode 100644 index 00000000000..31f8e9ddeed --- /dev/null +++ b/Master/texmf-dist/source/latex/morehype/blogdot.css @@ -0,0 +1,41 @@ +/* blogdot.css for blogdot.sty (morehype bundle) 2011/10/05 */ +/* (C) 2011 Uwe Lueck www.contact.uwe.lueck.de.vu */ +/* 2011/09/21 aus blog/plain.css, 2011/09/26 gekürzt, Versuche, Umbau */ +/* +b, h1, h2, h3, h4, div, p, td, th, body, span, table, ol, li, a, ul { +font-family:Arial,Verdana,"Lucinda Sans",sans-serif; +color:#000000; +font-size:21px; +} +*/ + +h1 { font-size: 42px; margin-bottom: 21px } +h2 { font-size: 30px; margin-bottom: 21px } +h3 { font-size: 24px; } +h4 { font-size: 21px; } + +/* body, td, th, div, p, ul, li, em, strong */ +td { +font-family:Arial,Verdana,"Lucinda Sans",sans-serif; +color:#000000; +font-size: 21px +} + +p { margin-bottom:0px } +dl, ol, ul { +/* padding-left: 18px; */ +padding-left: 1em; +margin-left: 1em; margin-top: 18px; margin-bottom: 18px; +vertical-align: middle; +} +dt { margin: 0px; margin-top: 18px; margin-bottom: 9px; padding: 0px } +li { margin: 0px; margin-top: 9px; margin-bottom: 9px; padding: 0px } +blockquote { margin-left: 2em } +pre { margin-left:2em; margin-top:0px } + +/* table { margin: 0px; margin-top: 9px; margin-bottom: 18px; padding: 0px} */ + +a:link { color:#0000d0; text-decoration:none; } +a:visited { color:purple; text-decoration:none; } +a:hover { color:blue; text-decoration:underline; } +a:active { color:blue; text-decoration:underline; } diff --git a/Master/texmf-dist/source/latex/morehype/blogexec.tex b/Master/texmf-dist/source/latex/morehype/blogexec.tex index 57830a9c125..791cfdafde4 100644 --- a/Master/texmf-dist/source/latex/morehype/blogexec.tex +++ b/Master/texmf-dist/source/latex/morehype/blogexec.tex @@ -1,4 +1,4 @@ -\ProvidesFile{blogexec.tex}[2011/11/20 documenting blogexec.sty] +\ProvidesFile{blogexec.tex}[2012/12/20 documenting blogexec.sty] \title{{\huge\pkg{blogexec.sty}}\\---\\Overcoming \pkg{blog.sty}'s Pure Expansion\thanks{This document describes version @@ -11,6 +11,7 @@ {\SectionLevelThreeParseInput} } \documentclass[fleqn]{article}%% TODO paper dimensions!? \input{makedoc.cfg} %% shared formatting settings +\usepackage{filesdo} \MDfinaldatechecks %% 2012/12/20 \providecommand*{\HTML}{\acro{HTML}} \ReadPackageInfos{blogexec} \sloppy @@ -111,5 +112,6 @@ VERSION HISTORY 2011/11/04 for v0.1 very first 2011/11/09f. something more 2011/11/20 star forms +2012/12/20 for v0.21 date checks diff --git a/Master/texmf-dist/source/latex/morehype/fdatechk.tex b/Master/texmf-dist/source/latex/morehype/fdatechk.tex index 5ed5da2e209..2b45acd55ed 100644 --- a/Master/texmf-dist/source/latex/morehype/fdatechk.tex +++ b/Master/texmf-dist/source/latex/morehype/fdatechk.tex @@ -1,18 +1,19 @@ -\ProvidesFile{fdatechk.tex}[2012/12/01 morehype filedate checks] +\ProvidesFile{fdatechk.tex}[2012/12/20 morehype filedate checks] %% load earlier: %\RequirePackage{filedate,filesdo} -\UseReferenceDate{\thepdfmoddate} +%\UseReferenceDate{\thepdfmoddate} \ModDates \DatesDiffErrors -\DoWithBasesExts\CheckDateOfGiven{ +\FileDateAutoChecks %% 2012/12/20 +\DoWithBasesExts\ReadFileInfos{ blog,blogexec,hypertoc,markblog,texlinks}{sty,tex} %\DoWithBasesExts\CheckDateOfGiven{blogdot}{cfg,sty} \DatesDiffWarnings -\CheckDateOfGiven{blogdot.cfg} +\ReadFileInfos{blogdot.cfg} \DatesDiffErrors -\DoWithExtBases\CheckDateOfGiven{sty}{blogdot,blogligs} -\DoWithExtBases\CheckDateOfGiven{fdf}{atari_ht,texblog} -\DoWithExtBases\CheckDateOfGiven{tex}{mkhellow,hellowor,srcfiles} -\CheckDateOfGiven{morehype.RLS} +\DoWithExtBases\ReadFileInfos{sty}{blogdot,blogligs} +\DoWithExtBases\ReadFileInfos{fdf}{atari_ht,texblog} +\ReadFileInfos{mkhellow,hellowor,wiki_mwe,fdatechk,srcfiles} +\ReadFileInfos{morehype.RLS} \DatesDiffWarnings \CheckDateOfToday{morehype.RLS} diff --git a/Master/texmf-dist/source/latex/morehype/srcfiles.tex b/Master/texmf-dist/source/latex/morehype/srcfiles.tex index ac877ecf203..186eeda3c0a 100644 --- a/Master/texmf-dist/source/latex/morehype/srcfiles.tex +++ b/Master/texmf-dist/source/latex/morehype/srcfiles.tex @@ -1,4 +1,4 @@ -\ProvidesFile{srcfiles.tex}[2012/12/01 file infos -> SrcFILEs.txt] +\ProvidesFile{srcfiles.tex}[2012/12/20 file infos -> SrcFILEs.txt] \RequirePackage{filedate} \RequirePackage[r,wrap]{nicefilelist}[2012/10/24] %\MFfieldtemplate{f-base}{nicefilelist} @@ -21,14 +21,15 @@ %\ReadFileInfos{makehtml,texmap} %% documentation main sources: \FileListRemark[ ----]{-----DOC.SRC} -\ReadFileInfos{blog,blogexec,hellowor,hypertoc,markblog,texlinks} +\ReadFileInfos{blog,blogexec, + hellowor,hypertoc,markblog,texlinks,wiki_mwe} %% documentation settings and auxiliaries: %\ReadFileInfos{NICETEXT....} \NoFileDateAutoChecks \FileListRemark[ ----]{-----DOC.FMT} \ReadFileInfos{README} %\ReadPackageInfos{nicefilelist} -\ReadFileInfos{mkhellow,srcfiles} +\ReadFileInfos{fdatechk,mkhellow,srcfiles} %% fdatechk 2012/12/20 \FileListRemark[ ----]{NICETEXT.---} \ReadPackageInfos{fifinddo,makedoc,niceverb} \ReadFileInfos{makedoc.cfg,mdoccorr.cfg} diff --git a/Master/texmf-dist/source/latex/morehype/texlinks.tex b/Master/texmf-dist/source/latex/morehype/texlinks.tex index 9a4e660f92b..d5eaf0b1659 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}[2012/12/01 documenting texlinks.sty] +\ProvidesFile{texlinks.tex}[2012/12/20 documenting texlinks.sty] \title{{\Huge\textsf{texlinks.sty}}\\---\\\TeX-Related Links for \textsf{hyperref}, \textsf{blog.sty}\\ (and maybe more)\thanks{This @@ -15,37 +15,62 @@ {\SectionLevelThreeParseInput} } \documentclass[fleqn]{article} %% TODO paper dimensions!? \input{makedoc.cfg} %% shared formatting settings -\usepackage{color} \newcommand*{\xmltagcode}[1]{\texttt{<#1>}} -\providecommand{\CTAN}{\acro{CTAN}} -\providecommand{\HTML}{\acro{HTML}} -\providecommand{\URL} {\acro{URL}} -\providecommand{\ctanpkgdref}[1]{% +\providecommand*{\CTAN}{\acro{CTAN}} +\providecommand*{\HTML}{\acro{HTML}} +\providecommand*{\URL} {\acro{URL}} +\providecommand*{\TUG} {\acro{TUG}} +\providecommand*{\ctanpkgdref}[1]{% \ctanpkgref{#1}\,\urlfoot{CtanPkgRef}{#1}} -% \RequirePackage{filesdo} -% \MDfinaldatechecks +\providecommand*{\secref}[1]{Section~\ref{sec:#1}} %% 2012/12/15 +\providecommand*{\codedots}{\code{...}} %% 2012/12/18 +\newenvironment*{example} %% 2012/12/19 + {\trivlist + \item[\skiplabelsep\bf Example:]} + {\endtrivlist} +\newcommand*{\skiplabelsep}{\hskip\labelsep} +\newcommand*{\simpleexample}[1]{% + {\example\fbox{\def~{\string~}%% TODO etc. + \strut + \CmdSyntaxVerb#1}\skiplabelsep + for\skiplabelsep + \fbox{\MakeActiveLet\&\empty + \strut + #1}% + \endexample}} +\RequirePackage{filesdo} \MDfinaldatechecks %% 2012/12/20 \sloppy \begin{document} \maketitle \begin{abstract}\noindent '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, \acro{TUG} material -(including texhax postings and TUGboat articles) and -\CTAN\ pages (package descriptions, directories, Catalogue) -are supported, also the UK~FAQ, -the \LaTeX\ Wikibook, %% 2011/08/27 +linking to \URL s %% \ 2012/12/15 +that one often refers to in discussing \TeX-related material. +\URL s for \TUG\ material %% Especially -> \URL s to 2012/12/16 +(including texhax postings and + \TUG boat articles) and %% \ 2012/12/15 +\CTAN\ pages (package descriptions, directories, Catalogue), +% are supported, also %% rm. 2012/12/16 +the \acro{UK~FAQ}, %% \acro 2012/12/15 +the \LaTeX\ +and the \TeX\ %% 2012/12/16 +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{\acro{HTML}} overviews -generated with 'blog.sty'. -They may as well be useful with better known (and better developed) -\TeX\,$\to$\,\acro{HTML} software such as -\ctanpkgref{tex4ht}\urlpkgfoot{tex4ht} or -\CtanPkgRef{latex2html}{LaTeX2HTML}\urlpkgfoot{latex2html} -(I don't know). + visually appealing manner) +are generated from minimal identifiers by pure expansion. %% 2012/12/16 +% However, up to now %% rm. 2012/12/16 +I have used them for documenting my packages %% 2012/12/16 +(\acro{PDF}) as well as for %% 2012/12/16 +\HTML\ overviews generated with 'blog.sty'. %% rm. \emph 2012/12/16 +They may furthermore %% was "as well" 2012/12/17 +be useful with better known (and better developed) +\TeX\,$\to$\,\HTML\ software such as %% \HTML 2012/12/15 +\ctanpkgdref{tex4ht} or %% d 2012/12/16 +\CtanPkgRef{latex2html}{LaTeX2HTML}% +\,\urlpkgfoot{latex2html} %% \, 2012/12/16 +(I don't know, doubt latter). %% doubt 2012/12/16 \end{abstract} \tableofcontents @@ -86,3 +111,9 @@ VERSION HISTORY 2012/11/09 Legalize -> Legalese 2012/11/28 \ctanpkgdref 2012/12/01 date checks +2012/12/15 \secref, more \acro and \HTML, \TUG +2012/12/16 mod. abstract +2012/12/17 color.sty obsolete, \pdfstringDisable..., mod. abstract +2012/12/18 \secref \provide'd only, \codedots, rm. \pdfstring... +2012/12/19 {example} etc. +2012/12/20 filedate checks again -- cgit v1.2.3