Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee8e60bb0d | ||
|
|
812f4784fd | ||
|
|
af08202981 |
@@ -32,6 +32,8 @@ function addressText(entry) {
|
|||||||
|
|
||||||
/** Platzhalterwerte einer Zeile (strukturierte Felder + freie Platzhalter). */
|
/** Platzhalterwerte einer Zeile (strukturierte Felder + freie Platzhalter). */
|
||||||
function placeholdersOf(entry) {
|
function placeholdersOf(entry) {
|
||||||
|
// Die 5 Adresszeilen (5-Zeilen-Modus) auch als [[Zeile1]]..[[Zeile5]] verfügbar.
|
||||||
|
const zeilen = String(entry.free_text || '').split('\n');
|
||||||
return {
|
return {
|
||||||
Anrede: entry.salutation || '',
|
Anrede: entry.salutation || '',
|
||||||
Vorname: entry.first_name || '',
|
Vorname: entry.first_name || '',
|
||||||
@@ -41,6 +43,8 @@ function placeholdersOf(entry) {
|
|||||||
Ort: entry.city || '',
|
Ort: entry.city || '',
|
||||||
Land: entry.country || '',
|
Land: entry.country || '',
|
||||||
Briefnummer: entry.letter_number ?? '',
|
Briefnummer: entry.letter_number ?? '',
|
||||||
|
Zeile1: zeilen[0] || '', Zeile2: zeilen[1] || '', Zeile3: zeilen[2] || '',
|
||||||
|
Zeile4: zeilen[3] || '', Zeile5: zeilen[4] || '',
|
||||||
...(entry.placeholders && typeof entry.placeholders === 'object' ? entry.placeholders : {}),
|
...(entry.placeholders && typeof entry.placeholders === 'object' ? entry.placeholders : {}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -94,7 +98,7 @@ function buildDocuments(order, entries) {
|
|||||||
if (recip) combined += `[[pk_adr]]${recip}`;
|
if (recip) combined += `[[pk_adr]]${recip}`;
|
||||||
documents.push({
|
documents.push({
|
||||||
index: nr, type: 'postcard', text: combined, format: letterFormat, font,
|
index: nr, type: 'postcard', text: combined, format: letterFormat, font,
|
||||||
placeholders, fontScale: fontScaleLetter, realisticHandwriting: realistisch,
|
placeholders, fontScale: fontScaleLetter, fontScaleEnv, realisticHandwriting: realistisch,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -336,7 +336,7 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
} else if (isPostcard) {
|
} else if (isPostcard) {
|
||||||
svgResult = generatePostcardSVG(
|
svgResult = generatePostcardSVG(
|
||||||
scriptalizedText, letter.format,
|
scriptalizedText, letter.format,
|
||||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, senderScale: metadata.envelopeSenderScale || 1 }
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, senderScale: metadata.envelopeSenderScale || 1, recipientScale: letter.fontScaleEnv || 1 }
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
svgResult = generateLetterSVG(
|
svgResult = generateLetterSVG(
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ async function generateBatch(req, res, next) {
|
|||||||
} else if (letter.type === "postcard") {
|
} else if (letter.type === "postcard") {
|
||||||
const svgResult = generatePostcardSVG(scriptalizedText, letter.format, {
|
const svgResult = generatePostcardSVG(scriptalizedText, letter.format, {
|
||||||
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false,
|
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false,
|
||||||
fontScale: letter.fontScale, senderScale: letter.senderScale || 1,
|
fontScale: letter.fontScale, senderScale: letter.senderScale || 1, recipientScale: letter.recipientScale || 1,
|
||||||
});
|
});
|
||||||
if (svgResult.overflow) hasOverflow = true;
|
if (svgResult.overflow) hasOverflow = true;
|
||||||
const filename = `letter_${pad}.svg`;
|
const filename = `letter_${pad}.svg`;
|
||||||
|
|||||||
@@ -502,8 +502,25 @@ function generatePostcardSVG(text, format, options = {}) {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Text links (L-förmig). Nur DER Text kann „zu lang" sein (Nutzer kürzt ihn).
|
// Absender oben links – ZUERST, damit der Text knapp darunter beginnen kann.
|
||||||
const baseline0 = mmToPx(14) + fontSizePx;
|
// Größe folgt der „Absender-Größe" aus dem manuellen Druck (options.senderScale).
|
||||||
|
let senderBottomPx = mmToPx(2);
|
||||||
|
if (sender) {
|
||||||
|
const senderScale = Math.max(0.5, Math.min(1.8, Number(options.senderScale) || 1));
|
||||||
|
const senderSize = FONT_SIZE_PX * 0.55 * senderScale;
|
||||||
|
const senderLH = (baseLineHeightPx / FONT_SIZE_PX) * senderSize;
|
||||||
|
const senderLines = wrapTextToLinesByWidth({ text: sender, maxWidthPx: mmToPx(textUpperRightMm - textLeftMm), fontFileName: fontFile, fontSizePx: senderSize }).slice(0, 2);
|
||||||
|
const senderStartY = mmToPx(2) + senderSize;
|
||||||
|
paths.push(...layoutTextToPaths({
|
||||||
|
lines: senderLines, fontFileName: fontFile, fontSizePx: senderSize,
|
||||||
|
startX: mmToPx(textLeftMm), startY: senderStartY, lineHeightPx: senderLH, realisticHandwriting: realistic,
|
||||||
|
}));
|
||||||
|
senderBottomPx = senderStartY + Math.max(0, senderLines.length - 1) * senderLH + senderSize * 0.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Text links (L-förmig). Beginn nur ETWAS unter dem Absender (≈2 mm); ohne
|
||||||
|
// Absender wie im Maßblatt bei y≈14 mm. Nur DER Text kann „zu lang" sein.
|
||||||
|
const baseline0 = (sender ? senderBottomPx + mmToPx(2) : mmToPx(14)) + fontSizePx;
|
||||||
bodyLineLimit = Math.max(1, Math.floor((mmToPx(maxYmm) - baseline0) / lineHeightPx) + 1);
|
bodyLineLimit = Math.max(1, Math.floor((mmToPx(maxYmm) - baseline0) / lineHeightPx) + 1);
|
||||||
if (body) {
|
if (body) {
|
||||||
const bodyLines = flowVariabel(body, fontSizePx, baseline0, lineHeightPx);
|
const bodyLines = flowVariabel(body, fontSizePx, baseline0, lineHeightPx);
|
||||||
@@ -515,30 +532,22 @@ function generatePostcardSVG(text, format, options = {}) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Absender oben links (2 Zeilen), klein genug für die 10-mm-Zone.
|
// Empfänger im sicheren Adressfeld (rechts unten). Größe folgt der „Schriftgröße
|
||||||
if (sender) {
|
// Kuvert" (options.recipientScale). Passt der Block nicht in die 46-mm-Zone, wird
|
||||||
const senderSize = FONT_SIZE_PX * 0.55 * Math.max(0.7, Math.min(1.2, Number(options.senderScale) || 1));
|
// er automatisch verkleinert – so bleibt die Codierzone IMMER frei.
|
||||||
const senderLH = (baseLineHeightPx / FONT_SIZE_PX) * senderSize;
|
|
||||||
const senderLines = wrapTextToLinesByWidth({ text: sender, maxWidthPx: mmToPx(textUpperRightMm - textLeftMm), fontFileName: fontFile, fontSizePx: senderSize }).slice(0, 2);
|
|
||||||
paths.push(...layoutTextToPaths({
|
|
||||||
lines: senderLines, fontFileName: fontFile, fontSizePx: senderSize,
|
|
||||||
startX: mmToPx(textLeftMm), startY: mmToPx(2) + senderSize, lineHeightPx: senderLH, realisticHandwriting: realistic,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Empfänger im sicheren Adressfeld (rechts unten). Passt der Block nicht in die
|
|
||||||
// 46 mm hohe Zone, wird die Schrift automatisch verkleinert – so bleibt die
|
|
||||||
// Codierzone (unten) IMMER frei und es gibt keinen „Adresse zu lang"-Fehler.
|
|
||||||
if (recipient) {
|
if (recipient) {
|
||||||
const feldOben = mmToPx(addrTopMm);
|
const feldOben = mmToPx(addrTopMm);
|
||||||
const feldUnten = mmToPx(maxYmm);
|
const feldUnten = mmToPx(maxYmm);
|
||||||
const feldBreite = mmToPx(addrRightMm - addrLeftMm);
|
const feldBreite = mmToPx(addrRightMm - addrLeftMm);
|
||||||
let recSize = fontSizePx;
|
const recScale = Math.max(0.6, Math.min(1.6, Number(options.recipientScale) || 1));
|
||||||
let recLH = lineHeightPx;
|
const recBaseSize = FONT_SIZE_PX * recScale;
|
||||||
|
const recBaseLH = baseLineHeightPx * recScale;
|
||||||
|
let recSize = recBaseSize;
|
||||||
|
let recLH = recBaseLH;
|
||||||
let recLines = [];
|
let recLines = [];
|
||||||
for (const scale of [1, 0.9, 0.8, 0.72, 0.65, 0.6]) {
|
for (const scale of [1, 0.9, 0.8, 0.72, 0.65, 0.6]) {
|
||||||
recSize = fontSizePx * scale;
|
recSize = recBaseSize * scale;
|
||||||
recLH = lineHeightPx * scale;
|
recLH = recBaseLH * scale;
|
||||||
recLines = wrapTextToLinesByWidth({ text: recipient, maxWidthPx: feldBreite, fontFileName: fontFile, fontSizePx: recSize });
|
recLines = wrapTextToLinesByWidth({ text: recipient, maxWidthPx: feldBreite, fontFileName: fontFile, fontSizePx: recSize });
|
||||||
const blockUnten = feldOben + recSize + Math.max(0, recLines.length - 1) * recLH + recSize * 0.3;
|
const blockUnten = feldOben + recSize + Math.max(0, recLines.length - 1) * recLH + recSize * 0.3;
|
||||||
if (blockUnten <= feldUnten) break;
|
if (blockUnten <= feldUnten) break;
|
||||||
@@ -561,8 +570,9 @@ function generatePostcardSVG(text, format, options = {}) {
|
|||||||
/>`)
|
/>`)
|
||||||
.join('\n ');
|
.join('\n ');
|
||||||
|
|
||||||
// Trennstrich (solide Linie, 1,2 mm breit) zwischen Text und Adressfeld.
|
// Trennstrich: einfache Kugelschreiber-Linie (Single-Stroke, keine Füllung) –
|
||||||
const trennstrich = `<path d="M ${mmToPx(trennXmm).toFixed(1)} ${mmToPx(addrTopMm).toFixed(1)} L ${mmToPx(trennXmm).toFixed(1)} ${mmToPx(maxYmm).toFixed(1)}" stroke="#000000" stroke-width="${mmToPx(1.2).toFixed(1)}" stroke-linecap="butt" fill="none"/>`;
|
// gleiche Strichstärke wie die Handschrift, damit die Ballpoint-Optik greift.
|
||||||
|
const trennstrich = `<path d="M ${mmToPx(trennXmm).toFixed(1)} ${mmToPx(addrTopMm).toFixed(1)} L ${mmToPx(trennXmm).toFixed(1)} ${mmToPx(maxYmm).toFixed(1)}" stroke="#000000" stroke-width="0.6" fill="none" stroke-linecap="round" vector-effect="non-scaling-stroke"/>`;
|
||||||
|
|
||||||
const svg = `<svg xmlns="http://www.w3.org/2000/svg"
|
const svg = `<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
width="${W}mm"
|
width="${W}mm"
|
||||||
|
|||||||
Reference in New Issue
Block a user