wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olikraus/u8g2

This commit is contained in:
kraus 2024-03-13 22:15:55 +01:00
parent 55d92aaa4b ec2559e846
commit 7f5bbccab9
3 changed files with 89 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/arduino/u8g2_page_buffer/Devanagari/Devanagari.ino
View File

@ -418,17 +418,40 @@ u8g2_uint_t u8g2_draw_unifont_devanagari(u8g2_uint_t x, u8g2_uint_t y, const cha
{ {
/* many more glyphs and corrections are missing */ /* many more glyphs and corrections are missing */
/* please report to https://github.com/olikraus/u8g2/issues/584 */ /* please report to https://github.com/olikraus/u8g2/issues/584 */
case 0x093e: x-= 12; break; case 0x0901: x-= 14; y-=2; break; // ँँ
case 0x093f: x-= 19; break; case 0x0902: x-= 14; y-=2; break; // move up // ं
case 0x0941: x-= 10; y+=3; break; // move down case 0x0903: x-= 14; break; // ः
case 0x0947: x-= 12; break; case 0x093e: x-= 12; break; // ा
case 0x094d: x-= 10; break; case 0x093f: x-= 16; break; // ि
case 0x0940: x-= 12; break; // ी
case 0x0941: x-= 15; y+=2; break; // move down // ु
case 0x0942: x-= 12; y+=2; break; // move down // ू
case 0x0943: x-= 16; y+=2; break; // move down // ृ
case 0x0944: x-= 16; y+=2; break; // move down // ॄ
case 0x0945: x-= 14; y-=2; break; // move up // ॅ
case 0x0946: x-= 14; break; // ॆ
case 0x0947: x-= 14; break; // े
case 0x0948: x-= 14; break; // ै
case 0x0949: x-= 14; break; // ै
case 0x094b: x-= 14; break; // ो
case 0x094c: x-= 14; break; // ौ
case 0x094d: x-= 10; break; // ्
} }
delta = u8g2.drawGlyph(x, y, e); delta = u8g2.drawGlyph(x, y, e);
switch(e) switch(e)
{ {
case 0x0941: x-= 3; y -=3; break; // revert the y shift case 0x0901: x-= 6; y +=2; break; // revert the y shift
case 0x094d: x-= 8; break; case 0x0902: x-= 6; y +=2; break; // revert the y shift
case 0x0941: x-= 3; y -=2; break; // revert the y shift
case 0x0942: x-= 6; y -=2; break; // revert the y shift
case 0x0943: x-= 4; y -=2; break; // revert the y shift
case 0x0944: x-= 4; y -=2; break; // revert the y shift
case 0x0945: x-= 6; y +=2; break; // revert the y shift
case 0x0946: x-= 2; break;
case 0x0947: x-= 2; break;
case 0x0948: x-= 2; break;
case 0x0949: x-= 2; break;
case 0x094d: x-= 8; break;
} }
x += delta; x += delta;
sum += delta; sum += delta;

35
sys/rt-thread/examples/page_buffer/Devanagari.cpp
View File

@ -278,16 +278,39 @@ static u8g2_uint_t u8g2_draw_unifont_devanagari(u8g2_uint_t x, u8g2_uint_t y, co
{ {
/* many more glyphs and corrections are missing */ /* many more glyphs and corrections are missing */
/* please report to https://github.com/olikraus/u8g2/issues/584 */ /* please report to https://github.com/olikraus/u8g2/issues/584 */
case 0x093e: x-= 12; break; case 0x0901: x-= 14; y-=2; break; // ँँ
case 0x093f: x-= 19; break; case 0x0902: x-= 14; y-=2; break; // move up // ं
case 0x0941: x-= 10; y+=3; break; // move down case 0x0903: x-= 14; break; // ः
case 0x0947: x-= 12; break; case 0x093e: x-= 12; break; // ा
case 0x094d: x-= 10; break; case 0x093f: x-= 16; break; // ि
case 0x0940: x-= 12; break; // ी
case 0x0941: x-= 15; y+=2; break; // move down // ु
case 0x0942: x-= 12; y+=2; break; // move down // ू
case 0x0943: x-= 16; y+=2; break; // move down // ृ
case 0x0944: x-= 16; y+=2; break; // move down // ॄ
case 0x0945: x-= 14; y-=2; break; // move up // ॅ
case 0x0946: x-= 14; break; // ॆ
case 0x0947: x-= 14; break; // े
case 0x0948: x-= 14; break; // ै
case 0x0949: x-= 14; break; // ै
case 0x094b: x-= 14; break; // ो
case 0x094c: x-= 14; break; // ौ
case 0x094d: x-= 10; break; // ्
} }
delta = u8g2.drawGlyph(x, y, e); delta = u8g2.drawGlyph(x, y, e);
switch(e) switch(e)
{ {
case 0x0941: x-= 3; y -=3; break; // revert the y shift case 0x0901: x-= 6; y +=2; break; // revert the y shift
case 0x0902: x-= 6; y +=2; break; // revert the y shift
case 0x0941: x-= 3; y -=2; break; // revert the y shift
case 0x0942: x-= 6; y -=2; break; // revert the y shift
case 0x0943: x-= 4; y -=2; break; // revert the y shift
case 0x0944: x-= 4; y -=2; break; // revert the y shift
case 0x0945: x-= 6; y +=2; break; // revert the y shift
case 0x0946: x-= 2; break;
case 0x0947: x-= 2; break;
case 0x0948: x-= 2; break;
case 0x0949: x-= 2; break;
case 0x094d: x-= 8; break; case 0x094d: x-= 8; break;
} }
x += delta; x += delta;

36
sys/sdl/devanagari/main.c
View File

@ -34,16 +34,40 @@ u8g2_uint_t u8g2_draw_unifont_devanagari(u8g2_t *u8g2, u8g2_uint_t x, u8g2_uint_
switch(e) switch(e)
{ {
case 0x093e: x-= 12; break; case 0x0901: x-= 14; y-=2; break; // ँँ
case 0x093f: x-= 19; break; case 0x0902: x-= 14; y-=2; break; // move up // ं
case 0x0941: x-= 14; break; case 0x0903: x-= 14; break; // ः
case 0x0947: x-= 12; break; case 0x093e: x-= 12; break; // ा
case 0x094d: x-= 10; break; case 0x093f: x-= 16; break; // ि
case 0x0940: x-= 12; break; // ी
case 0x0941: x-= 15; y+=2; break; // move down // ु
case 0x0942: x-= 12; y+=2; break; // move down // ू
case 0x0943: x-= 16; y+=2; break; // move down // ृ
case 0x0944: x-= 16; y+=2; break; // move down // ॄ
case 0x0945: x-= 14; y-=2; break; // move up // ॅ
case 0x0946: x-= 14; break; // ॆ
case 0x0947: x-= 14; break; // े
case 0x0948: x-= 14; break; // ै
case 0x0949: x-= 14; break; // ै
case 0x094b: x-= 14; break; // ो
case 0x094c: x-= 14; break; // ौ
case 0x094d: x-= 10; break; // ्
} }
delta = u8g2_DrawGlyph(u8g2, x, y, e); delta = u8g2_DrawGlyph(u8g2, x, y, e);
switch(e) switch(e)
{ {
case 0x094d: x-= 8; break; case 0x0901: x-= 6; y +=2; break; // revert the y shift
case 0x0902: x-= 6; y +=2; break; // revert the y shift
case 0x0941: x-= 3; y -=2; break; // revert the y shift
case 0x0942: x-= 6; y -=2; break; // revert the y shift
case 0x0943: x-= 4; y -=2; break; // revert the y shift
case 0x0944: x-= 4; y -=2; break; // revert the y shift
case 0x0945: x-= 6; y +=2; break; // revert the y shift
case 0x0946: x-= 2; break;
case 0x0947: x-= 2; break;
case 0x0948: x-= 2; break;
case 0x0949: x-= 2; break;
case 0x094d: x-= 8; break;
} }
x += delta; x += delta;