X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fiso2022jp.h;h=4a452d46d4bc04c5f384e12403381d1e29db39d5;hb=a0a5c796a6ec11a13c49912672a82bf1857bbc71;hp=fa8454aeceeedb0e888656b7189e429a5b471e71;hpb=9da6abdcabec59f4845da256a8ad75a810ed1589;p=libs%2Fcore.git

diff --git a/source/iso2022jp.h b/source/iso2022jp.h
index fa8454a..4a452d4 100644
--- a/source/iso2022jp.h
+++ b/source/iso2022jp.h
@@ -11,8 +11,9 @@ Distributed under the LGPL
 #include "codec.h"
 
 namespace Msp {
+namespace Codecs {
 
-class Iso2022Jp: public StringCodec
+class Iso2022Jp: public Codec
 {
 public:
 	enum Mode
@@ -21,38 +22,41 @@ public:
 		JISX0201,
 		JISX0208
 	};
-		
-	class Encoder: public StringCodec::Encoder
+
+	class Encoder: public Codec::Encoder
 	{
 	public:
-		Encoder(ErrorMode em=THROW_ON_ERROR): StringCodec::Encoder(em), mode(ASCII) { }
-		void encode_char(wchar_t);
-		void sync();
+		Encoder(ErrorMode em=THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
+		virtual void encode_char(UnicodeChar, std::string &);
+		virtual void sync(std::string &);
+		virtual void reset();
 	private:
 		Mode mode;
 
-		void switch_mode(Mode);
-		void append_replacement();
+		void switch_mode(Mode, std::string &);
+		virtual void transliterate(UnicodeChar, std::string &);
 	};
 
-	class Decoder: public StringCodec::Decoder
+	class Decoder: public Codec::Decoder
 	{
 	public:
 		Decoder(ErrorMode =THROW_ON_ERROR);
-		void decode_char(const std::string &, std::string::const_iterator &);
-		void sync();
+		virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+		virtual void reset();
 	private:
 		Mode mode;
-		StringCodec::Decoder *dec;
-		unsigned escape;
+		Codec::Decoder *dec;
 
-		void switch_mode(Mode);
+		virtual void switch_mode(Mode);
 	};
 
-	Encoder *create_encoder(ErrorMode em=THROW_ON_ERROR) const { return new Encoder(em); }
-	Decoder *create_decoder(ErrorMode em=THROW_ON_ERROR) const { return new Decoder(em); }
+	virtual const char *get_name() const { return "ISO-2022-JP"; }
+
+	virtual Encoder *create_encoder(ErrorMode em=THROW_ON_ERROR) const { return new Encoder(em); }
+	virtual Decoder *create_decoder(ErrorMode em=THROW_ON_ERROR) const { return new Decoder(em); }
 };
 
+} // namespace Codecs
 } // namespace Msp
 
 #endif