From da5493ad3c20657570e1d068c107c1d115d03b05 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Oct 2011 00:51:33 +0000 Subject: nicetext (24oct11) git-svn-id: svn://tug.org/texlive/trunk@24388 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG | 9 ++ Master/texmf-dist/doc/latex/nicetext/CHANGE.txt | 9 ++ Master/texmf-dist/doc/latex/nicetext/README.txt | 137 --------------------- Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt | 8 +- .../texmf-dist/doc/latex/nicetext/demo/sample.tex | 4 +- Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf | Bin 469212 -> 469082 bytes Master/texmf-dist/doc/latex/nicetext/makedoc.pdf | Bin 478068 -> 478364 bytes .../texmf-dist/source/latex/nicetext/makedoc.tex | 5 +- Master/texmf-dist/tex/latex/nicetext/fifinddo.sty | 12 +- Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg | 14 ++- 10 files changed, 45 insertions(+), 153 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/nicetext/README.txt diff --git a/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG b/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG index 350a26ee19a..95d4060b94f 100644 --- a/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG +++ b/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG @@ -1,4 +1,13 @@ +______________________________________________________________________ +nicetext RELEASE 0.47 2011/10/25 +`mdoccorr.cfg' uses `csquotes''s idea for symmetrical text ellipsis +(\unkern), no need for new macro as in r0.45; adds `...)' + +______________________________________________________________________ +nicetext RELEASE 0.46 2011/10/23 +`fifinddo' v0.44 sends messages from \ResultFile and \CloseResultFile + ______________________________________________________________________ nicetext RELEASE 0.45 2011/10/14 1. mdoccorr.cfg turns `...:' into `\dots:' (as opposed to symmetrical diff --git a/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt b/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt index 350a26ee19a..95d4060b94f 100644 --- a/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt +++ b/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt @@ -1,4 +1,13 @@ +______________________________________________________________________ +nicetext RELEASE 0.47 2011/10/25 +`mdoccorr.cfg' uses `csquotes''s idea for symmetrical text ellipsis +(\unkern), no need for new macro as in r0.45; adds `...)' + +______________________________________________________________________ +nicetext RELEASE 0.46 2011/10/23 +`fifinddo' v0.44 sends messages from \ResultFile and \CloseResultFile + ______________________________________________________________________ nicetext RELEASE 0.45 2011/10/14 1. mdoccorr.cfg turns `...:' into `\dots:' (as opposed to symmetrical diff --git a/Master/texmf-dist/doc/latex/nicetext/README.txt b/Master/texmf-dist/doc/latex/nicetext/README.txt deleted file mode 100644 index 9666441116a..00000000000 --- a/Master/texmf-dist/doc/latex/nicetext/README.txt +++ /dev/null @@ -1,137 +0,0 @@ - The NICETEXT bundle - - (c) 2009-2011 Uwe Lueck http://contact-ednotes.sty.de.vu - - - == General Idea == - -The NICETEXT bundle supports "minimal" markup syntax for rather -simple kinds of text. The code you type should show little more -characters than are printed, though you get LaTeX quality. We -try to do away with backslashes, technical terms, and curly -braces (clumsy to type ... - "syntactic sugar"). - -Main focus is easy documentation of LaTeX packages. -Preprocessing by Perl or so is replaced by TeX macros -(reviving/generalizing the `docstrip' idea), including -expandable, safe, correct string substitution and typographical -enhancements of plain text for LaTeX input. - - - == Packages == - -`wiki.sty' addresses general kinds of texts. `niceverb.sty' is -made for documenting LaTeX packages. `niceverb.sty' especially -offers [almost-]WYSIWIG for meta-variables (macro arguments) -and for referring to commands (and their syntax) in footnotes, -section titles etc. E.g., to get the syntax description - - \foo[]{} -you just type - \foo[]{} -!-) - -`fifinddo.sty' provides basic setup for text filtering, -especially string substitution. `makedoc.sty' extends it to -provide a simple script language for transforming plain text -package files into LaTeX input files [manual!?]. One LaTeX run -can perform preprocessing and typesetting. - - - == Comparisons == - -One source of inspiration is the markup syntax of editing -Wikipedia pages. `wiki.sty' of the bundle offers something -similar as a LaTeX front-end for italics, boldface, sectioning, -and certain list-like environments. This is also similar to -`easylatex', - - http://www.ctan.org/pkg/easylatex - -which is more powerful and uses Perl. NICETEXT, by contrast, -consists just of LaTeX packages, working on any TeX -installation [!? note restrictions in `fifinddo.pdf']. -Cf. also preprocessor packages `txt2tex' and `txt2latex'. - -Regarding "self-documentation," there is a difference to -current `\DocInput', similar ideas are in `gmdoc' and -`lineno.sty', see `niceverb.pdf' and `makedoc.pdf'. Standard -`doc.sty' and `contrib' extensions of it are rather avoided. - -There are several *LaTeX macro* packages for processing text or -databases or for editing TeX's input stream while typesetting --- see `fifinddo.pdf'. What seems to be new here is -*expandable string substitution* and safe, correct detection of -substrings -- discussed in `fifinddo.pdf'. - - - == Documentation == - -`fifinddo.pdf' describes `fifinddo.sty', typeset from -`fifinddo.tex'. `makedoc.pdf' describes `makedoc.sty', typeset -from `makedoc.tex'. `mdoccheat.pdf' is a list of script -commands, typeset from `mdocchea.tex'. `niceverb.pdf' describes -`niceverb.sty', typeset from `niceverb.tex'. Typesetting them -anew (for customizing printout) requires `makedoc.cfg', -`mdoccorr.cfg', and the *.sty files. - -`wikicheat.pdf' is a one-page manual of `wiki.sty'. The file -`wiki.sty' contains additional documentation as plain text. -Note that certain features must be activated by commands in the -document environment. - - - == Templates/Dialogue == - -txt to TeX functionality through \MakeDocCorrectHook can be -tried and applied with templates `fdtxttex.tpl' and -`makedoc.tpl' and in a dialogue started by running -`fdtxttex.tex'. Running `copyfile.tex', you get a dialogue -for "compressing" blank lines or text encoding conversion. - -`substr.tex' should typeset the version of Harald Harders' -`substr.sty' next at your TeX installation. `arseneau.tex' -should typeset documentation of a few packages by Donald -Arseneau. MY results are `substr.pdf' and `arseneau.pdf'. - - - == License == - -Copying, distributing, modifying, using the files of the -`nicetext' bundle are allowed under the terms of the -LaTeX Project Public License, either version 1.3a or any later -version, the latest version is at - - http://www.latex-project.org/lppl.txt - -There is NO WARRANTY, and you must CARE indeed with `fifinddo' -and `makedoc', they will OVERWRITE existing files without -warning (because their main purpose is updating). - -The bundle is AUTHOR-MAINTAINED in the sense of the LPPL. - -Copyright (C) 2009-2011 Uwe Lueck, - - http://www.contact-ednotes.sty.de.vu - -Please report bugs, problems, and suggestions via the previous -web form. - - - == Installing/Required == - -`makedoc.sty' requires the `moreverb' package from - - CTAN:/macros/latex/contrib/moreverb - -You find the latest public version of the NICETEXT bundle at - - http://mirror.ctan.org/macros/latex/contrib/nicetext/ - -A TDS version `nictext.tds.zip' is available at - - http://mirror.ctan.org/install/macros/latex/contrib/ - - - ________________________________ - [This file 2011/08/23 Uwe Lueck] diff --git a/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt b/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt index fb02bc31088..54f8c19bab5 100644 --- a/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt +++ b/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt @@ -4,7 +4,7 @@ srcfiles.tex 2011/09/13 collect file infos README.tex 2011/02/14 make README.pdf fifinddo.tex 2011/08/22 documenting fifinddo.sty - makedoc.tex 2011/10/12 documenting makedoc.sty + makedoc.tex 2011/10/25 documenting makedoc.sty niceverb.tex 2011/10/07 documenting niceverb.sty mdoccheat.tex 2011/01/26 cheat sheet for `makedoc.sty' wikicheat.tex 2011/01/26 cheatsheet for wiki.sty @@ -23,14 +23,14 @@ fddial0g.sty 2011/09/13 v0.2 dialogues with fifinddo (UL) copyfile.cfg 2011/09/13 initializing copyfile.tex fdtxttex.cfg 2011/09/12 initializing fdtxttex.tex USE. -fifinddo.sty 2011/09/13 v0.43 filtering TeX(t) files by TeX (UL) +fifinddo.sty 2011/10/23 v0.44 filtering TeX(t) files by TeX (UL) makedoc.sty 2011/10/12 v0.41b TeX input from *.sty (UL) makedoc.cfg 2011/08/22 documentation settings -mdoccorr.cfg 2011/10/13 local typographical corrections with makedoc.sty +mdoccorr.cfg 2011/10/25 local typographical corrections with makedoc.sty niceverb.sty 2011/09/09 v0.44 minimize doc markup (UL) wiki.sty 2008/07/02 v0.2 LaTeX through Wiki markup *********** - List made at 2011/10/14, 15:09 + List made at 2011/10/25, 11:29 from script file srcfiles.tex diff --git a/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex b/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex index ba39b3f5f50..f313574d5b2 100644 --- a/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex +++ b/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex @@ -1,5 +1,5 @@ -\ProvidesFile{sample.tex}[2011/09/13 automatically generated with fifinddo.sty] -blabla .\kern\fontdimen3\font.\kern\fontdimen3\font.\ blabla +\ProvidesFile{sample.tex}[2011/10/25 automatically generated with fifinddo.sty] +blabla \textellipsis\unkern\ blabla blabla cf.\ bla etc.\ bla bla diff --git a/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf b/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf index fa4d57c4c45..2b77512d809 100644 Binary files a/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf and b/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf differ diff --git a/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf b/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf index 701f8a13869..738e229018d 100644 Binary files a/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf and b/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf differ diff --git a/Master/texmf-dist/source/latex/nicetext/makedoc.tex b/Master/texmf-dist/source/latex/nicetext/makedoc.tex index 30a28f9a86c..88835e71e93 100644 --- a/Master/texmf-dist/source/latex/nicetext/makedoc.tex +++ b/Master/texmf-dist/source/latex/nicetext/makedoc.tex @@ -1,4 +1,4 @@ -\ProvidesFile{makedoc.tex}[2011/10/12 documenting makedoc.sty] +\ProvidesFile{makedoc.tex}[2011/10/25 documenting makedoc.sty] \RequirePackage{makedoc} \documentclass[fleqn]{article} %% fleqn 2011/10/12 \input{makedoc.cfg} @@ -576,7 +576,7 @@ And this is the content of the intermediate generated file: \MakeOther\|\MakeOther\`\MakeOther\'\MakeOther\< \listinginput[5]{1}{mdoccorr.doc} \endgroup -\enlargethispage{8pt} %% 2011/09/14 keep rule on same page +% \enlargethispage{8pt} %% 2011/09/14 keep rule on same page %% rm. 2011/10/25 \hrule % \fussy %% 2010/03/29 @@ -657,3 +657,4 @@ end of a file it writes. %% todo TeXbook where? 2009/04/08 2011/09/14 rm. \pagebreak 2011/10/07 "grouping" fix(?) + \label in "Separating" 2011/10/12 fleqn +2011/10/25 without \enlargethispage diff --git a/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty b/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty index a94479743fa..75681f23eb8 100644 --- a/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty +++ b/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty @@ -5,7 +5,7 @@ %% for processing tex(t) files %% (checking, filtering, converting, substituting, expanding, ...) -\def\fileversion{0.43} \def\filedate{2011/09/13} +\def\fileversion{0.44} \def\filedate{2011/10/23} %% This file can be redistributed and/or modified under %% the terms of the LaTeX Project Public License; either @@ -105,6 +105,8 @@ %% to be written into. \newcommand*{\ResultFile}[1]{% \def\result_file_name{#1}% +%% By analogy to `\ProcessFileWith' 2011/10/23: + \typeout{`fifinddo' generating `\result_file_name'}% \immediate\openout\result_file=#1} %% |\WriteResult{}| writes a line into %% (or more lines with `^^J'). @@ -230,7 +232,11 @@ %% replaces an empty line by a line consisting of \verb+

