summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-14 22:23:29 +0000
committerKarl Berry <karl@freefriends.org>2011-09-14 22:23:29 +0000
commit1720309de72694c4e699af26b975c1afd1239ca7 (patch)
tree8a4cc1f90ea1234bd467a44d8af731ad1e9acd58 /Master
parent373aa91278777ff3556416ccf46bc9530ff30aa3 (diff)
nicetext 0.44 (14sep11)
git-svn-id: svn://tug.org/texlive/trunk@23956 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/ANNOUNCE.txt47
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG37
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/CHANGE.txt37
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/FILEs.txt8
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/RELEASE043.txt36
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt31
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/demo/lns.txt5
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/demo/sample.tex2
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/fifinddo.pdfbin468092 -> 469212 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/makedoc.pdfbin477995 -> 478453 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/mdoccheat.pdfbin0 -> 69681 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nicetext/niceverb.pdfbin444848 -> 446793 bytes
-rw-r--r--Master/texmf-dist/source/latex/nicetext/makedoc.tex6
-rw-r--r--Master/texmf-dist/source/latex/nicetext/srcfiles.tex4
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/fifinddo.sty9
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/mdoccorr.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/niceverb.sty28
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/README-run.txt6
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/atari.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/atari.fdf5
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/copyfile.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/copyfile.tex41
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/fddial0g.sty196
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.cfg13
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tex79
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tpl9
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/makedoc.tpl11
-rw-r--r--Master/texmf-dist/tex/latex/nicetext/run/u8atablg.fdf34
28 files changed, 475 insertions, 181 deletions
diff --git a/Master/texmf-dist/doc/latex/nicetext/ANNOUNCE.txt b/Master/texmf-dist/doc/latex/nicetext/ANNOUNCE.txt
index ef40163b58d..a288aee0fb8 100644
--- a/Master/texmf-dist/doc/latex/nicetext/ANNOUNCE.txt
+++ b/Master/texmf-dist/doc/latex/nicetext/ANNOUNCE.txt
@@ -1,36 +1,27 @@
-Minimal markup for documentation, text filtering
+Nice meta-verbatim, dialogues for .txt->.tex/encoding conversion
=================================================================
-Release 0.43 synchronizes references to here,
-provides minor fixes, and enhances dialogues:
+Release 0.44:
- `atari.cfg' settings for conversion with:
-
- `atari.fdf' from `morehype' exemplifies conversion with:
+`niceverb.sty' v0.44 copes with design issue: on "\AddQuotes",
+ "`...'" indeed surrounds inline TeX code
+ with single quotation marks automatically
+ (besides meta-verbatim)
-`copyfile.cfg' initializes:
+`fddial0g.sty' v0.2 all my ideas so far for dialogue programming
+ tools carried out (handling "variables",
+ displaying their values on a "screen",
+ "\Spaces{15}" [e.g.] counts when expanding
+ w/o e-TeX); not super-comfortable, but fine
-`copyfile.tex' dialogue for compressing blank lines
- (and text encoding conversion)
+`fifinddo.sty' v0.43 new command useful in programming dialogues
-`fdtxttex.cfg' initializes:
+dialogues/templates adjusted
-`fdtxttex.tex' dialogue for .txt -> .tex conversion
+`u8atablg.fdf' fifinddo rules for replacing UTF-8 chars
+ with TeX commands (and some extended ASCII)
-`fddial0g.sty' shared macros for the dialogues
-
-`fifinddo.sty' documentation fix \WriteResult -> \ResultFile
-
- `makedoc.cfg' loads `color.sty'; provides \acro by `relsize.sty'
- (with a funny protection for hyperref bookmarks);
- uses \meta as semantical alias for \textit;
- [new with release r.0.43a:]
- \MDkeywords passes keywords to \hypersetup
- as well as to `MDabstract' environment
-
- `makedoc.sty' documentation fix makedoc.cfg -> mdoccorr.cfg
-
-`niceverb.sty' \gt for >, \lt for <;
- fixed noisy catcode changing in .aux
-
- `README' adjusted, enhanced
+(I use all of this for converting my Xpad/Tomboy notes into input
+ for my great Atari editor)
+`mdoccheat.pdf' was missing in previous release, back again
+
diff --git a/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG b/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG
index 3a3b8c19b60..94777b4874b 100644
--- a/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG
+++ b/Master/texmf-dist/doc/latex/nicetext/CHANGE.LOG
@@ -1,3 +1,40 @@
+
+______________________________________________________________________
+nicetext RELEASE 0.44 2011/09/14 SUMMARY: niceverb + \AddQuotes,
+ enhancements for dialogues and
+ templates, mdoccheat.pdf back
+ DOC.
+ ANNOUNCE.txt 2011/09/14 most recent
+ CHANGE.LOG/txt 2011/09/14 updated
+ SrcFILEs.txt 2011/09/14 updated
+ fifinddo.pdf 2011/09/13 updated
+mdoccheat.pdf 2010/03/30 back again
+ makedoc.pdf 2011/09/14 updated for mdoccorr.cfg
+ niceverb.pdf 2011/09/09 updated
+
+ DOCSRC.
+ srcfiles.tex 2011/09/13 updated
+ makedoc.tex 2011/09/14 revision of page breaks
+
+ RUN.
+README-run.txt 2011/09/14 more accurate
+ copyfile.tex 2011/09/13 adjusted for fddial0g v0.2
+ fdtxttex.tex 2011/09/13 adjusted for fddial0g/fifinddo
+ fdtxttex.tpl 2011/09/13 uses fifinddo v0.43
+ makedoc.tpl 2011/08/23 uses fifinddo v0.43
+
+ RUNUSE.
+ atari.cfg 2011/09/13 adjusted for fddial0g v0.2
+ u8atablg.fdf 2011/09/12 new
+ fddial0g.sty v0.2 2011/09/13 all ideas carried out
+ copyfile.cfg 2011/09/13 adjusted for fddial0g v0.2
+ fdtxttex.cfg 2011/09/12 adjusted for fddial0g v0.2
+
+ USE.
+ fifinddo.sty v0.43 2011/09/13 + \CorrectedInputLine
+ mdoccorr.cfg 2011/09/13 reloadable in dialogues
+ niceverb.sty v0.44 2011/09/09 + \AddQuotes
+
______________________________________________________________________
r0.43a 2011/08/25 adds in ANNOUNCE.txt as of 2011/08/25
that makedoc.cfg provides \MDkeywords and {MDabstract}
diff --git a/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt b/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt
index 3a3b8c19b60..94777b4874b 100644
--- a/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt
+++ b/Master/texmf-dist/doc/latex/nicetext/CHANGE.txt
@@ -1,3 +1,40 @@
+
+______________________________________________________________________
+nicetext RELEASE 0.44 2011/09/14 SUMMARY: niceverb + \AddQuotes,
+ enhancements for dialogues and
+ templates, mdoccheat.pdf back
+ DOC.
+ ANNOUNCE.txt 2011/09/14 most recent
+ CHANGE.LOG/txt 2011/09/14 updated
+ SrcFILEs.txt 2011/09/14 updated
+ fifinddo.pdf 2011/09/13 updated
+mdoccheat.pdf 2010/03/30 back again
+ makedoc.pdf 2011/09/14 updated for mdoccorr.cfg
+ niceverb.pdf 2011/09/09 updated
+
+ DOCSRC.
+ srcfiles.tex 2011/09/13 updated
+ makedoc.tex 2011/09/14 revision of page breaks
+
+ RUN.
+README-run.txt 2011/09/14 more accurate
+ copyfile.tex 2011/09/13 adjusted for fddial0g v0.2
+ fdtxttex.tex 2011/09/13 adjusted for fddial0g/fifinddo
+ fdtxttex.tpl 2011/09/13 uses fifinddo v0.43
+ makedoc.tpl 2011/08/23 uses fifinddo v0.43
+
+ RUNUSE.
+ atari.cfg 2011/09/13 adjusted for fddial0g v0.2
+ u8atablg.fdf 2011/09/12 new
+ fddial0g.sty v0.2 2011/09/13 all ideas carried out
+ copyfile.cfg 2011/09/13 adjusted for fddial0g v0.2
+ fdtxttex.cfg 2011/09/12 adjusted for fddial0g v0.2
+
+ USE.
+ fifinddo.sty v0.43 2011/09/13 + \CorrectedInputLine
+ mdoccorr.cfg 2011/09/13 reloadable in dialogues
+ niceverb.sty v0.44 2011/09/09 + \AddQuotes
+
______________________________________________________________________
r0.43a 2011/08/25 adds in ANNOUNCE.txt as of 2011/08/25
that makedoc.cfg provides \MDkeywords and {MDabstract}
diff --git a/Master/texmf-dist/doc/latex/nicetext/FILEs.txt b/Master/texmf-dist/doc/latex/nicetext/FILEs.txt
index 2a56a6707a6..7bf9fade487 100644
--- a/Master/texmf-dist/doc/latex/nicetext/FILEs.txt
+++ b/Master/texmf-dist/doc/latex/nicetext/FILEs.txt
@@ -22,6 +22,7 @@ doc documentation
|___RELEAS03.txt announcement for earlier release
|___RELEAS04.txt announcement for earlier release
|_RELEASE042.txt announcement for earlier release
+|_RELEASE043.txt announcement for earlier release
|___fifinddo.pdf for fifinddo.sty
|____makedoc.pdf for makedoc.sty
|__mdoccheat.pdf lists makedoc+fifinddo commands
@@ -39,9 +40,9 @@ docsrc documentation sources
run dialogues/templates/examples
|_README-run.txt describes this subdirectory
-|______atari.cfg Atari sample configuration
+|______atari.cfg Atari sample configuration for copyfile.tex
|______atari.fdf some Atari->ISO-8859-1 mappings
-|______atari.txt Atari umlauts
+|______atari.txt Atari umlauts (sample for copyfile.tex)
|___arseneau.tex typesets documentation of ...
|___copyfile.cfg initializes copyfile.tex dialogue
|___copyfile.tex dialogue: compressing blank lines, conversion
@@ -53,6 +54,7 @@ run dialogues/templates/examples
|____makedoc.tpl makedoc preprocessing script template
|_____sample.txt initial/demo input for fdtxttex.tex
|_____substr.tex typesets substr.sty documentation
+|___u8atablg.fdf UTF-8->Atari/blog conversion with fdtxttex
use macro packages
|___fifinddo.sty file handling and parsing
@@ -63,4 +65,4 @@ use macro packages
|_______wiki.sty Wikimedia-like markup
__________________________
-this file 2011/08/23, U.L.
+this file 2011/09/14, U.L.
diff --git a/Master/texmf-dist/doc/latex/nicetext/RELEASE043.txt b/Master/texmf-dist/doc/latex/nicetext/RELEASE043.txt
new file mode 100644
index 00000000000..ef40163b58d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nicetext/RELEASE043.txt
@@ -0,0 +1,36 @@
+Minimal markup for documentation, text filtering
+=================================================================
+Release 0.43 synchronizes references to here,
+provides minor fixes, and enhances dialogues:
+
+ `atari.cfg' settings for conversion with:
+
+ `atari.fdf' from `morehype' exemplifies conversion with:
+
+`copyfile.cfg' initializes:
+
+`copyfile.tex' dialogue for compressing blank lines
+ (and text encoding conversion)
+
+`fdtxttex.cfg' initializes:
+
+`fdtxttex.tex' dialogue for .txt -> .tex conversion
+
+`fddial0g.sty' shared macros for the dialogues
+
+`fifinddo.sty' documentation fix \WriteResult -> \ResultFile
+
+ `makedoc.cfg' loads `color.sty'; provides \acro by `relsize.sty'
+ (with a funny protection for hyperref bookmarks);
+ uses \meta as semantical alias for \textit;
+ [new with release r.0.43a:]
+ \MDkeywords passes keywords to \hypersetup
+ as well as to `MDabstract' environment
+
+ `makedoc.sty' documentation fix makedoc.cfg -> mdoccorr.cfg
+
+`niceverb.sty' \gt for >, \lt for <;
+ fixed noisy catcode changing in .aux
+
+ `README' adjusted, enhanced
+
diff --git a/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt b/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt
index 71ecb6f2779..642dc4800be 100644
--- a/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt
+++ b/Master/texmf-dist/doc/latex/nicetext/SrcFILEs.txt
@@ -1,35 +1,36 @@
*File List*
DOCSRC.
-srcfiles.tex 2011/08/23 collect file infos
+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/08/22 documenting makedoc.sty
+ makedoc.tex 2011/09/14 documenting makedoc.sty
niceverb.tex 2011/08/22 documenting niceverb.sty
mdoccheat.tex 2011/01/26 cheat sheet for `makedoc.sty'
wikicheat.tex 2011/01/26 cheatsheet for wiki.sty
RUN.
arseneau.tex 2010/04/05 some packages by D. Arseneau (ul)
substr.tex 2011/08/20 [2010/03/30] documentation for substr.sty
-copyfile.tex 2011/08/22 copy*ing/converting (UL)
-fdtxttex.tex 2011/08/23 txt to TeX by dialogue (UL)
-fdtxttex.tpl 2011/08/21 [2010/03/30] fifinddo correction template
- makedoc.tpl 2011/08/23 makedoc preprocessing template
+copyfile.tex 2011/09/13 copy*ing/converting (UL)
+fdtxttex.tex 2011/09/13 txt to TeX by dialogue (UL)
+fdtxttex.tpl 2011/09/13 fifinddo correction template
+ makedoc.tpl 2011/09/14 makedoc preprocessing template
RUNUSE.
- atari.cfg 2011/08/23 sample for copyfile.tex
- atari.fdf 2010/08/23 Atari to ISO-8859-1 with blog.sty
-fddial0g.sty 2011/08/23 dialogues with fifinddo (UL)
-copyfile.cfg 2011/08/22 initializing copyfile.tex
-fdtxttex.cfg 2010/11/25 initializing fdtxttex.tex
+ atari.cfg 2011/09/13 sample for copyfile.tex
+ atari.fdf 2010/08/29 Atari German to ISO-8859 with blog.sty
+u8atablg.fdf 2011/09/12 UTF-8->Atari/blog with fdtxttex
+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/08/22 v0.42a filtering TeX(t) files by TeX (UL)
+fifinddo.sty 2011/09/13 v0.43 filtering TeX(t) files by TeX (UL)
makedoc.sty 2011/08/22 v0.41a TeX input from *.sty (UL)
makedoc.cfg 2011/08/22 documentation settings
-mdoccorr.cfg 2011/01/27 local typographical corrections with makedoc.sty
-niceverb.sty 2011/08/20 v0.43 minimize doc markup (UL)
+mdoccorr.cfg 2011/09/13 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/08/23, 16:47
+ List made at 2011/09/14, 09:38
from script file srcfiles.tex
diff --git a/Master/texmf-dist/doc/latex/nicetext/demo/lns.txt b/Master/texmf-dist/doc/latex/nicetext/demo/lns.txt
index 455c8e2a79b..ff4f8b06e45 100644
--- a/Master/texmf-dist/doc/latex/nicetext/demo/lns.txt
+++ b/Master/texmf-dist/doc/latex/nicetext/demo/lns.txt
@@ -1,3 +1,4 @@
-
-
+abba
+
+abba
diff --git a/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex b/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex
index 046931aa080..ba39b3f5f50 100644
--- a/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex
+++ b/Master/texmf-dist/doc/latex/nicetext/demo/sample.tex
@@ -1,4 +1,4 @@
-\ProvidesFile{sample.tex}[2011/08/23 automatically generated with fifinddo.sty]
+\ProvidesFile{sample.tex}[2011/09/13 automatically generated with fifinddo.sty]
blabla .\kern\fontdimen3\font.\kern\fontdimen3\font.\ 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 819b4d48209..fa4d57c4c45 100644
--- a/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf
+++ b/Master/texmf-dist/doc/latex/nicetext/fifinddo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf b/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf
index c50c091d7eb..8dbb14fda1b 100644
--- a/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf
+++ b/Master/texmf-dist/doc/latex/nicetext/makedoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nicetext/mdoccheat.pdf b/Master/texmf-dist/doc/latex/nicetext/mdoccheat.pdf
new file mode 100644
index 00000000000..1ead8986302
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nicetext/mdoccheat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nicetext/niceverb.pdf b/Master/texmf-dist/doc/latex/nicetext/niceverb.pdf
index 09808c1771d..fff9f7761c0 100644
--- a/Master/texmf-dist/doc/latex/nicetext/niceverb.pdf
+++ b/Master/texmf-dist/doc/latex/nicetext/niceverb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/nicetext/makedoc.tex b/Master/texmf-dist/source/latex/nicetext/makedoc.tex
index 23371c332ce..322ad211721 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/08/22 documenting makedoc.sty]
+\ProvidesFile{makedoc.tex}[2011/09/14 documenting makedoc.sty]
\RequirePackage{makedoc}
\documentclass{article}
\input{makedoc.cfg}
@@ -574,6 +574,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
\hrule
% \fussy %% 2010/03/29
@@ -588,7 +589,7 @@ of a few packages by Donald Arseneau, see my own result `arseneau.pdf'.
This demonstrates the usual \lq`% '\rq\ commenting style
that 'makedoc' supports with v0.4.
-\pagebreak %% 2010/03/29
+% \pagebreak %% 2010/03/29; rm. 2011/09/14
\ResetCodeLineNumbers %% 2010/03/29
\section{Implementation}
\subsection{Preliminaries}
@@ -651,3 +652,4 @@ end of a file it writes. %% todo TeXbook where? 2009/04/08
2010/11/27 \ProvidesFile for myfilist
2011/01/25 \thanks with readprov.sty
2011/08/22 using new makedoc.cfg features
+2011/09/14 rm. \pagebreak
diff --git a/Master/texmf-dist/source/latex/nicetext/srcfiles.tex b/Master/texmf-dist/source/latex/nicetext/srcfiles.tex
index 743b729fed4..e674df5a1d5 100644
--- a/Master/texmf-dist/source/latex/nicetext/srcfiles.tex
+++ b/Master/texmf-dist/source/latex/nicetext/srcfiles.tex
@@ -1,5 +1,5 @@
\RequirePackage{myfilist}
-\ProvidesFile{srcfiles.tex}[2011/08/23 collect file infos]
+\ProvidesFile{srcfiles.tex}[2011/09/13 collect file infos]
\EmptyFileList %%% [readprov.sty,myfilist.sty]
% \ReadPackageInfos{readprov,myfilist}
\ReadFileInfos{DOCSRC.} %% updsfl.sh
@@ -11,7 +11,7 @@
\ReadFileInfos{copyfile,fdtxttex}
\ReadFileInfos{fdtxttex.tpl,makedoc.tpl}
\ReadFileInfos{RUNUSE.}
-\ReadFileInfos{atari.cfg,atari.fdf}
+\ReadFileInfos{atari.cfg,atari.fdf,u8atablg.fdf}
% \ReadPackageInfos{fddialog}
\ReadPackageInfos{fddial0g}
\ReadFileInfos{copyfile.cfg,fdtxttex.cfg}
diff --git a/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty b/Master/texmf-dist/tex/latex/nicetext/fifinddo.sty
index 9a591b6c9c1..a94479743fa 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.42a} \def\filedate{2011/08/22}
+\def\fileversion{0.43} \def\filedate{2011/09/13}
%% This file can be redistributed and/or modified under
%% the terms of the LaTeX Project Public License; either
@@ -875,6 +875,10 @@
%% most recently.
\newcommand*{\SetCorrectHookJobLast}
{\SetCorrectHookJob\fdParserId}
+%% |\CorrectedInputLine| results from `\MakeDocCorrectHook' when the
+%% latter is applied to `\fdInputLine': %% reworded for breaking 2011/09/13
+\newcommand*{\CorrectedInputLine}{%
+ \expandafter \MakeDocCorrectHook \expandafter{\fdInputLine}}
%%
%% == Leave package mode ==
%% We restore the underscore `_' for math subscripts.
@@ -992,7 +996,8 @@ v0.42 2010/11/09 typo corr.
TODO with \RemoveTilde; some manual line spacings
(adding `\ ')
belonged to nicetext RELEASE 0.42
-v0.42a 2011/08/06 doc.: mistake \WriteResult/\ResultFile,
+v0.43 2011/08/06 doc.: mistake \WriteResult/\ResultFile,
2011/08/22 use \acro
+ 2011/09/12f. \CorrectedInputLine - reworded for breaking
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 bbcadd90e34..11cd91f2c31 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/01/27
+\ProvidesFile{mdoccorr.cfg}[2011/09/13
local typographical corrections
with makedoc.sty]
%% ... also demonstrates 'niceverb.sty'---see the typeset
@@ -23,7 +23,8 @@
% \PrependExpandableAllReplacer{dots}{...}{$\dots$}
%% ... 2010/11/24 ``symmetric" variant of `\textellipsis':
%% allow extra space at line end.
-\newcommand*{\PXAR}{\PrependExpandableAllReplacer}
+\providecommand*{\PXAR}{\PrependExpandableAllReplacer}
+%% <- `provide' to allow more runs in dialogues 2011/09/13
\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
@@ -49,3 +50,4 @@ HISTORY
2010/11/24 `...' ``symmetric variant" of `\textellipsis';
\StartPrependingChain, no more \MakeExpandableAllreplacer
2011/01/27 blue "TODO"
+2011/09/13 \providecommand for dialogues
diff --git a/Master/texmf-dist/tex/latex/nicetext/niceverb.sty b/Master/texmf-dist/tex/latex/nicetext/niceverb.sty
index 2c4e0a7a9d1..8f88e1e46ce 100644
--- a/Master/texmf-dist/tex/latex/nicetext/niceverb.sty
+++ b/Master/texmf-dist/tex/latex/nicetext/niceverb.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{niceverb}[2011/08/20 v0.43
+\ProvidesPackage{niceverb}[2011/09/09 v0.44
minimize doc markup (UL)]
%% Copyright (C) 2009-2011 Uwe Lueck,
@@ -157,7 +157,11 @@
\verb@eol@error %% TODO change message 2009/04/09
}{\string\NVerb \string#1}}
%% 2009/04/11: about `etc.' [preceding a box!? 2010/03/14]
-\newcommand*{\niceverb_normal_egroup}{\egroup \ifmmode\else\@\fi}
+\newcommand*{\niceverb_normal_egroup}{%
+ \egroup
+%% 2011/09/09 adding `\niceverb_maybe_rq' for `\AddQuotes':
+ \niceverb_maybe_rq
+ \ifmmode\else\@\fi}
\@ifdefinable\niceverb_egroup
{\let\niceverb_egroup\niceverb_normal_egroup}
%%
@@ -196,6 +200,7 @@
\expandafter\expandafter\expandafter \lq_double_decide_ii
\else
\endgroup
+ \niceverb_maybe_qs %% 2011/09/09
\expandafter\expandafter\expandafter \NVerb
\expandafter\expandafter\expandafter \'%
\fi
@@ -632,6 +637,22 @@
%% the ampersand in single (non-verbatim) quotes.
% TODO \qtdverb!? alternative meaning for \LQverb!? 2010/03/06
% rather rare, & takes less space 2010/03/09
+%% |\AddQuotes| automatically surrounds code with single quotes.
+%% I have so often felt that it was a design mistake
+%% to drop them (2011/09/09):
+\newcommand*{\AddQuotes}{%
+ \let\niceverb_maybe_qs\niceverb_add_qs}
+\newcommand*{\niceverb_add_qs}{%
+%% In a math display, quotes are suppressed even with `\AddQuotes':
+ \ifmmode\else
+ `\let\niceverb_maybe_rq\niceverb_rq
+ \fi}
+\@ifdefinable\niceverb_maybe_rq{\let\niceverb_maybe_rq\relax}
+\newcommand*{\niceverb_rq}{'\let\niceverb_maybe_rq\relax}
+%% You can undo this by |\DontAddQuotes|:
+\newcommand*{\DontAddQuotes}{\let\niceverb_maybe_qs\relax}
+%% The default will be the behaviour that we had before:
+\DontAddQuotes
%% |\dqtd{<text>}| can be used for enclosing in \emph{double} quotes
%% with the dangerous `\nvAllRightQuotesSansSerif' (see above).
\newcommand*{\dqtd}[1]{``#1"}
@@ -804,3 +825,6 @@ v0.43 2011/05/09 \gt, \lt
2011/06/20 \MakeActiveLetHere in \nice_maybe_meta_verb !!!
2011/06/27 2011/05/27 undone
2011/08/20 `r0.42', `v0.43'
+with nicetext RELEASE r0.43
+v0.44 2011/09/09 \AddQuotes, \DontAddQuotes
+
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/README-run.txt b/Master/texmf-dist/tex/latex/nicetext/run/README-run.txt
index e4229bfc571..a953d293e83 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/README-run.txt
+++ b/Master/texmf-dist/tex/latex/nicetext/run/README-run.txt
@@ -3,7 +3,7 @@ arseneau.tex and substr.tex demonstrate the "auto" feature
of makedoc.sty, see makedoc.pdf.
copyfile.tex and fdtxttex.tex are dialogues.
Replace copyfile.cfg by atari.cfg to get a conversion sample.
-The .tpl files are templates for script files.
-See FILEs.txt and fifinddo.pdf for additional informations.
+The .tpl files are templates for script files. See FILEs.txt,
+fifinddo.pdf, and makedoc.pdffor additional informations.
-UL 2011-08-23
+UL 2011-09-14
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/atari.cfg b/Master/texmf-dist/tex/latex/nicetext/run/atari.cfg
index fa7179f5788..c226fd434ca 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/atari.cfg
+++ b/Master/texmf-dist/tex/latex/nicetext/run/atari.cfg
@@ -1,7 +1,6 @@
-\ProvidesFile{atari.cfg}[2011/08/23 sample for copyfile.tex]
+\ProvidesFile{atari.cfg}[2011/09/13 sample for copyfile.tex]
\catcode`\_=11
\InputFile{atari.txt}
\TextCodesFile{atari.fdf}
\ResultFile{iso.txt}
-% \toscreentrue
\endinput
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/atari.fdf b/Master/texmf-dist/tex/latex/nicetext/run/atari.fdf
index 6037cab688f..e2f80cdfa6e 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/atari.fdf
+++ b/Master/texmf-dist/tex/latex/nicetext/run/atari.fdf
@@ -1,8 +1,11 @@
-\ProvidesFile{atari.fdf}[2010/08/23 Atari to ISO-8859-1 with blog.sty]
+\ProvidesFile{atari.fdf}[2010/08/29
+ Atari German to ISO-8859 with blog.sty]
%% was \AtariCodes from 2010/08/24 till 2011/08/22:
\def\TextCodes{%
\MakeActiveDef{}\MakeActiveDef{}\MakeActiveDef{}%
\MakeActiveDef{}\MakeActiveDef{}\MakeActiveDef{}%
+%% So far it is Code Page 437. Sharp S is special %% 2011/08/29
+%% (cf. umlaute.pdf from the umlaute package):
\MakeActiveDef{}%
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/copyfile.cfg b/Master/texmf-dist/tex/latex/nicetext/run/copyfile.cfg
index d4f1f469435..63da90bfbc9 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/copyfile.cfg
+++ b/Master/texmf-dist/tex/latex/nicetext/run/copyfile.cfg
@@ -1,7 +1,6 @@
-\ProvidesFile{copyfile.cfg}[2011/08/22 initializing copyfile.tex]
+\ProvidesFile{copyfile.cfg}[2011/09/13 initializing copyfile.tex]
\catcode`\_=11
\InputFile{lines.txt}
\TextCodesFile{}
\ResultFile{lns.txt}
-% \toscreentrue
\endinput
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/copyfile.tex b/Master/texmf-dist/tex/latex/nicetext/run/copyfile.tex
index 3c8ae98da3e..f532ed4c545 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/copyfile.tex
+++ b/Master/texmf-dist/tex/latex/nicetext/run/copyfile.tex
@@ -1,28 +1,23 @@
-\ProvidesFile{copyfile.tex}[{2011/08/22 copy*ing/converting (UL)}]
+\ProvidesFile{copyfile.tex}[2011/09/13 copy*ing/converting (UL)]
\RequirePackage{fddial0g}
-\newcommand*{\TextCodesFile}{\def\text_codes_file_name}
-\TextCodesFile{} \let\TextCodes\relax
-\input{copyfile.cfg}
-
-\Announce{ * copyfile.tex * compressing blank lines/converting
- ^^J}
- {copyfile.cfg}
-\newcommand*{\Dialogue}{%
- \FD_dialogue_screen{%
- \string\InputFile {\input_file_name}^^J%
- \string\TextCodesFile{\text_codes_file_name}^^J%
- \string\ResultFile{\result_file_dialogue}%
- }%
-}
-\newcommand*{\RunWithSettings}{%
- \run_with_settings_gen{%
- \ifx\text_codes_file_name\empty\else
- \input{\text_codes_file_name}%
- \fi
- \CopyFile*[\TextCodes]{\input_file_name}%
- }%
+\MakeSet{codes-f}{\TextCodesFile}
+\let\TextCodes\relax %% avoid errmessage
+\TryDialogueCFG{copyfile}{%
+ \InputFile{lines.txt}
+ \TextCodesFile{atari.fdf}
+ \ResultFile{lns.txt}}
+\Announce{ * copyfile.tex * compressing blank lines/converting^^J}
+\newcommand*{\VarShowSettings}{%
+ \ShowSet{in-f}\LBrk
+ \ShowSet{codes-f}\LBrk
+ \ShowSet{out-f}}
+\newcommand*{\VarRunSettings}{%
+ \typeout{`copyfile.tex' generating `\UseSet{out-f}'}
+ \UseResultFile{\UseSet{out-f}}
+ \IfEmptySet{codes-f}{}{\input{\UseSet{codes-f}}}
+ \CopyFile*[\TextCodes]{\UseSet{in-f}}%
}
-\Dialogue
+\DialogueLoop
\stop
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/fddial0g.sty b/Master/texmf-dist/tex/latex/nicetext/run/fddial0g.sty
index 6c9b255c6e6..3e3a56ab830 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/fddial0g.sty
+++ b/Master/texmf-dist/tex/latex/nicetext/run/fddial0g.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{fddial0g}[2011/08/23 dialogues with fifinddo (UL)]
+\ProvidesPackage{fddial0g}[2011/09/13 v0.2 dialogues with fifinddo (UL)]
%% copyright (C) 2011 Uwe L\"uck,
%%
%% http://www.contact-ednotes.sty.de.vu
@@ -16,59 +16,177 @@
%%
%% http://www.contact-ednotes.sty.de.vu
%%
-%% T0D0: more abstract setting and using of variables
-%% so the user must not invent names and see underscores.
-%% (Probably use namemod.)
-%%
\RequirePackage{fifinddo}
\catcode`\_=11
+%% == Setting and Using Variables ==
+%% %% aus `fddialog.sty' in `blog/convert/' 2011/09/12:
+\newcommand*{\FDD_set}{set:}
+\newcommand*{\FDD_use}{use:}
+%% |\MakeSet{<id>}{<set>}| declares an internal variable `<id>'
+%% and defines a command `<set>' so that `<set>{<value>}'
+%% will assign <value> to <id>:
+\newcommand*{\MakeSet}[2]{%
+ \@namedef{\FDD_set#1}{#2}%
+ \newcommand*{#2}{\@namedef{\FDD_use#1}}
+}
+%% It would be nice if there were a warning when in an evaluation
+%% of a variable it turns out that it has not been ``declared" by
+%% `\MakeSet' or not been set by the according setting command.
+%% However, all the evaluations seem to happen in expansion
+%% (e.g., during `\typeout'), so \LaTeX's `\PackageError'
+%% (not even `\GenericError') is not helpful,
+%% and `\errhelp' cannot be set specifically (in time).
+%% It may tell more generally about `\MakeSet', but I am not sure
+%% about what errors can occur in processing the dialogues at all.
+%% At least we can get a real `\errmessage' using something else
+%% that has not been defined:
+\newcommand*{\FDD_check_use}[1]{%
+ \@ifundefined{\FDD_use#1}%
+ {\@ifundefined{\FDD_set#1}%
+ {\FDD_undeclared_variable `#1'}%
+ {\FDD_undefined_variable `#1'}}%
+}
+%% |\UseSet{<id>}| expands to <id>'s value.
+\newcommand*{\UseSet}[1]{%
+ \FDD_check_use{#1}{\csname\FDD_use#1\endcsname}}
+%% |\EvalBooleanSet{<id>}|:
+\newcommand*{\EvalBooleanSet}[1]{%
+ \FDD_check_use{#1}{%
+ \csname
+ \FDD_on_setstring\@gobble{#1}%% \if id
+ \csname\FDD_use#1\endcsname %% true/false
+ \endcsname
+ }%
+}
+\newcommand*{\FDD_on_setstring}[2]{%
+ \expandafter\FDD_double_xpa\expandafter
+ #1\expandafter\expandafter\expandafter
+ \string\csname\FDD_set#2\endcsname}
+\def\FDD_double_xpa{\expandafter\expandafter\expandafter}
+%% |\IfEmptySet{<id>}{<if>}{<unless>}|:
+\newcommand*{\IfEmptySet}[1]{%
+ \if^^J\UseSet{#1}^^J\expandafter\@firstoftwo
+ \else\expandafter\@secondoftwo\fi}
+%% TODO present variable names by tokens!? (namemod)
+%%
+%% |\DebugShowSet{<id>}|:
+\newcommand*{\DebugShowVar}[1]{%
+ \expandafter\show\csname\FDD_use#1\endcsname}
+%%
+%% == In/Out Variables ==
%% |\ResultFile| gets a different meaning here
%% in order to keep the dialogue nice.
-%% `\result_file_name' must be reserved for the original
-%% meaning of `\ResultFile'.
-\let\UseResultFile\ResultFile
-\def\ResultFile{\def\result_file_dialogue}
-\newcommand\InputFile{\def\input_file_name}
-\newif\iftoscreen
-
-\def\Announce#1#2{%
+\let\UseResultFile\ResultFile
+\let\ResultFile\relax
+\MakeSet{out-f}{\ResultFile}
+\MakeSet {in-f}{\InputFile}
+\MakeSet{cfg-f}{\CFGname}
+%% == `.cfg' ==
+%% |\TryDialogue{<file-name-base>}{<settings>}|
+%% loads file `<file-name-base>.cfg' if \TeX\ can find it,
+%% otherwise executes <settings>:
+\newcommand*{\TryDialogueCFG}[2]{%
+ \CFGname{#1}%
+ \InputIfFileExists{#1.cfg}%
+ {\typeout{^^J
+ * using settings from `#1.cfg'. *
+ ^^J}}%
+ {#2}%
+}
+%%
+%% == Screen ==
+\newcommand*{\Announce}[1]{%
\typeout{%
\FD_dialogue_double_line
^^J#1^^J%
The screen shows most recent settings commands.^^J%
- You can modify initial settings in #2.^^J%
- }%
+ You can modify initial settings in
+ `\UseSet{cfg-f}.cfg'.^^J}%
}
-\def\FD_dialogue_screen#1{%
- \typeout{%
- \FD_dialogue_double_line^^J%
- #1%
- \FD_dialogue_double_line
- }%
- \typein[\action]%
- {Run with these settings? (Y)es? (C)hange? (Otherwise quit.)}%
- \csname action_\action \endcsname
+%% |\DialogueLoop| is the last mandatory command in the
+%% main script file. It needs an earlier definition of
+%% |\VarShowSettings|. |\LBrk| can be used for a
+%% screen line break: %% TODO \MessageBreak \relax!?
+\newcommand*{\DialogueLoop}{%
+ {\def\LBrk{^^J}%
+ \typeout{%
+ \FD_dialogue_double_line^^J%
+ \VarShowSettings %% specific to purpose
+ \FD_dialogue_double_line}%
+ }%
+ \typein[\action]%
+ {Run with these settings?
+ (Y)es? (C)hange? (Otherwise quit.)}%
+ \csname FDD_action_\action \endcsname
}
\def\FD_dialogue_double_line{%
^^J%
===========================================================}
-\def\run_with_settings_gen#1{%
- \UseResultFile{\result_file_dialogue}%
- #1%
+%% For defining |\VarShowSettings|:
+\newcommand*{\ShowSet}[1]{%
+ \FDD_check_use{#1}{%
+% \expandafter\expandafter\expandafter
+% \string\csname\FDD_set#1\endcsname
+ \FDD_on_setstring\@empty{#1}%
+ {\UseSet{#1}}%
+ }%
+}
+\newcommand*{\TimesDo}[2]{%
+ \ifnum\number#1>\z@
+ #2\expandafter\@firstofone
+ \else
+ \expandafter\@gobble
+ \fi
+ {\expandafter\TimesDo\expandafter
+ {\number\predecessor_of{#1} }{#2}}%
+}
+\newcommand*{\predecessor_of}[1]{%
+ \ifnum#1>9
+ \expandafter\twodig_predecessor_of
+ \else
+ \expandafter\onedig_predecessor_of
+ \fi
+ #1}
+\newcommand*{\onedig_predecessor_of}[1]{%
+ \ifcase #1\or0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}
+\newcommand*{\twodig_predecessor_of}[2]{%
+ \ifcase #2
+ \onedig_predecessor_of#19\or
+ #10\or#11\or#12\or#13\or#14\or#15\or#16\or#17\or#18\or#19\fi}
+
+\newcommand*{\Spaces}[1]{\TimesDo{#1}{\space}}
+
+%%
+%% == Changing Settings ==
+%% When the user types `c' or `C', she is asked to input
+%% replacement text for the macro |\change|.
+%% This macro then is executed, and |\DialogueLoop|
+%% is invoked again:
+\newcommand*{\FDD_action_c}{\FDD_change_settings}
+\newcommand*{\FDD_action_C}{\FDD_change_settings}
+\newcommand*{\FDD_change_settings}{%
+ \typein[\change]{^^JType setting command(s).}%
+ \change \DialogueLoop}
+%% == Running with Current Settings ==
+\newcommand*{\FDD_action_y}{\FDD_run_with_settings}
+\newcommand*{\FDD_action_Y}{\FDD_run_with_settings}
+%% When the user types `y' or `Y', the following macro is executed.
+%% It invokes |\VarRunSettings| that must be defined
+%% before `\DialogueLoop' is executed:
+\newcommand*{\FDD_run_with_settings}{%
+ \VarRunSettings %% specific to purpose
\CloseResultFile
\typeout{Done.}%
- \Dialogue
-}
-\def\FD_corrected_input_line{%
- \expandafter \MakeDocCorrectHook \expandafter{\fdInputLine}}
-\@namedef{action_y}{\RunWithSettings}
-\@namedef{action_Y}{\RunWithSettings}
-\def\change_settings{%
- \typein[\change]{^^JType setting command(s).}%
- \change \Dialogue}
-\expandafter\let\csname action_c\endcsname \change_settings
-\expandafter\let\csname action_C\endcsname \change_settings
-
+ \DialogueLoop}
+%%
+%% == The End ==
\endinput
+
+== VERSION HISTORY ==
+
+v0.1 2011/08/23 first, uploaded with NICETEXT r0.43
+v0.2 2011/09/12 merged with something earlier/better, messages
+ 2011/09/13 messages more carefully: ...undefined_var...,
+ \EvalBooleanSet, \TimesDo with two digits
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.cfg b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.cfg
index 50c52d6eaab..452ea5173a2 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.cfg
+++ b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.cfg
@@ -1,8 +1,9 @@
-\ProvidesFile{fdtxttex.cfg}[2010/11/25 initializing fdtxttex.tex]
-\catcode`\_=11
+\ProvidesFile{fdtxttex.cfg}[2011/09/13 initializing fdtxttex.tex]
+\JobName{sample}
+\InputExtension{txt}
+\OutputExtension{tex}
\CorrectionFile{mdoccorr.cfg}
-%% Note different meaning for 'fdtxttex.tex':
-\ResultFile{sample.tex}
-\InputFile{sample.txt}
-% \toscreentrue
+\FileHeader{\protect\WriteProvides}
+\FileFooter{}
+\ShowLines{false}
\endinput
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tex b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tex
index 81353508933..0c17662f5d8 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tex
+++ b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tex
@@ -1,39 +1,54 @@
-\ProvidesFile{fdtxttex.tex}[2011/08/23 txt to TeX by dialogue (UL)]
+\ProvidesFile{fdtxttex.tex}[2011/09/13 txt to TeX by dialogue (UL)]
\RequirePackage{fddial0g}
-%% Dialogue settings:
-\newcommand\CorrectionFile{\def\mdoc_corr}
-%% Default settings (modify for your own):
-\input{fdtxttex.cfg}
-%% Screen:
+% \errorcontextlines=4
+\MakeSet{job-name}{\JobName}
+\MakeSet{in-ext} {\InputExtension}
+\MakeSet{out-ext} {\OutputExtension}
+\MakeSet{corr-f} {\CorrectionFile}
+\MakeSet{f-head} {\FileHeader}
+\MakeSet{f-foot} {\FileFooter}
+\newif\ifShowLines
+\MakeSet{show-l} {\ShowLines}
+\TryDialogueCFG{fdtxttex}{%
+ \JobName{sample}
+ \InputExtension{txt}
+ \OutputExtension{tex}
+ \CorrectionFile{mdoccorr.cfg}
+ \FileHeader{\protect\WriteProvides}
+ \FileFooter{}
+ \ShowLines{false}
+}
+% \DebugShowVar{cfg-f}
\Announce{ *fdtxttex.tex* txt to TeX by dialogue^^J
(apply \string\MakeDocCorrectHook)^^J}
- {fdtxttex.cfg}
-\newcommand*{\Dialogue}{%
- \FD_dialogue_screen{%
- \string\CorrectionFile{\mdoc_corr}
- \space (define \BackslashChar MakeDocCorrectHook)^^J%
- \string\InputFile \space\space\space\space\space
- {\input_file_name}^^J%
- \string\ResultFile\space\space\space\space
- {\result_file_dialogue}
- \space\space\space
- \string\toscreen\iftoscreen true\else false\fi
- }%
+\newcommand*{\VarShowSettings}{%
+ \ShowSet{job-name}\LBrk\Spaces{15}
+ \ShowSet{in-ext} \space
+ \ShowSet{out-ext}\LBrk
+ \ShowSet{corr-f}
+ (define \BackslashChar MakeDocCorrectHook)\LBrk
+ \ShowSet{f-head}\LBrk
+ \ShowSet{f-foot}\LBrk
+ \Spaces{15}
+ \ShowSet{show-l}
}%
-\newcommand*{\RunWithSettings}{%
- \run_with_settings_gen{%
- \input{\mdoc_corr}%
- \WriteProvides
- \ProcessFileWith{\input_file_name}{%
- \WriteResult{\FD_corrected_input_line}%
- \iftoscreen
- \typeout{\FD_corrected_input_line}%
- \else
- \message{.}%
- \fi}%
- }%
+\newcommand*{\VarRunSettings}{%
+ \input{\UseSet{corr-f}}%
+ \typeout{`fdtxttex.tex' generating
+ `\UseSet{job-name}.\UseSet{out-ext}'.}%
+ \UseResultFile{\UseSet{job-name}.\UseSet{out-ext}}%
+ \IfEmptySet{f-head}{}{\UseSet{f-head}}%
+ \EvalBooleanSet{show-l}%
+ \ProcessFileWith{\UseSet{job-name}.\UseSet{in-ext}}{%
+ \WriteResult{\CorrectedInputLine}%
+ \ifShowLines
+ \typeout{\CorrectedInputLine}%
+ \else
+ \message{.}%
+ \fi}%
+ \IfEmptySet{f-foot}{}{\UseSet{f-foot}}%
}
- \errorcontextlines=4
-\Dialogue
+
+\DialogueLoop
\stop
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tpl b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tpl
index 30f3978847f..b50b9f79c26 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tpl
+++ b/Master/texmf-dist/tex/latex/nicetext/run/fdtxttex.tpl
@@ -1,14 +1,11 @@
-\ProvidesFile{fdtxttex.tpl}[{2011/08/21 [2010/03/30]
- fifinddo correction template}]
+\ProvidesFile{fdtxttex.tpl}[2011/09/13 fifinddo correction template]
\RequirePackage{fifinddo}
\input{mdoccorr.cfg}
\ResultFile{sample.tex}
\WriteProvides
\ProcessFileWith{sample.txt}{%
- \typeout{\expandafter \MakeDocCorrectHook
- \expandafter{\fdInputLine}}%
- \WriteResult{\expandafter \MakeDocCorrectHook
- \expandafter{\fdInputLine}}%
+ \typeout{\CorrectedInputLine}%
+ \WriteResult{\CorrectedInputLine}%
}
\CloseResultFile
\stop
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/makedoc.tpl b/Master/texmf-dist/tex/latex/nicetext/run/makedoc.tpl
index cd38f303933..69b2b957a28 100644
--- a/Master/texmf-dist/tex/latex/nicetext/run/makedoc.tpl
+++ b/Master/texmf-dist/tex/latex/nicetext/run/makedoc.tpl
@@ -1,6 +1,5 @@
-\ProvidesFile{makedoc.tpl}[{2011/08/23
- makedoc preprocessing template}]
-\typeout{makedoc.tpl makedoc correction template}
+\ProvidesFile{makedoc.tpl}[2011/09/14
+ makedoc preprocessing template]
\RequirePackage{makedoc}
\renewcommand*{\mdJobName}{SAMPLE}
\input{mdoccorr.cfg}
@@ -8,12 +7,8 @@
\HeaderLines{0}
\ProcessLineMessage{}
\MainDocParser{%
-% \typeout{\ProcessInputWith{dots}}%
% \WriteResult{\ProcessInputWith{dots}}%
- \typeout{\expandafter \MakeDocCorrectHook
- \expandafter{\fdInputLine}}%
- \WriteResult{\expandafter \MakeDocCorrectHook
- \expandafter{\fdInputLine}}%
+ \WriteResult{\CorrectedInputLine}%
}
\MakeCloseDoc{\mdJobName.TEX}
\stop
diff --git a/Master/texmf-dist/tex/latex/nicetext/run/u8atablg.fdf b/Master/texmf-dist/tex/latex/nicetext/run/u8atablg.fdf
new file mode 100644
index 00000000000..17a28555e67
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nicetext/run/u8atablg.fdf
@@ -0,0 +1,34 @@
+\ProvidesFile{u8atablg.fdf}[2011/09/12 UTF-8->Atari/blog with fdtxttex]
+\SetPatternCodes{\MakeOther\&\MakeOther\\\MakeOther\ }
+\StartPrependingChain
+\PrependExpandableAllReplacer{amp} {&}{\&}
+%% <- for blog.sty. Next are Atari umlauts,
+%% cf. 'umlaute' documentation:
+\PrependExpandableAllReplacer{auml} {ä}{}
+\PrependExpandableAllReplacer{ouml} {ö}{}
+\PrependExpandableAllReplacer{uuml} {ü}{}
+\PrependExpandableAllReplacer{szlig}{ß}{}
+\PrependExpandableAllReplacer{Auml} {Ä}{}
+\PrependExpandableAllReplacer{Ouml} {Ö}{}
+\PrependExpandableAllReplacer{Uuml} {Ü}{}
+%% ... TODO as \TextCodes!? `' one-parameter macro
+%% there must be no space left of last argument.
+%% `\endash{}' is not a solution because 'blog.sty'
+%% then would display the braces:
+\PrependExpandableAllReplacer{apostr} {’}{'}
+\PrependExpandableAllReplacer{item} {•}{\item }
+\PrependExpandableAllReplacer{item } {• }{\item\ }
+\PrependExpandableAllReplacer{endash} {–}{\endash }
+\PrependExpandableAllReplacer{endash }{– }{\endash\ }
+\PrependExpandableAllReplacer{hellip} {…}{\dots }
+\PrependExpandableAllReplacer{hellip }{… }{\dots\ }
+\PrependExpandableAllReplacer{to} {→}{\to }
+\PrependExpandableAllReplacer{to } {→ }{\to\ }
+% \newcommand*{\PXAR}{\PrependExpandableAllReplacer}
+% \PXAR{dots}{...}{.\kern\fontdimen3\font.\kern\fontdimen3\font.}
+%% Tomboy 2011/09/12:
+% \PrependExpandableAllReplacer {it} {<italic>}{<i>}
+% \PrependExpandableAllReplacer{/it}{</italic>}{</i>}
+\SetCorrectHookJobLast
+\endinput
+