X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=include%2Fchxj_specified_device.h;h=761b1c76d111ce61f0be442fc9ad4bb4e065d0b8;hb=c86a609f5cf93f41f30938762e6a2b5cfd92def5;hp=2855a676a897c53ce8b419c338fe1ec978533e7d;hpb=5798e845e017b5e57cc3c781341d292dbd8dba6a;p=modchxj%2Fmod_chxj.git

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 2855a676..761b1c76 100644
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2005-2008 Atsushi Konno All rights reserved.
  * Copyright (C) 2005 QSDN,Inc. All rights reserved.
- * Copyright (C) 2005 Atsushi Konno All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,12 @@ typedef enum {
   CHXJ_SPEC_Chtml_3_0,
   CHXJ_SPEC_Chtml_4_0,
   CHXJ_SPEC_Chtml_5_0,
+  CHXJ_SPEC_Chtml_6_0, /* use XHTML */
+  CHXJ_SPEC_Chtml_7_0, /* use XHTML */
   CHXJ_SPEC_XHtml_Mobile_1_0,
   CHXJ_SPEC_Hdml,
   CHXJ_SPEC_Jhtml,
+  CHXJ_SPEC_Jxhtml,    /* use XHTML */
   CHXJ_SPEC_HTML,
 } spec_type;
 
@@ -63,13 +66,13 @@ struct device_table_t {
   int                    available_gif;
   int                    available_jpeg;
   int                    available_png;
-  int available_bmp2;
-  int available_bmp4;
+  int                    available_bmp2;
+  int                    available_bmp4;
   /*--------------------------------------------------------------------------*/
   /* Resolution                                                               */
   /*--------------------------------------------------------------------------*/
-  int dpi_width;
-  int dpi_heigh;
+  int                    dpi_width;
+  int                    dpi_heigh;
   /*--------------------------------------------------------------------------*/
   /* Color number type                                                        */
   /* 2       : 2        Colors                                                */
@@ -80,40 +83,42 @@ struct device_table_t {
   /* 262144  : 262144   Colors                                                */
   /* 15680000: 15680000 over colors                                           */
   /*--------------------------------------------------------------------------*/
-  int color;
-  char* emoji_type;
+  int                    color;
+  char*                  emoji_type;
 };
 
 typedef struct device_table_list_t  device_table_list;
 
 struct device_table_list_t {
-  struct device_table_list_t* next;
+  struct device_table_list_t  *next;
 
-  char*         pattern;
-  ap_regex_t*   regexp;
-  device_table* table;
-  device_table* tail;
+  char                        *pattern;
+  ap_regex_t                  *regexp;
+  device_table                *table;
+  device_table                *tail;
 };
 
 typedef struct converter_t converter_t;
 
 struct converter_t {
   /* convert routine */
-  char* (*converter)(request_rec*               r,
-                    struct _device_table_t*     spec,
-                    const char*                 src, 
-                    apr_size_t                  srclen, 
-                    apr_size_t*                 dstlen,
-                    struct _chxjconvrule_entry* entryp,
-                    cookie_t*                   cookie);
+  char* (*converter)(request_rec                 *r,
+                     struct device_table_t       *spec,
+                     const char                  *src, 
+                     apr_size_t                  srclen, 
+                     apr_size_t                  *dstlen,
+                     struct chxjconvrule_entry   *entryp,
+                     cookie_t                    *cookie);
 
-  char* (*encoder)(request_rec* r,
-                   const char*  src,
-                   apr_size_t*  len);
+  char* (*encoder)(request_rec  *r,
+                   const char   *src,
+                   apr_size_t   *len);
 };
 
 extern converter_t convert_routine[];
 
-device_table* chxj_specified_device(request_rec* r, const char* user_agent);
+extern device_table* chxj_specified_device(
+  request_rec             *r, 
+  const char              *user_agent);
 
 #endif