Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

modification to take into account new version of mupdf

Browse Source
pull/2/merge
traycold 12 years ago
parent 02dd9b023f
commit 429f572827
7 changed files with 148 additions and 133 deletions
Show Stats Download Patch File Download Diff File

12
Makefile
Unescape Escape View File

@ -130,7 +130,7 @@ lfs.o: $(LFSDIR)/src/lfs.c
fetchthirdparty: fetchthirdparty:
-rm -Rf lua lua-5.1.4 -rm -Rf lua lua-5.1.4
-rm -Rf mupdf/thirdparty -rm -Rf mupdf/thirdparty
test -d mupdf && (cd mupdf; git checkout .) test -d mupdf && (cd mupdf; git checkout .) || echo warn: mupdf folder not found
git submodule init git submodule init
git submodule update git submodule update
ln -sf kpvcrlib/crengine/cr3gui/data data ln -sf kpvcrlib/crengine/cr3gui/data data
@ -155,10 +155,10 @@ cleanthirdparty:
make -C $(LUADIR) clean make -C $(LUADIR) clean
make -C $(MUPDFDIR) clean make -C $(MUPDFDIR) clean
#make -C $(CRENGINEDIR)/thirdparty/antiword clean #make -C $(CRENGINEDIR)/thirdparty/antiword clean
make -C $(CRENGINEDIR)/thirdparty/chmlib clean test -d $(CRENGINEDIR)/thirdparty/chmlib && make -C $(CRENGINEDIR)/thirdparty/chmlib clean || echo warn: chmlib folder not found
make -C $(CRENGINEDIR)/thirdparty/libpng clean test -d $(CRENGINEDIR)/thirdparty/libpng && (make -C $(CRENGINEDIR)/thirdparty/libpng clean) || echo warn: chmlib folder not found
make -C $(CRENGINEDIR)/crengine clean test -d $(CRENGINEDIR)/crengine && (make -C $(CRENGINEDIR)/crengine clean) || echo warn: chmlib folder not found
make -C $(KPVCRLIGDIR) clean test -d $(KPVCRLIGDIR) && (make -C $(KPVCRLIGDIR) clean) || echo warn: chmlib folder not found
-rm -rf $(DJVUDIR)/build -rm -rf $(DJVUDIR)/build
-rm -f $(MUPDFDIR)/fontdump.host -rm -f $(MUPDFDIR)/fontdump.host
-rm -f $(MUPDFDIR)/cmapdump.host -rm -f $(MUPDFDIR)/cmapdump.host
@ -175,7 +175,7 @@ $(MUPDFDIR)/cmapdump.host:
$(MUPDFLIBS) $(THIRDPARTYLIBS): $(MUPDFDIR)/cmapdump.host $(MUPDFDIR)/fontdump.host $(MUPDFLIBS) $(THIRDPARTYLIBS): $(MUPDFDIR)/cmapdump.host $(MUPDFDIR)/fontdump.host
# build only thirdparty libs, libfitz and pdf utils, which will care for libmupdf.a being built # build only thirdparty libs, libfitz and pdf utils, which will care for libmupdf.a being built
CFLAGS="$(CFLAGS) -DNOBUILTINFONT" make -C mupdf CC="$(CC)" CMAPDUMP=cmapdump.host FONTDUMP=fontdump.host MUPDF= XPS_APPS= verbose=1 CFLAGS="$(CFLAGS) -DNOBUILTINFONT" make -C mupdf CC="$(CC)" CMAPDUMP=cmapdump.host FONTDUMP=fontdump.host MUPDF= MU_APPS= BUSY_APP= XPS_APPS= verbose=1
$(DJVULIBS): $(DJVULIBS):
-mkdir $(DJVUDIR)/build -mkdir $(DJVUDIR)/build

2
font.lua
Unescape Escape View File

