diff -cr Ver1.16/base.h Ver1.17/base.h
*** Ver1.16/base.h	Sat Oct 20 19:24:19 1990
--- Ver1.17/base.h	Fri Nov 16 14:20:38 1990
***************
*** 25,30 ****
--- 25,34 ----
   * for which all graphics state is defined.
   */
  
+ /*
+  * Class Graphic and FullGraphic are modified by chiba for the Kanji version.
+  */
+ 
  #ifndef base_h
  #define base_h
  
***************
*** 36,41 ****
--- 40,46 ----
  
  class Canvas;
  class GraphicToPainter;
+ class KFont;			// by chiba
  
  class Graphic : public Persistent {
  public:
***************
*** 61,66 ****
--- 66,74 ----
      virtual void SetFont(PFont*);
      virtual PFont* GetFont();
  
+     virtual void SetKFont(KFont*);
+     virtual KFont* GetKFont();
+ 
      void Translate(float dx, float dy);
      void Scale(float sx, float sy, float ctrx = 0.0, float ctry = 0.0);
      void Rotate(float angle, float ctrx = 0.0, float ctry = 0.0);
***************
*** 232,237 ****
--- 240,247 ----
      Transformer* t;
      static GraphicToPainter* painters;
      static Painter* p;
+ protected:			/* added by chiba */
+     Painter* GetPainter();
  };
  
  class FullGraphic : public Graphic {
***************
*** 245,250 ****
--- 255,263 ----
      virtual void SetFont(PFont*);
      virtual PFont* GetFont();
  
+     virtual void SetKFont(KFont*);	// by chiba
+     virtual KFont* GetKFont();
+ 
      virtual Graphic* Copy();
      virtual ClassId GetClassId();
      virtual boolean IsA(ClassId);
***************
*** 255,260 ****
--- 268,275 ----
      Ref pat;
      Ref brush;
      Ref font;
+ 
+     KFont* kfont;;		// Kanji Font. by chiba
  };
  
  /*
***************
*** 418,423 ****
--- 433,443 ----
      Graphic* g, Graphic* a, Graphic* b, Graphic* d
  ) {
      g->concat(a, b, d);
+ }
+ 
+ // added by chiba
+ inline Painter* Graphic::GetPainter() {
+     return p;
  }
  
  #endif