hwpfilter/source/formula.cxx | 2 - hwpfilter/source/hbox.cxx | 34 +++++++++---------- hwpfilter/source/hbox.h | 32 +++++++++--------- hwpfilter/source/hcode.cxx | 62 +++++++++++++++++------------------ hwpfilter/source/hinfo.cxx | 56 +++++++++++++++---------------- hwpfilter/source/hwpeq.cxx | 26 +++++++------- hwpfilter/source/hwpfile.cxx | 2 - hwpfilter/source/hwpread.cxx | 76 +++++++++++++++++++++---------------------- 8 files changed, 145 insertions(+), 145 deletions(-)
New commits: commit 2cd35d3abbf196ffaf0a4166841c0ecfe323c3ce Author: Julien Nabet <serval2...@yahoo.fr> Date: Sun Apr 13 16:42:00 2014 +0200 Change encoding from EUC-KR to utf8 These files have been converted with this command line: iconv -f EUC-KR -t utf8 <file> > <tmp file> For more info, see http://nabble.documentfoundation.org/About-encoding-of-some-files-in-hwpfilter-td4105106.html Change-Id: Ibb2fc0af465641d6cc9236887addefe8062d4ffe diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx index 9d61d2a..c6fa80f 100644 --- a/hwpfilter/source/formula.cxx +++ b/hwpfilter/source/formula.cxx @@ -387,7 +387,7 @@ void Formula::makeDecoration(Node *res) else fprintf(stderr,"<math:munder>\n"); #else - /* accent´Â ¾ðÁ¦ trueÀ̰í, ¾ðÁ¦, falseÀÎÁö ¸ð¸£°Ú´Ù. */ + /* accentë ì¸ì trueì´ê³ , ì¸ì , falseì¸ì§ ëª¨ë¥´ê² ë¤. */ if( isover ){ padd(ascii("accent"),ascii("CDATA"),ascii("true")); rstartEl(ascii("math:mover"), rList); diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index c2b8647..7b87059 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -436,7 +436,7 @@ Footnote::~Footnote(void) // auto number(18) // new number(19) // show page number (20) -// Ȧ¼öÂʽÃÀÛ/°¨Ãß±â (21) +// íì쪽ìì/ê°ì¶ê¸° (21) // mail merge(22) hchar_string MailMerge::GetString() @@ -582,9 +582,9 @@ static void getOutlineNumStr(int style, int level, int num, hchar * hstr) enum { OUTLINE_ON, OUTLINE_NUM }; -/* level Àº 0ºÎÅÍ ½ÃÀÛ. Áï 1.1.1. ÀÇ ·¹º§Àº 2ÀÌ´Ù. - number´Â °ªÀÌ ±×´ë·Î µé¾î°¡ ÀÖ´Ù. Áï, 1.2.1¿¡´Â 1,2,1ÀÌ µé¾î°¡ ÀÖ´Ù. - style Àº 1ºÎÅÍ °ªÀÌ µé¾î°¡ ÀÖ´Ù. hbox.h¿¡ Á¤ÀÇµÈ µ¥·Î.. +/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤. + numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤. + style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡.. */ hchar_string Outline::GetUnicode() const { @@ -643,17 +643,17 @@ hchar_string Outline::GetUnicode() const if( deco[i][0] ){ buffer[l++] = deco[i][0]; } -/* level Àº 0ºÎÅÍ ½ÃÀÛ. Áï 1.1.1. ÀÇ ·¹º§Àº 2ÀÌ´Ù. - number´Â °ªÀÌ ±×´ë·Î µé¾î°¡ ÀÖ´Ù. Áï, 1.2.1¿¡´Â 1,2,1ÀÌ µé¾î°¡ ÀÖ´Ù. - style Àº 1ºÎÅÍ °ªÀÌ µé¾î°¡ ÀÖ´Ù. hbox.h¿¡ Á¤ÀÇµÈ µ¥·Î.. +/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤. + numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤. + style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡.. */ switch( user_shape[i] ) { case 0: buffer[l++] = '1' + number[i] - 1; break; - case 1: /* ´ë¹®Àڷθ¶ */ - case 2: /* ¼Ò¹®Àڷθ¶ */ + case 1: /* ë문ìë¡ë§ */ + case 2: /* ì문ìë¡ë§ */ num2roman(number[i], dest); if( user_shape[i] == 1 ){ char *ptr = dest; @@ -678,22 +678,22 @@ hchar_string Outline::GetUnicode() const case 6: buffer[l++] = olHanglJaso(number[i] -1, OL_HANGL_JASO); break; - case 7: /* ÇÑÀÚ ¼ýÀÚ : ÀÏ¹Ý ¼ýÀڷΠǥÇö */ + case 7: /* íì ì«ì : ì¼ë° ì«ìë¡ íí */ buffer[l++] = '1' + number[i] -1; break; - case 8: /* ¿ø¼ýÀÚ */ + case 8: /* ìì«ì */ buffer[l++] = 0x2e00 + number[i]; break; - case 9: /* ¿ø ¾ËÆÄºª ¼Ò¹®ÀÚ */ + case 9: /* ì ìíë²³ ì문ì */ buffer[l++] = 0x2c20 + number[i]; break; - case 10: /* ¿ø °¡³ª´Ù */ + case 10: /* ì ê°ëë¤ */ buffer[l++] = 0x2c50 + number[i] -1; break; - case 11: /* ¿ø ¤¡ ¤¤ */ + case 11: /* ì ã± ã´ */ buffer[l++] = 0x2c40 + number[i] -1; break; - case 12: /* À̾îÁø ¼ýÀÚ. */ + case 12: /* ì´ì´ì§ ì«ì. */ { char cur_num_str[10],buf[80]; int j; @@ -727,7 +727,7 @@ hchar_string Outline::GetUnicode() const } -/* ¹À½ ºóÄ(30) */ -/* °íÁ¤Æø ºóÄ(31) */ +/* 묶ì ë¹ì¹¸(30) */ +/* ê³ ì í ë¹ì¹¸(31) */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 5bf64da..8dbe2bb 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -86,9 +86,9 @@ struct SkipData: public HBox struct DateCode; struct FieldCode : public HBox { - uchar type[2]; /* 2/0 - °è»ê½Ä, 3/0-¹®¼¿ä¾à, 3/1-°³ÀÎÁ¤º¸, 3/2-¸¸µç³¯Â¥, 4/0-´©¸§Æ² */ + uchar type[2]; /* 2/0 - ê³ì°ì, 3/0-문ììì½, 3/1-ê°ì¸ì ë³´, 3/2-ë§ë ë ì§, 4/0-ëë¦í */ char *reserved1; - unsigned short location_info; /* 0 - ³¡ÄÚµå, 1 - ½ÃÀÛÄÚµå */ + unsigned short location_info; /* 0 - ëì½ë, 1 - ììì½ë */ char *reserved2; hchar *str1; hchar *str2; @@ -213,7 +213,7 @@ enum struct CellLine { unsigned char key; - unsigned char top; // 0 - ¶óÀξøÀ½, 1-single, 2-thick, 3-double + unsigned char top; // 0 - ë¼ì¸ìì, 1-single, 2-thick, 3-double unsigned char bottom; unsigned char left; unsigned char right; @@ -261,7 +261,7 @@ struct FBoxStyle /** * Kind of wrap */ - unsigned char txtflow; /* ±×¸²ÇÇÇÔ. 0-2(ÀÚ¸®Â÷Áö,Åõ¸í,¾î¿ï¸²) */ + unsigned char txtflow; /* 그림í¼í¨. 0-2(ì리차ì§,í¬ëª ,ì´ì¸ë¦¼) */ /** * Horizontal alignment */ @@ -279,12 +279,12 @@ struct FBoxStyle /** * Index of floating object */ - short boxnum; /* ½ºÅ¸¿ÀÇǽº¿¡¼ ½ºÅ¸ÀÏ À̸§À¸·Î »ç¿ëµÉ ¼ýÀÚ */ + short boxnum; /* ì¤íì¤í¼ì¤ìì ì¤íì¼ ì´ë¦ì¼ë¡ ì¬ì©ë ì«ì */ /** * Type of floating object : line, txtbox, image, table, equalizer and button */ unsigned char boxtype; // (L)ine, t(X)tbox, Picture - (G) - short cap_len; /* ĸ¼ÇÀÇ ±æÀÌ */ + short cap_len; /* 캡ì ì ê¸¸ì´ */ void *cell; @@ -310,8 +310,8 @@ struct FBox: public HBox char xpos_type, ypos_type; unsigned char smart_linesp; -/* ÀÌ ÀÚ·á´Â tbox³ª pic¿¡¼´Â ÆÄÀÏ¿¡ ±â·ÏÇÏÁö ¾Ê°í ½ÇÇà½Ã¸¸ ÀÖÀ¸¸ç, - line¿¡¼´Â ÆÄÀÏ¿¡ ±â·ÏÇÑ´Ù. +/* ì´ ìë£ë tboxë picììë íì¼ì 기ë¡íì§ ìê³ ì¤íìë§ ìì¼ë©°, + lineììë íì¼ì 기ë¡íë¤. */ short boundsy, boundey; unsigned char boundx, draw; @@ -355,7 +355,7 @@ struct TxtBox: public FBox * The value of type indicates as the below: zero is table, one is * textbox, two is equalizer and three is button. */ - short type; // 0-table, 1-textbox, 2-¼ö½Ä, 3-button + short type; // 0-table, 1-textbox, 2-ìì, 3-button /** * nCell is greater than one only for table, otherwise it is 1. */ @@ -544,7 +544,7 @@ struct Table TxtBox *box; }; -/* picture (11) ±×¸², OLE±×¸², »ðÀԱ׸², ±×¸®±â */ +/* picture (11) 그림, OLE그림, ì½ì 그림, 그리기 */ enum pictype { PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED, @@ -623,7 +623,7 @@ struct Picture: public FBox * follow_block_size is the size information of the Drawing object of hwp. * It's value is greater than 0 if the pictype is PICTYPE_DRAW. */ - ulong follow_block_size; /* Ãß°¡Á¤º¸ ±æÀÌ. */ + ulong follow_block_size; /* ì¶ê°ì ë³´ 길ì´. */ short dummy1; // to not change structure size */ short dummy2; // to not change structure size */ uchar reserved1; @@ -653,7 +653,7 @@ struct Picture: public FBox /** * It's for the Drawing object */ - unsigned char *follow; /* ±×¸²Á¾·ù°¡ drawingÀ϶§, Ãß°¡Á¤º¸. */ + unsigned char *follow; /* ê·¸ë¦¼ì¢ ë¥ê° drawingì¼ë, ì¶ê°ì ë³´. */ bool ishyper; @@ -829,7 +829,7 @@ struct ShowPageNum: public HBox virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; -/* Ȧ¼öÂʽÃÀÛ (21) */ +/* íì쪽ìì (21) */ #define HIDE_HD 1 /* bit 0 */ #define HIDE_FT 2 /* bit 1 */ #define HIDE_PGNUM 4 /* bit 2 */ @@ -999,7 +999,7 @@ class Outline: public HBox /** * decoration character for the level type */ - hchar deco[MAX_OUTLINE_LEVEL][2]; /* »ç¿ëÀÚ Á¤Àǽà ¾ÕµÚ ¹®ÀÚ */ + hchar deco[MAX_OUTLINE_LEVEL][2]; /* ì¬ì©ì ì ìì ìë¤ ë¬¸ì */ hchar dummy; Outline(); @@ -1008,7 +1008,7 @@ class Outline: public HBox hchar_string GetUnicode() const; }; -/* ¹À½ ºóÄ(30) */ +/* 묶ì ë¹ì¹¸(30) */ /** * The Special space to be treated non-space when a string is * cut at the end of line @@ -1023,7 +1023,7 @@ struct KeepSpace: public HBox virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; -/* °íÁ¤Æø ºóÄ(31) */ +/* ê³ ì í ë¹ì¹¸(31) */ /** * @short Space with always same width not relation with fonts. */ diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx index 5949628..6ecd354 100644 --- a/hwpfilter/source/hcode.cxx +++ b/hwpfilter/source/hcode.cxx @@ -523,7 +523,7 @@ static hchar cdkssm2ks_han(hchar kssm) unsigned int index; unsigned char lo, hi; -/* "ÇÑ" */ +/* "í" */ if (kssm == 0xd3c5) return 0xc7d1; @@ -585,7 +585,7 @@ static const hchar choseong_to_unicode[] = 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1120, 0x1121, 0x1127, 0x112b, 0x112d, 0x112f, 0x1132, 0x1136, 0x1140, 0x114c, 0x1158 }; -/* Áß¼ºÀÌ 0°ú 1ÀÎ °÷¿¡´Â ´Ù¸¥ ÄÚµåµéÀÌ µé¾î°¡ ÀÖ´Ù. À̺κп¡ ´ëÇÑ ¹ýÄ¢À» »Ì¾Æ¶ó. */ +/* ì¤ì±ì´ 0ê³¼ 1ì¸ ê³³ìë ë¤ë¥¸ ì½ëë¤ì´ ë¤ì´ê° ìë¤. ì´ë¶ë¶ì ëí ë²ì¹ì ë½ìë¼. */ static const hchar joongseong_to_unicode[] = { 0, 0, 0, 0x1161, 0x1162, 0x1163, 0x1164, 0x1165, @@ -602,12 +602,12 @@ static const hchar jongseong_to_unicode[] = 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x11eb, 0x11f0 }; -/* Áß¼ºÀÌ 0°ú 1Àΰ÷ */ -/* óÀ½ 32°³´Â ÀÚ¸ð, ³ª¸ÓÁö 32°³´Â Á¶ÇÕÀ¸·Î ±¸¼º. - * 0x8000 ~ 0xa413±îÁö 32°³ ³ª¿À°í, 0x0400´õÇÑ 0x8400¿¡¼ ´Ù½Ã 32°³ ³ª¿À´Â ½ÄÀ¸·Î ÁøÇàµÈ´Ù. - * Àڸ𿵿ªÀº ÀÏ¹Ý Å×À̺í·Î ³ª¸ÓÁö´Â ±¸Á¶Ã¼ ¸ÅÇÎÅ×À̺í·Î ¸¸µç´Ù. +/* ì¤ì±ì´ 0ê³¼ 1ì¸ê³³ */ +/* ì²ì 32ê°ë ì모, ëë¨¸ì§ 32ê°ë ì¡°í©ì¼ë¡ 구ì±. + * 0x8000 ~ 0xa413ê¹ì§ 32ê° ëì¤ê³ , 0x0400ëí 0x8400ìì ë¤ì 32ê° ëì¤ë ìì¼ë¡ ì§íëë¤. + * ì모ììì ì¼ë° í ì´ë¸ë¡ ë머ì§ë 구조체 매íí ì´ë¸ë¡ ë§ë ë¤. */ -/* 308°³.. 1152°³¿¡¼ 308°³¸¦ Á¦¿ÜÇÑ ³ª¸ÓÁö 844°³´Â ÀÚ¸ðÁ¶ÇÕÀÌ´Ù. */ +/* 308ê°.. 1152ê°ìì 308ê°ë¥¼ ì ì¸í ëë¨¸ì§ 844ê°ë ì모조í©ì´ë¤. */ static const hchar jamo_to_unicode[] = { 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138, @@ -666,7 +666,7 @@ struct JamoComp{ hchar v2; hchar v3; }; -/* 704 + 12 = 706 °³ */ +/* 704 + 12 = 706 ê° */ static const JamoComp jamocomp1_to_unicode[] = { {3, 0x1100, 0x1161, 0x11e7}, {3, 0x1100, 0x1161, 0x3167}, @@ -789,7 +789,7 @@ static const JamoComp jamocomp1_to_unicode[] = {3, 0x1105, 0x119e, 0x11d7}, {3, 0x1105, 0x119e, 0x11dc}, {3, 0x1105, 0x119e, 0x11dd}, {2, 0x1105, 0x1176, 0x0000}, -/* -- ¿©±âºÎÅÍ ¼ýÀÚ ¾È¹Ù²Þ Áï, 3À» 2·Î ¹Ù²Ù¾î ÁÖ¾î¾ß ÇÔ. */ +/* -- ì¬ê¸°ë¶í° ì«ì ìë°ê¿ ì¦, 3ì 2ë¡ ë°ê¾¸ì´ 주ì´ì¼ í¨. */ {2, 0x1105, 0x1178, 0x0000}, {2, 0x1105, 0x117a, 0x0000}, {2, 0x1105, 0x117b, 0x0000}, {2, 0x1105, 0x1186, 0x0000}, {2, 0x1105, 0x1187, 0x0000}, {2, 0x1105, 0x118c, 0x0000}, @@ -914,13 +914,13 @@ int hcharconv(hchar ch, hchar *dest, int codeType) dest[0] = ch; return 1; } - /* ÇÑÀÚ´Â 0x4000ºÎÅÍ 4888°¡ÁöÀÇ °ªÀ» °¡Áø´Ù. */ + /* íìë 0x4000ë¶í° 4888ê°ì§ì ê°ì ê°ì§ë¤. */ else if (IsHanja(ch)) { unsigned int index; unsigned char hi; - /* 4888ÀÌ¿ÜÀÇ ¼ö´Â ¾Æ·¡Çѱۿ¡¼ Á¤ÀÇÇÑ È®ÀåÇÑÀÚÀÌ´Ù. À̰Ϳ¡ ´ëÇØ¼´Â - À¯´ÏÄڵ峪 ¿Ï¼ºÇüÄÚµå·ÎÀÇ º¯È¯À» À§ÇÑ ¸ÅÇÎÅ×À̺í¾î ¾ø´Â ½ÇÁ¤ÀÌ´Ù. + /* 4888ì´ì¸ì ìë ìëíê¸ìì ì ìí íì¥íìì´ë¤. ì´ê²ì ëí´ìë + ì ëì½ëë ìì±íì½ëë¡ì ë³íì ìí 매íí ì´ë¸ì´ ìë ì¤ì ì´ë¤. */ if ((index = ch - 0x4000) >= 4888) { @@ -932,8 +932,8 @@ int hcharconv(hchar ch, hchar *dest, int codeType) } if (codeType == KS) { - /* ÇÑÀÚÄÚµå´Â »óÀ§ÄÚµå¿Í ÇÏÀ§ÄÚµå·Î ³ª´©¾îÁö¸ç ÇÏÀ§ÄÚµå´Â 0xA1 - 0xFE ±îÁöÀÇ °ªÀ» °¡Áø´Ù. - Áï ÇÏÀ§Äڵ忡 ¿Ã¼öÀÖ´Â °¡Áö¼ö´Â 0xFE - 0xA1 +1 °¡Áö¼öÀÌ´Ù. + /* íìì½ëë ììì½ëì íìì½ëë¡ ëëì´ì§ë©° íìì½ëë 0xA1 - 0xFE ê¹ì§ì ê°ì ê°ì§ë¤. + ì¦ íìì½ëì ì¬ììë ê°ì§ìë 0xFE - 0xA1 +1 ê°ì§ìì´ë¤. */ hi = sal::static_int_cast<unsigned char>(index / (0xFE - 0xA1 + 1) + 0xCA); lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1); @@ -997,8 +997,8 @@ int hcharconv(hchar ch, hchar *dest, int codeType) return 1 ; } /** - * Ư¼ö¹®ÀÚ ÄÚµå - * ¾Æ·¡Çѱۿ¡¼´Â 0x3400ºÎÅÍ Æ¯¼ö¹®ÀÚ°¡ ½ÃÀ۵ȴÙ. Á¶ÇÕÇüÀº 0xA1A0 + * í¹ì문ì ì½ë + * ìëíê¸ììë 0x3400ë¶í° í¹ì문ìê° ììëë¤. ì¡°í©íì 0xA1A0 */ else { @@ -1013,7 +1013,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType) dest[0] = ch; return 1; } - /* Çѱ۰úÄÄÇ»ÅÍ : 0x37c0 ~ 0x37c5 */ + /* íê¸ê³¼ì»´í¨í° : 0x37c0 ~ 0x37c5 */ if( ch2 >= 0x37c0 && ch2 <= 0x37c5 ){ if( ch2 == 0x37c0 ) dest[0] = 0xd55c; else if( ch2 == 0x37c1 ) dest[0] = 0xae00; @@ -1059,7 +1059,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType) } } -/* ÇѱÛÀÏ °æ¿ì. */ +/* íê¸ì¼ ê²½ì°. */ int kssm_hangul_to_ucs2(hchar ch, hchar *dest) { hchar choseong, joongseong, jongseong; @@ -1070,13 +1070,13 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest) //printf("kssm_hangul_to_ucs2 : [%d,%d,%d]\n", choseong,joongseong,jongseong); - if( joongseong < 2 ){ /* Á¶ÇÕµÇÁö ¾ÊÀº ¿µ¿ª Áß¼º=0,1 */ - if( joongseong == 0 && ch < 0xa414 ){ /* °í¾îÆ÷ÇÔ ÀÚ¸ð */ + if( joongseong < 2 ){ /* ì¡°í©ëì§ ìì ìì ì¤ì±=0,1 */ + if( joongseong == 0 && ch < 0xa414 ){ /* ê³ ì´í¬í¨ ì모 */ int index = choseong * 32 + jongseong; dest[0] = jamo_to_unicode[index]; return 1; } - else{ /* °í¾îÆ÷ÇÔ ÀÚ¸ðÁ¶ÇÕ : Å×ÀÌºí ¹Ì¿Ï¼º */ + else{ /* ê³ ì´í¬í¨ ìëª¨ì¡°í© : í ì´ë¸ 미ìì± */ unsigned int index = choseong * 32 + jongseong - 308; if( index < SAL_N_ELEMENTS(jamocomp1_to_unicode) ){ dest[0] = jamocomp1_to_unicode[index].v1; @@ -1088,11 +1088,11 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest) return 1; } } - else if ( choseong == 1 && jongseong == 1 ){ /* ¸ðÀ½ */ + else if ( choseong == 1 && jongseong == 1 ){ /* 모ì */ dest[0] = joongseong_to_unicode[joongseong]; return 1; } - else if ( joongseong == 2 && jongseong == 1 ){ /* ÀÚÀ½ */ + else if ( joongseong == 2 && jongseong == 1 ){ /* ìì */ dest[0] = choseong_to_unicode[choseong]; return 1; } @@ -1101,8 +1101,8 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest) joongseong == 25 || joongseong > 29 || jongseong == 0 || jongseong == 18 || jongseong > 29 || - choseong == 1 || joongseong == 2 /* ¿Ï¼ºµÇÁö ¾ÊÀº ÇÑ±Û */ - ) { /* °í¾î */ + choseong == 1 || joongseong == 2 /* ìì±ëì§ ìì íê¸ */ + ) { /* ê³ ì´ */ int count = 0; if( choseong != 1 ){ dest[count] = choseong_to_unicode[choseong]; @@ -1182,7 +1182,7 @@ hchar_string hstr2ucsstr(hchar const* hstr) } /** - * ÇÑÄĽºÆ®¸µÀ» ¿Ï¼ºÇü½ºÆ®¸µÀ¸·Î º¯È¯ÇÑ´Ù + * íì»´ì¤í¸ë§ì ìì±íì¤í¸ë§ì¼ë¡ ë³ííë¤ */ ::std::string hstr2ksstr(hchar const* hstr) { @@ -1212,8 +1212,8 @@ hchar_string hstr2ucsstr(hchar const* hstr) /* - * Çѱۿ¡¼ ¿µ¹®¿ÜÀÇ ¹®ÀÚ±îÁö Æ÷ÇÔÇÒ ¼ö ÀÖ´Â kcharŸÀÔÀÇ ¹®ÀÚ¿À» - * Çѱۿ¡¼ »ç¿ëÇÏ´Â hcharŸÀÔÀÇ ¹®ÀÚ¿·Î º¯È¯ÇÑ´Ù. + * íê¸ìì ì문ì¸ì 문ìê¹ì§ í¬í¨í ì ìë kcharíì ì 문ìì´ì + * íê¸ìì ì¬ì©íë hcharíì ì 문ìì´ë¡ ë³ííë¤. */ hchar_string kstr2hstr(unsigned char const* src) { @@ -1244,7 +1244,7 @@ char* Int2Str(int value, const char *format, char *buf) } -/* colorÀ妽º °ª°ú À½¿µ°ªÀ» Á¶ÇÕÇÏ¿© ½ºÅ¸¿ÀÇǽºÀÇ color·Î º¯È¯ */ +/* colorì¸ë±ì¤ ê°ê³¼ ììê°ì ì¡°í©íì¬ ì¤íì¤í¼ì¤ì colorë¡ ë³í */ char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar) { unsigned short red,green,blue; @@ -1448,11 +1448,11 @@ double calcAngle(int x1, int y1, int x2, int y2) } double angle; angle = (180 / PI) * atan( ( y2 - y1 ) * 1.0 / ( x2 - x1 )); - if( y2 >= y1 ){ /* 1,2»çºÐ¸é */ + if( y2 >= y1 ){ /* 1,2ì¬ë¶ë©´ */ if( angle < 0. ) angle += 180.; } - else{ /* 3, 4 »çºÐ¸é */ + else{ /* 3, 4 ì¬ë¶ë©´ */ if( angle > 0 ) angle += 180.; else diff --git a/hwpfilter/source/hinfo.cxx b/hwpfilter/source/hinfo.cxx index 7f261f0..2b81362 100644 --- a/hwpfilter/source/hinfo.cxx +++ b/hwpfilter/source/hinfo.cxx @@ -54,42 +54,42 @@ HWPInfo::~HWPInfo(void) /** - * ¹®¼Á¤º¸¸¦ ÀоîµéÀÌ´Â ÇÔ¼ö ( 128 bytes ) - * ¹®¼Á¤º¸´Â ÆÄÀÏÀνÄÁ¤º¸( 30 bytes ) ´ÙÀ½¿¡ À§Ä¡ÇÑ Á¤º¸ÀÌ´Ù. + * 문ìì 보를 ì½ì´ë¤ì´ë í¨ì ( 128 bytes ) + * 문ìì ë³´ë íì¼ì¸ìì ë³´( 30 bytes ) ë¤ìì ìì¹í ì ë³´ì´ë¤. */ bool HWPInfo::Read(HWPFile & hwpf) { - hwpf.Read2b(&cur_col, 1); /* ¹®¼¸¦ ÀúÀåÇÒ ´ç½ÃÀÇ Ä¿¼°¡ À§Ä¡ÇÑ ¹®´Ü¹øÈ£ */ - hwpf.Read2b(&cur_row, 1); /* ¹®´Ü Ä */ + hwpf.Read2b(&cur_col, 1); /* 문ì를 ì ì¥í ë¹ìì 커ìê° ìì¹í 문ë¨ë²í¸ */ + hwpf.Read2b(&cur_row, 1); /* ë¬¸ë¨ ì¹¸ */ - hwpf.Read1b(&paper.paper_kind, 1); /* ¿ëÁö Á¾·ù */ - hwpf.Read1b(&paper.paper_direction, 1); /* ¿ëÁö ¹æÇâ */ + hwpf.Read1b(&paper.paper_kind, 1); /* ì©ì§ ì¢ ë¥ */ + hwpf.Read1b(&paper.paper_direction, 1); /* ì©ì§ ë°©í¥ */ // paper geometry information - paper.paper_height = (short) hwpf.Read2b(); /* ¿ëÁö ±æÀÌ */ - paper.paper_width = (short) hwpf.Read2b(); /* ¿ëÁö ³Êºñ */ - paper.top_margin = (short) hwpf.Read2b(); /* À§ÂÊ ¿©¹é */ - paper.bottom_margin = (short) hwpf.Read2b(); /* ¾Æ·¡ÂÊ ¿©¹é */ - paper.left_margin = (short) hwpf.Read2b(); /* ¿ÞÂÊ ¿©¹é */ - paper.right_margin = (short) hwpf.Read2b(); /* ¿À¸¥ÂÊ ¿©¹é */ - paper.header_length = (short) hwpf.Read2b(); /* ¸Ó¸®¸» ±æÀÌ */ - paper.footer_length = (short) hwpf.Read2b(); /* ²¿¸®¸» ±æÀÌ */ - paper.gutter_length = (short) hwpf.Read2b(); /* Á¦º»¿©¹é */ - hwpf.Read2b(&readonly, 1); /* ¿¹¾à */ - hwpf.Read1b(reserved1, 4); /* ¿¹¾à */ - hwpf.Read1b(&chain_info.chain_page_no, 1); /* ÂÊ ¹øÈ£ ¿¬°á 1-¿¬°á, 0-»õ·Î½ÃÀÛ (¿¬°áÀμ⿡¼ »ç¿ë) */ - hwpf.Read1b(&chain_info.chain_footnote_no, 1);/* °¢ÁÖ¹øÈ£ ¿¬°á 1-¿¬°á 0-»õ·Î½ÃÀÛ */ - /* ¿¬°áÀμâÇÒ ÆÄÀÏÀÇ À̸§ */ + paper.paper_height = (short) hwpf.Read2b(); /* ì©ì§ ê¸¸ì´ */ + paper.paper_width = (short) hwpf.Read2b(); /* ì©ì§ ëë¹ */ + paper.top_margin = (short) hwpf.Read2b(); /* ì쪽 ì¬ë°± */ + paper.bottom_margin = (short) hwpf.Read2b(); /* ìë쪽 ì¬ë°± */ + paper.left_margin = (short) hwpf.Read2b(); /* ì¼ìª½ ì¬ë°± */ + paper.right_margin = (short) hwpf.Read2b(); /* ì¤ë¥¸ìª½ ì¬ë°± */ + paper.header_length = (short) hwpf.Read2b(); /* ë¨¸ë¦¬ë§ ê¸¸ì´ */ + paper.footer_length = (short) hwpf.Read2b(); /* ê¼¬ë¦¬ë§ ê¸¸ì´ */ + paper.gutter_length = (short) hwpf.Read2b(); /* ì 본ì¬ë°± */ + hwpf.Read2b(&readonly, 1); /* ìì½ */ + hwpf.Read1b(reserved1, 4); /* ìì½ */ + hwpf.Read1b(&chain_info.chain_page_no, 1); /* 쪽 ë²í¸ ì°ê²° 1-ì°ê²°, 0-ìë¡ìì (ì°ê²°ì¸ììì ì¬ì©) */ + hwpf.Read1b(&chain_info.chain_footnote_no, 1);/* ê°ì£¼ë²í¸ ì°ê²° 1-ì°ê²° 0-ìë¡ìì */ + /* ì°ê²°ì¸ìí íì¼ì ì´ë¦ */ hwpf.Read1b(chain_info.chain_filename, CHAIN_MAX_PATH); - hwpf.Read1b(annotation, ANNOTATION_LEN); /* µ¡ºÙÀÌ´Â ¸» ( ÆÄÀÏ ÀúÀåÇÒ ¶§ µ¡ºÙÀÌ´Â ¸»¿¡ ÁöÁ¤ÇÑ ³»¿ë ) */ - hwpf.Read2b(&encrypted, 1); /* ¾ÏÈ£ ¿©ºÎ 0-º¸ÅëÆÄÀÏ, ±×¿Ü-¾ÏÈ£°É¸° ÆÄÀÏ */ -//hwpf.Read1b(reserved2, 6); /* ¾Æ·¡ 3°³ÀǰªÀ¸·Î ¹Ù²î¾ú´Ù. */ - hwpf.Read2b(&beginpagenum,1); /* ÆäÀÌÁö½ÃÀÛ¹øÈ£ */ + hwpf.Read1b(annotation, ANNOTATION_LEN); /* ë§ë¶ì´ë ë§ ( íì¼ ì ì¥í ë ë§ë¶ì´ë ë§ì ì§ì í ë´ì© ) */ + hwpf.Read2b(&encrypted, 1); /* ìí¸ ì¬ë¶ 0-ë³´íµíì¼, ê·¸ì¸-ìí¸ê±¸ë¦° íì¼ */ +//hwpf.Read1b(reserved2, 6); /* ìë 3ê°ìê°ì¼ë¡ ë°ëìë¤. */ + hwpf.Read2b(&beginpagenum,1); /* íì´ì§ììë²í¸ */ // footnote - hwpf.Read2b(&beginfnnum,1); /* °¢ÁÖ ½ÃÀÛ¹øÈ£ */ - hwpf.Read2b(&countfn,1); /* °¢ÁÖ °¹¼ö */ + hwpf.Read2b(&beginfnnum,1); /* ê°ì£¼ ììë²í¸ */ + hwpf.Read2b(&countfn,1); /* ê°ì£¼ ê°¯ì */ splinetext = (short) hwpf.Read2b(); splinefn = (short) hwpf.Read2b(); spfnfn = (short) hwpf.Read2b(); @@ -110,7 +110,7 @@ bool HWPInfo::Read(HWPFile & hwpf) if (hwpf.State()) return false; -/* ¹®¼ ¿ä¾àÀ» Àд´Ù. */ +/* 문ì ìì½ì ì½ëë¤. */ if (!summary.Read(hwpf)) return false; if (info_block_len > 0) @@ -122,7 +122,7 @@ bool HWPInfo::Read(HWPFile & hwpf) return false; } -/* hwpfÀÇ °ªÀ» Àç¼³Á¤ ÇÑ´Ù. */ +/* hwpfì ê°ì ì¬ì¤ì íë¤. */ hwpf.compressed = compressed ? true : false; hwpf.encrypted = encrypted ? true : false; hwpf.info_block_len = info_block_len; diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx index ce53b0c..ba2e762 100644 --- a/hwpfilter/source/hwpeq.cxx +++ b/hwpfilter/source/hwpeq.cxx @@ -32,7 +32,7 @@ using namespace std; #include <sal/types.h> #include <sal/macros.h> -/* @Man: hwp¼ö½ÄÀ» LaTeXÀ¸·Î ¹Ù²Ù±â */ +/* @Man: hwpììì LaTeXì¼ë¡ ë°ê¾¸ê¸° */ #ifdef WIN32 # define ENDL "\r\n" #else /* !WIN32 */ @@ -125,7 +125,7 @@ static const hwpeq eq_tbl[] = { { "bullet", NULL, 0, 0 }, { "cap", NULL, 0, 0 }, { "cases", NULL, 0, EQ_ENV }, - { "ccol", NULL, 0, 0 }, /* ¼¼·Î·Î °¡¿îµ¥ */ + { "ccol", NULL, 0, 0 }, /* ì¸ë¡ë¡ ê°ì´ë° */ { "cdot", NULL, 0, 0 }, { "cdots", NULL, 0, 0 }, { "check", NULL, 1, 0 }, @@ -401,7 +401,7 @@ static const hwpeq *lookup_eqn(char *str) return result; } -/* ùÀÚ¸¸ ´ë¹®ÀÚÀ̰ųª ÀüºÎ ´ë¹®ÀÚ¸é ¼Ò¹®ÀÚ·Î ¹Ù²Û´Ù. */ +/* 첫ìë§ ë문ìì´ê±°ë ì ë¶ ë문ìë©´ ì문ìë¡ ë°ê¾¼ë¤. */ static char *make_keyword( char *keyword, const char *token) { @@ -462,7 +462,7 @@ void push_token(MzString &white, MzString &token, istream *strm) stk->strm = strm; } -/* ÀÐÀº ÅäÅ«ÀÇ ±æÀ̸¦ ¹ÝȯÇÑ´Ù. */ +/* ì½ì í í°ì 길ì´ë¥¼ ë°ííë¤. */ /* control char, control sequence, binary sequence, alphabet string, sigle character */ static int next_token(MzString &white, MzString &token, istream *strm) @@ -498,8 +498,8 @@ static int next_token(MzString &white, MzString &token, istream *strm) ch = strm->get(); } while( ch != EOF && (ch & 0x80 || isalpha(ch)) ) ; strm->putback(sal::static_int_cast<char>(ch)); - /* sub, sub, over, atop Ư¼ö ó¸® - ±× ÀÌÀ¯´Â next_state()¿¡ ¿µÇâÀ» ¹ÌÄ¡±â ¶§¹®ÀÌ´Ù. + /* sub, sub, over, atop í¹ì ì²ë¦¬ + ê·¸ ì´ì ë next_state()ì ìí¥ì 미ì¹ê¸° ë문ì´ë¤. */ if( !STRICMP("sub", token) || !STRICMP("from", token) || !STRICMP("sup", token) || !STRICMP("to", token) || @@ -550,17 +550,17 @@ static int read_white_space(MzString& outs, istream *strm) return result; } -/* Àμö°¡ ÇÊ¿äÇÏÁö ¾ÊÀº °æ¿ì °¢ Ç׸ñ°£ÀÇ ±¸ºÐÀº space¿Í brace +/* ì¸ìê° íìíì§ ìì ê²½ì° ê° í목ê°ì 구ë¶ì spaceì brace sqrt {ab}c = sqrt{ab} c - (, }´Â grouping - ^, _ ´Â ¾ÕµÚ·Î °áÇÕÇÑ´Ù. + (, }ë grouping + ^, _ ë ìë¤ë¡ ê²°í©íë¤. - sqrt µî°ú °°ÀÌ Àμö°¡ ÀÖ´Â Çü½Ä Á¤¸® + sqrt ë±ê³¼ ê°ì´ ì¸ìê° ìë íì ì 리 sqrt a -> sqrt{a} sqrt {a} -> sqrt{a} - 1 ÀÌ»óÀÇ Àμö°¡ ÀÖ´Â °æ¿ì Àμöµé°£ÀÇ ¿ª¹éÀº ¾ø¾Ø´Ù. + 1 ì´ìì ì¸ìê° ìë ê²½ì° ì¸ìë¤ê°ì ìë°±ì ìì¤ë¤. \frac a b -> frac{a}{b} - overÀÇ Çü½Ä Á¤¸® + overì íì ì 리 a over b -> {a}over{b} */ @@ -591,7 +591,7 @@ static int eq_word(MzString& outs, istream *strm, int status) state << white << token; } else { - /* Á¤»óÀûÀÎ token */ + /* ì ìì ì¸ token */ int script_status = SCRIPT_NONE; while( true ) { state << white << token; diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 2b5a1fe..dabca79 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -374,7 +374,7 @@ ColumnDef *HWPFile::GetColumnDef(int num) else return 0; } -/* @return À妽º´Â 1ºÎÅÍ ½ÃÀÛÇÑ´Ù. */ +/* @return ì¸ë±ì¤ë 1ë¶í° ììíë¤. */ int HWPFile::GetPageMasterNum(int page) { std::list<ColumnInfo*>::iterator it = columnlist.begin(); diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index 0facd76..dd9bc91 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -63,10 +63,10 @@ bool FieldCode::Read(HWPFile & hwpf) { ulong size; hchar dummy; - ulong len1; /* hcharŸÀÔÀÇ ¹®ÀÚ¿ Å×ÀÌÅÍ #1ÀÇ ±æÀÌ */ - ulong len2; /* hcharŸÀÔÀÇ ¹®ÀÚ¿ Å×ÀÌÅÍ #2ÀÇ ±æÀÌ */ - ulong len3; /* hcharŸÀÔÀÇ ¹®ÀÚ¿ Å×ÀÌÅÍ #3ÀÇ ±æÀÌ */ - ulong binlen; /* ÀÓÀÇ Çü½ÄÀÇ ¹ÙÀ̳ʸ® µ¥ÀÌŸ ±æÀÌ */ + ulong len1; /* hcharíì ì 문ìì´ í ì´í° #1ì ê¸¸ì´ */ + ulong len2; /* hcharíì ì 문ìì´ í ì´í° #2ì ê¸¸ì´ */ + ulong len3; /* hcharíì ì 문ìì´ í ì´í° #3ì ê¸¸ì´ */ + ulong binlen; /* ìì íìì ë°ì´ë리 ë°ì´í ê¸¸ì´ */ hwpf.Read4b(&size, 1); hwpf.Read2b(&dummy, 1); @@ -100,7 +100,7 @@ bool FieldCode::Read(HWPFile & hwpf) hwpf.ReadBlock(bin, binlen); - if( type[0] == 3 && type[1] == 2 ){ /* ¸¸µç³¯Â¥·Î¼ Æ÷¸ËÀ» »ý¼ºÇØ¾ß ÇÑ´Ù. */ + if( type[0] == 3 && type[1] == 2 ){ /* ë§ë ë ì§ë¡ì í¬ë§·ì ìì±í´ì¼ íë¤. */ DateCode *pDate = new DateCode; for (int i = 0 ; i < static_cast<int>(len3_); i++) { if(str3[i] == 0 ) break; @@ -380,46 +380,46 @@ bool Picture::Read(HWPFile & hwpf) hwpf.AddBox(this); hwpf.Read4b(&follow_block_size, 1); - hwpf.Read2b(&dummy1, 1); /* ¿¹¾à 4¹ÙÀÌÆ® */ + hwpf.Read2b(&dummy1, 1); /* ìì½ 4ë°ì´í¸ */ hwpf.Read2b(&dummy2, 1); style.boxnum = fboxnum++; zorder = zindex++; - hwpf.Read1b(&style.anchor_type, 1); /* ±âÁØÀ§Ä¡ */ - hwpf.Read1b(&style.txtflow, 1); /* ±×¸²ÇÇÇÔ. 0-2(ÀÚ¸®Â÷Áö,Åõ¸í,¾î¿ï¸²) */ - hwpf.Read2b(&style.xpos, 1); /* °¡·ÎÀ§Ä¡ : 1 ¿ÞÂÊ, 2¿À¸¥ÂÊ, 3 °¡¿îµ¥, ÀÌ¿Ü = ÀÓÀÇ */ - hwpf.Read2b(&style.ypos, 1); /* ¼¼·ÎÀ§Ä¡ : 1 À§, 2 ¾Æ·¡, 3 °¡¿îµ¥, ÀÌ¿Ü ÀÓÀÇ */ - hwpf.Read2b(&option, 1); /* ±âŸ¿É¼Ç : Å׵θ®,±×¸²¹ÝÀü,µî. bit·Î ÀúÀå. */ - hwpf.Read2b(&ctrl_ch, 1); /* Ç×»ó 11 */ - hwpf.Read2b(style.margin, 12); /* ¿©¹é : [0-2][] out/in/¼¿,[][0-3] ¿Þ/¿À¸¥/À§/¾Æ·¡ ¿©¹é */ - hwpf.Read2b(&box_xs, 1); /* ¹Ú½ºÅ©±â °¡·Î */ - hwpf.Read2b(&box_ys, 1); /* ¼¼·Î */ - hwpf.Read2b(&cap_xs, 1); /* ĸ¼Ç Å©±â °¡·Î */ - hwpf.Read2b(&cap_ys, 1); /* ¼¼·Î */ - hwpf.Read2b(&style.cap_len, 1); /* ±æÀÌ */ - hwpf.Read2b(&xs, 1); /* Àüü Å©±â(¹Ú½º Å©±â + ĸ¼Ç + ¿©¹é) °¡·Î */ - hwpf.Read2b(&ys, 1); /* ¼¼·Î */ - hwpf.Read2b(&cap_margin, 1); /* ĸ¼Ç ¿©¹é */ + hwpf.Read1b(&style.anchor_type, 1); /* 기ì¤ìì¹ */ + hwpf.Read1b(&style.txtflow, 1); /* 그림í¼í¨. 0-2(ì리차ì§,í¬ëª ,ì´ì¸ë¦¼) */ + hwpf.Read2b(&style.xpos, 1); /* ê°ë¡ìì¹ : 1 ì¼ìª½, 2ì¤ë¥¸ìª½, 3 ê°ì´ë°, ì´ì¸ = ìì */ + hwpf.Read2b(&style.ypos, 1); /* ì¸ë¡ìì¹ : 1 ì, 2 ìë, 3 ê°ì´ë°, ì´ì¸ ìì */ + hwpf.Read2b(&option, 1); /* 기íìµì : í ë리,그림ë°ì ,ë±. bitë¡ ì ì¥. */ + hwpf.Read2b(&ctrl_ch, 1); /* íì 11 */ + hwpf.Read2b(style.margin, 12); /* ì¬ë°± : [0-2][] out/in/ì ,[][0-3] ì¼/ì¤ë¥¸/ì/ìë ì¬ë°± */ + hwpf.Read2b(&box_xs, 1); /* ë°ì¤í¬ê¸° ê°ë¡ */ + hwpf.Read2b(&box_ys, 1); /* ì¸ë¡ */ + hwpf.Read2b(&cap_xs, 1); /* 캡ì í¬ê¸° ê°ë¡ */ + hwpf.Read2b(&cap_ys, 1); /* ì¸ë¡ */ + hwpf.Read2b(&style.cap_len, 1); /* ê¸¸ì´ */ + hwpf.Read2b(&xs, 1); /* ì ì²´ í¬ê¸°(ë°ì¤ í¬ê¸° + 캡ì + ì¬ë°±) ê°ë¡ */ + hwpf.Read2b(&ys, 1); /* ì¸ë¡ */ + hwpf.Read2b(&cap_margin, 1); /* 캡ì ì¬ë°± */ hwpf.Read1b(&xpos_type, 1); hwpf.Read1b(&ypos_type, 1); - hwpf.Read1b(&smart_linesp, 1); /* ÁÙ°£°Ý º¸È£ : 0 ¹Ìº¸È£, 1 º¸È£ */ + hwpf.Read1b(&smart_linesp, 1); /* ì¤ê°ê²© ë³´í¸ : 0 미보í¸, 1 ë³´í¸ */ hwpf.Read1b(&reserved1, 1); - hwpf.Read2b(&pgx, 1); /* ½ÇÁ¦ °è»êµÈ ¹Ú½º °¡·Î */ - hwpf.Read2b(&pgy, 1); /* ¼¼·Î */ - hwpf.Read2b(&pgno, 1); /* ÆäÀÌÁö ¼ýÀÚ : 0ºÎÅÍ ½ÃÀÛ */ - hwpf.Read2b(&showpg, 1); /* ¹Ú½ºº¸¿©ÁÜ */ - hwpf.Read2b(&cap_pos, 1); /* ĸ¼ÇÀ§Ä¡ 0 - 7 ¸Þ´º¼ø¼. */ - hwpf.Read2b(&num, 1); /* ¹Ú½º¹øÈ£ 0ºÎÅÍ ½ÃÀÛÇØ¼ ¸Å±äÀϷùøÈ£ */ + hwpf.Read2b(&pgx, 1); /* ì¤ì ê³ì°ë ë°ì¤ ê°ë¡ */ + hwpf.Read2b(&pgy, 1); /* ì¸ë¡ */ + hwpf.Read2b(&pgno, 1); /* íì´ì§ ì«ì : 0ë¶í° ìì */ + hwpf.Read2b(&showpg, 1); /* ë°ì¤ë³´ì¬ì¤ */ + hwpf.Read2b(&cap_pos, 1); /* 캡ì ìì¹ 0 - 7 ë©ë´ìì. */ + hwpf.Read2b(&num, 1); /* ë°ì¤ë²í¸ 0ë¶í° ììí´ì 매긴ì¼ë ¨ë²í¸ */ - hwpf.Read1b(&pictype, 1); /* ±×¸²Á¾·ù */ + hwpf.Read1b(&pictype, 1); /* ê·¸ë¦¼ì¢ ë¥ */ - skip[0] = (short) hwpf.Read2b(); /* ±×¸²¿¡¼ ½ÇÁ¦ Ç¥½Ã¸¦ ½ÃÀÛÇÒ À§Ä¡ °¡·Î */ - skip[1] = (short) hwpf.Read2b(); /* ¼¼·Î */ - scale[0] = (short) hwpf.Read2b(); /* È®´ëºñÀ² : 0 °íÁ¤, ÀÌ¿Ü ÆÛ¼¾Æ® ´ÜÀ§ °¡·Î */ - scale[1] = (short) hwpf.Read2b(); /* ¼¼·Î */ + skip[0] = (short) hwpf.Read2b(); /* 그림ìì ì¤ì íì를 ììí ìì¹ ê°ë¡ */ + skip[1] = (short) hwpf.Read2b(); /* ì¸ë¡ */ + scale[0] = (short) hwpf.Read2b(); /* íëë¹ì¨ : 0 ê³ ì , ì´ì¸ í¼ì¼í¸ ë¨ì ê°ë¡ */ + scale[1] = (short) hwpf.Read2b(); /* ì¸ë¡ */ - hwpf.Read1b(picinfo.picun.path, 256); /* ±×¸²ÆÄÀÏ À̸§ : Á¾·ù°¡ DrawingÀÌ ¾Æ´Ò¶§. */ - hwpf.Read1b(reserved3, 9); /* ¹à±â/¸í¾Ï/±×¸²È¿°ú µî */ + hwpf.Read1b(picinfo.picun.path, 256); /* 그림íì¼ ì´ë¦ : ì¢ ë¥ê° Drawingì´ ìëë. */ + hwpf.Read1b(reserved3, 9); /* ë°ê¸°/ëª ì/그림í¨ê³¼ ë± */ UpdateBBox(this); if( pictype != PICTYPE_DRAW ) @@ -677,7 +677,7 @@ bool ShowPageNum::Read(HWPFile & hwpf) return !hwpf.State(); } -/* Ȧ¼öÂʽÃÀÛ/°¨Ãß±â (21) */ +/* íì쪽ìì/ê°ì¶ê¸° (21) */ PageNumCtrl::PageNumCtrl() : HBox(CH_PAGE_NUM_CTRL) , kind(0) @@ -823,7 +823,7 @@ bool Outline::Read(HWPFile & hwpf) } -/* ¹À½ ºóÄ(30) */ +/* 묶ì ë¹ì¹¸(30) */ KeepSpace::KeepSpace() : HBox(CH_KEEP_SPACE) , dummy(0) @@ -842,7 +842,7 @@ bool KeepSpace::Read(HWPFile & hwpf) } -/* °íÁ¤Æø ºóÄ(31) */ +/* ê³ ì í ë¹ì¹¸(31) */ FixedSpace::FixedSpace() : HBox(CH_FIXED_SPACE) , dummy(0)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits