summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/cwebdir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-09 23:52:01 +0000
committerKarl Berry <karl@freefriends.org>2019-01-09 23:52:01 +0000
commite95489acb4b55ad6f4f7f0fec83f6396a133d265 (patch)
treecf7a3a5ca382ef84a068ed654d68afa6716f29fb /Build/source/texk/web2c/cwebdir
parentb13fce1d942b61b6d2c79f716c30258cb9deb01b (diff)
cweb help msg update from andreas
git-svn-id: svn://tug.org/texlive/trunk@49655 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cwebdir')
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch97
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/web2c-help.mobin3657 -> 3657 bytes
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/web2c-help.po54
-rw-r--r--Build/source/texk/web2c/cwebdir/po/web2c-help.pot52
4 files changed, 116 insertions, 87 deletions
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 84ad9ada53a..e6300f6c36f 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -226,9 +226,10 @@ if ((found_filename=kpse_find_cweb(web_file_name))==NULL || @|
(web_file=fopen(found_filename,"r"))==NULL) {
fatal(_("! Cannot open input file "), web_file_name);
} else if (strlen(found_filename) < max_file_name_length) {
+ /* Copy name for |#line| directives. */
if (strcmp(web_file_name, found_filename))
strcpy(web_file_name, found_filename +
- ((found_filename[0]=='.' && found_filename[1]=='/') ? 2 : 0));
+ ((strncmp(found_filename,"./",2)==0) ? 2 : 0));
free(found_filename);
} else fatal(_("! Filename too long\n"), found_filename);
@z
@@ -241,9 +242,10 @@ if ((found_filename=kpse_find_cweb(change_file_name))==NULL || @|
(change_file=fopen(found_filename,"r"))==NULL) {
fatal(_("! Cannot open change file "), change_file_name);
} else if (strlen(found_filename) < max_file_name_length) {
+ /* Copy name for |#line| directives. */
if (strcmp(change_file_name, found_filename))
strcpy(change_file_name, found_filename +
- ((found_filename[0]=='.' && found_filename[1]=='/') ? 2 : 0));
+ ((strncmp(found_filename,"./",2)==0) ? 2 : 0));
free(found_filename);
} else fatal(_("! Filename too long\n"), found_filename);
@z
@@ -327,7 +329,7 @@ The remainder of the \.{@@i} line after the file name is ignored.
if (strlen(found_filename) < max_file_name_length) {
if (strcmp(cur_file_name, found_filename))
strcpy(cur_file_name, found_filename +
- ((found_filename[0]=='.' && found_filename[1]=='/') ? 2 : 0));
+ ((strncmp(found_filename,"./",2)==0) ? 2 : 0));
free(found_filename);
} else fatal(_("! Filename too long\n"), found_filename);
@z
@@ -849,35 +851,9 @@ overflow(
@z
@x
-the names of those files. Most of the 128 flags are undefined but available
-for future extensions.
-@y
-the names of those files. Most of the 128 flags are undefined but available
-for future extensions.
-
-We use `kpathsea' library functions to find literate sources. When the files
-you expect are not found, the thing to do is to enable `kpathsea' runtime
-debugging by assigning to the |kpathsea_debug| variable a small number via the
-`\.{-d}' option. The meaning of this number is shown below. To set more than
-one debugging option, simply sum the corresponding numbers.
-$$\halign{\hskip5em\tt\hfil#&&\qquad\tt#\cr
- 1&report `\.{stat}' calls\cr
- 2&report lookups in all hash tables\cr
- 4&report file openings and closings\cr
- 8&report path information\cr
-16&report directory list\cr
-32&report on each file search\cr
-64&report values of variables being looked up\cr}$$
-Debugging output is always written to |stderr|, and begins with the string
-`\.{kdebug:}'.
-@z
-
-@x
@d show_happiness flags['h'] /* should lack of errors be announced? */
@y
@d show_happiness flags['h'] /* should lack of errors be announced? */
-@d show_kpathsea_debug flags['d']
- /* should results of file searching be shown? */
@d make_xrefs flags['x'] /* should cross references be output? */
@z
@@ -1018,11 +994,23 @@ the other arrays for the argument.
{
if (strcmp("-help",*argv)==0 || strcmp("--help",*argv)==0)
@.--help@>
- @<Display help message and exit@>@;
+ @<Display help message and |exit|@>@;
if (strcmp("-version",*argv)==0 || strcmp("--version",*argv)==0)
@.--version@>
- @<Display version information and exit@>@;
+ @<Display version information and |exit|@>@;
+ if (strcmp("-verbose",*argv)==0 || strcmp("--verbose",*argv)==0)
+@.--verbose@>
+ { show_banner=show_progress=show_happiness=1; continue; }
+ if (strcmp("-quiet",*argv)==0 || strcmp("--quiet",*argv)==0)
+@.--quiet@>
+ { show_banner=show_progress=show_happiness=0; continue; }
for(dot_pos=*argv+1;*dot_pos>'\0';dot_pos++)
+ if (*dot_pos=='v') {
+ show_banner=show_progress=show_happiness=1;
+ } else
+ if (*dot_pos=='q') {
+ show_banner=show_progress=show_happiness=0;
+ } else
if (*dot_pos=='d') {
if (sscanf(*argv+2,"%u",&kpathsea_debug)!=1) @<Print usage error...@>@;
} else
@@ -1039,6 +1027,7 @@ the other arrays for the argument.
@z
@x
+{
if (program==ctangle)
fatal(
"! Usage: ctangle [options] webfile[.w] [{changefile[.ch]|-} [outfile[.c]]]\n"
@@ -1047,6 +1036,7 @@ if (program==ctangle)
else fatal(
"! Usage: cweave [options] webfile[.w] [{changefile[.ch]|-} [outfile[.tex]]]\n"
,"");
+}
@y
cb_usage(program==ctangle ? "ctangle" : program==cweave ? "cweave" : "ctwill");
@.Usage:@>
@@ -1172,11 +1162,11 @@ static void check_change(void);@/
static void prime_the_change_buffer(void);@/
@* Standard C library interfaces. This updated version of \.{CWEB} uses
-standard C types for pointers, boolean values, and objects with fixed sizes.
+standard C types for boolean values, pointers, and objects with fixed sizes.
@<Include files@>=
-#include <stddef.h> /* type definition of |ptrdiff_t| */
#include <stdbool.h> /* type definition of |bool| */
+#include <stddef.h> /* type definition of |ptrdiff_t| */
#include <stdint.h> /* type definition of |uint8_t| et al. */
@ The |scan_args| and |cb_show_banner| routines need a few extra variables.
@@ -1258,14 +1248,15 @@ searched for files, if they could not be found in the current directory.
This version uses the \Kpathsea/ mechanism for searching files.
The directories to be searched for come from three sources:
-
- (a)~a user-set environment variable \.{CWEBINPUTS}
- (overriden by \.{CWEBINPUTS\_cweb});\par
- (b)~a line in \Kpathsea/ configuration file \.{texmf.cnf},\hfil\break
+\smallskip
+{\parindent5em
+\item{(a)} a user-set environment variable \.{CWEBINPUTS}
+ (overriden by \.{CWEBINPUTS\_cweb});
+\item{(b)} a line in \Kpathsea/ configuration file \.{texmf.cnf},\hfil\break
e.g. \.{CWEBINPUTS=.:\$TEXMF/texmf/cweb//}
- or \.{CWEBINPUTS.cweb=.:\$TEXMF/texmf/cweb//};\hangindent=2\parindent\par
- (c)~compile-time default directories \.{.:\$TEXMF/texmf/cweb//}
- (specified in \.{texmf.in}).
+ or \.{CWEBINPUTS.cweb=.:\$TEXMF/texmf/cweb//};
+\item{(c)} compile-time default directories \.{.:\$TEXMF/texmf/cweb//}
+ (specified in \.{texmf.in}).}
@d kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)
@@ -1293,11 +1284,32 @@ different search paths.
@<Set up |PROGNAME| feature and initialize the search path mechanism@>=
kpse_set_program_name(argv[0], "cweb");
+@ When the files you expect are not found, the thing to do is to enable
+`kpathsea' runtime debugging by assigning to the |kpathsea_debug| variable a
+small number via the `\.{-d}' option. The meaning of this number is shown
+below. To set more than one debugging option, simply sum the corresponding
+numbers.
+\medskip
+\halign{\hskip5em\tt\hfil#&&\qquad\rm#\hfil\cr
+ 1&report `\.{stat}' calls\cr
+ 2&report lookups in all hash tables\cr
+ 4&report file openings and closings\cr
+ 8&report path information\cr
+16&report directory list\cr
+32&report on each file search\cr
+64&report values of variables being looked up\cr}
+\medskip
+Debugging output is always written to |stderr|, and begins with the string
+`\.{kdebug:}'.
+
+@d show_kpathsea_debug flags['d']
+ /* should results of file searching be shown? */
+
@* System dependent changes. The most volatile stuff comes at the very end.
@ Modules for dealing with help messages and version info.
-@<Display help message and exit@>=
+@<Display help message and |exit|@>=
cb_usagehelp(program==ctangle ? CTANGLEHELP :
program==cweave ? CWEAVEHELP : CTWILLHELP, NULL);
@.--help@>
@@ -1314,6 +1326,7 @@ static void cb_usagehelp (const_string *message, const_string bug_email);@/
@c
void cb_show_banner (void)
{
+ assert(cb_banner[0]!='\0');
textdomain("cweb-tl");
@.cweb-tl.mo@>
printf("%s%s\n", cb_banner, versionstring);
@@ -1353,7 +1366,7 @@ static void cb_usagehelp (const_string *message, const_string bug_email)
@ The version information will not be translated.
-@<Display version information and exit@>=
+@<Display version information and |exit|@>=
printversionandexit(cb_banner,
program == ctwill ? "Donald E. Knuth" : "Silvio Levy and Donald E. Knuth",
NULL, NULL);
diff --git a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.mo b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.mo
index 140d8d33843..b8eff120a9a 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.mo
+++ b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.mo
Binary files differ
diff --git a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
index 33a5fb22463..54ec700d7ff 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
+++ b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: CWEBbin 2018\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-01 15:41+0100\n"
-"PO-Revision-Date: 2018-12-30 10:37+0100\n"
+"POT-Creation-Date: 2019-01-07 17:10+0100\n"
+"PO-Revision-Date: 2019-01-07 17:10+0100\n"
"Last-Translator: Andreas Scherer <andreas_github@freenet.de>\n"
"Language-Team: German\n"
"Language: de\n"
@@ -25,7 +25,7 @@ msgstr "Aufruf: ctangle [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.c]]
msgid " Tangle WEBFILE with CHANGEFILE into a C/C++ program."
msgstr " Verknüpfe WEBFILE mit CHANGEFILE in ein C/C++ Programm."
-#: help.h:54 help.h:71 help.h:94
+#: help.h:54 help.h:73 help.h:98
msgid " Default CHANGEFILE is /dev/null;"
msgstr " Vorgabe für CHANGEFILE ist /dev/null;"
@@ -33,82 +33,90 @@ msgstr " Vorgabe für CHANGEFILE ist /dev/null;"
msgid " C output goes to the basename of WEBFILE extended with `.c'"
msgstr " C Ausgabe geht in den Hauptnamen des WEBFILE erweitert um `.c',"
-#: help.h:56 help.h:73 help.h:96
+#: help.h:56 help.h:75 help.h:100
msgid " unless otherwise specified by OUTFILE; in this case, '-' specifies"
msgstr " sofern nicht ein anderes OUTFILE angegeben ist; in diesem Fall"
-#: help.h:57 help.h:74 help.h:97
+#: help.h:57 help.h:76 help.h:101
msgid " a null CHANGEFILE."
msgstr " bezeichnet '-' ein leeres CHANGEFILE."
-#: help.h:59 help.h:76 help.h:99
+#: help.h:59 help.h:78 help.h:103
msgid "+b print banner line on terminal"
msgstr "+b schreibe die Startmeldung"
-#: help.h:60 help.h:78 help.h:101
+#: help.h:60 help.h:80 help.h:105
msgid "+h print success message on completion"
msgstr "+h schreibe die Erfolgsmeldung am Ende"
-#: help.h:61 help.h:81 help.h:105
+#: help.h:61 help.h:83 help.h:109
msgid "+p print progress report messages"
msgstr "+p schreibe die Fortschrittsmeldungen"
-#: help.h:62 help.h:85 help.h:109
+#: help.h:62 help.h:87 help.h:113
msgid "+s print usage statistics"
msgstr "+s melde die Verbrauchsstatistik"
-#: help.h:63 help.h:86 help.h:110
+#: help.h:63 help.h:88 help.h:114
msgid "--help display this help and exit"
msgstr "--help zeige diesen Hilfetext und ende"
-#: help.h:64 help.h:87 help.h:111
+#: help.h:64 help.h:89 help.h:114
msgid "--version output version information and exit"
msgstr "--version zeige de Versionsinformation und ende"
-#: help.h:69
+#: help.h:65 help.h:90 help.h:116
+msgid "--quiet combined '-bhp'"
+msgstr ""
+
+#: help.h:66 help.h:91 help.h:117
+msgid "--verbose combined '+bhp'"
+msgstr ""
+
+#: help.h:71
msgid "Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr "Aufruf: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
-#: help.h:70
+#: help.h:72
msgid " Weave WEBFILE with CHANGEFILE into a TeX document."
msgstr " Verwebe WEBFILE mit CHANGEFILE in ein TeX Dokument."
-#: help.h:72 help.h:96
+#: help.h:74 help.h:99
msgid " TeX output goes to the basename of WEBFILE extended with `.tex'"
msgstr " TeX Ausgabe geht in den Hauptnamen des WEBFILE erweitert um `.tex',"
-#: help.h:77 help.h:100
+#: help.h:79 help.h:104
msgid "-f do not force a newline after every C statement in output"
msgstr "-f erzwinge keinen Zeilenumbruch nach jedem C Statement"
-#: help.h:79 help.h:102
+#: help.h:81 help.h:106
msgid "-i suppress indentation of parameter declarations"
msgstr "-i unterdrücke die Einrückung von Parameterdeklarationen"
-#: help.h:80 help.h:103
+#: help.h:82 help.h:107
msgid "-o suppress separation of declarations and statements"
msgstr "-o unterdrücke die Trennung von Deklarationen und Statements"
-#: help.h:82 help.h:106
+#: help.h:84 help.h:110
msgid "-x omit indices, section names, table of contents"
msgstr "-x verzichte auf Indexe, Abschnittnamen und Inhaltsverzeichnis"
-#: help.h:83 help.h:107
+#: help.h:85 help.h:111
msgid "+e enclose C material in \\PB{...}"
msgstr "+e schließe C Material in \\PB{...} ein"
-#: help.h:84 help.h:108
+#: help.h:86 help.h:112
msgid "+lX use macros for language X as of Xcwebmac.tex"
msgstr "+lX benutze Macros für Sprache X aus Xcwebmac.tex"
-#: help.h:92
+#: help.h:96
msgid "Usage: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr "Aufruf: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
-#: help.h:93
+#: help.h:97
msgid " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes."
msgstr " Verwebe WEBFILE mit CHANGEFILE in ein TeX Dokument mit Miniindexen."
-#: help.h:104
+#: help.h:108
msgid "+P \\input proofmac.tex instead of ctwimac.tex"
msgstr "+P \\input proofmac.tex an Stelle von ctwimac.tex"
diff --git a/Build/source/texk/web2c/cwebdir/po/web2c-help.pot b/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
index 592cc8f80c8..0ee9d9f71ba 100644
--- a/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
+++ b/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CWEBbin 2019\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-01 15:41+0100\n"
+"POT-Creation-Date: 2019-01-07 17:10+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid " Tangle WEBFILE with CHANGEFILE into a C/C++ program."
msgstr ""
-#: help.h:54 help.h:71 help.h:94
+#: help.h:54 help.h:73 help.h:98
msgid " Default CHANGEFILE is /dev/null;"
msgstr ""
@@ -34,84 +34,92 @@ msgstr ""
msgid " C output goes to the basename of WEBFILE extended with `.c'"
msgstr ""
-#: help.h:56 help.h:73 help.h:96
+#: help.h:56 help.h:75 help.h:100
msgid " unless otherwise specified by OUTFILE; in this case, '-' specifies"
msgstr ""
-#: help.h:57 help.h:74 help.h:97
+#: help.h:57 help.h:76 help.h:101
msgid " a null CHANGEFILE."
msgstr ""
-#: help.h:59 help.h:76 help.h:99
+#: help.h:59 help.h:78 help.h:103
msgid "+b print banner line on terminal"
msgstr ""
-#: help.h:60 help.h:78 help.h:101
+#: help.h:60 help.h:80 help.h:105
msgid "+h print success message on completion"
msgstr ""
-#: help.h:61 help.h:81 help.h:105
+#: help.h:61 help.h:83 help.h:109
msgid "+p print progress report messages"
msgstr ""
-#: help.h:62 help.h:85 help.h:109
+#: help.h:62 help.h:87 help.h:113
msgid "+s print usage statistics"
msgstr ""
-#: help.h:63 help.h:86 help.h:110
+#: help.h:63 help.h:88 help.h:114
msgid "--help display this help and exit"
msgstr ""
-#: help.h:64 help.h:87 help.h:111
+#: help.h:64 help.h:89 help.h:114
msgid "--version output version information and exit"
msgstr ""
-#: help.h:69
+#: help.h:65 help.h:90 help.h:116
+msgid "--quiet combined '-bhp'"
+msgstr ""
+
+#: help.h:66 help.h:91 help.h:117
+msgid "--verbose combined '+bhp'"
+msgstr ""
+
+#: help.h:71
msgid ""
"Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr ""
-#: help.h:70
+#: help.h:72
msgid " Weave WEBFILE with CHANGEFILE into a TeX document."
msgstr ""
-#: help.h:72 help.h:96
+#: help.h:74 help.h:99
msgid " TeX output goes to the basename of WEBFILE extended with `.tex'"
msgstr ""
-#: help.h:77 help.h:100
+#: help.h:79 help.h:104
msgid "-f do not force a newline after every C statement in output"
msgstr ""
-#: help.h:79 help.h:102
+#: help.h:81 help.h:106
msgid "-i suppress indentation of parameter declarations"
msgstr ""
-#: help.h:80 help.h:103
+#: help.h:82 help.h:107
msgid "-o suppress separation of declarations and statements"
msgstr ""
-#: help.h:82 help.h:106
+#: help.h:84 help.h:110
msgid "-x omit indices, section names, table of contents"
msgstr ""
-#: help.h:83 help.h:107
+#: help.h:85 help.h:111
msgid "+e enclose C material in \\PB{...}"
msgstr ""
-#: help.h:84 help.h:108
+#: help.h:86 help.h:112
msgid "+lX use macros for language X as of Xcwebmac.tex"
msgstr ""
-#: help.h:92
+#: help.h:96
msgid ""
"Usage: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr ""
-#: help.h:93
+#: help.h:97
msgid " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes."
msgstr ""
-#: help.h:104
+#: help.h:108
msgid "+P \\input proofmac.tex instead of ctwimac.tex"
msgstr ""