Index: externs.h =================================================================== RCS file: /home/uwe/repository/lout/externs.h,v retrieving revision 1.1.1.2 diff -c -r1.1.1.2 externs.h *** externs.h 1998/04/08 18:26:44 1.1.1.2 --- externs.h 1998/04/22 15:43:46 *************** *** 31,49 **** #include #include ! #if LOCALE_ON || COLLATE ! #include ! #endif ! ! #if LOCALE_ON ! #include ! extern nl_catd MsgCat; ! #define condcatgets(cat, set, msg, s) catgets(cat, set, msg, s) ! #else ! #define condcatgets(cat, set, msg, s) s #endif - /*****************************************************************************/ /* */ /* Include, font and database directories, and the DEBUG_ON and ASSERT_ON */ --- 31,42 ---- #include #include ! #if !(OS_UNIX || OS_DOS || OS_MAC) ! #define OS_UNIX 1 ! #define OS_DOS 0 ! #define OS_MAC 0 #endif /*****************************************************************************/ /* */ /* Include, font and database directories, and the DEBUG_ON and ASSERT_ON */ *************** *** 70,82 **** /* #define DATA_DIR "data" */ /* #define HYPH_DIR "hyph" */ /* #define LOCALE_DIR "locale" (only used if LOCALE_ON) */ ! /* #define CHAR_IN 0 */ /* #define CHAR_OUT 0 */ /* #define DEBUG_ON 0 */ /* #define ASSERT_ON 1 */ ! /* #define LOCALE_ON 1 */ /* */ /*****************************************************************************/ /*@::File naming conventions and address@hidden/ --- 63,179 ---- /* #define DATA_DIR "data" */ /* #define HYPH_DIR "hyph" */ /* #define LOCALE_DIR "locale" (only used if LOCALE_ON) */ ! /* #define CHAR_IN 1 */ /* #define CHAR_OUT 0 */ /* #define DEBUG_ON 0 */ /* #define ASSERT_ON 1 */ ! /* #define LOCALE_ON 0 */ ! /* */ ! /*****************************************************************************/ ! ! #ifndef LIB_DIR ! # if OS_UNIX ! # define LIB_DIR "/usr/local/lib/lout" ! # elsif OS_DOS ! # define LIB_DIR "c:/lout/3.12" ! # elsif OS_MAC ! # define LIB_DIR ":lout:3.12:" ! # endif ! #endif ! ! #ifndef INCL_DIR ! # define INCL_DIR "include" ! #endif ! ! #ifndef FONT_DIR ! # define FONT_DIR "font" ! #endif ! ! #ifndef MAPS_DIR ! # define MAPS_DIR "maps" ! #endif ! ! #ifndef DATA_DIR ! # define DATA_DIR "data" ! #endif ! ! #ifndef HYPH_DIR ! # define HYPH_DIR "hyph" ! #endif ! ! #ifndef LOCALE_DIR ! # define LOCALE_DIR "locale" /* only used if LOCALE_ON */ ! #endif ! ! #ifndef CHAR_IN ! # define CHAR_IN 1 ! #endif ! ! #ifndef CHAR_OUT ! # define CHAR_OUT 0 ! #endif ! ! #ifndef DEBUG_ON ! # define DEBUG_ON 0 ! #endif ! ! #ifndef ASSERT_ON ! # define ASSERT_ON 1 ! #endif ! ! #ifndef PDF_COMPRESSION ! # define PDF_COMPRESSION 0 ! #endif ! ! #ifndef SAFE_DFT ! # define SAFE_DFT 0 ! #endif ! ! #ifndef USE_STAT ! # if OS_UNIX || defined(_WIN32) ! # define USE_STAT 1 ! # else ! # define USE_STAT 0 ! # endif ! #endif ! ! #ifndef DB_FIX ! # ifdef _WIN32 ! # define DB_FIX 1 ! # else ! # define DB_FIX 0 ! # endif ! #endif ! ! ! /*****************************************************************************/ ! /* */ ! /* Locale settings */ ! /* */ ! /* LOCALE_ON Use localized messages */ ! /* COLLATE Use strcoll() for sorting databases */ /* */ /*****************************************************************************/ + + #ifndef LOCALE_ON + # define LOCALE_ON 0 + #endif + + #ifndef COLLATE + # define COLLATE 0 + #endif + + #if LOCALE_ON || COLLATE + #include + #endif + + #if LOCALE_ON + #include + extern nl_catd MsgCat; + #define condcatgets(cat, set, msg, s) catgets(cat, set, msg, s) + #else + #define condcatgets(cat, set, msg, s) s + #endif /*@::File naming conventions and address@hidden/ Index: z48.c =================================================================== RCS file: /home/uwe/repository/lout/z48.c,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 z48.c *** z48.c 1998/04/08 18:26:23 1.1.1.1 --- z48.c 1998/04/20 19:24:50 *************** *** 3038,3054 **** g_page_h_origin = g_page_v_origin = 0; g_page_line_width = in_line_width; - g_graphics_vars[k_in] = IN; - g_graphics_vars[k_cm] = CM; - g_graphics_vars[k_pt] = PT; - g_graphics_vars[k_em] = EM; g_graphics_vars[k_xsize] = 0; /* undefined */ g_graphics_vars[k_ysize] = 0; /* undefined */ g_graphics_vars[k_xmark] = 0; /* undefined */ g_graphics_vars[k_ymark] = 0; /* undefined */ ! g_graphics_vars[k_loutf] = 0; /* undefined */ ! g_graphics_vars[k_loutv] = 0; /* undefined */ ! g_graphics_vars[k_louts] = 0; /* undefined */ g_ET_pending = FALSE; g_TJ_pending = FALSE; --- 3038,3051 ---- g_page_h_origin = g_page_v_origin = 0; g_page_line_width = in_line_width; g_graphics_vars[k_xsize] = 0; /* undefined */ g_graphics_vars[k_ysize] = 0; /* undefined */ g_graphics_vars[k_xmark] = 0; /* undefined */ g_graphics_vars[k_ymark] = 0; /* undefined */ ! ! g_units[k_loutf] = 0; /* undefined */ ! g_units[k_loutv] = 0; /* undefined */ ! g_units[k_louts] = 0; /* undefined */ g_ET_pending = FALSE; g_TJ_pending = FALSE; *************** *** 3636,3652 **** /* write out trailer */ if (g_PDF_debug) fprintf(in_fp, "%%\n%% trailer:\n%%\n"); ! fputs("trailer\n" ! "<< ", in_fp); ! fprintf(in_fp, "/Size %u ", g_next_objnum); ! fputs("/Root ", in_fp); PDFObject_WriteRef(in_fp, catalog_obj_num); ! fputs(" /Info ", in_fp); PDFObject_WriteRef(in_fp, info_obj_num); ! fprintf(in_fp, " >>\n" ! "startxref %u\n", xref_start); fputs("%%EOF\n", in_fp); /* memory deallocation (no need to dispose of the qsave_marking_stack because it's always --- 3633,3657 ---- /* write out trailer */ + /* uwe: comments can appear in the body only. if (g_PDF_debug) fprintf(in_fp, "%%\n%% trailer:\n%%\n"); + */ + fputs("trailer\n<<\n", in_fp); + + fprintf(in_fp, "/Size %u\n", g_next_objnum); + + fputs("/Root ", in_fp); + PDFObject_WriteRef(in_fp, catalog_obj_num); + fputc('\n', in_fp); ! fputs("/Info ", in_fp); ! PDFObject_WriteRef(in_fp, info_obj_num); ! fputc('\n', in_fp); ! fprintf(in_fp, ">>\n" ! "startxref\n" ! "%u\n", xref_start); fputs("%%EOF\n", in_fp); /* memory deallocation (no need to dispose of the qsave_marking_stack because it's always