summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-18 10:07:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-18 10:07:53 +0000
commit2c9611093f83facc8843572a8dccff85083073f6 (patch)
tree3d493cf8780bbba3c2eced50d110caeba8565c1b
parent5bcf1990f4d5d2498d15ce7006a2aff6bdfa7081 (diff)
various minor updates
git-svn-id: svn://tug.org/texlive/trunk@13811 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/afm2pl/configure.ac2
-rw-r--r--Build/source/texk/cjkutils/hbf2gf/hbf2gf.c208
-rw-r--r--Build/source/texk/configure.ac2
-rw-r--r--Build/source/texk/web2c/web2c/web2c-parser.c6
4 files changed, 109 insertions, 109 deletions
diff --git a/Build/source/texk/afm2pl/configure.ac b/Build/source/texk/afm2pl/configure.ac
index dc9e25a3da9..35906ad8551 100644
--- a/Build/source/texk/afm2pl/configure.ac
+++ b/Build/source/texk/afm2pl/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([afm2pl for TeX Live], [x.x], [tex-k@tug.org])
+AC_INIT([afm2pl for TeX Live], [0.7.03], [tex-k@tug.org])
AC_PREREQ([2.63])
AC_CONFIG_SRCDIR([afm2pl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c
index d800c048a29..9aa366e7790 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c
+++ b/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c
@@ -100,10 +100,10 @@
#define VALID_SUBCODE 1 \
/*4:*/
-#line 193 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 193 "hbf2gf.w"
/*10:*/
-#line 413 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 413 "hbf2gf.w"
#include <ctype.h>
#include <stdio.h>
@@ -118,7 +118,7 @@
/*:10*//*69:*/
-#line 2483 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2483 "hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
#ifdef VERY_OLD_KPATHSEA
@@ -137,46 +137,46 @@
#endif
/*:69*/
-#line 194 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 194 "hbf2gf.w"
/*11:*/
-#line 431 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 431 "hbf2gf.w"
void write_file(void);
/*:11*//*13:*/
-#line 493 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 493 "hbf2gf.w"
void write_pre(void);
/*:13*//*16:*/
-#line 581 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 581 "hbf2gf.w"
void write_data(void);
/*:16*//*20:*/
-#line 692 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 692 "hbf2gf.w"
void write_post(void);
/*:20*//*25:*/
-#line 836 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 836 "hbf2gf.w"
void fputl(long,FILE*);
/*:25*//*29:*/
-#line 999 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 999 "hbf2gf.w"
void make_pixel_array(void);
/*:29*//*36:*/
-#line 1227 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1227 "hbf2gf.w"
#ifdef __GNUC__
__inline__
@@ -185,7 +185,7 @@ void read_row(unsigned char*);
/*:36*//*39:*/
-#line 1279 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1279 "hbf2gf.w"
#ifdef __GNUC__
__inline__
@@ -194,55 +194,55 @@ void write_row(unsigned char*);
/*:39*//*41:*/
-#line 1334 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1334 "hbf2gf.w"
void write_coding(void);
/*:41*//*45:*/
-#line 1495 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1495 "hbf2gf.w"
void write_pl(void);
/*:45*//*47:*/
-#line 1592 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1592 "hbf2gf.w"
void write_ovp(void);
/*:47*//*50:*/
-#line 1737 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1737 "hbf2gf.w"
void write_job(void);
/*:50*//*54:*/
-#line 1986 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1986 "hbf2gf.w"
void read_config(void);
/*:54*//*64:*/
-#line 2317 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2317 "hbf2gf.w"
int fsearch(char*);
/*:64*//*67:*/
-#line 2457 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2457 "hbf2gf.w"
void config_error(char*);
/*:67*//*71:*/
-#line 2517 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2517 "hbf2gf.w"
char*TeX_search_version(void);
/*:71*//*74:*/
-#line 2552 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2552 "hbf2gf.w"
#ifdef HAVE_EMTEXDIR
extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
@@ -252,17 +252,17 @@ char*file_find(char*,struct emtex_dir*);
/*:74*//*79:*/
-#line 2649 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2649 "hbf2gf.w"
char*TeX_search_cfg_file(char*);
char*TeX_search_hbf_file(char*);
/*:79*/
-#line 195 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 195 "hbf2gf.w"
/*2:*/
-#line 129 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 129 "hbf2gf.w"
int nmb_files= -1;
int unicode= FALSE;
@@ -303,7 +303,7 @@ int end_of_file= FALSE;
/*:2*//*15:*/
-#line 540 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 540 "hbf2gf.w"
long char_adr[256];
long*char_adr_p;
@@ -345,7 +345,7 @@ int dot_count;
/*:15*//*19:*/
-#line 669 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 669 "hbf2gf.w"
char coding[STRING_LENGTH+1];
char comment[STRING_LENGTH+1];
@@ -364,7 +364,7 @@ double ppp_y;
/*:19*//*27:*/
-#line 876 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 876 "hbf2gf.w"
HBF_CHAR code;
const unsigned char*bitmap;
@@ -387,13 +387,13 @@ long s_mag_x,s_mag_y,s_slant;
/*:27*//*38:*/
-#line 1274 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1274 "hbf2gf.w"
int threshold= 128;
/*:38*//*49:*/
-#line 1726 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1726 "hbf2gf.w"
char job_extension[EXTENSION_LENGTH+1];
char rm_command[STRING_LENGTH+1];
@@ -405,13 +405,13 @@ int ofm_file= FALSE;
/*:49*//*53:*/
-#line 1981 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1981 "hbf2gf.w"
char Buffer[STRING_LENGTH+1];
/*:53*//*58:*/
-#line 2099 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2099 "hbf2gf.w"
int offset_x;
int offset_y;
@@ -420,13 +420,13 @@ HBF_CHAR user_min_char;
int have_min_char= FALSE;
/*:58*//*60:*/
-#line 2256 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2256 "hbf2gf.w"
HBF_CHAR min_char,max_char;
/*:60*//*62:*/
-#line 2283 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2283 "hbf2gf.w"
char b2_codes[256];
unsigned char min_2_byte,max_2_byte;
@@ -434,7 +434,7 @@ int nmb_2_bytes= 0;
/*:62*//*70:*/
-#line 2501 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2501 "hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
#ifdef KPSEDLL
@@ -451,7 +451,7 @@ char no_version_string[]= "no search library";
/*:70*//*73:*/
-#line 2545 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2545 "hbf2gf.w"
#ifdef HAVE_EMTEXDIR
struct emtex_dir cfg_path,hbf_path;
@@ -459,13 +459,13 @@ struct emtex_dir cfg_path,hbf_path;
/*:73*//*76:*/
-#line 2591 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2591 "hbf2gf.w"
char name_buffer[FILE_NAME_LENGTH+1];
/*:76*/
-#line 196 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 196 "hbf2gf.w"
@@ -476,7 +476,7 @@ char*argv[];
{char*p;
/*78:*/
-#line 2613 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2613 "hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
#ifdef OLD_KPATHSEA
@@ -506,16 +506,16 @@ exit(1);
/*:78*/
-#line 205 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 205 "hbf2gf.w"
/*7:*/
-#line 312 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 312 "hbf2gf.w"
if(argc==2)
{if(strcmp(argv[1],"--help")==0)
/*6:*/
-#line 293 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 293 "hbf2gf.w"
{printf(USAGE);
exit(0);
@@ -523,11 +523,11 @@ exit(0);
/*:6*/
-#line 315 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 315 "hbf2gf.w"
else if(strcmp(argv[1],"--version")==0)
/*5:*/
-#line 266 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 266 "hbf2gf.w"
{printf("\n");
printf(banner);
@@ -538,7 +538,7 @@ exit(0);
/*:5*/
-#line 317 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 317 "hbf2gf.w"
}
@@ -576,7 +576,7 @@ exit(1);
/*:7*/
-#line 207 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 207 "hbf2gf.w"
if(!quiet)
@@ -605,7 +605,7 @@ read_config();
if(mf_like)
/*8:*/
-#line 357 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 357 "hbf2gf.w"
{if(unicode)
file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -633,11 +633,11 @@ y_scale= (double)x_resolution/y_scale;
/*:8*/
-#line 234 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 234 "hbf2gf.w"
/*28:*/
-#line 908 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 908 "hbf2gf.w"
{int col,offset;
@@ -720,11 +720,11 @@ s_slant= slant*SCALE;
/*:28*/
-#line 236 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 236 "hbf2gf.w"
/*9:*/
-#line 392 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 392 "hbf2gf.w"
{int j,max_numb;
@@ -746,7 +746,7 @@ nmb_files= j;
/*:9*/
-#line 238 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 238 "hbf2gf.w"
if(tfm_files)
@@ -764,7 +764,7 @@ return 0;
/*:4*//*12:*/
-#line 439 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 439 "hbf2gf.w"
void write_file(void)
{char output_file[FILE_NAME_LENGTH+1];
@@ -808,7 +808,7 @@ write_data();
/*:12*//*14:*/
-#line 500 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 500 "hbf2gf.w"
void write_pre(void)
{char out_s[40],s[20];
@@ -831,7 +831,7 @@ fputs(out_s,out);
/*:14*//*17:*/
-#line 586 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 586 "hbf2gf.w"
void write_data(void)
{dot_count= 0;
@@ -839,7 +839,7 @@ char_adr_p= char_adr;
for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
/*18:*/
-#line 611 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 611 "hbf2gf.w"
{if(dot_count++%10==0)
if(pk_files&&!quiet)
@@ -883,13 +883,13 @@ fputc(EOC,out);
/*:18*/
-#line 592 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 592 "hbf2gf.w"
}
/*:17*//*21:*/
-#line 697 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 697 "hbf2gf.w"
void write_post(void)
{long special_adr;
@@ -917,7 +917,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
/*22:*/
-#line 743 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 743 "hbf2gf.w"
special_adr= ftell(out);
@@ -935,10 +935,10 @@ fputs(comment,out);
/*:22*/
-#line 723 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 723 "hbf2gf.w"
/*23:*/
-#line 772 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 772 "hbf2gf.w"
post_adr= ftell(out);
fputc(POST,out);
@@ -977,10 +977,10 @@ fputl(*char_adr_p++,out);
/*:23*/
-#line 724 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 724 "hbf2gf.w"
/*24:*/
-#line 823 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 823 "hbf2gf.w"
fputc(POSTPOST,out);
fputl(post_adr,out);
@@ -992,13 +992,13 @@ fputc(POSTPOST_ID,out);
/*:24*/
-#line 725 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 725 "hbf2gf.w"
}
/*:21*//*26:*/
-#line 841 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 841 "hbf2gf.w"
void fputl(num,f)
long num;
@@ -1012,7 +1012,7 @@ fputc(num,f);
/*:26*//*30:*/
-#line 1004 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1004 "hbf2gf.w"
void make_pixel_array(void)
{unsigned char*prP;
@@ -1050,7 +1050,7 @@ if(!bitmap)
empty_char= TRUE;
else
/*31:*/
-#line 1063 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1063 "hbf2gf.w"
{if(pk_output_size_y==input_size_y)
temp_prP= prP;
@@ -1058,7 +1058,7 @@ temp_prP= prP;
curr_row= input_size_y-1;
for(row= 0;row<pk_output_size_y;++row)
{/*32:*/
-#line 1077 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1077 "hbf2gf.w"
if(pk_output_size_y==input_size_y)
@@ -1080,7 +1080,7 @@ need_to_read_row= 1;
}
/*33:*/
-#line 1104 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1104 "hbf2gf.w"
if(need_to_read_row)
if(rows_read<input_size_y)
@@ -1112,16 +1112,16 @@ frac_row_to_fill= SCALE;
/*:33*/
-#line 1097 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1097 "hbf2gf.w"
}
/*:32*/
-#line 1069 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1069 "hbf2gf.w"
/*34:*/
-#line 1145 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1145 "hbf2gf.w"
if(pk_width==input_size_x&&s_slant==0)
@@ -1176,7 +1176,7 @@ frac_col_to_fill-= frac_col_left;
}
/*35:*/
-#line 1203 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1203 "hbf2gf.w"
if(frac_col_to_fill> 0)
{--xP;
@@ -1196,20 +1196,20 @@ write_row(new_prP);
/*:35*/
-#line 1198 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1198 "hbf2gf.w"
}
/*:34*/
-#line 1071 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1071 "hbf2gf.w"
}
}
/*:31*/
-#line 1040 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1040 "hbf2gf.w"
}
}
@@ -1233,7 +1233,7 @@ goto again;
/*:30*//*37:*/
-#line 1235 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1235 "hbf2gf.w"
#ifdef __GNUC__
__inline__
@@ -1270,7 +1270,7 @@ bitshift= 7;
/*:37*//*40:*/
-#line 1287 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1287 "hbf2gf.w"
#ifdef __GNUC__
__inline__
@@ -1288,7 +1288,7 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
/*:40*//*42:*/
-#line 1342 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1342 "hbf2gf.w"
void write_coding(void)
{register int count,skip;
@@ -1305,7 +1305,7 @@ goto start;
while(y<pk_output_size_y)
{/*43:*/
-#line 1366 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1366 "hbf2gf.w"
count= 0;
x= 0;
@@ -1374,11 +1374,11 @@ continue;
/*:43*/
-#line 1357 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1357 "hbf2gf.w"
start:
/*44:*/
-#line 1434 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1434 "hbf2gf.w"
while(x<pk_output_size_x)
{if(*cp==paint)
@@ -1419,7 +1419,7 @@ paint= WHITE;
/*:44*/
-#line 1359 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1359 "hbf2gf.w"
y++;
}
@@ -1427,7 +1427,7 @@ y++;
/*:42*//*46:*/
-#line 1500 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1500 "hbf2gf.w"
void write_pl(void)
{int i,pos;
@@ -1517,7 +1517,7 @@ fclose(out);
/*:46*//*48:*/
-#line 1597 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1597 "hbf2gf.w"
void write_ovp(void)
{int c,i,nmb_subfonts,remainder,count,pos;
@@ -1632,7 +1632,7 @@ fclose(out);
/*:48*//*51:*/
-#line 1742 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1742 "hbf2gf.w"
void write_job(void)
{FILE*out;
@@ -1718,7 +1718,7 @@ fclose(out);
/*:51*//*55:*/
-#line 1994 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 1994 "hbf2gf.w"
void read_config(void)
{HBF_BBOX*boxp;
@@ -1726,7 +1726,7 @@ char*real_config_file;
/*56:*/
-#line 2046 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2046 "hbf2gf.w"
{int i,lastext= -1;
@@ -1744,7 +1744,7 @@ strcat(config_file,".cfg");
/*:56*/
-#line 2000 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2000 "hbf2gf.w"
real_config_file= TeX_search_cfg_file(config_file);
@@ -1779,7 +1779,7 @@ exit(0);
}
/*57:*/
-#line 2063 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2063 "hbf2gf.w"
{char hbf_header[STRING_LENGTH+1];
char*real_hbf_header;
@@ -1816,10 +1816,10 @@ strcpy(output_name,Buffer);
/*:57*/
-#line 2033 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2033 "hbf2gf.w"
/*59:*/
-#line 2107 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2107 "hbf2gf.w"
{if(fsearch("nmb_files"))
nmb_files= atoi(Buffer);
@@ -1961,11 +1961,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
/*:59*/
-#line 2034 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2034 "hbf2gf.w"
/*61:*/
-#line 2261 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2261 "hbf2gf.w"
{const void*cp;
HBF_CHAR dummy;
@@ -1980,10 +1980,10 @@ min_char= user_min_char;
/*:61*/
-#line 2036 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2036 "hbf2gf.w"
/*63:*/
-#line 2290 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2290 "hbf2gf.w"
{const void*b2r;
unsigned char dummy;
@@ -2006,7 +2006,7 @@ nmb_2_bytes++;
/*:63*/
-#line 2037 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2037 "hbf2gf.w"
fclose(config);
@@ -2014,7 +2014,7 @@ fclose(config);
/*:55*//*65:*/
-#line 2322 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2322 "hbf2gf.w"
int fsearch(search_string)
char*search_string;
@@ -2071,7 +2071,7 @@ Ch= fgetc(config);
if(*temp_buffer)
/*66:*/
-#line 2402 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2402 "hbf2gf.w"
{P= temp_buffer;
Buf_p= Buffer;
@@ -2124,7 +2124,7 @@ count--;
/*:66*/
-#line 2377 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2377 "hbf2gf.w"
else
*Buffer= '\0';
@@ -2134,7 +2134,7 @@ return(*Buffer)?1:0;
/*:65*//*68:*/
-#line 2462 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2462 "hbf2gf.w"
void config_error(message)
char*message;
@@ -2147,7 +2147,7 @@ exit(1);
/*:68*//*72:*/
-#line 2522 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2522 "hbf2gf.w"
char*TeX_search_version(void)
{
@@ -2169,7 +2169,7 @@ return no_version_string;
/*:72*//*75:*/
-#line 2564 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2564 "hbf2gf.w"
#ifdef HAVE_EMTEXDIR
int dir_setup(ed,env,dir,flags)
@@ -2197,7 +2197,7 @@ return TRUE;
/*:75*//*77:*/
-#line 2596 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2596 "hbf2gf.w"
char*file_find(name,list)
char*name;
@@ -2212,7 +2212,7 @@ return NULL;
/*:77*//*80:*/
-#line 2655 "../../../../tex-live-2009test-1.4/texk/cjkutils/hbf2gf/hbf2gf.w"
+#line 2655 "hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
char*TeX_search_cfg_file(name)
diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac
index f1ca2e39143..51cda9ba4b2 100644
--- a/Build/source/texk/configure.ac
+++ b/Build/source/texk/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([TeX Live texk], [1.1], [peb@mppmu.mpg.de])
+AC_INIT([TeX Live texk], [2009], [peb@mppmu.mpg.de])
AC_PREREQ([2.63])
AC_CONFIG_SRCDIR([../build-aux/missing])
AC_CONFIG_AUX_DIR([../build-aux])
diff --git a/Build/source/texk/web2c/web2c/web2c-parser.c b/Build/source/texk/web2c/web2c/web2c-parser.c
index 978ca0aaea8..aa8be84435b 100644
--- a/Build/source/texk/web2c/web2c/web2c-parser.c
+++ b/Build/source/texk/web2c/web2c/web2c-parser.c
@@ -105,7 +105,7 @@ static boolean doreturn P1H(string);
/* Line 189 of yacc.c */
-#line 109 "../../../../tex-live-2009test-1.3/texk/web2c/web2c/web2c-parser.c"
+#line 109 "web2c-parser.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -263,7 +263,7 @@ typedef int YYSTYPE;
/* Line 264 of yacc.c */
-#line 267 "../../../../tex-live-2009test-1.3/texk/web2c/web2c/web2c-parser.c"
+#line 267 "web2c-parser.c"
#ifdef short
# undef short
@@ -3880,7 +3880,7 @@ yyreduce:
/* Line 1455 of yacc.c */
-#line 3884 "../../../../tex-live-2009test-1.3/texk/web2c/web2c/web2c-parser.c"
+#line 3884 "web2c-parser.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);