gsl-shell.git - gsl-shell

diff --git a/agg-plot/lua-text.cpp b/agg-plot/lua-text.cpp
index 7802b0c3..3f6b15f2 100644
--- a/agg-plot/lua-text.cpp
+++ b/agg-plot/lua-text.cpp

@@ -24,155 +24,155 @@ static int agg_text_angle_get (lua_State *L);

static draw::text* check_agg_text (lua_State *L, int index);

static const struct luaL_Reg text_functions[] = {

- {"text", agg_text_new},

- {NULL, NULL}

+ {"text", agg_text_new},

+ {NULL, NULL}

};

static const struct luaL_Reg text_metatable[] = {

- {"__gc", agg_text_free},

- {NULL, NULL}

+ {"__gc", agg_text_free},

+ {NULL, NULL}

};

static const struct luaL_Reg text_methods[] = {

- {"set", agg_text_set_point},

- {"justif", agg_text_justif_set },

- {NULL, NULL}

+ {"set", agg_text_set_point},

+ {"justif", agg_text_justif_set },

+ {NULL, NULL}

};

static const struct luaL_Reg text_properties_get[] = {

- {"text", agg_text_text_get },

- {"angle", agg_text_angle_get },

- {NULL, NULL}

+ {"text", agg_text_text_get },

+ {"angle", agg_text_angle_get },

+ {NULL, NULL}

};

static const struct luaL_Reg text_properties_set[] = {

- {"angle", agg_text_angle_set },

- {NULL, NULL}

+ {"angle", agg_text_angle_set },

+ {NULL, NULL}

};

draw::text *

check_agg_text (lua_State *L, int index)

{

- return (draw::text *) gs_check_userdata (L, index, GS_DRAW_TEXT);

+ return (draw::text *) gs_check_userdata (L, index, GS_DRAW_TEXT);

}

int

agg_text_new (lua_State *L)

{

- double x = luaL_checknumber (L, 1);

- double y = luaL_checknumber (L, 2);

- const char *text = luaL_checkstring (L, 3);

- double size = luaL_optnumber (L, 4, 14.0);

- draw::text* t = new(L, GS_DRAW_TEXT) draw::text(text, size);

- t->set_point(x, y);

- return 1;

+ double x = luaL_checknumber (L, 1);

+ double y = luaL_checknumber (L, 2);

+ const char *text = luaL_checkstring (L, 3);

+ double size = luaL_optnumber (L, 4, 14.0);

+ draw::text* t = new(L, GS_DRAW_TEXT) draw::text(text, size);

+ t->set_point(x, y);

+ return 1;

}

int

agg_text_free (lua_State *L)

{

- typedef draw::text text_type;

- text_type *t = check_agg_text (L, 1);

- t->~text_type();

- return 0;

+ typedef draw::text text_type;

+ text_type *t = check_agg_text (L, 1);

+ t->~text_type();

+ return 0;

}

int

agg_text_angle_set (lua_State *L)

{

- draw::text *t = check_agg_text (L, 1);

- double th = luaL_checknumber (L, 2);

- t->angle(th);

- return 0;

+ draw::text *t = check_agg_text (L, 1);

+ double th = luaL_checknumber (L, 2);

+ t->angle(th);

+ return 0;

}

int

agg_text_angle_get (lua_State *L)

{

- draw::text *t = check_agg_text (L, 1);

- lua_pushnumber (L, t->angle());

- return 1;

+ draw::text *t = check_agg_text (L, 1);

+ lua_pushnumber (L, t->angle());

+ return 1;

}

int

agg_text_text_get (lua_State *L)

{

- draw::text *t = check_agg_text (L, 1);

- lua_pushstring (L, t->get_text());

- return 1;

+ draw::text *t = check_agg_text (L, 1);

+ lua_pushstring (L, t->get_text());

+ return 1;

}

int

agg_text_justif_set (lua_State *L)

{

- draw::text *t = check_agg_text (L, 1);

- const char *justif = luaL_checkstring (L, 2);

- size_t len = strlen (justif);

+ draw::text *t = check_agg_text (L, 1);

+ const char *justif = luaL_checkstring (L, 2);

+ size_t len = strlen (justif);

- if (len > 0)

+ if (len > 0)

{

- char ch = justif[0];

- double hjf;

- switch (ch)

+ char ch = justif[0];

+ double hjf;

+ switch (ch)

{

case 'l':

- hjf = 0.0;

- break;

+ hjf = 0.0;

+ break;

case 'c':

- hjf = 0.5;

- break;

+ hjf = 0.5;

+ break;

case 'r':

- hjf = 1.0;

- break;

+ hjf = 1.0;

+ break;

default:

- return luaL_error (L, "invalid text justification");

+ return luaL_error (L, "invalid text justification");

}

- t->hjustif(hjf);

+ t->hjustif(hjf);

}

- if (len > 1)

+ if (len > 1)

{

- char ch = justif[1];

- double vjf;

- switch (ch)

+ char ch = justif[1];

+ double vjf;

+ switch (ch)

{

case 'b':

- vjf = 0.0;

- break;

+ vjf = 0.0;

+ break;

case 'c':

- vjf = 0.5;

- break;

+ vjf = 0.5;

+ break;

case 't':

- vjf = 1.0;

- break;

+ vjf = 1.0;

+ break;

default:

- return luaL_error (L, "invalid text justification");

+ return luaL_error (L, "invalid text justification");

}

- t->vjustif(vjf);

+ t->vjustif(vjf);

}

- return 0;

+ return 0;

}

int

agg_text_set_point (lua_State *L)

{

- draw::text *t = check_agg_text (L, 1);

- double x = luaL_checknumber (L, 2);

- double y = luaL_checknumber (L, 3);

- t->set_point(x, y);

- return 0;

+ draw::text *t = check_agg_text (L, 1);

+ double x = luaL_checknumber (L, 2);

+ double y = luaL_checknumber (L, 3);

+ t->set_point(x, y);

+ return 0;

}

void

text_register (lua_State *L)

{

- luaL_newmetatable (L, GS_METATABLE(GS_DRAW_TEXT));

- register_properties_index(L, text_methods, text_properties_get, text_properties_set);

- luaL_register (L, NULL, text_metatable);

- lua_pop (L, 1);

+ luaL_newmetatable (L, GS_METATABLE(GS_DRAW_TEXT));

+ register_properties_index(L, text_methods, text_properties_get, text_properties_set);

+ luaL_register (L, NULL, text_metatable);

+ lua_pop (L, 1);

- luaL_register (L, NULL, text_functions);

+ luaL_register (L, NULL, text_functions);

}