・DS外字、ASCII etc の文字も追加

・文字表示で赤色緑色が入っていたのを修正

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@129 7061adef-622a-194b-ae81-725974e89856
This commit is contained in:
akabane_jumpei 2009-01-21 06:45:41 +00:00
parent 0c6b8d9c26
commit 77f52bd37a
5 changed files with 928 additions and 838 deletions

View File

@ -46,24 +46,24 @@
// 外部変数 // 外部変数
//**************************************************************************** //****************************************************************************
//グループごとの文字コードテーブル //グループごとの文字コードテーブル
/* extern const unsigned short DS[]; extern const unsigned short DS[];
extern const unsigned short ASCII[]; extern const unsigned short ASCII[];
extern const unsigned short JIS_X_0201_Half_width_KATAKANA[]; extern const unsigned short JIS_X_0201_Half_width_KATAKANA[];
extern const unsigned short Code_Page_1252[]; extern const unsigned short Code_Page_1252[];
extern const unsigned short ISO_8859_1_Latin_1[]; extern const unsigned short ISO_8859_1_Latin_1[];
extern const unsigned short JIS_X_0208_Not_Hanja[]; */ extern const unsigned short JIS_X_0208_Not_Hanja[];
extern const unsigned short KS_X_1001_Hangul[]; extern const unsigned short KS_X_1001_Hangul[];
extern const unsigned short KS_X_1001_Jamo[]; extern const unsigned short KS_X_1001_Jamo[];
extern const unsigned short additional_Hangul[]; extern const unsigned short additional_Hangul[];
extern const unsigned short wii_additional_Hangul[]; // トゥルータイプフォント(2360 + 8844) extern const unsigned short wii_additional_Hangul[]; // トゥルータイプフォント(2360 + 8844)
//文字コードテーブルの要素数定数 //文字コードテーブルの要素数定数
/* extern const unsigned short Count_of_DS ; extern const unsigned short Count_of_DS ;
extern const unsigned short Count_of_ASCII ; extern const unsigned short Count_of_ASCII ;
extern const unsigned short Count_of_JIS_X_0201_Half_width_KATAKANA ; extern const unsigned short Count_of_JIS_X_0201_Half_width_KATAKANA ;
extern const unsigned short Count_of_Code_Page_1252 ; extern const unsigned short Count_of_Code_Page_1252 ;
extern const unsigned short Count_of_ISO_8859_1_Latin_1 ; extern const unsigned short Count_of_ISO_8859_1_Latin_1 ;
extern const unsigned short Count_of_JIS_X_0208_Not_Hanja ;*/ extern const unsigned short Count_of_JIS_X_0208_Not_Hanja ;
extern const unsigned short Count_of_KS_X_1001_Hangul; extern const unsigned short Count_of_KS_X_1001_Hangul;
extern const unsigned short Count_of_KS_X_1001_Jamo; extern const unsigned short Count_of_KS_X_1001_Jamo;
extern const unsigned short Count_of_additional_Hangul; extern const unsigned short Count_of_additional_Hangul;
@ -71,12 +71,12 @@
//文字コードテーブルの名前 //文字コードテーブルの名前
typedef const char * LPCSTR; typedef const char * LPCSTR;
/* extern const LPCSTR Title_of_DS ; extern const LPCSTR Title_of_DS ;
extern const LPCSTR Title_of_ASCII ; extern const LPCSTR Title_of_ASCII ;
extern const LPCSTR Title_of_JIS_X_0201_Half_width_KATAKANA ; extern const LPCSTR Title_of_JIS_X_0201_Half_width_KATAKANA ;
extern const LPCSTR Title_of_Code_Page_1252 ; extern const LPCSTR Title_of_Code_Page_1252 ;
extern const LPCSTR Title_of_ISO_8859_1_Latin_1 ; extern const LPCSTR Title_of_ISO_8859_1_Latin_1 ;
extern const LPCSTR Title_of_JIS_X_0208_Not_Hanja ;*/ extern const LPCSTR Title_of_JIS_X_0208_Not_Hanja ;
extern const LPCSTR Title_of_KS_X_1001_Hangul ; extern const LPCSTR Title_of_KS_X_1001_Hangul ;
extern const LPCSTR Title_of_KS_X_1001_Jamo ; extern const LPCSTR Title_of_KS_X_1001_Jamo ;
extern const LPCSTR Title_of_additional_Hangul ; extern const LPCSTR Title_of_additional_Hangul ;
@ -88,12 +88,12 @@
//**************************************************************************** //****************************************************************************
//定義 //定義
enum FONTCATEGORY{ enum FONTCATEGORY{
/* CATEGORY_DS, CATEGORY_DS,
CATEGORY_ASCII, CATEGORY_ASCII,
CATEGORY_JIS_X_0201_Half_width_KATAKANA, CATEGORY_JIS_X_0201_Half_width_KATAKANA,
CATEGORY_Code_Page_1252, CATEGORY_Code_Page_1252,
CATEGORY_ISO_8859_1_Latin_1, CATEGORY_ISO_8859_1_Latin_1,
CATEGORY_JIS_X_0208_Not_Hanja,*/ CATEGORY_JIS_X_0208_Not_Hanja,
CATEGORY_KS_X_1001_Hangul, CATEGORY_KS_X_1001_Hangul,
CATEGORY_KS_X_1001_Jamo, CATEGORY_KS_X_1001_Jamo,
CATEGORY_additional_Hangul, CATEGORY_additional_Hangul,
@ -119,12 +119,12 @@
//フォントカテゴリテーブル //フォントカテゴリテーブル
static const FontCategory m_FontCategoryTbl[] = { static const FontCategory m_FontCategoryTbl[] = {
/* { DS, &Count_of_DS , &Title_of_DS }, { DS, &Count_of_DS , &Title_of_DS },
{ ASCII, &Count_of_ASCII , &Title_of_ASCII }, { ASCII, &Count_of_ASCII , &Title_of_ASCII },
{ JIS_X_0201_Half_width_KATAKANA, &Count_of_JIS_X_0201_Half_width_KATAKANA, &Title_of_JIS_X_0201_Half_width_KATAKANA }, { JIS_X_0201_Half_width_KATAKANA, &Count_of_JIS_X_0201_Half_width_KATAKANA, &Title_of_JIS_X_0201_Half_width_KATAKANA },
{ Code_Page_1252, &Count_of_Code_Page_1252 , &Title_of_Code_Page_1252 }, { Code_Page_1252, &Count_of_Code_Page_1252 , &Title_of_Code_Page_1252 },
{ ISO_8859_1_Latin_1, &Count_of_ISO_8859_1_Latin_1 , &Title_of_ISO_8859_1_Latin_1 }, { ISO_8859_1_Latin_1, &Count_of_ISO_8859_1_Latin_1 , &Title_of_ISO_8859_1_Latin_1 },
{ JIS_X_0208_Not_Hanja, &Count_of_JIS_X_0208_Not_Hanja , &Title_of_JIS_X_0208_Not_Hanja },*/ { JIS_X_0208_Not_Hanja, &Count_of_JIS_X_0208_Not_Hanja , &Title_of_JIS_X_0208_Not_Hanja },
{ KS_X_1001_Hangul, &Count_of_KS_X_1001_Hangul , &Title_of_KS_X_1001_Hangul }, { KS_X_1001_Hangul, &Count_of_KS_X_1001_Hangul , &Title_of_KS_X_1001_Hangul },
{ KS_X_1001_Jamo, &Count_of_KS_X_1001_Jamo , &Title_of_KS_X_1001_Jamo }, { KS_X_1001_Jamo, &Count_of_KS_X_1001_Jamo , &Title_of_KS_X_1001_Jamo },
{ additional_Hangul, &Count_of_additional_Hangul , &Title_of_additional_Hangul }, { additional_Hangul, &Count_of_additional_Hangul , &Title_of_additional_Hangul },
@ -236,10 +236,7 @@
}; };
enum FontSize{ enum FontSize{
SIZE_9x9, SIZE_9x9,
SIZE_10x10,
SIZE_11x11, SIZE_11x11,
SIZE_11x12,
SIZE_14x14,
SIZE_15x15, SIZE_15x15,
SIZE_MAX SIZE_MAX
@ -292,16 +289,21 @@
// フォント // フォント
static NNSG2dFont m_Font; static NNSG2dFont m_Font;
#ifdef USE_OLD_FONTS
static NNSG2dFont m_Font_9x9; static NNSG2dFont m_Font_9x9;
// static NNSG2dFont m_Font_10x10; // いらない
static NNSG2dFont m_Font_11x11; static NNSG2dFont m_Font_11x11;
// static NNSG2dFont m_Font_11x12; // いらない #endif
// static NNSG2dFont m_Font_14x14; // いらない
#define m_Font_15x15 m_Font
static NNSG2dFont m_Font_11x13; static NNSG2dFont m_Font_11x13;
static NNSG2dFont m_Font_13x16; static NNSG2dFont m_Font_13x16;
#ifdef USE_OLD_FONTS
#define m_Font_15x15 m_Font
static NNSG2dFont m_Font_17x21; static NNSG2dFont m_Font_17x21;
#else
#define m_Font_17x21 m_Font
#endif
//共有物 //共有物
static MainWnd m_MainWnd; static MainWnd m_MainWnd;
@ -374,6 +376,7 @@
TXT_SetupBackground(); TXT_SetupBackground();
// フォントを読み込みます // フォントを読み込みます
#ifdef USE_OLD_FONTS
{ {
void* pFontFile; void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_9x9.NFTR" ); u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_9x9.NFTR" );
@ -381,13 +384,6 @@
NNS_G2dFontInitUTF16(&m_Font_9x9, pFontFile); NNS_G2dFontInitUTF16(&m_Font_9x9, pFontFile);
NNS_G2dPrintFont(&m_Font_9x9); NNS_G2dPrintFont(&m_Font_9x9);
} }
/* {
void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_10x10.NFTR" );
NNS_G2D_ASSERT( size > 0 );
NNS_G2dFontInitUTF16(&m_Font_10x10, pFontFile);
NNS_G2dPrintFont(&m_Font_10x10);
}*/
{ {
void* pFontFile; void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_11x11.NFTR" ); u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_11x11.NFTR" );
@ -395,20 +391,6 @@
NNS_G2dFontInitUTF16(&m_Font_11x11, pFontFile); NNS_G2dFontInitUTF16(&m_Font_11x11, pFontFile);
NNS_G2dPrintFont(&m_Font_11x11); NNS_G2dPrintFont(&m_Font_11x11);
} }
/* {
void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_11x12.NFTR" );
NNS_G2D_ASSERT( size > 0 );
NNS_G2dFontInitUTF16(&m_Font_11x12, pFontFile);
NNS_G2dPrintFont(&m_Font_11x12);
}*/
/* {
void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_14x14.NFTR" );
NNS_G2D_ASSERT( size > 0 );
NNS_G2dFontInitUTF16(&m_Font_14x14, pFontFile);
NNS_G2dPrintFont(&m_Font_14x14);
}*/
{ {
void* pFontFile; void* pFontFile;
u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_15x15.NFTR" ); u32 size = TXT_LoadFile( &pFontFile, "data/HANGUL_15x15.NFTR" );
@ -416,7 +398,7 @@
NNS_G2dFontInitUTF16(&m_Font_15x15, pFontFile); NNS_G2dFontInitUTF16(&m_Font_15x15, pFontFile);
NNS_G2dPrintFont(&m_Font_15x15); NNS_G2dPrintFont(&m_Font_15x15);
} }
#endif
// 新規追加 ----------------------------------------- // 新規追加 -----------------------------------------
{ {
void* pFontFile; void* pFontFile;
@ -597,8 +579,8 @@
{ {
//初期化 //初期化
TXT_EnableBackground(); TXT_EnableBackground();
ChangeCategory( CATEGORY_KS_X_1001_Hangul, DISPTYPE_8x2 ); ChangeCategory( CATEGORY_DS, DISPTYPE_10x2 );
m_FontType = 0; m_FontType = FONTTYPE_MAX-1;
m_fDispUnderLine = true; m_fDispUnderLine = true;
//ループ処理 //ループ処理
@ -697,20 +679,24 @@
m_MainWnd.Clear(); m_MainWnd.Clear();
m_SubWnd.Clear(); m_SubWnd.Clear();
//GroupIDの表示 //【上画面表示】
// GroupIDの表示・フォントカテゴリの表示
#ifdef USE_OLD_FONTS
m_MainWnd.PrintDec( &m_Font_15x15, GROUP_ID_X, GROUP_ID_Y, GetGroupID()+1 ); m_MainWnd.PrintDec( &m_Font_15x15, GROUP_ID_X, GROUP_ID_Y, GetGroupID()+1 );
m_MainWnd.PrintString( &m_Font_9x9, FONTTITLE_X, FONTTITLE_Y, m_FontCategoryTbl[m_CurCategory].GetTitle() );
#else
m_MainWnd.PrintDec( &m_Font_17x21, GROUP_ID_X, GROUP_ID_Y, GetGroupID()+1 );
m_MainWnd.PrintString( &m_Font_11x13, FONTTITLE_X, FONTTITLE_Y, m_FontCategoryTbl[m_CurCategory].GetTitle() );
#endif
//GroupIDの示すグループ文字を表示 (上画面表示) //GroupIDの示すグループ文字を表示
for( int y = 0; y<GROUP_HEIGHT; y++ ){ for( int y = 0; y<GROUP_HEIGHT; y++ ){
for( int x = 0; x<m_GroupWidth; x++ ){ for( int x = 0; x<m_GroupWidth; x++ ){
//フォント切り替え //フォント切り替え
static const NNSG2dFont* const fonts[FONTTYPE_MAX]={ static const NNSG2dFont* const fonts[FONTTYPE_MAX]={
&m_Font_9x9, &m_Font_17x21,
// &m_Font_10x10, &m_Font_13x16,
&m_Font_11x11, &m_Font_11x13,
// &m_Font_11x12,
// &m_Font_14x14,
&m_Font_15x15,
}; };
//先頭文字からのオフセットを求め、描画する //先頭文字からのオフセットを求め、描画する
@ -733,33 +719,22 @@
if( m_GroupCursor == y ){ if( m_GroupCursor == y ){
NNSG2dGlyph g; NNSG2dGlyph g;
NNS_G2dFontGetGlyph(&g, fonts[m_FontType], c ); NNS_G2dFontGetGlyph(&g, fonts[m_FontType], c );
m_MainWnd.Fill( xPos, yPos + NNS_G2dFontGetHeight(fonts[m_FontType]), GetCharWidth(g.pWidths), 1 ); m_MainWnd.Fill( xPos, yPos + NNS_G2dFontGetHeight(fonts[m_FontType]), GetCharWidth(g.pWidths), 1 ); // color = 1
} }
} }
} }
//フォントカテゴリの表示 //【下画面の表示】
m_MainWnd.PrintString( &m_Font_9x9, FONTTITLE_X, FONTTITLE_Y, m_FontCategoryTbl[m_CurCategory].GetTitle() );
//FontIDの表示 //FontIDの表示
m_SubWnd.PrintHex( &m_Font_15x15, FONT_ID_X, FONT_ID_Y, GetFontID() ); m_SubWnd.PrintHex( &m_Font, FONT_ID_X, FONT_ID_Y, GetFontID() );
//ターゲットウインドウの表示 (下画面の表示) //ターゲットウインドウの表示
for( int y = 0; y<TARGET_HEIGHT; y++ ){ for( int y = 0; y<TARGET_HEIGHT; y++ ){
for( int x = 0; x<TARGET_WIDTH; x++ ){ for( int x = 0; x<TARGET_WIDTH; x++ ){
static NNSG2dFont* fonts[TARGET_WIDTH]; static NNSG2dFont* fonts[TARGET_WIDTH];
//フォント切り替え
if(m_CurCategory == 3 || m_CurCategory == 4){
fonts[0] = &m_Font_17x21; fonts[0] = &m_Font_17x21;
fonts[1] = &m_Font_13x16; fonts[1] = &m_Font_13x16;
fonts[2] = &m_Font_11x13; fonts[2] = &m_Font_11x13;
}
else{
fonts[0] = &m_Font_15x15;
fonts[1] = &m_Font_11x11;
fonts[2] = &m_Font_9x9;
}
//文字色切り替え //文字色切り替え
static int colors[TARGET_HEIGHT]={ static int colors[TARGET_HEIGHT]={
@ -797,11 +772,13 @@
break; break;
} }
u16 c = m_FontCategoryTbl[m_CurCategory].GetValue(Index); u16 c = m_FontCategoryTbl[m_CurCategory].GetValue(Index);
m_SubWnd.PrintChar( &m_Font, SELECT_LEFT + i*SELECT_WIDTH, SELECT_TOP, c ); // m_Font -> m_Font_17x21
m_SubWnd.PrintChar( &m_Font_17x21, SELECT_LEFT + i*SELECT_WIDTH, SELECT_TOP, c );
} }
//セレクトウインドウ カーソルの表示 //セレクトウインドウ カーソルの表示
m_SubWnd.PrintChar( &m_Font, SELECT_LEFT + SELECT_WIDTH * (m_CurIndex % m_GroupWidth), CURSOR_TOP, CURSOR_CODE ); // m_Font -> m_Font_17x21
m_SubWnd.PrintChar( &m_Font_17x21, SELECT_LEFT + SELECT_WIDTH * (m_CurIndex % m_GroupWidth), CURSOR_TOP, CURSOR_CODE );
} }
//VBLANK割り込みを待つ //VBLANK割り込みを待つ
@ -870,11 +847,15 @@
"Font Check Mode", "Font Check Mode",
"Text Check Mode", "Text Check Mode",
}; };
#ifdef USE_OLD_FONTS
m_MainWnd.PrintString( &m_Font, MENU_LEFT, MENU_TOP + MENU_HEIGHT*i, MenuStr[i] ); m_MainWnd.PrintString( &m_Font, MENU_LEFT, MENU_TOP + MENU_HEIGHT*i, MenuStr[i] );
#else
m_MainWnd.PrintString( &m_Font_13x16, MENU_LEFT, MENU_TOP + MENU_HEIGHT*i, MenuStr[i] );
#endif
} }
//カーソルの表示 //カーソルの表示
m_MainWnd.PrintChar( &m_Font, CURSOR_LEFT, CURSOR_TOP+MENU_HEIGHT*m_CursorIndex, CURSOR_CODE ); m_MainWnd.PrintChar( &m_Font_13x16, CURSOR_LEFT, CURSOR_TOP+MENU_HEIGHT*m_CursorIndex, CURSOR_CODE );
} }
//VBLANK割り込みを待つ //VBLANK割り込みを待つ
@ -985,12 +966,15 @@
//フォントサイズ情報表示 //フォントサイズ情報表示
static const char * const SizeMes[] = { static const char * const SizeMes[] = {
#ifdef USE_OLD_FONTS
" 9x 9", " 9x 9",
"10x10",
"11x11", "11x11",
"11x12",
"14x14",
"15x15", "15x15",
#else
"11x13",
"13x16",
"17x21",
#endif
}; };
m_SubWnd.PrintString( &m_Font, SIZE_LEFT, SIZE_TOP, SizeMes[m_CurFontSize] ); m_SubWnd.PrintString( &m_Font, SIZE_LEFT, SIZE_TOP, SizeMes[m_CurFontSize] );
@ -999,12 +983,15 @@
//対象テキスト表示 //対象テキスト表示
static const NNSG2dFont* const fonts[SIZE_MAX]={ static const NNSG2dFont* const fonts[SIZE_MAX]={
#ifdef USE_OLD_FONT
&m_Font_9x9, &m_Font_9x9,
// &m_Font_10x10,
&m_Font_11x11, &m_Font_11x11,
// &m_Font_11x12,
// &m_Font_14x14,
&m_Font_15x15, &m_Font_15x15,
#else
&m_Font_11x13,
&m_Font_13x16,
&m_Font_17x21,
#endif
}; };
m_SubWnd.PrintUnicodeString( fonts[m_CurFontSize], TEXT_LEFT, TEXT_TOP, g_TextTable[m_CurIndex][m_CurTextType] ); m_SubWnd.PrintUnicodeString( fonts[m_CurFontSize], TEXT_LEFT, TEXT_TOP, g_TextTable[m_CurIndex][m_CurTextType] );
} }