@ -38,6 +38,7 @@ Font = {
function Font:getFace(font, size) function Font:getFace(font, size)
print("getFace: "..font.." size:"..size)
if not font then if not font then
-- default to content font -- default to content font
font = self.cfont font = self.cfont
@ -57,6 +58,7 @@ function Font:getFace(font, size)
return nil return nil
end end
self.faces[font..size] = face self.faces[font..size] = face
print("getFace, found: "..realname.." size:"..size)
end end
return { size = size, ftface = face, hash = font..size } return { size = size, ftface = face, hash = font..size }
end end

11
helppage.lua
Unescape Escape View File

@ -48,8 +48,8 @@ function HelpPage:show(ypos, height, commands)
end end
table.sort(self.commands,function(w1,w2) return w1.order<w2.order end) table.sort(self.commands,function(w1,w2) return w1.order<w2.order end)
local faceHeight, faceAscender = self.face:getHeightAndAscender(); local faceHeight, faceAscender = self.face.ftface:getHeightAndAscender();
local ffaceHeight, ffaceAscender = self.fface:getHeightAndAscender(); local ffaceHeight, ffaceAscender = self.fface.ftface:getHeightAndAscender();
--print(faceHeight.."-"..faceAscender) --print(faceHeight.."-"..faceAscender)
--print(ffaceHeight.."-"..ffaceAscender) --print(ffaceHeight.."-"..ffaceAscender)
faceHeight = math.ceil(faceHeight) faceHeight = math.ceil(faceHeight)
@ -73,7 +73,7 @@ function HelpPage:show(ypos, height, commands)
local key = self.commands[i].shortcut local key = self.commands[i].shortcut
for _k,aMod in pairs(MOD_TABLE) do for _k,aMod in pairs(MOD_TABLE) do
local modStart, modEnd = key:find(aMod.v) local modStart, modEnd = key:find(aMod.v)
--print("key:"..key.." v:"..aMod.v.." d:"..aMod.d.." modstart:"..(modStart or "nil")) print("key:"..key.." v:"..aMod.v.." d:"..aMod.d.." modstart:"..(modStart or "nil"))
if(modStart ~= nil) then if(modStart ~= nil) then
key = key:sub(1,modStart-1)..key:sub(modEnd+1) key = key:sub(1,modStart-1)..key:sub(modEnd+1)
local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, aMod.d, true) local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, aMod.d, true)
@ -83,9 +83,10 @@ function HelpPage:show(ypos, height, commands)
max_x = math.max(max_x, pen_x) max_x = math.max(max_x, pen_x)
end end
end end
print("key:"..key)
local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, key , true) local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, key , true)
fb.bb:paintRect(x, ypos + spacing*c - box.y_top, box.x, box.y_top + box.y_bottom, 4); fb.bb:paintRect(x, ypos + spacing*c - box.y_top, box.x, box.y_top + box.y_bottom, 4);
local pen_x = renderUtf8Text(fb.bb, x, ypos + spacing*c, self.face, self.mHash, key, true) local pen_x = renderUtf8Text(fb.bb, x, ypos + spacing*c, self.face, key, true)
x = x + pen_x x = x + pen_x
max_x = math.max(max_x, x) max_x = math.max(max_x, x)
end end
@ -96,7 +97,7 @@ function HelpPage:show(ypos, height, commands)
renderUtf8Text(fb.bb, max_x + 20, ypos + spacing*c, self.hface, self.commands[i].help, true) renderUtf8Text(fb.bb, max_x + 20, ypos + spacing*c, self.hface, self.commands[i].help, true)
end end
end end
renderUtf8Text(fb.bb, 5, height - ffaceHeight + ffaceAscender - 5, self.fFace, renderUtf8Text(fb.bb, 5, height - ffaceHeight + ffaceAscender - 5, self.fface,
"Page "..self.page.." of "..math.ceil(self.items / perpage).." - click Back to close this page", true) "Page "..self.page.." of "..math.ceil(self.items / perpage).." - click Back to close this page", true)
markerdirty = true markerdirty = true
end end

44
mupdf.patch
Unescape Escape View File

