diff --git a/include/default.url b/include/default.url index 1f247f914..ae638f46d 100755 --- a/include/default.url +++ b/include/default.url @@ -1,6 +1,9 @@ #ifndef APPNAME #define APPNAME PRASSI #define QAPPNAME "PRASSI" +#endif + +#ifndef LIBDIR #define LIBDIR f:\xvt.403\win_x86\ptk\lib #endif diff --git a/include/mask.cpp b/include/mask.cpp index a609dbe7b..8001593a5 100755 --- a/include/mask.cpp +++ b/include/mask.cpp @@ -761,8 +761,13 @@ WINDOW TMask::read_page( } else { - if (_pages == 0) rect = r; - else r = rect; + if (_pages == 0) + { + if (!is_sheetmask()) + rect = r; + } + else + r = rect; } } diff --git a/include/printwin.cpp b/include/printwin.cpp index 154846137..e6254c664 100755 --- a/include/printwin.cpp +++ b/include/printwin.cpp @@ -208,15 +208,22 @@ void TPrintwin::paint_row(long j) } } } - } else + } + else { set_font(printer().fontname(), XVT_FS_NONE, _char_size); - TString s(_txt.line(j)); #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT - if ((j % _realformlen) == 0 && (j != 0)) // Questo e' il patch per TTY.DRV. - s.insert("\n"); // Quando uscira' un nuovo driver, si dovra' controllare -#endif // se esiste ancora questo piccolo bigol. - xvt_dwin_draw_text(win(), 0, y, (char*)(const char*)s, -1); + // Questa e' la patch per TTY.DRV. + if (j > 0 && (j % _realformlen) == 0) + { + TString s(512); + s << "\015" << _txt.line(j-1) << '\n'; + s << _txt.line(j); + xvt_dwin_draw_text(win(), 0, y, (char*)(const char*)s, -1); + } + else +#endif + xvt_dwin_draw_text(win(), 0, y, (char*)(const char*)_txt.line(j), -1); } }