View File

@ -10,6 +10,8 @@
#ifndef FONTVIEW_H_ #ifndef FONTVIEW_H_
#define FONTVIEW_H_ #define FONTVIEW_H_
void FontView(); #define USE_OLD_FONTS
void FontView();
#endif // FONTVIEW_H_ #endif // FONTVIEW_H_

View File

@ -13,6 +13,93 @@
// <area width="16" /> // <area width="16" />
// //
//<!-- DS -->
const unsigned short DS[] = {
0xE000, 0xE001, 0xE002, 0xE003, 0xE004, 0xE005, 0xE006, 0xE007, 0xE008, 0xE009, 0xE00A, 0xE00B, 0xE00C, 0xE00D, 0xE00E, 0xE00F,
0xE010, 0xE011, 0xE012, 0xE013, 0xE014, 0xE015, 0xE016, 0xE017, 0xE018, 0xE019, 0xE01A, 0xE01B, 0xE01C, 0xE01D, 0xE01E, 0xE01F,
0xE020, 0xE021, 0xE022, 0xE023, 0xE024, 0xE025, 0xE026, 0xE027, 0xE028, 0xE029, 0xE02A, 0xE02B, 0xE02C, 0xE02D, 0xE02E, 0xE02F,
0xE030, 0xE031, 0xE032, 0xE033, 0xE034, 0xE035, 0xE036, 0xE037, 0xE038, 0xE039, 0xE03A, 0xE03B, 0xE03C, 0xE03D, 0xE03E, 0xE03F,
};
//<!-- ASCII -->
const unsigned short ASCII[] = {
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43,
0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b,
0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x00,
};
//<!-- JIS X 0201 / Half width KATAKANA -->
const unsigned short JIS_X_0201_Half_width_KATAKANA[] = {
0x0000, 0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67, 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77, 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87, 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97, 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
};
//<!-- Code Page 1252 -->
const unsigned short Code_Page_1252[] = {
0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
};
//<!-- ISO 8859-1 / Latin-1 -->
const unsigned short ISO_8859_1_Latin_1[] = {
0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
};
//<!-- JIS X 0208 / Not Hanja -->
const unsigned short JIS_X_0208_Not_Hanja[] = {
0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A, 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x0000, 0xFF40, 0x0000, 0xFF3E,
0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003, 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2015, 0x2010, 0xFF0F, 0xFF3C,
0xFF5E, 0x2225, 0xFF5C, 0x0000, 0x2025, 0x0000, 0x0000, 0x0000, 0x0000, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D, 0xFF5B,
0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D, 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x0000, 0x0000, 0x0000,
0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E, 0x2234, 0x2642, 0x2640, 0x0000, 0x2032, 0x2033, 0x2103, 0xFFE5, 0xFF04,
0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20, 0x0000, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7, 0x25C6, 0x25A1,
0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0x2208, 0x220B, 0x2286, 0x2287,
0x2282, 0x2283, 0x222A, 0x2229, 0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200, 0x2203, 0x2220, 0x22A5, 0x2312, 0x2202, 0x2207,
0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D, 0x2235, 0x222B, 0x222C, 0x212B, 0x0000, 0x266F, 0x266D, 0x266A, 0x0000,
0x0000, 0x0000, 0x25EF, 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19, 0xFF21, 0xFF22, 0xFF23,
0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, 0xFF32, 0xFF33,
0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, 0xFF3A, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, 0xFF48, 0xFF49,
0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, 0xFF58, 0xFF59,
0xFF5A, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
0x3090, 0x3091, 0x3092, 0x3093, 0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC,
0x30AD, 0x30AE, 0x30AF, 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC,
0x30BD, 0x30BE, 0x30BF, 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7, 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC,
0x30CD, 0x30CE, 0x30CF, 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC,
0x30DD, 0x30DE, 0x30DF, 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC,
0x30ED, 0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396,
0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
0x03A8, 0x03A9, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE,
0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415,
0x0401, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424,
0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434,
0x0435, 0x0451, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443,
0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2500, 0x2502, 0x250C, 0x2510,
0x2518, 0x2514, 0x251C, 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513, 0x251B, 0x2517, 0x2523, 0x2533, 0x252B,
0x253B, 0x254B, 0x2520, 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538, 0x2542, 0x2460, 0x2461, 0x2462, 0x2463,
0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F, 0x2470, 0x2471, 0x2472, 0x2473,
0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327,
0x3303, 0x3336, 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B, 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4,
0x33A1, 0x337B, 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E,
0x337D, 0x337C, 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220, 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,
};
// <order> // <order>
// <!-- KS X 1003 / ASCII --> // <!-- KS X 1003 / ASCII -->
const unsigned short KS_X_1003_ASCII[] = { const unsigned short KS_X_1003_ASCII[] = {
@ -912,14 +999,25 @@ const unsigned short wii_additional_Hangul[] = {
}; };
const unsigned short Count_of_DS = sizeof(DS)/sizeof(DS[0]);
const unsigned short Count_of_ASCII = sizeof(ASCII)/sizeof(ASCII[0]);
const unsigned short Count_of_JIS_X_0201_Half_width_KATAKANA = sizeof(JIS_X_0201_Half_width_KATAKANA)/sizeof(JIS_X_0201_Half_width_KATAKANA[0]);
const unsigned short Count_of_Code_Page_1252 = sizeof(Code_Page_1252)/sizeof(Code_Page_1252[0]);
const unsigned short Count_of_ISO_8859_1_Latin_1 = sizeof(ISO_8859_1_Latin_1)/sizeof(ISO_8859_1_Latin_1[0]);
const unsigned short Count_of_JIS_X_0208_Not_Hanja = sizeof(JIS_X_0208_Not_Hanja)/sizeof(JIS_X_0208_Not_Hanja[0]);
const unsigned short Count_of_KS_X_1003_ASCII = sizeof(KS_X_1003_ASCII)/sizeof(KS_X_1003_ASCII[0]); const unsigned short Count_of_KS_X_1003_ASCII = sizeof(KS_X_1003_ASCII)/sizeof(KS_X_1003_ASCII[0]);
const unsigned short Count_of_KS_X_1001_Hangul = sizeof(KS_X_1001_Hangul)/sizeof(KS_X_1001_Hangul[0]); const unsigned short Count_of_KS_X_1001_Hangul = sizeof(KS_X_1001_Hangul)/sizeof(KS_X_1001_Hangul[0]);
const unsigned short Count_of_KS_X_1001_Jamo = sizeof(KS_X_1001_Jamo)/sizeof(KS_X_1001_Jamo[0]); const unsigned short Count_of_KS_X_1001_Jamo = sizeof(KS_X_1001_Jamo)/sizeof(KS_X_1001_Jamo[0]);
const unsigned short Count_of_additional_Hangul = sizeof(additional_Hangul)/sizeof(additional_Hangul[0]); const unsigned short Count_of_additional_Hangul = sizeof(additional_Hangul)/sizeof(additional_Hangul[0]);
const unsigned short Count_of_wii_additional_Hangul = sizeof(wii_additional_Hangul)/sizeof(wii_additional_Hangul[0]); const unsigned short Count_of_wii_additional_Hangul = sizeof(wii_additional_Hangul)/sizeof(wii_additional_Hangul[0]);
const char * const Title_of_DS = "DS";
const char * const Title_of_ASCII = "ASCII";
const char * const Title_of_JIS_X_0201_Half_width_KATAKANA = "JIS X 0201 Half width KATAKANA";
const char * const Title_of_Code_Page_1252 = "Code Page 1252";
const char * const Title_of_ISO_8859_1_Latin_1 = "ISO 8859 1 Latin 1";
const char * const Title_of_JIS_X_0208_Not_Hanja = "JIS X 0208 Not Hanja";
const char * const Title_of_KS_X_1003_ASCII = "KS X 1003 / ASCII"; const char * const Title_of_KS_X_1003_ASCII = "KS X 1003 / ASCII";
const char * const Title_of_KS_X_1001_Hangul = "KS X 1001 / Hangul"; const char * const Title_of_KS_X_1001_Hangul = "KS X 1001 / Hangul";
const char * const Title_of_KS_X_1001_Jamo = "KS X 1001 / Jamo"; const char * const Title_of_KS_X_1001_Jamo = "KS X 1001 / Jamo";

View File

@ -46,10 +46,11 @@ static NNSFndAllocator sAllocator;
// デモ共通のカラーパレット // デモ共通のカラーパレット
GXRgb TXTColorPalette[32] = GXRgb TXTColorPalette[32] =
{ {
GX_RGB( 0, 0, 0), GX_RGB(31, 31, 31), GX_RGB( 0, 0, 0), GX_RGB(31, 0, 0), GX_RGB( 0, 0, 0), // NULL
GX_RGB( 0, 31, 0), GX_RGB( 0, 0, 31), GX_RGB( 0, 31, 31), GX_RGB(31, 0, 31), GX_RGB(31, 31, 31), GX_RGB(25, 25, 25), GX_RGB(22, 22, 22), GX_RGB(20, 20, 20),
GX_RGB(31, 31, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 6, 6, 6), GX_RGB( 8, 8, 8), GX_RGB(10, 10, 10),
GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0),
GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0), GX_RGB( 0, 0, 0),
GX_RGB( 0, 0, 0), GX_RGB(12, 16, 19), GX_RGB(23, 9, 0), GX_RGB(31, 0, 3), GX_RGB( 0, 0, 0), GX_RGB(12, 16, 19), GX_RGB(23, 9, 0), GX_RGB(31, 0, 3),
GX_RGB(31, 17, 31), GX_RGB(31, 18, 0), GX_RGB(30, 28, 0), GX_RGB(21, 31, 0), GX_RGB(31, 17, 31), GX_RGB(31, 18, 0), GX_RGB(30, 28, 0), GX_RGB(21, 31, 0),

View File

@ -78,19 +78,21 @@ enum
{ {
// パレット0 TXT_CPALETTE_MAIN // パレット0 TXT_CPALETTE_MAIN
TXT_COLOR_NULL=0, TXT_COLOR_NULL=0,
TXT_COLOR_WHITE, TXT_COLOR_WHITE,
TXT_COLOR_WHITE_1,
TXT_COLOR_WHITE_2,
TXT_COLOR_WHITE_3,
TXT_COLOR_BLACK, TXT_COLOR_BLACK,
TXT_UCOLOR_GRAY, //TXT_COLOR_RED, TXT_COLOR_BLACK_1,
TXT_UCOLOR_BROWN, //TXT_COLOR_GREEN, TXT_COLOR_BLACK_2,
TXT_COLOR_BLUE, TXT_COLOR_BLACK_3,
TXT_COLOR_CYAN,
TXT_COLOR_MAGENTA,
TXT_COLOR_YELLOW,
// パレット1 TXT_CPALETTE_USERCOLOR // パレット1 TXT_CPALETTE_USERCOLOR
TXT_UCOLOR_NULL=0, TXT_UCOLOR_NULL=0,
TXT_COLOR_RED, // TXT_UCOLOR_GRAY, TXT_UCOLOR_GRAY,
TXT_COLOR_GREEN, // TXT_UCOLOR_BROWN, TXT_UCOLOR_BROWN,
TXT_UCOLOR_RED, TXT_UCOLOR_RED,
TXT_UCOLOR_PINK, TXT_UCOLOR_PINK,
TXT_UCOLOR_ORANGE, TXT_UCOLOR_ORANGE,