mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually change SVG font to "Arimo, Arial, sans-serif" ([607e4ed])

Browse Source 
Allow `--embedfont` for non-EAN/UPC SVG also (& update GUI)
SVG: add "fonts/normal_woff2.h"; use array syntax for it &
  "fonts/upcean_woff2.h" to avoid large strings
GUI: embed Arimo (via "fonts/normal_ttf.h"), same as OCRB
Change textgap max 5X -> 10X
README: make list of barcodes 2-col table for readability
win32/README: note Visual Studio 2022 re CMake
This commit is contained in:
gitlost
2023-06-13 18:12:20 +01:00
parent 55458cf659
commit acd52ac489
84 changed files with 2951 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend_qt/qzint.cpp
View File

@ -31,6 +31,7 @@
/* The following include is necessary to compile with Qt 5.15 on Windows; Qt 5.7 did not require it */
#include <QPainterPath>
#include <QRegularExpression>
#include "../backend/fonts/normal_ttf.h" /* Arimo */
#include "../backend/fonts/upcean_ttf.h" /* OCR-B subset (digits, "<", ">") */
// Shorthand
@ -44,11 +45,22 @@ namespace Zint {
static const QRegularExpression colorRE(
QSL("^([0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?)|(((100|[0-9]{0,2}),){3}(100|[0-9]{0,2}))$"));
static const QString fontFamily = QSL("Arimo"); /* Sans-serif metrically compatible with Arial */
static const QString normalFontFamily = QSL("Arimo"); /* Sans-serif metrically compatible with Arial */
static const QString upceanFontFamily = QSL("OCRB"); /* Monospace OCR-B */
static const QString fontFamilyError = QSL("Arimo");
static const int fontSizeError = 14; /* Point size */
static int normalFontID = -2; /* Use -2 as `addApplicationFontFromData()` returns -1 on error */
/* Load Arimo from static array */
static int loadNormalFont() {
static const QByteArray normalFontArray
= QByteArray::fromRawData((const char *) normal_ttf, sizeof(normal_ttf));
normalFontID = QFontDatabase::addApplicationFontFromData(normalFontArray);
return normalFontID;
}
static int upceanFontID = -2; /* Use -2 as `addApplicationFontFromData()` returns -1 on error */
/* Load OCR-B EAN/UPC subset from static array */
@ -1093,6 +1105,9 @@ namespace Zint {
// Plot text
string = m_zintSymbol->vector->strings;
if (string) {
if (normalFontID == -2) { /* First time? */
loadNormalFont();
}
if (upceanFontID == -2) { /* First time? */
loadUpceanFont();
}
@ -1101,7 +1116,8 @@ namespace Zint {
p.setColor(fgColor);
painter.setPen(p);
bool bold = (m_zintSymbol->output_options & BOLD_TEXT) && !isExtendable();
QFont font(isExtendable() ? upceanFontFamily : fontFamily, -1 /*pointSize*/, bold ? QFont::Bold : -1);
QFont font(isExtendable() ? upceanFontFamily : normalFontFamily, -1 /*pointSize*/,
bold ? QFont::Bold : -1);
while (string) {
font.setPixelSize(string->fsize);
painter.setFont(font);
@ -1280,7 +1296,7 @@ namespace Zint {
arg_bool(cmd, "--dotty", dotty());
}
if (isExtendable() && showText()) {
if (showText()) {
arg_bool(cmd, "--embedfont", embedVectorFont());
}
arg_bool(cmd, "--esc", inputMode() & ESCAPE_MODE);