[Libreoffice-commits] core.git: hwpfilter/source
Julien Nabet
serval2412 at yahoo.fr
Sun Apr 13 07:45:43 PDT 2014
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 <serval2412 at 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)
More information about the Libreoffice-commits
mailing list