diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-14 22:23:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-14 22:23:29 +0000 |
commit | 1720309de72694c4e699af26b975c1afd1239ca7 (patch) | |
tree | 8a4cc1f90ea1234bd467a44d8af731ad1e9acd58 /Master/texmf-dist/tex/latex/nicetext | |
parent | 373aa91278777ff3556416ccf46bc9530ff30aa3 (diff) |
nicetext 0.44 (14sep11)
git-svn-id: svn://tug.org/texlive/trunk@23956 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/nicetext')
14 files changed, 315 insertions, 128 deletions
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 + |