+. %% %% |\CloseResultFile| closes . -\newcommand*{\CloseResultFile}{\immediate\closeout\result_file} +\newcommand*{\CloseResultFile}{% + \immediate\closeout\result_file +%% \enlargethispage{1\baselineskip} +%% Another analogy to `\ProcessFileWith' 2011/10/23: + \typeout{`\result_file_name' completed (`fifinddo')}} %% %% \pagebreak %% == Basic handling of substring conditionals == @@ -999,5 +1005,7 @@ belonged to nicetext RELEASE 0.42 v0.43 2011/08/06 doc.: mistake \WriteResult/\ResultFile, 2011/08/22 use \acro 2011/09/12f. \CorrectedInputLine - reworded for breaking +belonged to nicetext RELEASE 0.44 +v0.44 2011/10/23 messages from \ResultFile and \CloseResultFile TODO: cleveref 2010/03/18 diff --git a/Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg b/Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg index e9ec00eb61b..5ff8438a78e 100644 --- a/Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg +++ b/Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg @@ -1,4 +1,4 @@ -\ProvidesFile{mdoccorr.cfg}[2011/10/13 +\ProvidesFile{mdoccorr.cfg}[2011/10/25 local typographical corrections with makedoc.sty] %% ... also demonstrates 'niceverb.sty'---see the typeset %% documentation of the present file in `makedoc.pdf'. @@ -22,14 +22,15 @@ % \PrependExpandableAllReplacer{dots}{...}{$\dots$} %% ... 2010/11/24 ``symmetric" variant of `\textellipsis': %% allow extra space at line end. -%% `MD' macro 2011/10/13 -%% (final dot separates; TODO provide generally): -\gdef\MDtwodots{.\kern\fontdimen3\font.\kern\fontdimen3\font} -\PrependExpandableAllReplacer{dots}{...}{\MDtwodots.} +%% % `MD' macro 2011/10/13 +%% % (final dot separates; TODO provide generally): +% \gdef\MDtwodots{.\kern\fontdimen3\font.\kern\fontdimen3\font} +\PrependExpandableAllReplacer{dots}{...}{\textellipsis\unkern } %% 2011/10/13: original `\dots' correct before punctuation: % \PrependExpandableAllReplacer{dots,}{...,}{\dots,} +\PrependExpandableAllReplacer{dots)}{...)}{\dots)} %% 2011/10/25 \PrependExpandableAllReplacer{dots:}{...:}{\dots:} -\PrependExpandableAllReplacer{dots }{... }{\MDtwodots.\ } +\PrependExpandableAllReplacer{dots }{... }{\textellipsis\unkern\ } \PrependExpandableAllReplacer{TODO}{TODO}{\textcolor{blue}{TODO}} %% ... chain starts here, and here |\MakeDocCorrectHook| (silently) %% enters through a default variant |\SetCorrectHookJobLast| @@ -54,3 +55,4 @@ HISTORY 2011/01/27 blue "TODO" 2011/09/13 \providecommand for dialogues 2011/10/13 \MDtwodots, without \PXAR, `...,' `...:' +2011/10/25 \textellipsis\unkern from csquotes instead, `...)' -- cgit v1.2.3