From d0836738c17f6d9b24fb0b4f6e1bdf490807334c Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 17 Jun 2018 02:44:04 +0000 Subject: texk/cjkutils: Adjust #line directive to the new convention git-svn-id: svn://tug.org/texlive/trunk@48036 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/cjkutils/ChangeLog | 4 + Build/source/texk/cjkutils/bg5conv.c | 2 +- Build/source/texk/cjkutils/cef5conv.c | 2 +- Build/source/texk/cjkutils/cefconv.c | 2 +- Build/source/texk/cjkutils/cefsconv.c | 2 +- Build/source/texk/cjkutils/extconv.c | 2 +- Build/source/texk/cjkutils/hbf2gf.c | 208 +++++++++++++++++----------------- Build/source/texk/cjkutils/sjisconv.c | 2 +- 8 files changed, 114 insertions(+), 110 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 1eb36209ba6..d69aa3d1034 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2018-06-17 TANAKA Takuji + + * *.c: Adjust #line directive to the new convention. + 2016-02-23 Akira Kakuto * Makefile.am, configure.ac: New convention. diff --git a/Build/source/texk/cjkutils/bg5conv.c b/Build/source/texk/cjkutils/bg5conv.c index 7acc54321ef..891f7920669 100644 --- a/Build/source/texk/cjkutils/bg5conv.c +++ b/Build/source/texk/cjkutils/bg5conv.c @@ -2,7 +2,7 @@ "bg5conv (CJK ver. 4.8.4)" \ /*2:*/ -#line 94 "./cjkutils-4.8.4/Bg5conv/bg5conv.w" +#line 94 "./cjkutils-src/Bg5conv/bg5conv.w" #include #include diff --git a/Build/source/texk/cjkutils/cef5conv.c b/Build/source/texk/cjkutils/cef5conv.c index e8524a023ed..30a0f97209d 100644 --- a/Build/source/texk/cjkutils/cef5conv.c +++ b/Build/source/texk/cjkutils/cef5conv.c @@ -2,7 +2,7 @@ "cef5conv (CJK ver. 4.8.4)" \ /*2:*/ -#line 108 "./cjkutils-4.8.4/CEFconv/cef5conv.w" +#line 108 "./cjkutils-src/CEFconv/cef5conv.w" #include #include diff --git a/Build/source/texk/cjkutils/cefconv.c b/Build/source/texk/cjkutils/cefconv.c index 6773e45bdd5..18bcf6eee3c 100644 --- a/Build/source/texk/cjkutils/cefconv.c +++ b/Build/source/texk/cjkutils/cefconv.c @@ -2,7 +2,7 @@ "cefconv (CJK ver. 4.8.4)" \ /*2:*/ -#line 100 "./cjkutils-4.8.4/CEFconv/cefconv.w" +#line 100 "./cjkutils-src/CEFconv/cefconv.w" #include #include diff --git a/Build/source/texk/cjkutils/cefsconv.c b/Build/source/texk/cjkutils/cefsconv.c index 528e880063d..324ee77a666 100644 --- a/Build/source/texk/cjkutils/cefsconv.c +++ b/Build/source/texk/cjkutils/cefsconv.c @@ -2,7 +2,7 @@ "cefsconv (CJK ver. 4.8.4)" \ /*2:*/ -#line 111 "./cjkutils-4.8.4/CEFconv/cefsconv.w" +#line 111 "./cjkutils-src/CEFconv/cefsconv.w" #include #include diff --git a/Build/source/texk/cjkutils/extconv.c b/Build/source/texk/cjkutils/extconv.c index 78f13d14c02..a2d879488fd 100644 --- a/Build/source/texk/cjkutils/extconv.c +++ b/Build/source/texk/cjkutils/extconv.c @@ -2,7 +2,7 @@ "extconv (CJK ver. 4.8.4)" \ /*2:*/ -#line 94 "./cjkutils-4.8.4/extconv/extconv.w" +#line 94 "./cjkutils-src/extconv/extconv.w" #include #include diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c index 90620308edd..d1980e7939e 100644 --- a/Build/source/texk/cjkutils/hbf2gf.c +++ b/Build/source/texk/cjkutils/hbf2gf.c @@ -100,10 +100,10 @@ #define VALID_SUBCODE 1 \ /*4:*/ -#line 191 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 191 "./cjkutils-src/hbf2gf/hbf2gf.w" /*10:*/ -#line 408 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 408 "./cjkutils-src/hbf2gf/hbf2gf.w" #ifdef HAVE_CONFIG_H #include @@ -121,7 +121,7 @@ /*:10*//*69:*/ -#line 2473 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2473 "./cjkutils-src/hbf2gf/hbf2gf.w" #if defined(HAVE_LIBKPATHSEA) #include "kpathsea/kpathsea.h" @@ -134,46 +134,46 @@ #endif /*:69*/ -#line 192 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 192 "./cjkutils-src/hbf2gf/hbf2gf.w" /*11:*/ -#line 429 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 429 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_file(void); /*:11*//*13:*/ -#line 491 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 491 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_pre(void); /*:13*//*16:*/ -#line 579 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 579 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_data(void); /*:16*//*20:*/ -#line 690 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 690 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_post(void); /*:20*//*25:*/ -#line 834 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 834 "./cjkutils-src/hbf2gf/hbf2gf.w" static void fputl(long,FILE*); /*:25*//*29:*/ -#line 994 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 994 "./cjkutils-src/hbf2gf/hbf2gf.w" static void make_pixel_array(void); /*:29*//*36:*/ -#line 1222 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1222 "./cjkutils-src/hbf2gf/hbf2gf.w" static #ifdef __GNUC__ @@ -183,7 +183,7 @@ void read_row(unsigned char*); /*:36*//*39:*/ -#line 1274 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1274 "./cjkutils-src/hbf2gf/hbf2gf.w" static #ifdef __GNUC__ @@ -193,55 +193,55 @@ void write_row(unsigned char*); /*:39*//*41:*/ -#line 1329 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1329 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_coding(void); /*:41*//*45:*/ -#line 1490 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1490 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_pl(void); /*:45*//*47:*/ -#line 1587 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1587 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_ovp(void); /*:47*//*50:*/ -#line 1732 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1732 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_job(void); /*:50*//*54:*/ -#line 1981 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1981 "./cjkutils-src/hbf2gf/hbf2gf.w" static void read_config(void); /*:54*//*64:*/ -#line 2312 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2312 "./cjkutils-src/hbf2gf/hbf2gf.w" static int fsearch(const char*); /*:64*//*67:*/ -#line 2451 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2451 "./cjkutils-src/hbf2gf/hbf2gf.w" static void config_error(const char*); /*:67*//*71:*/ -#line 2494 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2494 "./cjkutils-src/hbf2gf/hbf2gf.w" static const char*TeX_search_version(void); /*:71*//*74:*/ -#line 2529 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2529 "./cjkutils-src/hbf2gf/hbf2gf.w" #ifdef HAVE_EMTEXDIR extern int setup_list(struct emtex_dir*,char*,const char*,unsigned); @@ -251,17 +251,17 @@ static char*file_find(char*,struct emtex_dir*); /*:74*//*79:*/ -#line 2621 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2621 "./cjkutils-src/hbf2gf/hbf2gf.w" static char*TeX_search_cfg_file(char*); static char*TeX_search_hbf_file(char*); /*:79*/ -#line 193 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 193 "./cjkutils-src/hbf2gf/hbf2gf.w" /*2:*/ -#line 127 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 127 "./cjkutils-src/hbf2gf/hbf2gf.w" int nmb_files= -1; int unicode= FALSE; @@ -302,7 +302,7 @@ int end_of_file= FALSE; /*:2*//*15:*/ -#line 538 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 538 "./cjkutils-src/hbf2gf/hbf2gf.w" long char_adr[256]; long*char_adr_p; @@ -344,7 +344,7 @@ int dot_count; /*:15*//*19:*/ -#line 667 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 667 "./cjkutils-src/hbf2gf/hbf2gf.w" char coding[STRING_LENGTH+1]; char comment[STRING_LENGTH+1]; @@ -363,7 +363,7 @@ double ppp_y; /*:19*//*27:*/ -#line 871 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 871 "./cjkutils-src/hbf2gf/hbf2gf.w" HBF_CHAR code; const unsigned char*bitmap; @@ -386,13 +386,13 @@ long s_mag_x,s_mag_y,s_slant; /*:27*//*38:*/ -#line 1269 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1269 "./cjkutils-src/hbf2gf/hbf2gf.w" int threshold= 128; /*:38*//*49:*/ -#line 1721 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1721 "./cjkutils-src/hbf2gf/hbf2gf.w" char job_extension[EXTENSION_LENGTH+1]; char rm_command[STRING_LENGTH+1]; @@ -404,13 +404,13 @@ int ofm_file= FALSE; /*:49*//*53:*/ -#line 1976 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1976 "./cjkutils-src/hbf2gf/hbf2gf.w" char Buffer[STRING_LENGTH+1]; /*:53*//*58:*/ -#line 2094 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2094 "./cjkutils-src/hbf2gf/hbf2gf.w" int offset_x; int offset_y; @@ -419,13 +419,13 @@ HBF_CHAR user_min_char; int have_min_char= FALSE; /*:58*//*60:*/ -#line 2251 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2251 "./cjkutils-src/hbf2gf/hbf2gf.w" HBF_CHAR min_char,max_char; /*:60*//*62:*/ -#line 2278 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2278 "./cjkutils-src/hbf2gf/hbf2gf.w" char b2_codes[256]; unsigned char min_2_byte,max_2_byte; @@ -433,7 +433,7 @@ int nmb_2_bytes= 0; /*:62*//*70:*/ -#line 2485 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2485 "./cjkutils-src/hbf2gf/hbf2gf.w" #if defined(HAVE_EMTEXDIR) char emtex_version_string[]= "emTeXdir"; @@ -443,7 +443,7 @@ char no_version_string[]= "no search library"; /*:70*//*73:*/ -#line 2522 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2522 "./cjkutils-src/hbf2gf/hbf2gf.w" #ifdef HAVE_EMTEXDIR struct emtex_dir cfg_path,hbf_path; @@ -451,7 +451,7 @@ struct emtex_dir cfg_path,hbf_path; /*:73*//*76:*/ -#line 2569 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2569 "./cjkutils-src/hbf2gf/hbf2gf.w" #ifdef HAVE_EMTEXDIR char name_buffer[FILE_NAME_LENGTH+1]; @@ -459,7 +459,7 @@ char name_buffer[FILE_NAME_LENGTH+1]; /*:76*/ -#line 194 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 194 "./cjkutils-src/hbf2gf/hbf2gf.w" @@ -467,7 +467,7 @@ int main(int argc,char*argv[]) {char*p; /*78:*/ -#line 2594 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 2594 "./cjkutils-src/hbf2gf/hbf2gf.w" #if defined(HAVE_LIBKPATHSEA) kpse_set_program_name(argv[0],"hbf2gf"); @@ -488,16 +488,16 @@ exit(1); /*:78*/ -#line 200 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 200 "./cjkutils-src/hbf2gf/hbf2gf.w" /*7:*/ -#line 307 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 307 "./cjkutils-src/hbf2gf/hbf2gf.w" if(argc==2) {if(strcmp(argv[1],"--help")==0) /*6:*/ -#line 288 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 288 "./cjkutils-src/hbf2gf/hbf2gf.w" {printf(USAGE); exit(0); @@ -505,11 +505,11 @@ exit(0); /*:6*/ -#line 310 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 310 "./cjkutils-src/hbf2gf/hbf2gf.w" else if(strcmp(argv[1],"--version")==0) /*5:*/ -#line 261 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 261 "./cjkutils-src/hbf2gf/hbf2gf.w" {printf("\n"); printf(banner); @@ -520,7 +520,7 @@ exit(0); /*:5*/ -#line 312 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 312 "./cjkutils-src/hbf2gf/hbf2gf.w" } @@ -558,7 +558,7 @@ exit(1); /*:7*/ -#line 202 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 202 "./cjkutils-src/hbf2gf/hbf2gf.w" if(!quiet) @@ -587,7 +587,7 @@ read_config(); if(mf_like) /*8:*/ -#line 352 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 352 "./cjkutils-src/hbf2gf/hbf2gf.w" {if(unicode) file_number= (int)strtol(&argv[1][strlen(argv[1])-2], @@ -615,11 +615,11 @@ y_scale= (double)x_resolution/y_scale; /*:8*/ -#line 229 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 229 "./cjkutils-src/hbf2gf/hbf2gf.w" /*28:*/ -#line 903 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 903 "./cjkutils-src/hbf2gf/hbf2gf.w" {int col,offset; @@ -702,11 +702,11 @@ s_slant= slant*SCALE; /*:28*/ -#line 231 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 231 "./cjkutils-src/hbf2gf/hbf2gf.w" /*9:*/ -#line 387 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 387 "./cjkutils-src/hbf2gf/hbf2gf.w" {int j,max_numb; @@ -728,7 +728,7 @@ nmb_files= j; /*:9*/ -#line 233 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 233 "./cjkutils-src/hbf2gf/hbf2gf.w" if(tfm_files) @@ -746,7 +746,7 @@ return 0; /*:4*//*12:*/ -#line 437 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 437 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_file(void) {char output_file[FILE_NAME_LENGTH+1]; @@ -790,7 +790,7 @@ write_data(); /*:12*//*14:*/ -#line 498 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 498 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_pre(void) {char out_s[40],s[20]; @@ -813,7 +813,7 @@ fputs(out_s,out); /*:14*//*17:*/ -#line 584 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 584 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_data(void) {dot_count= 0; @@ -821,7 +821,7 @@ char_adr_p= char_adr; for(last_char= 0;(last_char<256)&&!end_of_file;last_char++) /*18:*/ -#line 609 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 609 "./cjkutils-src/hbf2gf/hbf2gf.w" {if(dot_count++%10==0) if(pk_files&&!quiet) @@ -865,13 +865,13 @@ fputc(EOC,out); /*:18*/ -#line 590 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 590 "./cjkutils-src/hbf2gf/hbf2gf.w" } /*:17*//*21:*/ -#line 695 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 695 "./cjkutils-src/hbf2gf/hbf2gf.w" static void write_post(void) {long special_adr; @@ -899,7 +899,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20; /*22:*/ -#line 741 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 741 "./cjkutils-src/hbf2gf/hbf2gf.w" special_adr= ftell(out); @@ -917,10 +917,10 @@ fputs(comment,out); /*:22*/ -#line 721 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 721 "./cjkutils-src/hbf2gf/hbf2gf.w" /*23:*/ -#line 770 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 770 "./cjkutils-src/hbf2gf/hbf2gf.w" post_adr= ftell(out); fputc(POST,out); @@ -959,10 +959,10 @@ fputl(*char_adr_p++,out); /*:23*/ -#line 722 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 722 "./cjkutils-src/hbf2gf/hbf2gf.w" /*24:*/ -#line 821 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 821 "./cjkutils-src/hbf2gf/hbf2gf.w" fputc(POSTPOST,out); fputl(post_adr,out); @@ -974,13 +974,13 @@ fputc(POSTPOST_ID,out); /*:24*/ -#line 723 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 723 "./cjkutils-src/hbf2gf/hbf2gf.w" } /*:21*//*26:*/ -#line 839 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 839 "./cjkutils-src/hbf2gf/hbf2gf.w" static void fputl(long num,FILE*f) {fputc(num>>24,f); @@ -991,7 +991,7 @@ fputc(num,f); /*:26*//*30:*/ -#line 999 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 999 "./cjkutils-src/hbf2gf/hbf2gf.w" static void make_pixel_array(void) {unsigned char*prP; @@ -1029,7 +1029,7 @@ if(!bitmap) empty_char= TRUE; else /*31:*/ -#line 1058 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1058 "./cjkutils-src/hbf2gf/hbf2gf.w" {if(pk_output_size_y==input_size_y) temp_prP= prP; @@ -1037,7 +1037,7 @@ temp_prP= prP; curr_row= input_size_y-1; for(row= 0;row 0) {--xP; @@ -1175,20 +1175,20 @@ write_row(new_prP); /*:35*/ -#line 1193 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1193 "./cjkutils-src/hbf2gf/hbf2gf.w" } /*:34*/ -#line 1066 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1066 "./cjkutils-src/hbf2gf/hbf2gf.w" } } /*:31*/ -#line 1035 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1035 "./cjkutils-src/hbf2gf/hbf2gf.w" } } @@ -1212,7 +1212,7 @@ goto again; /*:30*//*37:*/ -#line 1231 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1231 "./cjkutils-src/hbf2gf/hbf2gf.w" static #ifdef __GNUC__ @@ -1248,7 +1248,7 @@ bitshift= 7; /*:37*//*40:*/ -#line 1283 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w" +#line 1283 "./cjkutils-src/hbf2gf/hbf2gf.w" static #ifdef __GNUC__ @@ -1265,7 +1265,7 @@ for(col= 0,xP= pixelrow;col #include -- cgit v1.2.3