From 9cb40e9f55c9abfe5dcc26e34ed09cf13d49ff6f Mon Sep 17 00:00:00 2001 From: Martin Ruckert Date: Tue, 23 Nov 2021 13:59:53 +0000 Subject: fixing some hitex command line options and the hitex man page git-svn-id: svn://tug.org/texlive/trunk@61126 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/hitexdir/hilexer.c | 792 ++++++++++++++--------------- Build/source/texk/web2c/hitexdir/hitex.man | 84 ++- Build/source/texk/web2c/hitexdir/hitex.w | 11 +- 3 files changed, 461 insertions(+), 426 deletions(-) diff --git a/Build/source/texk/web2c/hitexdir/hilexer.c b/Build/source/texk/web2c/hitexdir/hilexer.c index 2b6f3e6d00c..949adf83370 100644 --- a/Build/source/texk/web2c/hitexdir/hilexer.c +++ b/Build/source/texk/web2c/hitexdir/hilexer.c @@ -1,12 +1,13 @@ -#line 1 "lexer.c" +#line 2 "lexer.c" -#line 3 "lexer.c" +#line 4 "lexer.c" #define YY_INT_ALIGNED short int /* A lexical scanner generated by flex */ /* %not-for-header */ + /* %if-c-only */ /* %if-not-reentrant */ @@ -16,8 +17,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -26,7 +27,7 @@ /* %endif */ /* %if-c-only */ - + /* %endif */ /* %if-c-only */ @@ -108,39 +109,50 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - #endif /* ! C99 */ #endif /* ! FLEXINT_H */ /* %endif */ -/* begin standard C++ headers. */ /* %if-c++-only */ /* %endif */ -/* TODO: this is always defined, so inline it */ -#define yyconst const +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const #else -#define yynoreturn +#define yyconst #endif /* %not-for-header */ + /* Returned upon end-of-file. */ #define YY_NULL 0 /* %ok-for-header */ /* %not-for-header */ -/* Promotes a possibly negative, possibly signed char to an - * integer in range [0..255] for use as an array index. + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. */ -#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) /* %ok-for-header */ /* %if-reentrant */ @@ -155,29 +167,25 @@ typedef unsigned int flex_uint32_t; * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * + /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START + /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) + #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -195,7 +203,7 @@ typedef size_t yy_size_t; #endif /* %if-not-reentrant */ -extern int yyleng; +extern yy_size_t yyleng; /* %endif */ /* %if-c-only */ @@ -207,10 +215,10 @@ extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -222,13 +230,6 @@ extern FILE *yyin, *yyout; if ( yytext[yyl] == '\n' )\ --yylineno;\ }while(0) - #define YY_LINENO_REWIND_TO(dst) \ - do {\ - const char *p;\ - for ( p = yy_cp-1; p >= (dst); --p)\ - if ( *p == '\n' )\ - --yylineno;\ - }while(0) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -243,6 +244,7 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) + #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -262,12 +264,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + yy_size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -290,7 +292,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -317,12 +319,13 @@ struct yy_buffer_state /* %if-c-only Standard (non-C++) definition */ /* %not-for-header */ + /* %if-not-reentrant */ /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* %endif */ /* %ok-for-header */ @@ -337,6 +340,7 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) + /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -346,13 +350,14 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* %if-not-reentrant */ /* %not-for-header */ + /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = NULL; +static char *yy_c_buf_p = (char *) 0; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -364,77 +369,78 @@ static int yy_did_buffer_switch_on_eof; /* %endif */ -void yyrestart ( FILE *input_file ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); -void yy_delete_buffer ( YY_BUFFER_STATE b ); -void yy_flush_buffer ( YY_BUFFER_STATE b ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state ( void ); +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); -static void yyensure_buffer_stack ( void ); -static void yy_load_buffer_state ( void ); -static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); -#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); /* %endif */ -void *yyalloc ( yy_size_t ); -void *yyrealloc ( void *, yy_size_t ); -void yyfree ( void * ); +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); #define yy_new_buffer yy_create_buffer + #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } + #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } + #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* Begin user sect3 */ #define FLEX_DEBUG -typedef flex_uint8_t YY_CHAR; -FILE *yyin = NULL, *yyout = NULL; +typedef unsigned char YY_CHAR; + +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; typedef int yy_state_type; extern int yylineno; + int yylineno = 1; extern char *yytext; -#ifdef yytext_ptr -#undef yytext_ptr -#endif #define yytext_ptr yytext -/* %% [1.5] DFA */ - /* %if-c-only Standard (non-C++) definition */ -static yy_state_type yy_get_previous_state ( void ); -static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); -static int yy_get_next_buffer ( void ); -static void yynoreturn yy_fatal_error ( const char* msg ); +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* %endif */ @@ -444,11 +450,12 @@ static void yynoreturn yy_fatal_error ( const char* msg ); #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ /* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\ - yyleng = (int) (yy_cp - yy_bp); \ + yyleng = (size_t) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; + /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ #define YY_NUM_RULES 126 #define YY_END_OF_BUFFER 127 @@ -459,7 +466,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[371] = +static yyconst flex_int16_t yy_accept[371] = { 0, 0, 0, 0, 0, 0, 0, 127, 125, 6, 6, 43, 47, 10, 125, 114, 125, 4, 4, 1, 2, @@ -503,7 +510,7 @@ static const flex_int16_t yy_accept[371] = 92, 124, 124, 38, 93, 124, 117, 124, 119, 0 } ; -static const YY_CHAR yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, 2, 1, 1, 1, 1, 1, 1, 1, @@ -535,7 +542,7 @@ static const YY_CHAR yy_ec[256] = 65, 65, 65, 65, 65 } ; -static const YY_CHAR yy_meta[66] = +static yyconst flex_int32_t yy_meta[66] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -546,7 +553,7 @@ static const YY_CHAR yy_meta[66] = 4, 1, 1, 1, 4 } ; -static const flex_int16_t yy_base[376] = +static yyconst flex_int16_t yy_base[376] = { 0, 0, 0, 65, 130, 194, 258, 629, 630, 630, 630, 630, 630, 74, 68, 64, 68, 77, 72, 630, 630, @@ -591,7 +598,7 @@ static const flex_int16_t yy_base[376] = 503, 507, 511, 514, 70 } ; -static const flex_int16_t yy_def[376] = +static yyconst flex_int16_t yy_def[376] = { 0, 370, 1, 371, 371, 372, 372, 370, 370, 370, 370, 370, 370, 373, 374, 370, 370, 370, 370, 370, 370, @@ -636,7 +643,7 @@ static const flex_int16_t yy_def[376] = 370, 370, 370, 370, 370 } ; -static const flex_int16_t yy_nxt[696] = +static yyconst flex_int16_t yy_nxt[696] = { 0, 8, 9, 10, 9, 9, 11, 12, 8, 13, 14, 8, 15, 16, 16, 8, 17, 18, 18, 19, 20, @@ -717,7 +724,7 @@ static const flex_int16_t yy_nxt[696] = } ; -static const flex_int16_t yy_chk[696] = +static yyconst flex_int16_t yy_chk[696] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -799,7 +806,7 @@ static const flex_int16_t yy_chk[696] = } ; /* Table of booleans, true if rule could match eol. */ -static const flex_int32_t yy_rule_can_match_eol[127] = +static yyconst flex_int32_t yy_rule_can_match_eol[127] = { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -815,22 +822,22 @@ static char *yy_last_accepting_cpos; extern int yy_flex_debug; int yy_flex_debug = 1; -static const flex_int16_t yy_rule_linenum[126] = +static yyconst flex_int16_t yy_rule_linenum[126] = { 0, - 171, 172, 173, 174, 175, 176, 177, 179, 181, 183, - 185, 186, 187, 188, 189, 194, 195, 196, 197, 198, - 199, 200, 201, 203, 205, 207, 208, 209, 210, 212, - 213, 214, 216, 217, 218, 220, 221, 223, 225, 226, - 227, 229, 230, 232, 233, 234, 236, 239, 241, 242, - 244, 245, 246, 247, 248, 249, 250, 252, 253, 255, - 257, 258, 259, 260, 261, 262, 263, 264, 265, 268, - 270, 271, 272, 274, 275, 276, 277, 280, 281, 282, - 284, 285, 286, 287, 288, 289, 290, 292, 293, 294, - 295, 297, 299, 301, 303, 305, 307, 308, 310, 312, - - 313, 314, 315, 317, 319, 320, 321, 323, 325, 327, - 328, 329, 330, 331, 333, 335, 337, 338, 340, 342, - 344, 346, 348, 350, 351 + 170, 171, 172, 173, 174, 175, 176, 178, 180, 182, + 184, 185, 186, 187, 188, 193, 194, 195, 196, 197, + 198, 199, 200, 202, 204, 206, 207, 208, 209, 211, + 212, 213, 215, 216, 217, 219, 220, 222, 224, 225, + 226, 228, 229, 231, 232, 233, 235, 238, 240, 241, + 243, 244, 245, 246, 247, 248, 249, 251, 252, 254, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 267, + 269, 270, 271, 273, 274, 275, 276, 279, 280, 281, + 283, 284, 285, 286, 287, 288, 289, 291, 292, 293, + 294, 296, 298, 300, 302, 304, 306, 307, 309, 311, + + 312, 313, 314, 316, 318, 319, 320, 322, 324, 326, + 327, 328, 329, 330, 332, 334, 336, 337, 339, 341, + 343, 345, 347, 349, 350 } ; /* The intent behind this definition is that it'll catch @@ -842,8 +849,8 @@ static const flex_int16_t yy_rule_linenum[126] = #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "lexer.l" -#line 2 "lexer.l" - /*511:*/ +/*511:*/ +#line 3 "lexer.l" #line 10258 "format.w" #include "hibasetypes.h" @@ -986,21 +993,19 @@ int yywrap(void){ #pragma warning( disable : 4267) #endif -#line 989 "lexer.c" #define YY_NO_UNISTD_H 1 #define YY_NO_INPUT 1 -#line 152 "lexer.l" - /*23:*/ - /*:23*/ /*32:*/ +/*23:*/ +/*:23*/ /*32:*/ - /*:32*/ /*39:*/ - /*:39*/ /*41:*/ - /*:41*/ /*43:*/ - /*:43*/ /*45:*/ - /*:45*/ /*149:*/ +/*:32*/ /*39:*/ +/*:39*/ /*41:*/ +/*:41*/ /*43:*/ +/*:43*/ /*45:*/ +/*:45*/ /*149:*/ - /*:149*/ -#line 1003 "lexer.c" +/*:149*/ +#line 1009 "lexer.c" #define INITIAL 0 #define STR 1 @@ -1026,7 +1031,7 @@ int yywrap(void){ /* %if-reentrant */ /* %if-c-only */ -static int yy_init_globals ( void ); +static int yy_init_globals (void ); /* %endif */ /* %if-reentrant */ @@ -1036,31 +1041,31 @@ static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( void ); +int yylex_destroy (void ); -int yyget_debug ( void ); +int yyget_debug (void ); -void yyset_debug ( int debug_flag ); +void yyset_debug (int debug_flag ); -YY_EXTRA_TYPE yyget_extra ( void ); +YY_EXTRA_TYPE yyget_extra (void ); -void yyset_extra ( YY_EXTRA_TYPE user_defined ); +void yyset_extra (YY_EXTRA_TYPE user_defined ); -FILE *yyget_in ( void ); +FILE *yyget_in (void ); -void yyset_in ( FILE * _in_str ); +void yyset_in (FILE * in_str ); -FILE *yyget_out ( void ); +FILE *yyget_out (void ); -void yyset_out ( FILE * _out_str ); +void yyset_out (FILE * out_str ); - int yyget_leng ( void ); +yy_size_t yyget_leng (void ); -char *yyget_text ( void ); +char *yyget_text (void ); -int yyget_lineno ( void ); +int yyget_lineno (void ); -void yyset_lineno ( int _line_number ); +void yyset_lineno (int line_number ); /* %if-bison-bridge */ /* %endif */ @@ -1071,35 +1076,34 @@ void yyset_lineno ( int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( void ); +extern "C" int yywrap (void ); #else -extern int yywrap ( void ); +extern int yywrap (void ); #endif #endif /* %not-for-header */ -#ifndef YY_NO_UNPUT - -#endif + /* %ok-for-header */ /* %endif */ #ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int ); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * ); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT /* %if-c-only Standard (non-C++) definition */ /* %not-for-header */ + #ifdef __cplusplus -static int yyinput ( void ); +static int yyinput (void ); #else -static int input ( void ); +static int input (void ); #endif /* %ok-for-header */ @@ -1112,20 +1116,15 @@ static int input ( void ); static int yy_start_stack_depth = 0; static int *yy_start_stack = NULL; - static void yy_push_state ( int _new_state ); + static void yy_push_state (int new_state ); - static void yy_pop_state ( void ); + static void yy_pop_state (void ); /* %endif */ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1134,7 +1133,7 @@ static int input ( void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) /* %endif */ /* %if-c++-only C++ definition */ /* %endif */ @@ -1149,7 +1148,7 @@ static int input ( void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1162,7 +1161,7 @@ static int input ( void ); else \ { \ errno=0; \ - while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1203,9 +1202,11 @@ static int input ( void ); /* %if-tables-serialization structures and prototypes */ /* %not-for-header */ + /* %ok-for-header */ /* %not-for-header */ + /* %tables-yydmap generated elements */ /* %endif */ /* end tables serialization structures and prototypes */ @@ -1236,7 +1237,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK /*LINTED*/break; +#define YY_BREAK break; #endif /* %% [6.0] YY_RULE_SETUP definition goes here */ @@ -1244,14 +1245,22 @@ extern int yylex (void); YY_USER_ACTION /* %not-for-header */ + /** The main scanner function which does all the work. */ YY_DECL { - yy_state_type yy_current_state; - char *yy_cp, *yy_bp; - int yy_act; + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; +/* %% [7.0] user's declarations go here */ +#line 167 "lexer.l" + + + /*3:*/ +#line 1263 "lexer.c" + if ( !(yy_init) ) { (yy_init) = 1; @@ -1280,21 +1289,13 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE ); + yy_create_buffer(yyin,YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - { -/* %% [7.0] user's declarations go here */ -#line 168 "lexer.l" - - - /*3:*/ -#line 1295 "lexer.c" - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + while ( 1 ) /* loops until end-of-file is reached */ { /* %% [8.0] yymore()-related code goes here */ yy_cp = (yy_c_buf_p); @@ -1312,7 +1313,7 @@ YY_DECL yy_match: do { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1322,9 +1323,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 371 ) - yy_c = yy_meta[yy_c]; + yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } while ( yy_current_state != 370 ); @@ -1344,7 +1345,7 @@ yy_find_action: int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + yylineno++; ; } @@ -1380,686 +1381,686 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 171 "lexer.l" +#line 170 "lexer.l" SCAN_START;return START; YY_BREAK case 2: YY_RULE_SETUP -#line 172 "lexer.l" +#line 171 "lexer.l" SCAN_END;return END; YY_BREAK case 3: YY_RULE_SETUP -#line 173 "lexer.l" +#line 172 "lexer.l" return GLYPH; YY_BREAK case 4: YY_RULE_SETUP -#line 174 "lexer.l" +#line 173 "lexer.l" SCAN_UDEC(yytext);return UNSIGNED; YY_BREAK case 5: YY_RULE_SETUP -#line 175 "lexer.l" +#line 174 "lexer.l" SCAN_UDEC(yytext+1);return REFERENCE; YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 176 "lexer.l" +#line 175 "lexer.l" ; YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 177 "lexer.l" +#line 176 "lexer.l" ; YY_BREAK /*:3*/ /*24:*/ case 8: YY_RULE_SETUP -#line 179 "lexer.l" +#line 178 "lexer.l" SCAN_HEX(yytext+2);return UNSIGNED; YY_BREAK /*:24*/ /*27:*/ case 9: YY_RULE_SETUP -#line 181 "lexer.l" +#line 180 "lexer.l" SCAN_DEC(yytext);return SIGNED; YY_BREAK /*:27*/ /*34:*/ case 10: YY_RULE_SETUP -#line 183 "lexer.l" +#line 182 "lexer.l" STR_START;BEGIN(STR); YY_BREAK case 11: YY_RULE_SETUP -#line 185 "lexer.l" +#line 184 "lexer.l" STR_END;SCAN_STR;BEGIN(INITIAL);return STRING; YY_BREAK case 12: YY_RULE_SETUP -#line 186 "lexer.l" +#line 185 "lexer.l" STR_ADD('\''); YY_BREAK case 13: YY_RULE_SETUP -#line 187 "lexer.l" +#line 186 "lexer.l" STR_ADD(yytext[0]); YY_BREAK case 14: YY_RULE_SETUP -#line 188 "lexer.l" +#line 187 "lexer.l" RNG("String character",yytext[0],0x20,0x7E); YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 189 "lexer.l" +#line 188 "lexer.l" QUIT("Unterminated String in line %d",yylineno); YY_BREAK /*:34*/ /*48:*/ case 16: YY_RULE_SETUP -#line 194 "lexer.l" +#line 193 "lexer.l" STR_START;STR_PUT('\'');BEGIN(STR); YY_BREAK case 17: YY_RULE_SETUP -#line 195 "lexer.l" +#line 194 "lexer.l" SCAN_UTF8_1(yytext+1);return CHARCODE; YY_BREAK case 18: YY_RULE_SETUP -#line 196 "lexer.l" +#line 195 "lexer.l" STR_START;STR_PUT(yytext[1]);STR_PUT('\'');BEGIN(STR); YY_BREAK case 19: YY_RULE_SETUP -#line 197 "lexer.l" +#line 196 "lexer.l" STR_START;STR_PUT('\'');STR_PUT('\'');BEGIN(STR); YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 198 "lexer.l" +#line 197 "lexer.l" SCAN_UTF8_1(yytext+1);return CHARCODE; YY_BREAK case 21: YY_RULE_SETUP -#line 199 "lexer.l" +#line 198 "lexer.l" SCAN_UTF8_2(yytext+1);return CHARCODE; YY_BREAK case 22: YY_RULE_SETUP -#line 200 "lexer.l" +#line 199 "lexer.l" SCAN_UTF8_3(yytext+1);return CHARCODE; YY_BREAK case 23: YY_RULE_SETUP -#line 201 "lexer.l" +#line 200 "lexer.l" SCAN_UTF8_4(yytext+1);return CHARCODE; YY_BREAK /*:48*/ /*55:*/ case 24: YY_RULE_SETUP -#line 203 "lexer.l" +#line 202 "lexer.l" SCAN_DECFLOAT;return FPNUM; YY_BREAK /*:55*/ /*59:*/ case 25: YY_RULE_SETUP -#line 205 "lexer.l" +#line 204 "lexer.l" SCAN_HEXFLOAT;return FPNUM; YY_BREAK /*:59*/ /*80:*/ case 26: YY_RULE_SETUP -#line 207 "lexer.l" +#line 206 "lexer.l" return DIMEN; YY_BREAK case 27: YY_RULE_SETUP -#line 208 "lexer.l" +#line 207 "lexer.l" return PT; YY_BREAK case 28: YY_RULE_SETUP -#line 209 "lexer.l" +#line 208 "lexer.l" return MM; YY_BREAK case 29: YY_RULE_SETUP -#line 210 "lexer.l" +#line 209 "lexer.l" return INCH; YY_BREAK /*:80*/ /*88:*/ case 30: YY_RULE_SETUP -#line 212 "lexer.l" +#line 211 "lexer.l" return XDIMEN; YY_BREAK case 31: YY_RULE_SETUP -#line 213 "lexer.l" +#line 212 "lexer.l" return H; YY_BREAK case 32: YY_RULE_SETUP -#line 214 "lexer.l" +#line 213 "lexer.l" return V; YY_BREAK /*:88*/ /*99:*/ case 33: YY_RULE_SETUP -#line 216 "lexer.l" +#line 215 "lexer.l" return FIL; YY_BREAK case 34: YY_RULE_SETUP -#line 217 "lexer.l" +#line 216 "lexer.l" return FILL; YY_BREAK case 35: YY_RULE_SETUP -#line 218 "lexer.l" +#line 217 "lexer.l" return FILLL; YY_BREAK /*:99*/ /*103:*/ case 36: YY_RULE_SETUP -#line 220 "lexer.l" +#line 219 "lexer.l" return PENALTY; YY_BREAK case 37: YY_RULE_SETUP -#line 221 "lexer.l" +#line 220 "lexer.l" return INTEGER; YY_BREAK /*:103*/ /*109:*/ case 38: YY_RULE_SETUP -#line 223 "lexer.l" +#line 222 "lexer.l" return LANGUAGE; YY_BREAK /*:109*/ /*115:*/ case 39: YY_RULE_SETUP -#line 225 "lexer.l" +#line 224 "lexer.l" return RULE; YY_BREAK case 40: YY_RULE_SETUP -#line 226 "lexer.l" +#line 225 "lexer.l" return RUNNING; YY_BREAK case 41: YY_RULE_SETUP -#line 227 "lexer.l" +#line 226 "lexer.l" return RUNNING; YY_BREAK /*:115*/ /*124:*/ case 42: YY_RULE_SETUP -#line 229 "lexer.l" +#line 228 "lexer.l" return KERN; YY_BREAK case 43: YY_RULE_SETUP -#line 230 "lexer.l" +#line 229 "lexer.l" return EXPLICIT; YY_BREAK /*:124*/ /*133:*/ case 44: YY_RULE_SETUP -#line 232 "lexer.l" +#line 231 "lexer.l" return GLUE; YY_BREAK case 45: YY_RULE_SETUP -#line 233 "lexer.l" +#line 232 "lexer.l" return PLUS; YY_BREAK case 46: YY_RULE_SETUP -#line 234 "lexer.l" +#line 233 "lexer.l" return MINUS; YY_BREAK /*:133*/ /*151:*/ case 47: YY_RULE_SETUP -#line 236 "lexer.l" +#line 235 "lexer.l" SCAN_TXT_START;return TXT_START; YY_BREAK case 48: YY_RULE_SETUP -#line 239 "lexer.l" +#line 238 "lexer.l" SCAN_TXT_END;return TXT_END; YY_BREAK case 49: YY_RULE_SETUP -#line 241 "lexer.l" +#line 240 "lexer.l" SCAN_START;return START; YY_BREAK case 50: YY_RULE_SETUP -#line 242 "lexer.l" +#line 241 "lexer.l" QUIT("> not allowed in text mode"); YY_BREAK case 51: YY_RULE_SETUP -#line 244 "lexer.l" +#line 243 "lexer.l" yylval.u= '\\';return TXT_CC; YY_BREAK case 52: YY_RULE_SETUP -#line 245 "lexer.l" +#line 244 "lexer.l" yylval.u= '"';return TXT_CC; YY_BREAK case 53: YY_RULE_SETUP -#line 246 "lexer.l" +#line 245 "lexer.l" yylval.u= '<';return TXT_CC; YY_BREAK case 54: YY_RULE_SETUP -#line 247 "lexer.l" +#line 246 "lexer.l" yylval.u= '>';return TXT_CC; YY_BREAK case 55: YY_RULE_SETUP -#line 248 "lexer.l" +#line 247 "lexer.l" yylval.u= ' ';return TXT_CC; YY_BREAK case 56: YY_RULE_SETUP -#line 249 "lexer.l" +#line 248 "lexer.l" yylval.u= '-';return TXT_CC; YY_BREAK case 57: YY_RULE_SETUP -#line 250 "lexer.l" +#line 249 "lexer.l" return TXT_IGNORE; YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -#line 252 "lexer.l" +#line 251 "lexer.l" return TXT_FONT_GLUE; YY_BREAK case 59: /* rule 59 can match eol */ YY_RULE_SETUP -#line 253 "lexer.l" +#line 252 "lexer.l" ; YY_BREAK case 60: YY_RULE_SETUP -#line 255 "lexer.l" +#line 254 "lexer.l" yylval.u= yytext[1]-'0';return TXT_FONT; YY_BREAK case 61: YY_RULE_SETUP -#line 257 "lexer.l" +#line 256 "lexer.l" SCAN_REF(font_kind);return TXT_GLOBAL; YY_BREAK case 62: YY_RULE_SETUP -#line 258 "lexer.l" +#line 257 "lexer.l" SCAN_REF(penalty_kind);return TXT_GLOBAL; YY_BREAK case 63: YY_RULE_SETUP -#line 259 "lexer.l" +#line 258 "lexer.l" SCAN_REF(kern_kind);return TXT_GLOBAL; YY_BREAK case 64: YY_RULE_SETUP -#line 260 "lexer.l" +#line 259 "lexer.l" SCAN_REF(ligature_kind);return TXT_GLOBAL; YY_BREAK case 65: YY_RULE_SETUP -#line 261 "lexer.l" +#line 260 "lexer.l" SCAN_REF(disc_kind);return TXT_GLOBAL; YY_BREAK case 66: YY_RULE_SETUP -#line 262 "lexer.l" +#line 261 "lexer.l" SCAN_REF(glue_kind);return TXT_GLOBAL; YY_BREAK case 67: YY_RULE_SETUP -#line 263 "lexer.l" +#line 262 "lexer.l" SCAN_REF(language_kind);return TXT_GLOBAL; YY_BREAK case 68: YY_RULE_SETUP -#line 264 "lexer.l" +#line 263 "lexer.l" SCAN_REF(rule_kind);return TXT_GLOBAL; YY_BREAK case 69: YY_RULE_SETUP -#line 265 "lexer.l" +#line 264 "lexer.l" SCAN_REF(image_kind);return TXT_GLOBAL; YY_BREAK case 70: YY_RULE_SETUP -#line 268 "lexer.l" +#line 267 "lexer.l" SCAN_UDEC(yytext+2);return TXT_CC; YY_BREAK case 71: YY_RULE_SETUP -#line 270 "lexer.l" +#line 269 "lexer.l" yylval.u= yytext[1]-'a';return TXT_LOCAL; YY_BREAK case 72: YY_RULE_SETUP -#line 271 "lexer.l" +#line 270 "lexer.l" return TXT_FONT_GLUE; YY_BREAK case 73: YY_RULE_SETUP -#line 272 "lexer.l" +#line 271 "lexer.l" return TXT_FONT_HYPHEN; YY_BREAK case 74: /* rule 74 can match eol */ YY_RULE_SETUP -#line 274 "lexer.l" +#line 273 "lexer.l" SCAN_UTF8_1(yytext);return TXT_CC; YY_BREAK case 75: YY_RULE_SETUP -#line 275 "lexer.l" +#line 274 "lexer.l" SCAN_UTF8_2(yytext);return TXT_CC; YY_BREAK case 76: YY_RULE_SETUP -#line 276 "lexer.l" +#line 275 "lexer.l" SCAN_UTF8_3(yytext);return TXT_CC; YY_BREAK case 77: YY_RULE_SETUP -#line 277 "lexer.l" +#line 276 "lexer.l" SCAN_UTF8_4(yytext);return TXT_CC; YY_BREAK /*:151*/ /*162:*/ case 78: YY_RULE_SETUP -#line 280 "lexer.l" +#line 279 "lexer.l" return HBOX; YY_BREAK case 79: YY_RULE_SETUP -#line 281 "lexer.l" +#line 280 "lexer.l" return VBOX; YY_BREAK case 80: YY_RULE_SETUP -#line 282 "lexer.l" +#line 281 "lexer.l" return SHIFTED; YY_BREAK /*:162*/ /*170:*/ case 81: YY_RULE_SETUP -#line 284 "lexer.l" +#line 283 "lexer.l" return HPACK; YY_BREAK case 82: YY_RULE_SETUP -#line 285 "lexer.l" +#line 284 "lexer.l" return HSET; YY_BREAK case 83: YY_RULE_SETUP -#line 286 "lexer.l" +#line 285 "lexer.l" return VPACK; YY_BREAK case 84: YY_RULE_SETUP -#line 287 "lexer.l" +#line 286 "lexer.l" return VSET; YY_BREAK case 85: YY_RULE_SETUP -#line 288 "lexer.l" +#line 287 "lexer.l" return ADD; YY_BREAK case 86: YY_RULE_SETUP -#line 289 "lexer.l" +#line 288 "lexer.l" return TO; YY_BREAK case 87: YY_RULE_SETUP -#line 290 "lexer.l" +#line 289 "lexer.l" return DEPTH; YY_BREAK /*:170*/ /*175:*/ case 88: YY_RULE_SETUP -#line 292 "lexer.l" +#line 291 "lexer.l" return LEADERS; YY_BREAK case 89: YY_RULE_SETUP -#line 293 "lexer.l" +#line 292 "lexer.l" return ALIGN; YY_BREAK case 90: YY_RULE_SETUP -#line 294 "lexer.l" +#line 293 "lexer.l" return CENTER; YY_BREAK case 91: YY_RULE_SETUP -#line 295 "lexer.l" +#line 294 "lexer.l" return EXPAND; YY_BREAK /*:175*/ /*182:*/ case 92: YY_RULE_SETUP -#line 297 "lexer.l" +#line 296 "lexer.l" return BASELINE; YY_BREAK /*:182*/ /*189:*/ case 93: YY_RULE_SETUP -#line 299 "lexer.l" +#line 298 "lexer.l" return LIGATURE; YY_BREAK /*:189*/ /*197:*/ case 94: YY_RULE_SETUP -#line 301 "lexer.l" +#line 300 "lexer.l" return DISC; YY_BREAK /*:197*/ /*205:*/ case 95: YY_RULE_SETUP -#line 303 "lexer.l" +#line 302 "lexer.l" return PAR; YY_BREAK /*:205*/ /*210:*/ case 96: YY_RULE_SETUP -#line 305 "lexer.l" +#line 304 "lexer.l" return MATH; YY_BREAK /*:210*/ /*215:*/ case 97: YY_RULE_SETUP -#line 307 "lexer.l" +#line 306 "lexer.l" return ON; YY_BREAK case 98: YY_RULE_SETUP -#line 308 "lexer.l" +#line 307 "lexer.l" return OFF; YY_BREAK /*:215*/ /*219:*/ case 99: YY_RULE_SETUP -#line 310 "lexer.l" +#line 309 "lexer.l" return ADJUST; YY_BREAK /*:219*/ /*223:*/ case 100: YY_RULE_SETUP -#line 312 "lexer.l" +#line 311 "lexer.l" return TABLE; YY_BREAK case 101: YY_RULE_SETUP -#line 313 "lexer.l" +#line 312 "lexer.l" return ITEM; YY_BREAK case 102: YY_RULE_SETUP -#line 314 "lexer.l" +#line 313 "lexer.l" return ITEM; YY_BREAK case 103: YY_RULE_SETUP -#line 315 "lexer.l" +#line 314 "lexer.l" return ITEM; YY_BREAK /*:223*/ /*230:*/ case 104: YY_RULE_SETUP -#line 317 "lexer.l" +#line 316 "lexer.l" return IMAGE; YY_BREAK /*:230*/ /*247:*/ case 105: YY_RULE_SETUP -#line 319 "lexer.l" +#line 318 "lexer.l" return LABEL; YY_BREAK case 106: YY_RULE_SETUP -#line 320 "lexer.l" +#line 319 "lexer.l" return BOT; YY_BREAK case 107: YY_RULE_SETUP -#line 321 "lexer.l" +#line 320 "lexer.l" return MID; YY_BREAK /*:247*/ /*261:*/ case 108: YY_RULE_SETUP -#line 323 "lexer.l" +#line 322 "lexer.l" return LINK; YY_BREAK /*:261*/ /*271:*/ case 109: YY_RULE_SETUP -#line 325 "lexer.l" +#line 324 "lexer.l" return OUTLINE; YY_BREAK /*:271*/ /*278:*/ case 110: YY_RULE_SETUP -#line 327 "lexer.l" +#line 326 "lexer.l" if(section_no==1)return STREAMDEF;else return STREAM; YY_BREAK case 111: YY_RULE_SETUP -#line 328 "lexer.l" +#line 327 "lexer.l" return FIRST; YY_BREAK case 112: YY_RULE_SETUP -#line 329 "lexer.l" +#line 328 "lexer.l" return LAST; YY_BREAK case 113: YY_RULE_SETUP -#line 330 "lexer.l" +#line 329 "lexer.l" return TOP; YY_BREAK case 114: YY_RULE_SETUP -#line 331 "lexer.l" +#line 330 "lexer.l" return NOREFERENCE; YY_BREAK /*:278*/ /*288:*/ case 115: YY_RULE_SETUP -#line 333 "lexer.l" +#line 332 "lexer.l" return PAGE; YY_BREAK /*:288*/ /*296:*/ case 116: YY_RULE_SETUP -#line 335 "lexer.l" +#line 334 "lexer.l" return RANGE; YY_BREAK /*:296*/ /*323:*/ case 117: YY_RULE_SETUP -#line 337 "lexer.l" +#line 336 "lexer.l" return DIRECTORY; YY_BREAK case 118: YY_RULE_SETUP -#line 338 "lexer.l" +#line 337 "lexer.l" return SECTION; YY_BREAK /*:323*/ /*344:*/ case 119: YY_RULE_SETUP -#line 340 "lexer.l" +#line 339 "lexer.l" return DEFINITIONS; YY_BREAK /*:344*/ /*352:*/ case 120: YY_RULE_SETUP -#line 342 "lexer.l" +#line 341 "lexer.l" return MAX; YY_BREAK /*:352*/ /*367:*/ case 121: YY_RULE_SETUP -#line 344 "lexer.l" +#line 343 "lexer.l" return PARAM; YY_BREAK /*:367*/ /*376:*/ case 122: YY_RULE_SETUP -#line 346 "lexer.l" +#line 345 "lexer.l" return FONT; YY_BREAK /*:376*/ /*404:*/ case 123: YY_RULE_SETUP -#line 348 "lexer.l" +#line 347 "lexer.l" return CONTENT; YY_BREAK /*:404*/ case 124: YY_RULE_SETUP -#line 350 "lexer.l" +#line 349 "lexer.l" QUIT("Unexpected keyword '%s' in line %d",yytext,yylineno); YY_BREAK case 125: YY_RULE_SETUP -#line 351 "lexer.l" +#line 350 "lexer.l" QUIT("Unexpected character '%c' (0x%02X) in line %d",yytext[0]>' '?yytext[0]:' ',yytext[0],yylineno); YY_BREAK case 126: YY_RULE_SETUP -#line 353 "lexer.l" +#line 352 "lexer.l" ECHO; YY_BREAK -#line 2062 "lexer.c" +#line 2064 "lexer.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(STR): case YY_STATE_EOF(TXT): @@ -2086,11 +2087,7 @@ case YY_STATE_EOF(TXT): * back-up) that will match for the new input source. */ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; -/* %if-c-only */ YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; -/* %endif */ -/* %if-c++-only */ -/* %endif */ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } @@ -2145,7 +2142,7 @@ case YY_STATE_EOF(TXT): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -2198,12 +2195,12 @@ case YY_STATE_EOF(TXT): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of user's declarations */ } /* end of yylex */ /* %ok-for-header */ /* %if-c++-only */ /* %not-for-header */ + /* %ok-for-header */ /* %endif */ @@ -2221,9 +2218,9 @@ static int yy_get_next_buffer (void) /* %if-c++-only */ /* %endif */ { - char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - char *source = (yytext_ptr); - int number_to_move, i; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); + register int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2252,7 +2249,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2265,7 +2262,7 @@ static int yy_get_next_buffer (void) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -2279,7 +2276,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -2288,12 +2285,11 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc( (void *) b->yy_ch_buf, - (yy_size_t) (b->yy_buf_size + 2) ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = NULL; + b->yy_ch_buf = 0; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -2321,7 +2317,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else @@ -2335,15 +2331,12 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( - (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -2359,13 +2352,14 @@ static int yy_get_next_buffer (void) /* %if-c-only */ /* %not-for-header */ + static yy_state_type yy_get_previous_state (void) /* %endif */ /* %if-c++-only */ /* %endif */ { - yy_state_type yy_current_state; - char *yy_cp; + register yy_state_type yy_current_state; + register char *yy_cp; /* %% [15.0] code to get the start state into yy_current_state goes here */ yy_current_state = (yy_start); @@ -2373,7 +2367,7 @@ static int yy_get_next_buffer (void) for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { /* %% [16.0] code to find the next state goes here */ - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2383,9 +2377,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 371 ) - yy_c = yy_meta[yy_c]; + yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; } return yy_current_state; @@ -2402,11 +2396,11 @@ static int yy_get_next_buffer (void) /* %if-c++-only */ /* %endif */ { - int yy_is_jam; + register int yy_is_jam; /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */ - char *yy_cp = (yy_c_buf_p); + register char *yy_cp = (yy_c_buf_p); - YY_CHAR yy_c = 1; + register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2416,19 +2410,17 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 371 ) - yy_c = yy_meta[yy_c]; + yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 370); return yy_is_jam ? 0 : yy_current_state; } -#ifndef YY_NO_UNPUT /* %if-c-only */ /* %endif */ -#endif /* %if-c-only */ #ifndef YY_NO_INPUT @@ -2458,7 +2450,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2475,14 +2467,14 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return 0; + if ( yywrap( ) ) + return EOF; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -2506,7 +2498,7 @@ static int yy_get_next_buffer (void) /* %% [19.0] update BOL and yylineno */ if ( c == '\n' ) - + yylineno++; ; @@ -2531,16 +2523,13 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE ); + yy_create_buffer(yyin,YY_BUF_SIZE ); } - yy_init_buffer( YY_CURRENT_BUFFER, input_file ); - yy_load_buffer_state( ); + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); } -/* %if-c++-only */ -/* %endif */ - /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @@ -2570,7 +2559,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2588,11 +2577,7 @@ static void yy_load_buffer_state (void) { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; -/* %if-c-only */ yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; -/* %endif */ -/* %if-c++-only */ -/* %endif */ (yy_hold_char) = *(yy_c_buf_p); } @@ -2610,7 +2595,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2619,20 +2604,17 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; } -/* %if-c++-only */ -/* %endif */ - /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() * @@ -2651,9 +2633,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree( (void *) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yyfree( (void *) b ); + yyfree((void *) b ); } /* Initializes or reinitializes a buffer. @@ -2669,13 +2651,9 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer( b ); + yy_flush_buffer(b ); -/* %if-c-only */ b->yy_input_file = file; -/* %endif */ -/* %if-c++-only */ -/* %endif */ b->yy_fill_buffer = 1; /* If b is the current buffer, then yy_init_buffer was _probably_ @@ -2725,7 +2703,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /* %if-c-or-c++ */ @@ -2761,7 +2739,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } /* %endif */ @@ -2786,7 +2764,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -2810,15 +2788,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + num_to_alloc = 1; (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2827,7 +2805,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - yy_size_t grow_size = 8 /* arbitrary grow size */; + int grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2849,7 +2827,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -2859,23 +2837,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return NULL; + return 0; - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = NULL; + b->yy_input_file = 0; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; } @@ -2890,10 +2868,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (const char * yystr ) +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); + return yy_scan_bytes(yystr,strlen(yystr) ); } /* %endif */ @@ -2905,7 +2883,7 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -2913,8 +2891,8 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc( n ); + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2923,7 +2901,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2937,7 +2915,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) /* %endif */ /* %if-c-only */ - static void yy_push_state (int _new_state ) + static void yy_push_state (int new_state ) /* %endif */ /* %if-c++-only */ /* %endif */ @@ -2947,14 +2925,13 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) yy_size_t new_size; (yy_start_stack_depth) += YY_START_STACK_INCR; - new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int ); + new_size = (yy_start_stack_depth) * sizeof( int ); if ( ! (yy_start_stack) ) - (yy_start_stack) = (int *) yyalloc( new_size ); + (yy_start_stack) = (int *) yyalloc(new_size ); else - (yy_start_stack) = (int *) yyrealloc( - (void *) (yy_start_stack), new_size ); + (yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size ); if ( ! (yy_start_stack) ) YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); @@ -2962,7 +2939,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; - BEGIN(_new_state); + BEGIN(new_state); } /* %if-c-only */ @@ -2982,9 +2959,9 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) #endif /* %if-c-only */ -static void yynoreturn yy_fatal_error (const char* msg ) +static void yy_fatal_error (yyconst char* msg ) { - fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } /* %endif */ @@ -3019,7 +2996,7 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -3042,7 +3019,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +yy_size_t yyget_leng (void) { return yyleng; } @@ -3060,29 +3037,29 @@ char *yyget_text (void) /* %endif */ /** Set the current line number. - * @param _line_number line number + * @param line_number * */ -void yyset_lineno (int _line_number ) +void yyset_lineno (int line_number ) { - yylineno = _line_number; + yylineno = line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param _in_str A readable stream. + * @param in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * _in_str ) +void yyset_in (FILE * in_str ) { - yyin = _in_str ; + yyin = in_str ; } -void yyset_out (FILE * _out_str ) +void yyset_out (FILE * out_str ) { - yyout = _out_str ; + yyout = out_str ; } int yyget_debug (void) @@ -3090,9 +3067,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int _bdebug ) +void yyset_debug (int bdebug ) { - yy_flex_debug = _bdebug ; + yy_flex_debug = bdebug ; } /* %endif */ @@ -3112,10 +3089,10 @@ static int yy_init_globals (void) /* We do not touch yylineno unless the option is enabled. */ yylineno = 1; - (yy_buffer_stack) = NULL; + (yy_buffer_stack) = 0; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = NULL; + (yy_c_buf_p) = (char *) 0; (yy_init) = 0; (yy_start) = 0; @@ -3128,8 +3105,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = NULL; - yyout = NULL; + yyin = (FILE *) 0; + yyout = (FILE *) 0; #endif /* For future reference: Set errno on error, since we are called by @@ -3146,7 +3123,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_delete_buffer(YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -3156,7 +3133,7 @@ int yylex_destroy (void) (yy_buffer_stack) = NULL; /* Destroy the start condition stack. */ - yyfree( (yy_start_stack) ); + yyfree((yy_start_stack) ); (yy_start_stack) = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time @@ -3174,19 +3151,18 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, const char * s2, int n ) +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - - int i; + register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (const char * s ) +static int yy_flex_strlen (yyconst char * s ) { - int n; + register int n; for ( n = 0; s[n]; ++n ) ; @@ -3196,12 +3172,11 @@ static int yy_flex_strlen (const char * s ) void *yyalloc (yy_size_t size ) { - return malloc(size); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -3209,12 +3184,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return realloc(ptr, size); + return (void *) realloc( (char *) ptr, size ); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } /* %if-tables-serialization definitions */ @@ -3224,7 +3199,8 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 353 "lexer.l" +#line 352 "lexer.l" + /*:511*/ diff --git a/Build/source/texk/web2c/hitexdir/hitex.man b/Build/source/texk/web2c/hitexdir/hitex.man index 753f0f18968..4fe6516744e 100644 --- a/Build/source/texk/web2c/hitexdir/hitex.man +++ b/Build/source/texk/web2c/hitexdir/hitex.man @@ -91,6 +91,20 @@ as a .I texmf.cnf configuration line. See the Kpathsea manual. .TP +.B -compress +Enable the use of compression for the HINT file. Compressed files are +smaller but require decompression when viewing. Use only for large +files if the file size matters. +.TP +.B -empty-page +When writing books, often empty pages are inserted - for example to +begin chapters on a right hand side page. These empty pages are +a nuisance for on-screen reading where there are no left or right +hand side pages. This option keeps empty pages in the output. +.TP +.B -no-empty-page +This option tries to eliminate empty pages in the output. It is set as a default. +.TP .B -etex Enable the e-\*(TX extensions. This option is only effective in combination with @@ -119,6 +133,26 @@ line. .B -help Print help message and exit. .TP +.BI -hint-debug \ bitmask +Sets HINT file debugging flags according to the +.IR bitmask . +See the +.B -hint-debug-help +option for details. +.TP +.B -hint-debug-help +Print an explanation of the HINT debugging flags and exit. +.TP +.B -hyphenate-first-word +\*(TX will usualy not attempt to insert hyphenation points into the first +word of a paragraph. If a HINT file must be displayed on a very small device +such hyphenation points might prove necessary. This option is set by default +and enables the genaration of these hyphenation points. +.TP +.B -no-hyphenate-first-word +Disable the automatic insertion of hyphenation points in the first word +of a paragraph. Needed only if complete compatibility with \*(TX is required. +.TP .B -ini Start in .I INI @@ -154,6 +188,15 @@ combination with See .BR latex (1). .TP +.BI -mfmode \ mode +Use +.I mode +as the \*(MF +.I mode +when generating missing fonts. See +.BR mf (1) +for details. +.TP .BI -mktex \ fmt Enable .RI mktex fmt , @@ -198,6 +241,13 @@ Pretend to be program .IR name . This affects both the format used and the search paths. .TP +.BI -resolution \ number +When using \*(MF to generate missing pk fonts, use a resolution of +.I number +DPI. See +.BR mf (1) +for details. +.TP .B -version Print version information and exit. .\"===================================================================== @@ -280,10 +330,18 @@ utility to find their locations. Metric files for Hi\*(TX's fonts. .TP .I *.fmt -Predigested Hi\*(TX format (.\|fmt) files. +Predigested Hi\*(TX format files. +.TP +.I *.pk *.pfb +Font files used by Hi\*(TX. .\"===================================================================== .SH NOTES -.\"===================================================================== +This manual page is not meant to be exhaustive. The complete +documentation for Hi\*(TX can be found in the +.IR "Hi\*(TX user manual" +and the manual of the +.IR "Kpathsea library" . +.PP.\"===================================================================== .SH BUGS This version of Hi\*(TX fails to handle correctly glues and kerns with a width that depends on \ehsize or \evsize. Similarly, when @@ -294,30 +352,28 @@ or \evsize their output might be distorted. Hi\*(TX should compile on a large variety of machine architectures and operating systems. Hi\*(TX is part of the \*(TX Live distribution. -.br -The Hi\*(TX home page: https://hint.userweb.mwn.de +.PP +The Hi\*(TX home page is at +.BR https://hint.userweb.mwn.de . +There you find additional software, most importantly viewers for HINT files, +and further information. .\"===================================================================== .SH "SEE ALSO" -This manual page is not meant to be exhaustive. The complete -documentation for Hi\*(TX can be found in the -.IR "Hi\*(TX user manual" -and the manual of the -.IR "Kpathsea library" . -.PP -Related programs: .BR histretch (1), .BR hishrink (1), .BR latex (1), .BR tex (1), +.BR kpsewhich (1), .\"===================================================================== .SH AUTHORS The primary author of Hi\*(TX is Martin Ruckert, with e\*(TX extensions by Peter Breitenlohner, -\*LX extensions by Thierry Laronde, and +\*(LX extensions by Thierry Laronde, and the kpathsearch library by Karl Berry. .PP \*(TX was designed by Donald E. Knuth, who implemented it using his \*(WB system for Pascal programs. -It was ported to Unix at Stanford by Howard Trickey, and -at Cornell by Pavel Curtis. +.PP +Many, many more contributed to the typesetting system now known as \*(TX; +far too many to name all of them here. .\" vim: syntax=nroff diff --git a/Build/source/texk/web2c/hitexdir/hitex.w b/Build/source/texk/web2c/hitexdir/hitex.w index 146def646e2..535a820e910 100644 --- a/Build/source/texk/web2c/hitexdir/hitex.w +++ b/Build/source/texk/web2c/hitexdir/hitex.w @@ -29937,7 +29937,7 @@ static void hint_debug_help(void) { fprintf(stderr,@/ "To generate HINT format debug output use the option\n" - " -debug=XX "@/ + " -hint-debug=XX "@/ @t\qquad@>"\t XX is a hexadecimal value. OR together these values:\n");@/ fprintf(stderr,"\t\t\t XX=%04X \t basic debugging\n", DBGBASIC);@/ fprintf(stderr,"\t\t\t XX=%04X \t tag debugging\n", DBGTAGS);@/ @@ -33865,6 +33865,8 @@ static void usage_help(void) @t\qquad@>"\t enable compression of section 1 and 2\n"@/ " [-no]-empty-page "@/ @t\qquad@>"\t Disable/Enable empty pages\n"@/ + " -hyphenate-first-word "@/ + @t\qquad@>"\t hyphenate the first word of a paragraph\n"@/ " -no-hyphenate-first-word "@/ @t\qquad@>"\t don't hyphenate the first word of a paragraph\n"@/ " -resolution=NUMBER "@/ @@ -33872,7 +33874,7 @@ static void usage_help(void) " -mfmode=MODE "@/ @t\qquad@>"\t set the METAFONT mode to MODE\n"@/ #ifdef DEBUG - " -debug=FLAGS "@/ + " -hint-debug=FLAGS "@/ @t\qquad@>"\t set flags to controll hint debug output\n"@/ " -hint-debug-help "@/ @t\qquad@>"\t give help on hint debugging\n"@/ @@ -33930,11 +33932,12 @@ static struct option long_options[] = {@/ { "compress", 0, &option_compress, 1 },@/ { "no-empty-page", 0, &option_no_empty_page, 1 },@/ { "empty-page", 0, &option_no_empty_page, 0 },@/ + { "hyphenate-first-word", 0, &option_hyphen_first, 1 },@/ { "no-hyphenate-first-word", 0, &option_hyphen_first, 0 },@/ { "resolution", 1, 0, 0 },@/ { "mfmode", 1, 0, 0 },@/ #ifdef DEBUG - { "debug", 1, 0, 0 },@/ + { "hint-debug", 1, 0, 0 },@/ { "hint-debug-help", 0, 0, 0 },@/ #endif { 0, 0, 0, 0 }@+}@+; @@ -34043,7 +34046,7 @@ else if (ARGUMENT_IS("resolution")) @t\2@> else if (ARGUMENT_IS("mfmode")) option_mfmode=optarg; #ifdef DEBUG@t\1@> -else @+if (ARGUMENT_IS("debug")) +else @+if (ARGUMENT_IS("hint-debug")) debugflags=strtol(optarg,NULL,16); else @+if (ARGUMENT_IS("hint-debug-help")) hint_debug_help(); -- cgit v1.2.3