From f8365488a670454b3ac86c9e4292cebd56991927 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Mon, 20 Jun 2022 14:40:50 +0000 Subject: [CWEB] Update translated macros. git-svn-id: svn://tug.org/texlive/trunk@63661 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex | 16 +++++++------ .../tex/plain/cweb/cwebbin/dcwebstrings.tex | 3 ++- .../texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex | 20 +++++++++-------- .../texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex | 26 +++++++++++++--------- 4 files changed, 37 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/plain') diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex index d74e5bff025..826a514e8b4 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex @@ -27,6 +27,7 @@ % Version 3.64 [p20] --- Andreas Scherer, March 2002 % Version 3.64 [p21] --- Andreas Scherer, Octobre 2005 % Version 3.64 [p22] --- Andreas Scherer, March 2016 +% Version 4.9 --- Andreas Scherer, June 2022 \ifx\undefined\botofcontents\input cwebmac.tex\fi @@ -53,28 +54,28 @@ \def\fin{\par\vfill\eject % this is done when we are ending the index \ifpagesaved\null\vfill\eject\fi % output a null index column \if L\lr\else\null\vfill\eject\fi % finish the current page - \ifpdftex \makebookmarks \fi % added in Version 3.68 + \ifpdf \ifpdftex \makebookmarks % added in Version 3.68 + \countsections \fi\fi % and in Version 4.9 \parfillskip 0pt plus 1fil \let\topsecno=\nullsec \redeffin \output={\normaloutput\page\lheader\rheader} \setpage - \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}} + \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}} \def\I{\par\hangindent 2em}\let\*=* - \ifacro \let\Xpdf\X + \ifpdf \let\Xpdf\X \ifpdftex \pdfdest name {NOS} fith - \pdfoutline goto name {NOS} count -\secno {\outsecname} + \pdfoutline goto name {NOS} count -\the\countD {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \pdfoutline goto num \the\toksA \expandafter{\the\toksE}} - \else\ifpdf - \special{pdf: outline -1 << /Title (\outsecname) + \else \special{pdf: outline -1 << /Title (\outsecname) /Dest [ @thispage /FitH @ypos ] >>} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \special{pdf: outline 0 << /Title (\the\toksE) /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}} - \fi\fi\fi + \fi\fi \readsections} \def\con{\par\vfill\eject % finish the section names % \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers @@ -83,6 +84,7 @@ \titletrue % prepare to output the table of contents \pageno=\contentspagenumber \redefcon + \ifhint\HINThome\fi% Mark the Table of contents as home page \topofcontents \startpdf \line{\headerline} \let\ZZ=\contentsline diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebstrings.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebstrings.tex index 28049f3b4c1..7f6417dfedf 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebstrings.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebstrings.tex @@ -36,5 +36,6 @@ \def\redefcon{\message{Inhaltsverzeichnis:} \def\grouptitle{INHALTSVERZEICHNIS:} - \def\headerline{\hfil Abschnitt\hbox to3em{\hss Seite}} + \def\headerline{\hfil Abschnitt\ifhint\else\hbox to3em{\hss Seite}\fi} + % No Page in HINT } diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex index 9a19a884074..a28944c1d73 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex @@ -25,8 +25,9 @@ % Version 3.61 [p18] --- Andreas Scherer, July 2000 % Version 3.63 [p19] --- Andreas Scherer, January 2001 % Version 3.64 [p20] --- Andreas Scherer, March 2002 -% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005 +% Version 3.64 [p21] --- Andreas Scherer, October 2005 % Version 3.64 [p22] --- Andreas Scherer, March 2016 +% Version 4.9 --- Andreas Scherer, June 2022 % french translations --- Denis Roegel, 18 September 1994 @@ -73,34 +74,34 @@ \def\fin{\par\vfill\eject % this is done when we are ending the index \ifpagesaved\null\vfill\eject\fi % output a null index column \if L\lr\else\null\vfill\eject\fi % finish the current page - \ifpdftex \makebookmarks \fi % added in Version 3.68 + \ifpdf \ifpdftex \makebookmarks % added in Version 3.68 + \countsections \fi\fi % and in Version 4.9 \parfillskip 0pt plus 1fil \def\grouptitle{NOMS DES SECTIONS} \let\topsecno=\nullsec \message{Noms des sections:} \output={\normaloutput\page\lheader\rheader} \setpage - \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}} + \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}} \def\Q{\note{Cit\'e dans la section}} % crossref for mention of a section \def\Qs{\note{Cit\'e dans les sections}} % crossref for mentions of a section \def\U{\note{Utilis\'e dans la section}} % crossref for use of a section \def\Us{\note{Utilis\'e dans les sections}} % crossref for uses of a section \def\I{\par\hangindent 2em}\let\*=* - \ifacro \def\outsecname{Noms des sections} \let\Xpdf\X + \ifpdf \def\outsecname{Noms des sections} \let\Xpdf\X % \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69 - \pdfoutline goto name {NOS} count -\secno {\outsecname} + \pdfoutline goto name {NOS} count -\the\countD {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \pdfoutline goto num \the\toksA \expandafter{\the\toksE}} - \else\ifpdf - \special{pdf: outline -1 << /Title (\outsecname) + \else \special{pdf: outline -1 << /Title (\outsecname) /Dest [ @thispage /FitH @ypos ] >>} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \special{pdf: outline 0 << /Title (\the\toksE) /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}} - \fi\fi\fi + \fi\fi \readsections} \def\con{\par\vfill\eject % finish the section names % \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers @@ -110,8 +111,9 @@ \pageno=\contentspagenumber \def\grouptitle{SOMMAIRE:} \message{Sommaire:} + \ifhint\HINThome\fi% Mark the Table of contents as home page \topofcontents \startpdf - \line{\hfil Section\hbox to3em{\hss Page}} + \line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT \let\ZZ=\contentsline \readcontents\relax % read the contents info \botofcontents \end} % print the contents page(s) and terminate diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex index d3eeca269e7..974e7993b46 100644 --- a/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex +++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex @@ -25,8 +25,9 @@ % Version 3.61 [p18] --- Andreas Scherer, July 2000 % Version 3.63 [p19] --- Andreas Scherer, January 2001 % Version 3.64 [p20] --- Andreas Scherer, March 2002 -% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005 +% Version 3.64 [p21] --- Andreas Scherer, October 2005 % Version 3.64 [p22] --- Andreas Scherer, March 2016 +% Version 4.9 --- Andreas Scherer, June 2022 \ifx\undefined\botofcontents\input cwebmac.tex\fi @@ -74,13 +75,15 @@ \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \closeout\cont % the contents information has been fully gathered \output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi - \global\setbox\sbox=\page \global\pagesavedtrue} + \global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}} \pagesavedfalse \eject % eject the page-so-far and predecessors \setbox\sbox\vbox{\unvbox\sbox} % take it out of its box \vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height \hsize=.5\pagewidth \advance\hsize by -10pt % column width for the index (20pt between cols) + \ifhint\else \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines + \fi \def\lr{L} % this tells whether the left or right column is next \output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R} \else\normaloutput{\vbox to\pageheight{\box\sbox\vss @@ -89,7 +92,7 @@ \message{Indice Analitico:} \parskip 0pt plus .5pt \outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em - \ifacro\pdfnote##2.\else##2\fi.} % index entry + \ifacrohint\pdfnote##2.\else##2\fi.} % index entry \def\[##1]{$\underline{##1}$} % underlined index item \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar \hyphenpenalty 10000 \parindent0pt @@ -97,34 +100,34 @@ \def\fin{\par\vfill\eject % this is done when we are ending the index \ifpagesaved\null\vfill\eject\fi % output a null index column \if L\lr\else\null\vfill\eject\fi % finish the current page - \ifpdftex \makebookmarks \fi % added in Version 3.68 + \ifpdf \ifpdftex \makebookmarks % added in Version 3.68 + \countsections \fi\fi % and in Version 4.9 \parfillskip 0pt plus 1fil \def\grouptitle{NOMI DELLE SEZIONI} \let\topsecno=\nullsec \message{Nomi delle sezioni:} \output={\normaloutput\page\lheader\rheader} \setpage - \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}} + \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}} \def\Q{\note{Citato nella sezione}} % crossref for mention of a section \def\Qs{\note{Citato nelle sezioni}} % crossref for mentions of a section \def\U{\note{Usato nella sezione}} % crossref for use of a section \def\Us{\note{Usato nelle sezioni}} % crossref for uses of a section \def\I{\par\hangindent 2em}\let\*=* - \ifacro \def\outsecname{Nomi delle sezioni} \let\Xpdf\X + \ifpdf \def\outsecname{Nomi delle sezioni} \let\Xpdf\X % \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69 - \pdfoutline goto name {NOS} count -\secno {\outsecname} + \pdfoutline goto name {NOS} count -\the\countD {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \pdfoutline goto num \the\toksA \expandafter{\the\toksE}} - \else\ifpdf - \special{pdf: outline -1 << /Title (\outsecname) + \else \special{pdf: outline -1 << /Title (\outsecname) /Dest [ @thispage /FitH @ypos ] >>} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% \special{pdf: outline 0 << /Title (\the\toksE) /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}} - \fi\fi\fi + \fi\fi \readsections} \def\con{\par\vfill\eject % finish the section names % \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers @@ -134,8 +137,9 @@ \pageno=\contentspagenumber \def\grouptitle{INDICE} \message{Indice:} + \ifhint\HINThome\fi% Mark the Table of contents as home page \topofcontents \startpdf - \line{\hfil Sezione\hbox to3em{\hss Pag.}} + \line{\hfil Sezione\ifhint\else\hbox to3em{\hss Pag.}\fi}% No Page in HINT \let\ZZ=\contentsline \readcontents\relax % read the contents info \botofcontents \end} % print the contents page(s) and terminate -- cgit v1.2.3