@ -5,7 +5,7 @@ index 5e54e0b..38bd1d8 100644
@@ -182,8 +182,13 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname) @@ -182,8 +182,13 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname)
if (!data) if (!data)
fz_throw(ctx, "cannot find builtin font: '%s'", fontname); fz_throw(ctx, "cannot find builtin font: '%s'", fontname);
+#ifndef NOBUILTINFONT +#ifndef NOBUILTINFONT
fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1); fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1);
/* RJW: "cannot load freetype font from memory" */ /* RJW: "cannot load freetype font from memory" */
@ -13,13 +13,13 @@ index 5e54e0b..38bd1d8 100644
+ fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1); + fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1);
+ free(data); + free(data);
+#endif +#endif
if (!strcmp(fontname, "Symbol") || !strcmp(fontname, "ZapfDingbats")) if (!strcmp(fontname, "Symbol") || !strcmp(fontname, "ZapfDingbats"))
fontdesc->flags |= PDF_FD_SYMBOLIC; fontdesc->flags |= PDF_FD_SYMBOLIC;
@@ -199,8 +204,13 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, int mono, int @@ -199,8 +204,13 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, int mono, int
if (!data) if (!data)
fz_throw(ctx, "cannot find substitute font"); fz_throw(ctx, "cannot find substitute font");
+#ifndef NOBUILTINFONT +#ifndef NOBUILTINFONT
fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1); fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1);
/* RJW: "cannot load freetype font from memory" */ /* RJW: "cannot load freetype font from memory" */
@ -27,12 +27,12 @@ index 5e54e0b..38bd1d8 100644
+ fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1); + fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1);
+ free(data); + free(data);
+#endif +#endif
fontdesc->font->ft_substitute = 1; fontdesc->font->ft_substitute = 1;
fontdesc->font->ft_bold = bold && !ft_is_bold(fontdesc->font->ft_face); fontdesc->font->ft_bold = bold && !ft_is_bold(fontdesc->font->ft_face);
@@ -218,7 +228,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, int ros, @@ -218,7 +228,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, int ros,
fz_throw(ctx, "cannot find builtin CJK font"); fz_throw(ctx, "cannot find builtin CJK font");
/* a glyph bbox cache is too big for droid sans fallback (51k glyphs!) */ /* a glyph bbox cache is too big for droid sans fallback (51k glyphs!) */
+#ifndef NOBUILTINFONT +#ifndef NOBUILTINFONT
fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 0); fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 0);
@ -41,7 +41,7 @@ index 5e54e0b..38bd1d8 100644
+ free(data); + free(data);
+#endif +#endif
/* RJW: "cannot load builtin CJK font" */ /* RJW: "cannot load builtin CJK font" */
fontdesc->font->ft_substitute = 1; fontdesc->font->ft_substitute = 1;
diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c
index 543ce76..a076033 100644 index 543ce76..a076033 100644
@ -50,7 +50,7 @@ index 543ce76..a076033 100644
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
#include "fitz.h" #include "fitz.h"
#include "mupdf.h" #include "mupdf.h"
+#ifndef NOBUILTINFONT +#ifndef NOBUILTINFONT
+ +
#ifdef NOCJK #ifdef NOCJK
@ -83,7 +83,7 @@ index 543ce76..a076033 100644
+} +}
+ +
+unsigned char * +unsigned char *
+pdf_find_builtin_font(char *name, unsigned int *len) +pdf_lookup_builtin_font(char *name, unsigned int *len)
+{ +{
+ *len = 0; + *len = 0;
+ if (!strcmp("Courier", name)) { + if (!strcmp("Courier", name)) {
@ -132,37 +132,37 @@ index 543ce76..a076033 100644
+} +}
+ +
+unsigned char * +unsigned char *
+pdf_find_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len) +pdf_lookup_substitute_font(int mono, int serif, int bold, int italic, unsigned int *len)
+{ +{
+ if (mono) { + if (mono) {
+ if (bold) { + if (bold) {
+ if (italic) return pdf_find_builtin_font("Courier-BoldOblique", len); + if (italic) return pdf_lookup_builtin_font("Courier-BoldOblique", len);
+ else return pdf_find_builtin_font("Courier-Bold", len); + else return pdf_lookup_builtin_font("Courier-Bold", len);
+ } else { + } else {
+ if (italic) return pdf_find_builtin_font("Courier-Oblique", len); + if (italic) return pdf_lookup_builtin_font("Courier-Oblique", len);
+ else return pdf_find_builtin_font("Courier", len); + else return pdf_lookup_builtin_font("Courier", len);
+ } + }
+ } else if (serif) { + } else if (serif) {
+ if (bold) { + if (bold) {
+ if (italic) return pdf_find_builtin_font("Times-BoldItalic", len); + if (italic) return pdf_lookup_builtin_font("Times-BoldItalic", len);
+ else return pdf_find_builtin_font("Times-Bold", len); + else return pdf_lookup_builtin_font("Times-Bold", len);
+ } else { + } else {
+ if (italic) return pdf_find_builtin_font("Times-Italic", len); + if (italic) return pdf_lookup_builtin_font("Times-Italic", len);
+ else return pdf_find_builtin_font("Times-Roman", len); + else return pdf_lookup_builtin_font("Times-Roman", len);
+ } + }
+ } else { + } else {
+ if (bold) { + if (bold) {
+ if (italic) return pdf_find_builtin_font("Helvetica-BoldOblique", len); + if (italic) return pdf_lookup_builtin_font("Helvetica-BoldOblique", len);
+ else return pdf_find_builtin_font("Helvetica-Bold", len); + else return pdf_lookup_builtin_font("Helvetica-Bold", len);
+ } else { + } else {
+ if (italic) return pdf_find_builtin_font("Helvetica-Oblique", len); + if (italic) return pdf_lookup_builtin_font("Helvetica-Oblique", len);
+ else return pdf_find_builtin_font("Helvetica", len); + else return pdf_lookup_builtin_font("Helvetica", len);
+ } + }
+ } + }
+} +}
+ +
+unsigned char * +unsigned char *
+pdf_find_substitute_cjk_font(int ros, int serif, unsigned int *len) +pdf_lookup_substitute_cjk_font(int ros, int serif, unsigned int *len)
+{ +{
+ *len = 0; + *len = 0;
+ return get_font_file("droid/DroidSansFallback.ttf"); + return get_font_file("droid/DroidSansFallback.ttf");

2
mupdfimg.c
Unescape Escape View File

@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <fitz/fitz.h> #include <fitz/fitz-internal.h>
#include "blitbuffer.h" #include "blitbuffer.h"
#include "mupdfimg.h" #include "mupdfimg.h"

196
pdf.c
Unescape Escape View File

@ -311,8 +311,105 @@ static int openPage(lua_State *L) {
return 1; return 1;
} }
static void load_lua_text_page(lua_State *L, fz_text_page *page)
{
fz_text_block *block;
fz_text_line *aline;
fz_text_span *span;
fz_rect bbox, linebbox;
int i;
int word, line;
int len, c;
int start;
char chars[4]; // max length of UTF-8 encoded rune
luaL_Buffer textbuf;
/* table that contains all the lines */
lua_newtable(L);
for (block = page->blocks; block < page->blocks + page->len; block++)
{
for (aline = block->lines; aline < block->lines + block->len; aline++)
{
for (span = aline->spans; span < aline->spans + aline->len; span++)
{
linebbox = span->text[0].bbox; // start with sensible default
for(i = 0; i < span->len; ) {
/* will hold information about a word: */
lua_newtable(L);
luaL_buffinit(L, &textbuf);
bbox = span->text[i].bbox; // start with sensible default
for(; i < span->len; i++) {
/* check for space characters */
if(span->text[i].c == ' ' ||
span->text[i].c == '\t' ||
span->text[i].c == '\n' ||
span->text[i].c == '\v' ||
span->text[i].c == '\f' ||
span->text[i].c == '\r' ||
span->text[i].c == 0xA0 ||
span->text[i].c == 0x1680 ||
span->text[i].c == 0x180E ||
(span->text[i].c >= 0x2000 && span->text[i].c <= 0x200A) ||
span->text[i].c == 0x202F ||
span->text[i].c == 0x205F ||
span->text[i].c == 0x3000) {
// ignore and end word
i++;
break;
}
len = fz_runetochar(chars, &span->text[i].c);
for(c = 0; c < len; c++) {
luaL_addchar(&textbuf, chars[c]);
}
bbox = fz_union_rect(bbox, span->text[i].bbox);
linebbox = fz_union_rect(linebbox, span->text[i].bbox);
}
lua_pushstring(L, "word");
luaL_pushresult(&textbuf);
lua_settable(L, -3);
/* bbox for a word: */
lua_pushstring(L, "x0");
lua_pushinteger(L, bbox.x0);
lua_settable(L, -3);
lua_pushstring(L, "y0");
lua_pushinteger(L, bbox.y0);
lua_settable(L, -3);
lua_pushstring(L, "x1");
lua_pushinteger(L, bbox.x1);
lua_settable(L, -3);
lua_pushstring(L, "y1");
lua_pushinteger(L, bbox.y1);
lua_settable(L, -3);
lua_rawseti(L, -2, word++);
}
/* bbox for a whole line (or in fact, a "span") */
lua_pushstring(L, "x0");
lua_pushinteger(L, linebbox.x0);
lua_settable(L, -3);
lua_pushstring(L, "y0");
lua_pushinteger(L, linebbox.y0);
lua_settable(L, -3);
lua_pushstring(L, "x1");
lua_pushinteger(L, linebbox.x1);
lua_settable(L, -3);
lua_pushstring(L, "y1");
lua_pushinteger(L, linebbox.y1);
lua_settable(L, -3);
lua_rawseti(L, -2, line++);
}
}
}
}
/* get the text of the given page /* get the text of the given page
* *
* will return text in a Lua table that is modeled after * will return text in a Lua table that is modeled after
* djvu.c creates this table. * djvu.c creates this table.
* *
@ -327,105 +424,20 @@ static int openPage(lua_State *L) {
* will return an empty table if we have no text * will return an empty table if we have no text
*/ */
static int getPageText(lua_State *L) { static int getPageText(lua_State *L) {
fz_text_span *page_text; fz_text_page *text_page;
fz_text_span *ptr;
fz_device *tdev; fz_device *tdev;
fz_bbox bbox, linebbox;
int i;
int word, line;
int len, c;
int start;
char chars[4]; // max length of UTF-8 encoded rune
luaL_Buffer textbuf;
PdfPage *page = (PdfPage*) luaL_checkudata(L, 1, "pdfpage"); PdfPage *page = (PdfPage*) luaL_checkudata(L, 1, "pdfpage");
page_text = fz_new_text_span(page->doc->context); text_page = fz_new_text_page(page->doc->context, fz_bound_page(page->doc->xref, page->page));
tdev = fz_new_text_device(page->doc->context, page_text); tdev = fz_new_text_device(page->doc->context, NULL, text_page);
fz_run_page(page->doc->xref, page->page, tdev, fz_identity, NULL); fz_run_page(page->doc->xref, page->page, tdev, fz_identity, NULL);
fz_free_device(tdev); fz_free_device(tdev);
tdev = NULL;
/* table that contains all the lines */ load_lua_text_page(L, text_page);
lua_newtable(L);
line = 1;
for(ptr = page_text; ptr != NULL; ptr = ptr->next) {
if(ptr->text == NULL) continue;
/* table for the words */
lua_newtable(L);
word = 1;
linebbox = ptr->text[0].bbox; // start with sensible default
for(i = 0; i < ptr->len; ) {
/* will hold information about a word: */
lua_newtable(L);
luaL_buffinit(L, &textbuf);
bbox = ptr->text[i].bbox; // start with sensible default
for(; i < ptr->len; i++) {
/* check for space characters */
if(ptr->text[i].c == ' ' ||
ptr->text[i].c == '\t' ||
ptr->text[i].c == '\n' ||
ptr->text[i].c == '\v' ||
ptr->text[i].c == '\f' ||
ptr->text[i].c == '\r' ||
ptr->text[i].c == 0xA0 ||
ptr->text[i].c == 0x1680 ||
ptr->text[i].c == 0x180E ||
(ptr->text[i].c >= 0x2000 && ptr->text[i].c <= 0x200A) ||
ptr->text[i].c == 0x202F ||
ptr->text[i].c == 0x205F ||
ptr->text[i].c == 0x3000) {
// ignore and end word
i++;
break;
}
len = runetochar(chars, &ptr->text[i].c);
for(c = 0; c < len; c++) {
luaL_addchar(&textbuf, chars[c]);
}
bbox = fz_union_bbox(bbox, ptr->text[i].bbox);
linebbox = fz_union_bbox(linebbox, ptr->text[i].bbox);
}
lua_pushstring(L, "word");
luaL_pushresult(&textbuf);
lua_settable(L, -3);
/* bbox for a word: */
lua_pushstring(L, "x0");
lua_pushinteger(L, bbox.x0);
lua_settable(L, -3);
lua_pushstring(L, "y0");
lua_pushinteger(L, bbox.y0);
lua_settable(L, -3);
lua_pushstring(L, "x1");
lua_pushinteger(L, bbox.x1);
lua_settable(L, -3);
lua_pushstring(L, "y1");
lua_pushinteger(L, bbox.y1);
lua_settable(L, -3);
lua_rawseti(L, -2, word++);
}
/* bbox for a whole line (or in fact, a "span") */
lua_pushstring(L, "x0");
lua_pushinteger(L, linebbox.x0);
lua_settable(L, -3);
lua_pushstring(L, "y0");
lua_pushinteger(L, linebbox.y0);
lua_settable(L, -3);
lua_pushstring(L, "x1");
lua_pushinteger(L, linebbox.x1);
lua_settable(L, -3);
lua_pushstring(L, "y1");
lua_pushinteger(L, linebbox.y1);
lua_settable(L, -3);
lua_rawseti(L, -2, line++);
}
fz_free_text_span(page->doc->context, page_text); fz_free_text_page(page->doc->context, text_page);
return 1; return 1;
} }

14
rendertext.lua
Unescape Escape View File

@ -44,7 +44,7 @@ function clearGlyphCache()
glyphcache = {} glyphcache = {}
end end
function sizeUtf8Text(x, width, face, facehash, text, kerning) function sizeUtf8Text(x, width, face, text, kerning)
if text == nil then if text == nil then
print("# sizeUtf8Text called without text"); print("# sizeUtf8Text called without text");
return return
@ -59,13 +59,13 @@ function sizeUtf8Text(x, width, face, facehash, text, kerning)
for uchar in string.gfind(text, "([%z\1-\127\194-\244][\128-\191]*)") do for uchar in string.gfind(text, "([%z\1-\127\194-\244][\128-\191]*)") do
if pen_x < (width - x) then if pen_x < (width - x) then
local charcode = util.utf8charcode(uchar) local charcode = util.utf8charcode(uchar)
local glyph = getGlyph(face, facehash, charcode) local glyph = getGlyph(face, charcode)
if kerning and prevcharcode then if kerning and prevcharcode then
local kern = face:getKerning(prevcharcode, charcode) local kern = face.ftface:getKerning(prevcharcode, charcode)
pen_x = pen_x + kern pen_x = pen_x + kern
print("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern) --print("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern)
else else
print("curr:"..string.char(charcode)) --print("curr:"..string.char(charcode))
end end
pen_x = pen_x + glyph.ax pen_x = pen_x + glyph.ax
pen_y_top = math.max(pen_y_top, glyph.t) pen_y_top = math.max(pen_y_top, glyph.t)
@ -77,10 +77,10 @@ function sizeUtf8Text(x, width, face, facehash, text, kerning)
return { x = pen_x, y_top = pen_y_top, y_bottom = pen_y_bottom} return { x = pen_x, y_top = pen_y_top, y_bottom = pen_y_bottom}
end end
function renderUtf8Text(buffer, x, y, face, facehash, text, kerning, backgroundColor) function renderUtf8Text(buffer, x, y, face, text, kerning)
if text == nil then if text == nil then
print("# renderUtf8Text called without text"); print("# renderUtf8Text called without text");
return return 0
end end
-- may still need more adaptive pen placement when kerning, -- may still need more adaptive pen placement when kerning,
-- see: http://freetype.org/freetype2/docs/glyphs/glyphs-4.html -- see: http://freetype.org/freetype2/docs/glyphs/glyphs-4.html

Write Preview
Loading…
Cancel
Save