Fix image-to-pdf in flowchart, break apart pdf2printable and ppm2pwg boxes

This commit is contained in:
Anton Thomasson 2022-12-17 20:51:01 +01:00
parent 3045244c71
commit 5d5e86dc6b
2 changed files with 283 additions and 289 deletions

View file

@ -1,27 +1,27 @@
Normal flow: Normal flow:
.---------------. .---------------.
PDF -------------------------------->| | PDF -------------------------------------------->| +----------------------> PDF 1.5
.-----------------. | +----------------> Postscript 2 .-----------------. | |
Plaintext ---->| QTextDocument +------>| pdf2printable | Plaintext ---->| QTextDocument +------------------>| pdf2printable +----------------------> Postscript 2
| + QPdfWriter | | +----------------> PDF 1.5 '-----------------' | |
'-----------------' | (Poppler+Cairo) | DOC/PPT .-------------------. | (Poppler+Cairo) | .---------.
DOC/PPT .-------------------. | | ODT/ODP ---->| Calligraconverter +---------------->| | | |
ODT/ODP ---->| Calligraconverter +---->| '---------. | (optional) | | +---->| +----> PWG-Raster
| (optional) | '---------------. +----> PWG-Raster '-------------------' .--------. | | | ppm2pwg |
'-------------------' .--------. | ppm2pwg | Images --------------------------->| +---->| | | +----> URF-Raster
Images -------------------------------->| +----->| +----> URF-Raster | | '---------------' | |
| QImage | '---------' | QImage +---------------------------->| |
.--------------. | | .--------------. | | '---------'
SVG ---->| QSvgRenderer +--------->| +-----------------------> PNG, JPEG, SVG ---->| QSvgRenderer +---->| +----------------------------------------------> PNG, JPEG,
'--------------' '--------' Reverse BMP '--------------' '--------' Reverse BMP
If target format is the same: If target format is the same:
Postscript --------------------------------------------------------------------> Postscript Postscript --------------------------------------------------------------------------------------> Postscript
.-----------------------. .-----------------------.
Plaintext ---->+ ensure CR+LF newlines +------------------------------------> Plaintext Plaintext ---->| ensure CR+LF newlines +------------------------------------------------------> Plaintext
'-----------------------' '-----------------------'
PNG --------------------------------------------------------------------> PNG PNG --------------------------------------------------------------------------------------> PNG
.------------. .------------.
JPEG ---->+ baselinify +-----------------------------------------------> JPEG JPEG ---->| baselinify +-----------------------------------------------------------------> JPEG
'------------' (Baseline profile) '------------' (Baseline profile)

View file

