X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/975ddbf53c2305aa7cb0be023a440baa867d3974..fd48cd1850a268afab416e836cd3b333a7f6e31e:/src/ccl.h

diff --git a/src/ccl.h b/src/ccl.h
index 17f2c4d302..7199170a15 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -1,12 +1,14 @@
 /* Header for CCL (Code Conversion Language) interpreter.
-   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -16,8 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_CCL_H
 #define EMACS_CCL_H
@@ -33,6 +35,10 @@ Boston, MA 02111-1307, USA.  */
 /* Structure to hold information about running CCL code.  Read
    comments in the file ccl.c for the detail of each field.  */
 struct ccl_program {
+  int idx;			/* Index number of the CCL program.
+				   -1 means that the program was given
+				   by a vector, not by a program
+				   name.  */
   int size;			/* Size of the compiled code.  */
   Lisp_Object *prog;		/* Pointer into the compiled code.  */
   int ic;			/* Instruction Counter (index for PROG).  */
@@ -44,7 +50,7 @@ struct ccl_program {
   int private_state;            /* CCL instruction may use this
 				   for private use, mainly for saving
 				   internal states on suspending.
-				   This variable is set to 0 when ccl is 
+				   This variable is set to 0 when ccl is
 				   set up.  */
   int last_block;		/* Set to 1 while processing the last
 				   block. */
@@ -55,9 +61,21 @@ struct ccl_program {
   int stack_idx;		/* How deep the call of CCL_Call is nested.  */
   int eol_type;			/* When the CCL program is used for
 				   encoding by a coding system, set to
-				   the eol_type of the coding
-				   system.  */
+				   the eol_type of the coding system.
+				   In other cases, always
+				   CODING_EOL_LF.  */
   int multibyte;		/* 1 if the source text is multibyte.  */
+  int cr_consumed;		/* Flag for encoding DOS-like EOL
+				   format when the CCL program is used
+				   for encoding by a coding
+				   system.  */
+  int suppress_error;		/* If nonzero, don't insert error
+				   message in the output.  */
+  int eight_bit_control;	/* If nonzero, ccl_driver counts all
+				   eight-bit-control bytes written by
+				   CCL_WRITE_CHAR.  After execution,
+				   if no such byte is written, set
+				   this value to zero.  */
 };
 
 /* This data type is used for the spec field of the structure
@@ -68,6 +86,7 @@ struct ccl_spec {
   struct ccl_program encoder;
   unsigned char valid_codes[256];
   int cr_carryover;		/* CR carryover flag.  */
+  unsigned char eight_bit_carryover[MAX_MULTIBYTE_LENGTH];
 };
 
 /* Alist of fontname patterns vs corresponding CCL program.  */
@@ -77,6 +96,9 @@ extern Lisp_Object Vfont_ccl_encoder_alist;
    execution of ccl program CCL_PROG (symbol or vector).  */
 extern int setup_ccl_program P_ ((struct ccl_program *, Lisp_Object));
 
+/* Check if CCL is updated or not.  If not, re-setup members of CCL.  */
+extern int check_ccl_update P_ ((struct ccl_program *));
+
 extern int ccl_driver P_ ((struct ccl_program *, unsigned char *,
 			   unsigned char *, int, int, int *));
 
@@ -88,3 +110,6 @@ extern Lisp_Object Vccl_program_table;
 extern Lisp_Object Qccl_program_idx;
 
 #endif /* EMACS_CCL_H */
+
+/* arch-tag: 14681df7-876d-43de-bc71-6b78e23a4e3c
+   (do not change this comment) */