@ -1,4 +1,4 @@
<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='441' width='832' font-family='Menlo,Lucida Console,monospace'> <svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='441' width='976' font-family='Menlo,Lucida Console,monospace'>
<style type="text/css"> <style type="text/css">
svg { svg {
color: #000000; color: #000000;
@ -10,98 +10,103 @@ svg {
} }
</style> </style>
<g transform='translate(8,16)'> <g transform='translate(8,16)'>
<path d='M 400,16 L 512,16' fill='none' stroke='currentColor'></path> <path d='M 496,16 L 608,16' fill='none' stroke='currentColor'></path>
<path d='M 120,32 L 376,32' fill='none' stroke='currentColor'></path> <path d='M 120,32 L 472,32' fill='none' stroke='currentColor'></path>
<path d='M 624,32 L 808,32' fill='none' stroke='currentColor'></path>
<path d='M 176,48 L 304,48' fill='none' stroke='currentColor'></path> <path d='M 176,48 L 304,48' fill='none' stroke='currentColor'></path>
<path d='M 528,48 L 664,48' fill='none' stroke='currentColor'></path>
<path d='M 120,64 L 152,64' fill='none' stroke='currentColor'></path> <path d='M 120,64 L 152,64' fill='none' stroke='currentColor'></path>
<path d='M 320,64 L 376,64' fill='none' stroke='currentColor'></path> <path d='M 320,64 L 472,64' fill='none' stroke='currentColor'></path>
<path d='M 528,80 L 664,80' fill='none' stroke='currentColor'></path> <path d='M 624,64 L 808,64' fill='none' stroke='currentColor'></path>
<path d='M 176,96 L 304,96' fill='none' stroke='currentColor'></path> <path d='M 176,80 L 304,80' fill='none' stroke='currentColor'></path>
<path d='M 176,112 L 320,112' fill='none' stroke='currentColor'></path> <path d='M 176,96 L 320,96' fill='none' stroke='currentColor'></path>
<path d='M 120,128 L 152,128' fill='none' stroke='currentColor'></path> <path d='M 688,96 L 752,96' fill='none' stroke='currentColor'></path>
<path d='M 336,128 L 376,128' fill='none' stroke='currentColor'></path> <path d='M 120,112 L 152,112' fill='none' stroke='currentColor'></path>
<path d='M 544,128 L 608,128' fill='none' stroke='currentColor'></path> <path d='M 336,112 L 472,112' fill='none' stroke='currentColor'></path>
<path d='M 400,144 L 512,144' fill='none' stroke='currentColor'></path> <path d='M 624,128 L 664,128' fill='none' stroke='currentColor'></path>
<path d='M 624,144 L 664,144' fill='none' stroke='currentColor'></path> <path d='M 768,128 L 808,128' fill='none' stroke='currentColor'></path>
<path d='M 176,160 L 320,160' fill='none' stroke='currentColor'></path> <path d='M 176,144 L 320,144' fill='none' stroke='currentColor'></path>
<path d='M 400,160 L 456,160' fill='none' stroke='currentColor'></path> <path d='M 360,144 L 416,144' fill='none' stroke='currentColor'></path>
<path d='M 120,176 L 376,176' fill='none' stroke='currentColor'></path> <path d='M 120,160 L 336,160' fill='none' stroke='currentColor'></path>
<path d='M 472,176 L 520,176' fill='none' stroke='currentColor'></path> <path d='M 432,160 L 472,160' fill='none' stroke='currentColor'></path>
<path d='M 624,176 L 664,176' fill='none' stroke='currentColor'></path> <path d='M 768,160 L 808,160' fill='none' stroke='currentColor'></path>
<path d='M 544,192 L 608,192' fill='none' stroke='currentColor'></path> <path d='M 496,176 L 608,176' fill='none' stroke='currentColor'></path>
<path d='M 432,192 L 664,192' fill='none' stroke='currentColor'></path>
<path d='M 176,208 L 280,208' fill='none' stroke='currentColor'></path> <path d='M 176,208 L 280,208' fill='none' stroke='currentColor'></path>
<path d='M 688,208 L 752,208' fill='none' stroke='currentColor'></path>
<path d='M 120,224 L 152,224' fill='none' stroke='currentColor'></path> <path d='M 120,224 L 152,224' fill='none' stroke='currentColor'></path>
<path d='M 296,224 L 376,224' fill='none' stroke='currentColor'></path> <path d='M 296,224 L 336,224' fill='none' stroke='currentColor'></path>
<path d='M 472,224 L 664,224' fill='none' stroke='currentColor'></path> <path d='M 432,224 L 808,224' fill='none' stroke='currentColor'></path>
<path d='M 176,240 L 280,240' fill='none' stroke='currentColor'></path> <path d='M 176,240 L 280,240' fill='none' stroke='currentColor'></path>
<path d='M 400,240 L 456,240' fill='none' stroke='currentColor'></path> <path d='M 360,240 L 416,240' fill='none' stroke='currentColor'></path>
<path d='M 120,304 L 664,304' fill='none' stroke='currentColor'></path> <path d='M 120,304 L 808,304' fill='none' stroke='currentColor'></path>
<path d='M 176,320 L 352,320' fill='none' stroke='currentColor'></path> <path d='M 176,320 L 352,320' fill='none' stroke='currentColor'></path>
<path d='M 120,336 L 152,336' fill='none' stroke='currentColor'></path> <path d='M 120,336 L 152,336' fill='none' stroke='currentColor'></path>
<path d='M 368,336 L 664,336' fill='none' stroke='currentColor'></path> <path d='M 368,336 L 808,336' fill='none' stroke='currentColor'></path>
<path d='M 176,352 L 352,352' fill='none' stroke='currentColor'></path> <path d='M 176,352 L 352,352' fill='none' stroke='currentColor'></path>
<path d='M 120,368 L 664,368' fill='none' stroke='currentColor'></path> <path d='M 120,368 L 808,368' fill='none' stroke='currentColor'></path>
<path d='M 176,384 L 264,384' fill='none' stroke='currentColor'></path> <path d='M 176,384 L 264,384' fill='none' stroke='currentColor'></path>
<path d='M 120,400 L 152,400' fill='none' stroke='currentColor'></path> <path d='M 120,400 L 152,400' fill='none' stroke='currentColor'></path>
<path d='M 280,400 L 664,400' fill='none' stroke='currentColor'></path> <path d='M 280,400 L 808,400' fill='none' stroke='currentColor'></path>
<path d='M 176,416 L 264,416' fill='none' stroke='currentColor'></path> <path d='M 176,416 L 264,416' fill='none' stroke='currentColor'></path>
<path d='M 160,64 L 160,80' fill='none' stroke='currentColor'></path> <path d='M 160,112 L 160,128' fill='none' stroke='currentColor'></path>
<path d='M 160,128 L 160,144' fill='none' stroke='currentColor'></path> <path d='M 336,112 L 336,128' fill='none' stroke='currentColor'></path>
<path d='M 320,64 L 320,80' fill='none' stroke='currentColor'></path> <path d='M 344,160 L 344,224' fill='none' stroke='currentColor'></path>
<path d='M 336,128 L 336,144' fill='none' stroke='currentColor'></path> <path d='M 432,160 L 432,192' fill='none' stroke='currentColor'></path>
<path d='M 384,32 L 384,128' fill='none' stroke='currentColor'></path> <path d='M 432,192 L 432,224' fill='none' stroke='currentColor'></path>
<path d='M 384,176 L 384,224' fill='none' stroke='currentColor'></path> <path d='M 480,32 L 480,160' fill='none' stroke='currentColor'></path>
<path d='M 472,176 L 472,224' fill='none' stroke='currentColor'></path> <path d='M 624,32 L 624,64' fill='none' stroke='currentColor'></path>
<path d='M 528,32 L 528,48' fill='none' stroke='currentColor'></path> <path d='M 624,64 L 624,128' fill='none' stroke='currentColor'></path>
<path d='M 528,48 L 528,80' fill='none' stroke='currentColor'></path> <path d='M 624,128 L 624,160' fill='none' stroke='currentColor'></path>
<path d='M 528,80 L 528,112' fill='none' stroke='currentColor'></path> <path d='M 672,112 L 672,192' fill='none' stroke='currentColor'></path>
<path d='M 528,160 L 528,176' fill='none' stroke='currentColor'></path> <path d='M 768,112 L 768,128' fill='none' stroke='currentColor'></path>
<path d='M 624,144 L 624,176' fill='none' stroke='currentColor'></path> <path d='M 768,128 L 768,160' fill='none' stroke='currentColor'></path>
<path d='M 768,160 L 768,192' fill='none' stroke='currentColor'></path>
<polygon points='160.000000,64.000000 148.000000,58.400002 148.000000,69.599998' fill='currentColor' transform='rotate(0.000000, 152.000000, 64.000000)'></polygon> <polygon points='160.000000,64.000000 148.000000,58.400002 148.000000,69.599998' fill='currentColor' transform='rotate(0.000000, 152.000000, 64.000000)'></polygon>
<polygon points='160.000000,128.000000 148.000000,122.400002 148.000000,133.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 128.000000)'></polygon> <polygon points='160.000000,112.000000 148.000000,106.400002 148.000000,117.599998' fill='currentColor' transform='rotate(0.000000, 152.000000, 112.000000)'></polygon>
<polygon points='160.000000,224.000000 148.000000,218.399994 148.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 224.000000)'></polygon> <polygon points='160.000000,224.000000 148.000000,218.399994 148.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 224.000000)'></polygon>
<polygon points='160.000000,336.000000 148.000000,330.399994 148.000000,341.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 336.000000)'></polygon> <polygon points='160.000000,336.000000 148.000000,330.399994 148.000000,341.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 336.000000)'></polygon>
<polygon points='160.000000,400.000000 148.000000,394.399994 148.000000,405.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 400.000000)'></polygon> <polygon points='160.000000,400.000000 148.000000,394.399994 148.000000,405.600006' fill='currentColor' transform='rotate(0.000000, 152.000000, 400.000000)'></polygon>
<polygon points='384.000000,32.000000 372.000000,26.400000 372.000000,37.599998' fill='currentColor' transform='rotate(0.000000, 376.000000, 32.000000)'></polygon> <polygon points='344.000000,160.000000 332.000000,154.399994 332.000000,165.600006' fill='currentColor' transform='rotate(0.000000, 336.000000, 160.000000)'></polygon>
<polygon points='384.000000,64.000000 372.000000,58.400002 372.000000,69.599998' fill='currentColor' transform='rotate(0.000000, 376.000000, 64.000000)'></polygon> <polygon points='344.000000,224.000000 332.000000,218.399994 332.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 336.000000, 224.000000)'></polygon>
<polygon points='384.000000,128.000000 372.000000,122.400002 372.000000,133.600006' fill='currentColor' transform='rotate(0.000000, 376.000000, 128.000000)'></polygon> <polygon points='480.000000,32.000000 468.000000,26.400000 468.000000,37.599998' fill='currentColor' transform='rotate(0.000000, 472.000000, 32.000000)'></polygon>
<polygon points='384.000000,176.000000 372.000000,170.399994 372.000000,181.600006' fill='currentColor' transform='rotate(0.000000, 376.000000, 176.000000)'></polygon> <polygon points='480.000000,64.000000 468.000000,58.400002 468.000000,69.599998' fill='currentColor' transform='rotate(0.000000, 472.000000, 64.000000)'></polygon>
<polygon points='384.000000,224.000000 372.000000,218.399994 372.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 376.000000, 224.000000)'></polygon> <polygon points='480.000000,112.000000 468.000000,106.400002 468.000000,117.599998' fill='currentColor' transform='rotate(0.000000, 472.000000, 112.000000)'></polygon>
<polygon points='528.000000,176.000000 516.000000,170.399994 516.000000,181.600006' fill='currentColor' transform='rotate(0.000000, 520.000000, 176.000000)'></polygon> <polygon points='480.000000,160.000000 468.000000,154.399994 468.000000,165.600006' fill='currentColor' transform='rotate(0.000000, 472.000000, 160.000000)'></polygon>
<polygon points='672.000000,48.000000 660.000000,42.400002 660.000000,53.599998' fill='currentColor' transform='rotate(0.000000, 664.000000, 48.000000)'></polygon> <polygon points='672.000000,128.000000 660.000000,122.400002 660.000000,133.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 128.000000)'></polygon>
<polygon points='672.000000,80.000000 660.000000,74.400002 660.000000,85.599998' fill='currentColor' transform='rotate(0.000000, 664.000000, 80.000000)'></polygon> <polygon points='672.000000,192.000000 660.000000,186.399994 660.000000,197.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 192.000000)'></polygon>
<polygon points='672.000000,144.000000 660.000000,138.399994 660.000000,149.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 144.000000)'></polygon> <polygon points='816.000000,32.000000 804.000000,26.400000 804.000000,37.599998' fill='currentColor' transform='rotate(0.000000, 808.000000, 32.000000)'></polygon>
<polygon points='672.000000,176.000000 660.000000,170.399994 660.000000,181.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 176.000000)'></polygon> <polygon points='816.000000,64.000000 804.000000,58.400002 804.000000,69.599998' fill='currentColor' transform='rotate(0.000000, 808.000000, 64.000000)'></polygon>
<polygon points='672.000000,224.000000 660.000000,218.399994 660.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 224.000000)'></polygon> <polygon points='816.000000,128.000000 804.000000,122.400002 804.000000,133.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 128.000000)'></polygon>
<polygon points='672.000000,304.000000 660.000000,298.399994 660.000000,309.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 304.000000)'></polygon> <polygon points='816.000000,160.000000 804.000000,154.399994 804.000000,165.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 160.000000)'></polygon>
<polygon points='672.000000,336.000000 660.000000,330.399994 660.000000,341.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 336.000000)'></polygon> <polygon points='816.000000,224.000000 804.000000,218.399994 804.000000,229.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 224.000000)'></polygon>
<polygon points='672.000000,368.000000 660.000000,362.399994 660.000000,373.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 368.000000)'></polygon> <polygon points='816.000000,304.000000 804.000000,298.399994 804.000000,309.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 304.000000)'></polygon>
<polygon points='672.000000,400.000000 660.000000,394.399994 660.000000,405.600006' fill='currentColor' transform='rotate(0.000000, 664.000000, 400.000000)'></polygon> <polygon points='816.000000,336.000000 804.000000,330.399994 804.000000,341.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 336.000000)'></polygon>
<path d='M 400,16 A 16,16 0 0,0 384,32' fill='none' stroke='currentColor'></path> <polygon points='816.000000,368.000000 804.000000,362.399994 804.000000,373.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 368.000000)'></polygon>
<path d='M 512,16 A 16,16 0 0,1 528,32' fill='none' stroke='currentColor'></path> <polygon points='816.000000,400.000000 804.000000,394.399994 804.000000,405.600006' fill='currentColor' transform='rotate(0.000000, 808.000000, 400.000000)'></polygon>
<path d='M 496,16 A 16,16 0 0,0 480,32' fill='none' stroke='currentColor'></path>
<path d='M 608,16 A 16,16 0 0,1 624,32' fill='none' stroke='currentColor'></path>
<path d='M 176,48 A 16,16 0 0,0 160,64' fill='none' stroke='currentColor'></path> <path d='M 176,48 A 16,16 0 0,0 160,64' fill='none' stroke='currentColor'></path>
<path d='M 304,48 A 16,16 0 0,1 320,64' fill='none' stroke='currentColor'></path> <path d='M 304,48 A 16,16 0 0,1 320,64' fill='none' stroke='currentColor'></path>
<path d='M 160,80 A 16,16 0 0,0 176,96' fill='none' stroke='currentColor'></path> <path d='M 160,64 A 16,16 0 0,0 176,80' fill='none' stroke='currentColor'></path>
<path d='M 320,80 A 16,16 0 0,1 304,96' fill='none' stroke='currentColor'></path> <path d='M 320,64 A 16,16 0 0,1 304,80' fill='none' stroke='currentColor'></path>
<path d='M 176,112 A 16,16 0 0,0 160,128' fill='none' stroke='currentColor'></path> <path d='M 176,96 A 16,16 0 0,0 160,112' fill='none' stroke='currentColor'></path>
<path d='M 320,112 A 16,16 0 0,1 336,128' fill='none' stroke='currentColor'></path> <path d='M 320,96 A 16,16 0 0,1 336,112' fill='none' stroke='currentColor'></path>
<path d='M 528,112 A 16,16 0 0,0 544,128' fill='none' stroke='currentColor'></path> <path d='M 688,96 A 16,16 0 0,0 672,112' fill='none' stroke='currentColor'></path>
<path d='M 608,128 A 16,16 0 0,1 624,144' fill='none' stroke='currentColor'></path> <path d='M 752,96 A 16,16 0 0,1 768,112' fill='none' stroke='currentColor'></path>
<path d='M 384,128 A 16,16 0 0,0 400,144' fill='none' stroke='currentColor'></path> <path d='M 160,128 A 16,16 0 0,0 176,144' fill='none' stroke='currentColor'></path>
<path d='M 512,144 A 16,16 0 0,1 528,160' fill='none' stroke='currentColor'></path> <path d='M 336,128 A 16,16 0 0,1 320,144' fill='none' stroke='currentColor'></path>
<path d='M 160,144 A 16,16 0 0,0 176,160' fill='none' stroke='currentColor'></path> <path d='M 360,144 A 16,16 0 0,0 344,160' fill='none' stroke='currentColor'></path>
<path d='M 336,144 A 16,16 0 0,1 320,160' fill='none' stroke='currentColor'></path> <path d='M 416,144 A 16,16 0 0,1 432,160' fill='none' stroke='currentColor'></path>
<path d='M 400,160 A 16,16 0 0,0 384,176' fill='none' stroke='currentColor'></path> <path d='M 480,160 A 16,16 0 0,0 496,176' fill='none' stroke='currentColor'></path>
<path d='M 456,160 A 16,16 0 0,1 472,176' fill='none' stroke='currentColor'></path> <path d='M 624,160 A 16,16 0 0,1 608,176' fill='none' stroke='currentColor'></path>
<path d='M 528,176 A 16,16 0 0,0 544,192' fill='none' stroke='currentColor'></path>
<path d='M 624,176 A 16,16 0 0,1 608,192' fill='none' stroke='currentColor'></path>
<path d='M 176,208 A 16,16 0 0,0 160,224' fill='none' stroke='currentColor'></path> <path d='M 176,208 A 16,16 0 0,0 160,224' fill='none' stroke='currentColor'></path>
<path d='M 280,208 A 16,16 0 0,1 296,224' fill='none' stroke='currentColor'></path> <path d='M 280,208 A 16,16 0 0,1 296,224' fill='none' stroke='currentColor'></path>
<path d='M 672,192 A 16,16 0 0,0 688,208' fill='none' stroke='currentColor'></path>
<path d='M 768,192 A 16,16 0 0,1 752,208' fill='none' stroke='currentColor'></path>
<path d='M 160,224 A 16,16 0 0,0 176,240' fill='none' stroke='currentColor'></path> <path d='M 160,224 A 16,16 0 0,0 176,240' fill='none' stroke='currentColor'></path>
<path d='M 296,224 A 16,16 0 0,1 280,240' fill='none' stroke='currentColor'></path> <path d='M 296,224 A 16,16 0 0,1 280,240' fill='none' stroke='currentColor'></path>
<path d='M 384,224 A 16,16 0 0,0 400,240' fill='none' stroke='currentColor'></path> <path d='M 344,224 A 16,16 0 0,0 360,240' fill='none' stroke='currentColor'></path>
<path d='M 472,224 A 16,16 0 0,1 456,240' fill='none' stroke='currentColor'></path> <path d='M 432,224 A 16,16 0 0,1 416,240' fill='none' stroke='currentColor'></path>
<path d='M 176,320 A 16,16 0 0,0 160,336' fill='none' stroke='currentColor'></path> <path d='M 176,320 A 16,16 0 0,0 160,336' fill='none' stroke='currentColor'></path>
<path d='M 352,320 A 16,16 0 0,1 368,336' fill='none' stroke='currentColor'></path> <path d='M 352,320 A 16,16 0 0,1 368,336' fill='none' stroke='currentColor'></path>
<path d='M 160,336 A 16,16 0 0,0 176,352' fill='none' stroke='currentColor'></path> <path d='M 160,336 A 16,16 0 0,0 176,352' fill='none' stroke='currentColor'></path>
@ -132,17 +137,12 @@ svg {
<text x='32' y='36'>P</text> <text x='32' y='36'>P</text>
<text x='40' y='36'>D</text> <text x='40' y='36'>D</text>
<text x='48' y='36'>F</text> <text x='48' y='36'>F</text>
<text x='680' y='52'>P</text> <text x='824' y='36'>P</text>
<text x='688' y='52'>o</text> <text x='832' y='36'>D</text>
<text x='696' y='52'>s</text> <text x='840' y='36'>F</text>
<text x='704' y='52'>t</text> <text x='856' y='36'>1</text>
<text x='712' y='52'>s</text> <text x='864' y='36'>.</text>
<text x='720' y='52'>c</text> <text x='872' y='36'>5</text>
<text x='728' y='52'>r</text>
<text x='736' y='52'>i</text>
<text x='744' y='52'>p</text>
<text x='752' y='52'>t</text>
<text x='768' y='52'>2</text>
<text x='32' y='68'>P</text> <text x='32' y='68'>P</text>
<text x='40' y='68'>l</text> <text x='40' y='68'>l</text>
<text x='48' y='68'>a</text> <text x='48' y='68'>a</text>
@ -165,131 +165,125 @@ svg {
<text x='272' y='68'>e</text> <text x='272' y='68'>e</text>
<text x='280' y='68'>n</text> <text x='280' y='68'>n</text>
<text x='288' y='68'>t</text> <text x='288' y='68'>t</text>
<text x='408' y='68'>p</text> <text x='504' y='68'>p</text>
<text x='416' y='68'>d</text> <text x='512' y='68'>d</text>
<text x='424' y='68'>f</text> <text x='520' y='68'>f</text>
<text x='432' y='68'>2</text> <text x='528' y='68'>2</text>
<text x='440' y='68'>p</text> <text x='536' y='68'>p</text>
<text x='448' y='68'>r</text> <text x='544' y='68'>r</text>
<text x='456' y='68'>i</text> <text x='552' y='68'>i</text>
<text x='464' y='68'>n</text> <text x='560' y='68'>n</text>
<text x='472' y='68'>t</text> <text x='568' y='68'>t</text>
<text x='480' y='68'>a</text> <text x='576' y='68'>a</text>
<text x='488' y='68'>b</text> <text x='584' y='68'>b</text>
<text x='496' y='68'>l</text> <text x='592' y='68'>l</text>
<text x='504' y='68'>e</text> <text x='600' y='68'>e</text>
<text x='192' y='84'>+</text> <text x='824' y='68'>P</text>
<text x='208' y='84'>Q</text> <text x='832' y='68'>o</text>
<text x='216' y='84'>P</text> <text x='840' y='68'>s</text>
<text x='224' y='84'>d</text> <text x='848' y='68'>t</text>
<text x='232' y='84'>f</text> <text x='856' y='68'>s</text>
<text x='240' y='84'>W</text> <text x='864' y='68'>c</text>
<text x='248' y='84'>r</text> <text x='872' y='68'>r</text>
<text x='256' y='84'>i</text> <text x='880' y='68'>i</text>
<text x='264' y='84'>t</text> <text x='888' y='68'>p</text>
<text x='272' y='84'>e</text> <text x='896' y='68'>t</text>
<text x='280' y='84'>r</text> <text x='912' y='68'>2</text>
<text x='680' y='84'>P</text> <text x='32' y='100'>D</text>
<text x='688' y='84'>D</text> <text x='40' y='100'>O</text>
<text x='696' y='84'>F</text> <text x='48' y='100'>C</text>
<text x='712' y='84'>1</text> <text x='56' y='100'>/</text>
<text x='720' y='84'>.</text> <text x='64' y='100'>P</text>
<text x='728' y='84'>5</text> <text x='72' y='100'>P</text>
<text x='400' y='100'>(</text> <text x='80' y='100'>T</text>
<text x='408' y='100'>P</text> <text x='496' y='100'>(</text>
<text x='416' y='100'>o</text> <text x='504' y='100'>P</text>
<text x='424' y='100'>p</text> <text x='512' y='100'>o</text>
<text x='432' y='100'>p</text> <text x='520' y='100'>p</text>
<text x='440' y='100'>l</text> <text x='528' y='100'>p</text>
<text x='448' y='100'>e</text> <text x='536' y='100'>l</text>
<text x='456' y='100'>r</text> <text x='544' y='100'>e</text>
<text x='464' y='100'>+</text> <text x='552' y='100'>r</text>
<text x='472' y='100'>C</text> <text x='560' y='100'>+</text>
<text x='480' y='100'>a</text> <text x='568' y='100'>C</text>
<text x='488' y='100'>i</text> <text x='576' y='100'>a</text>
<text x='496' y='100'>r</text> <text x='584' y='100'>i</text>
<text x='504' y='100'>o</text> <text x='592' y='100'>r</text>
<text x='512' y='100'>)</text> <text x='600' y='100'>o</text>
<text x='32' y='116'>D</text> <text x='608' y='100'>)</text>
<text x='40' y='116'>O</text> <text x='32' y='116'>O</text>
<text x='48' y='116'>C</text> <text x='40' y='116'>D</text>
<text x='48' y='116'>T</text>
<text x='56' y='116'>/</text> <text x='56' y='116'>/</text>
<text x='64' y='116'>P</text> <text x='64' y='116'>O</text>
<text x='72' y='116'>P</text> <text x='72' y='116'>D</text>
<text x='80' y='116'>T</text> <text x='80' y='116'>P</text>
<text x='32' y='132'>O</text> <text x='184' y='116'>C</text>
<text x='40' y='132'>D</text> <text x='192' y='116'>a</text>
<text x='48' y='132'>T</text> <text x='200' y='116'>l</text>
<text x='56' y='132'>/</text> <text x='208' y='116'>l</text>
<text x='64' y='132'>O</text> <text x='216' y='116'>i</text>
<text x='72' y='132'>D</text> <text x='224' y='116'>g</text>
<text x='80' y='132'>P</text> <text x='232' y='116'>r</text>
<text x='184' y='132'>C</text> <text x='240' y='116'>a</text>
<text x='192' y='132'>a</text> <text x='248' y='116'>c</text>
<text x='200' y='132'>l</text> <text x='256' y='116'>o</text>
<text x='208' y='132'>l</text> <text x='264' y='116'>n</text>
<text x='216' y='132'>i</text> <text x='272' y='116'>v</text>
<text x='224' y='132'>g</text> <text x='280' y='116'>e</text>
<text x='232' y='132'>r</text> <text x='288' y='116'>r</text>
<text x='240' y='132'>a</text> <text x='296' y='116'>t</text>
<text x='248' y='132'>c</text> <text x='304' y='116'>e</text>
<text x='256' y='132'>o</text> <text x='312' y='116'>r</text>
<text x='264' y='132'>n</text> <text x='208' y='132'>(</text>
<text x='272' y='132'>v</text> <text x='216' y='132'>o</text>
<text x='280' y='132'>e</text> <text x='224' y='132'>p</text>
<text x='288' y='132'>r</text> <text x='232' y='132'>t</text>
<text x='296' y='132'>t</text> <text x='240' y='132'>i</text>
<text x='304' y='132'>e</text> <text x='248' y='132'>o</text>
<text x='312' y='132'>r</text> <text x='256' y='132'>n</text>
<text x='208' y='148'>(</text> <text x='264' y='132'>a</text>
<text x='216' y='148'>o</text> <text x='272' y='132'>l</text>
<text x='224' y='148'>p</text> <text x='280' y='132'>)</text>
<text x='232' y='148'>t</text> <text x='824' y='132'>P</text>
<text x='240' y='148'>i</text> <text x='832' y='132'>W</text>
<text x='248' y='148'>o</text> <text x='840' y='132'>G</text>
<text x='256' y='148'>n</text> <text x='848' y='132'>-</text>
<text x='264' y='148'>a</text> <text x='856' y='132'>R</text>
<text x='272' y='148'>l</text> <text x='864' y='132'>a</text>
<text x='280' y='148'>)</text> <text x='872' y='132'>s</text>
<text x='680' y='148'>P</text> <text x='880' y='132'>t</text>
<text x='688' y='148'>W</text> <text x='888' y='132'>e</text>
<text x='696' y='148'>G</text> <text x='896' y='132'>r</text>
<text x='704' y='148'>-</text> <text x='696' y='148'>p</text>
<text x='712' y='148'>R</text> <text x='704' y='148'>p</text>
<text x='720' y='148'>a</text> <text x='712' y='148'>m</text>
<text x='728' y='148'>s</text> <text x='720' y='148'>2</text>
<text x='736' y='148'>t</text> <text x='728' y='148'>p</text>
<text x='744' y='148'>e</text> <text x='736' y='148'>w</text>
<text x='752' y='148'>r</text> <text x='744' y='148'>g</text>
<text x='552' y='164'>p</text> <text x='32' y='164'>I</text>
<text x='560' y='164'>p</text> <text x='40' y='164'>m</text>
<text x='568' y='164'>m</text> <text x='48' y='164'>a</text>
<text x='576' y='164'>2</text> <text x='56' y='164'>g</text>
<text x='584' y='164'>p</text> <text x='64' y='164'>e</text>
<text x='592' y='164'>w</text> <text x='72' y='164'>s</text>
<text x='600' y='164'>g</text> <text x='824' y='164'>U</text>
<text x='32' y='180'>I</text> <text x='832' y='164'>R</text>
<text x='40' y='180'>m</text> <text x='840' y='164'>F</text>
<text x='48' y='180'>a</text> <text x='848' y='164'>-</text>
<text x='56' y='180'>g</text> <text x='856' y='164'>R</text>
<text x='64' y='180'>e</text> <text x='864' y='164'>a</text>
<text x='72' y='180'>s</text> <text x='872' y='164'>s</text>
<text x='680' y='180'>U</text> <text x='880' y='164'>t</text>
<text x='688' y='180'>R</text> <text x='888' y='164'>e</text>
<text x='696' y='180'>F</text> <text x='896' y='164'>r</text>
<text x='704' y='180'>-</text> <text x='368' y='196'>Q</text>
<text x='712' y='180'>R</text> <text x='376' y='196'>I</text>
<text x='720' y='180'>a</text> <text x='384' y='196'>m</text>
<text x='728' y='180'>s</text> <text x='392' y='196'>a</text>
<text x='736' y='180'>t</text> <text x='400' y='196'>g</text>
<text x='744' y='180'>e</text> <text x='408' y='196'>e</text>
<text x='752' y='180'>r</text>
<text x='408' y='196'>Q</text>
<text x='416' y='196'>I</text>
<text x='424' y='196'>m</text>
<text x='432' y='196'>a</text>
<text x='440' y='196'>g</text>
<text x='448' y='196'>e</text>
<text x='32' y='228'>S</text> <text x='32' y='228'>S</text>
<text x='40' y='228'>V</text> <text x='40' y='228'>V</text>
<text x='48' y='228'>G</text> <text x='48' y='228'>G</text>
@ -305,25 +299,25 @@ svg {
<text x='256' y='228'>r</text> <text x='256' y='228'>r</text>
<text x='264' y='228'>e</text> <text x='264' y='228'>e</text>
<text x='272' y='228'>r</text> <text x='272' y='228'>r</text>
<text x='680' y='228'>P</text> <text x='824' y='228'>P</text>
<text x='688' y='228'>N</text> <text x='832' y='228'>N</text>
<text x='696' y='228'>G</text> <text x='840' y='228'>G</text>
<text x='704' y='228'>,</text> <text x='848' y='228'>,</text>
<text x='720' y='228'>J</text> <text x='864' y='228'>J</text>
<text x='728' y='228'>P</text> <text x='872' y='228'>P</text>
<text x='736' y='228'>E</text> <text x='880' y='228'>E</text>
<text x='744' y='228'>G</text> <text x='888' y='228'>G</text>
<text x='752' y='228'>,</text> <text x='896' y='228'>,</text>
<text x='680' y='244'>R</text> <text x='824' y='244'>R</text>
<text x='688' y='244'>e</text> <text x='832' y='244'>e</text>
<text x='696' y='244'>v</text> <text x='840' y='244'>v</text>
<text x='704' y='244'>e</text> <text x='848' y='244'>e</text>
<text x='712' y='244'>r</text> <text x='856' y='244'>r</text>
<text x='720' y='244'>s</text> <text x='864' y='244'>s</text>
<text x='728' y='244'>e</text> <text x='872' y='244'>e</text>
<text x='744' y='244'>B</text> <text x='888' y='244'>B</text>
<text x='752' y='244'>M</text> <text x='896' y='244'>M</text>
<text x='760' y='244'>P</text> <text x='904' y='244'>P</text>
<text x='16' y='276'>I</text> <text x='16' y='276'>I</text>
<text x='24' y='276'>f</text> <text x='24' y='276'>f</text>
<text x='40' y='276'>t</text> <text x='40' y='276'>t</text>
@ -358,16 +352,16 @@ svg {
<text x='88' y='308'>i</text> <text x='88' y='308'>i</text>
<text x='96' y='308'>p</text> <text x='96' y='308'>p</text>
<text x='104' y='308'>t</text> <text x='104' y='308'>t</text>
<text x='680' y='308'>P</text> <text x='824' y='308'>P</text>
<text x='688' y='308'>o</text> <text x='832' y='308'>o</text>
<text x='696' y='308'>s</text> <text x='840' y='308'>s</text>
<text x='704' y='308'>t</text> <text x='848' y='308'>t</text>
<text x='712' y='308'>s</text> <text x='856' y='308'>s</text>
<text x='720' y='308'>c</text> <text x='864' y='308'>c</text>
<text x='728' y='308'>r</text> <text x='872' y='308'>r</text>
<text x='736' y='308'>i</text> <text x='880' y='308'>i</text>
<text x='744' y='308'>p</text> <text x='888' y='308'>p</text>
<text x='752' y='308'>t</text> <text x='896' y='308'>t</text>
<text x='32' y='340'>P</text> <text x='32' y='340'>P</text>
<text x='40' y='340'>l</text> <text x='40' y='340'>l</text>
<text x='48' y='340'>a</text> <text x='48' y='340'>a</text>
@ -396,21 +390,21 @@ svg {
<text x='328' y='340'>n</text> <text x='328' y='340'>n</text>
<text x='336' y='340'>e</text> <text x='336' y='340'>e</text>
<text x='344' y='340'>s</text> <text x='344' y='340'>s</text>
<text x='680' y='340'>P</text> <text x='824' y='340'>P</text>
<text x='688' y='340'>l</text> <text x='832' y='340'>l</text>
<text x='696' y='340'>a</text> <text x='840' y='340'>a</text>
<text x='704' y='340'>i</text> <text x='848' y='340'>i</text>
<text x='712' y='340'>n</text> <text x='856' y='340'>n</text>
<text x='720' y='340'>t</text> <text x='864' y='340'>t</text>
<text x='728' y='340'>e</text> <text x='872' y='340'>e</text>
<text x='736' y='340'>x</text> <text x='880' y='340'>x</text>
<text x='744' y='340'>t</text> <text x='888' y='340'>t</text>
<text x='32' y='372'>P</text> <text x='32' y='372'>P</text>
<text x='40' y='372'>N</text> <text x='40' y='372'>N</text>
<text x='48' y='372'>G</text> <text x='48' y='372'>G</text>
<text x='680' y='372'>P</text> <text x='824' y='372'>P</text>
<text x='688' y='372'>N</text> <text x='832' y='372'>N</text>
<text x='696' y='372'>G</text> <text x='840' y='372'>G</text>
<text x='32' y='404'>J</text> <text x='32' y='404'>J</text>
<text x='40' y='404'>P</text> <text x='40' y='404'>P</text>
<text x='48' y='404'>E</text> <text x='48' y='404'>E</text>
@ -425,26 +419,26 @@ svg {
<text x='240' y='404'>i</text> <text x='240' y='404'>i</text>
<text x='248' y='404'>f</text> <text x='248' y='404'>f</text>
<text x='256' y='404'>y</text> <text x='256' y='404'>y</text>
<text x='680' y='404'>J</text> <text x='824' y='404'>J</text>
<text x='688' y='404'>P</text> <text x='832' y='404'>P</text>
<text x='696' y='404'>E</text> <text x='840' y='404'>E</text>
<text x='704' y='404'>G</text> <text x='848' y='404'>G</text>
<text x='680' y='420'>(</text> <text x='824' y='420'>(</text>
<text x='688' y='420'>B</text> <text x='832' y='420'>B</text>
<text x='696' y='420'>a</text> <text x='840' y='420'>a</text>
<text x='704' y='420'>s</text> <text x='848' y='420'>s</text>
<text x='712' y='420'>e</text> <text x='856' y='420'>e</text>
<text x='720' y='420'>l</text> <text x='864' y='420'>l</text>
<text x='728' y='420'>i</text> <text x='872' y='420'>i</text>
<text x='736' y='420'>n</text> <text x='880' y='420'>n</text>
<text x='744' y='420'>e</text> <text x='888' y='420'>e</text>
<text x='760' y='420'>p</text> <text x='904' y='420'>p</text>
<text x='768' y='420'>r</text> <text x='912' y='420'>r</text>
<text x='776' y='420'>o</text> <text x='920' y='420'>o</text>
<text x='784' y='420'>f</text> <text x='928' y='420'>f</text>
<text x='792' y='420'>i</text> <text x='936' y='420'>i</text>
<text x='800' y='420'>l</text> <text x='944' y='420'>l</text>
<text x='808' y='420'>e</text> <text x='952' y='420'>e</text>
<text x='816' y='420'>)</text> <text x='960' y='420'>)</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB