From f39a23b8dc9137458a6e4591a9f575ecf4e04a24 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Tue, 10 Nov 2020 23:39:48 +0100
Subject: [PATCH] switch to own SVG of the Swiss cross

Compared to the Adobe Illustrator-exported version from SIX,
this version is defined on a 166px x 166px viewbox,
which are the recommended dimensions with which the cross
should be overlaid on top of QR codes.

This versions visually matches the PNG version from SIX
when rendered onto the same pixel size (166px x 166px).

But, this version scales better!
The SIX version does not render correctly.
My guess is that it might have to do with their
use of floating point coordinates.
---
 GENERATED_swisscross.go | 2 ++
 generate.go             | 2 +-
 qrbill.go               | 4 ++--
 swisscross.svg          | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 swisscross.svg

diff --git a/GENERATED_swisscross.go b/GENERATED_swisscross.go
index adeab15..365dac1 100644
--- a/GENERATED_swisscross.go
+++ b/GENERATED_swisscross.go
@@ -4,6 +4,8 @@ package qrbill
 var swisscross = map[string][]byte{
 	"third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.png": swisscross_0,
 	"third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.svg": swisscross_1,
+	"swisscross.svg": swisscross_2,
 }
 var swisscross_0 = []byte("\x89PNG
\n\n\x00\x00\x00
IHDR\x00\x00\x00\xa6\x00\x00\x00\xa6
\x00\x00\x00\x00x\xf3\xc9\xda\x00\x00\x00	pHYs\x00\x00\\F\x00\x00\\F
\x94CA\x00\x0080iTXtXML:com.adobe.xmp\x00\x00\x00\x00\x00<?xpacket begin=\"\xef\xbb\xbf\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"Adobe XMP Core 5.6-c132 79.159284, 2016/04/19-13:13:40        \">\n   <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n      <rdf:Description rdf:about=\"\"\n            xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\"\n            xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n            xmlns:photoshop=\"http://ns.adobe.com/photoshop/1.0/\"\n            xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\"\n            xmlns:stEvt=\"http://ns.adobe.com/xap/1.0/sType/ResourceEvent#\"\n            xmlns:tiff=\"http://ns.adobe.com/tiff/1.0/\"\n            xmlns:exif=\"http://ns.adobe.com/exif/1.0/\">\n         <xmp:CreatorTool>Adobe Photoshop CC 2015.5 (Macintosh)</xmp:CreatorTool>\n         <xmp:CreateDate>2017-06-07T09:36:22+02:00</xmp:CreateDate>\n         <xmp:ModifyDate>2017-06-07T09:43:10+02:00</xmp:ModifyDate>\n         <xmp:MetadataDate>2017-06-07T09:43:10+02:00</xmp:MetadataDate>\n         <dc:format>image/png</dc:format>\n         <photoshop:ColorMode>0</photoshop:ColorMode>\n         <xmpMM:InstanceID>xmp.iid:d37a2394-3f20-4130-9fc2-6cccaed7bb7f</xmpMM:InstanceID>\n         <xmpMM:DocumentID>xmp.did:d37a2394-3f20-4130-9fc2-6cccaed7bb7f</xmpMM:DocumentID>\n         <xmpMM:OriginalDocumentID>xmp.did:d37a2394-3f20-4130-9fc2-6cccaed7bb7f</xmpMM:OriginalDocumentID>\n         <xmpMM:History>\n            <rdf:Seq>\n               <rdf:li rdf:parseType=\"Resource\">\n                  <stEvt:action>created</stEvt:action>\n                  <stEvt:instanceID>xmp.iid:d37a2394-3f20-4130-9fc2-6cccaed7bb7f</stEvt:instanceID>\n                  <stEvt:when>2017-06-07T09:36:22+02:00</stEvt:when>\n                  <stEvt:softwareAgent>Adobe Photoshop CC 2015.5 (Macintosh)</stEvt:softwareAgent>\n               </rdf:li>\n            </rdf:Seq>\n         </xmpMM:History>\n         <tiff:Orientation>1</tiff:Orientation>\n         <tiff:XResolution>6000000/10000</tiff:XResolution>\n         <tiff:YResolution>6000000/10000</tiff:YResolution>\n         <tiff:ResolutionUnit>2</tiff:ResolutionUnit>\n         <exif:ColorSpace>65535</exif:ColorSpace>\n         <exif:PixelXDimension>166</exif:PixelXDimension>\n         <exif:PixelYDimension>166</exif:PixelYDimension>\n      </rdf:Description>\n   </rdf:RDF>\n</x:xmpmeta>\n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                                                                                                    \n                            \n<?xpacket end=\"w\"?>\x98\xfd\xb9B\x00\x00\x00 cHRM\x00\x00\x87\n\x00\x00\x8c
\x00
\xb7\x00\x00\x80\xe8\x00\x00R\x00
[\x00\x006\xaf\x00\x00A\xd0\xdci\x00\x00\x00\xb9IDATx\xda\xec\x97K\xc20Dm\x87}\x8f\x94\xabs\xa4r\x80tX\xf0i\xde\x83Y\xa0d=Yv2\x9e\xb8\xaaÒ\xdcR\xea)E\xebD5\"6\xa7\x83\xa9fX\xdf`Q-W'\x88X\xfa2yM\xa6!\xeb\xe0D/\xd2wϻ\x008\xe2_\xc6})mD5\xc6}\x90\xdff\xfb\xa9SM\xf6/s+Rry\x9b\xdc\xe3\x9b:\x80\xd5\xcc\xfa\xddÍ8\x99>K\x82\xb8\xc5V\xd4!\xdd;U\xd3ȋ\xce0\x88^|az>\xbf\x85\x879\xd9!\xabE\x9d\x9ftҗuzl.>ՙ\xb4\x8c\xca(B\xaf\x00\x89\xabA\x00\x80\x85S\x00\x00\x00\x00IEND\xaeB`\x82")
 var swisscross_1 = []byte("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\n<svg version=\"1.1\" id=\"Ebene_2\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n	 viewBox=\"0 0 19.8 19.8\" style=\"enable-background:new 0 0 19.8 19.8;\" xml:space=\"preserve\">\n<style type=\"text/css\">\n	.st0{fill:#FFFFFF;}\n	.st1{fill:none;stroke:#FFFFFF;stroke-width:1.4357;stroke-miterlimit:10;}\n</style>\n<polygon points=\"18.3,0.7 1.6,0.7 0.7,0.7 0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 \"/>\n<rect x=\"8.3\" y=\"4\" class=\"st0\" width=\"3.3\" height=\"11\"/>\n<rect x=\"4.4\" y=\"7.9\" class=\"st0\" width=\"11\" height=\"3.3\"/>\n<polygon class=\"st1\" points=\"0.7,1.6 0.7,18.3 0.7,19.1 1.6,19.1 18.3,19.1 19.1,19.1 19.1,18.3 19.1,1.6 19.1,0.7 18.3,0.7 \n	1.6,0.7 0.7,0.7 \"/>\n</svg>\n")
+var swisscross_2 = []byte("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<svg x=\"0\" y=\"0\" width=\"166\" height=\"166\" viewBox=\"0 0 166 166\" version=\"1.1\" baseProfile=\"full\" xmlns=\"http://www.w3.org/2000/svg\">\n  <rect x=\"0\" y=\"0\" width=\"166\" height=\"166\" fill=\"white\"></rect>\n  <rect x=\"12\" y=\"12\" width=\"142\" height=\"142\" fill=\"black\"></rect>\n  <rect x=\"36\" y=\"66\" width=\"94\" height=\"28\" fill=\"white\"></rect>\n  <rect x=\"68\" y=\"34\" width=\"30\" height=\"92\" fill=\"white\"></rect>\n</svg>\n")
diff --git a/generate.go b/generate.go
index 050155c..db9009d 100644
--- a/generate.go
+++ b/generate.go
@@ -14,4 +14,4 @@
 
 package qrbill
 
-//go:generate sh -c "go run third_party/goembed/goembed.go -package qrbill -var swisscross third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.png third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.svg > GENERATED_swisscross.go && gofmt -w GENERATED_swisscross.go"
+//go:generate sh -c "go run third_party/goembed/goembed.go -package qrbill -var swisscross third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.png third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.svg swisscross.svg > GENERATED_swisscross.go && gofmt -w GENERATED_swisscross.go"
diff --git a/qrbill.go b/qrbill.go
index c062d2a..c39e4c7 100644
--- a/qrbill.go
+++ b/qrbill.go
@@ -277,11 +277,11 @@ func (b *Bill) EncodeToSVG() ([]byte, error) {
 	}
 
 	// overlay the swiss cross
-	cross := swisscross["third_party/swiss-cross/CH-Kreuz_7mm/CH-Kreuz_7mm.svg"]
+	cross := swisscross["swisscross.svg"]
 	// Remove XML document header, we embed the <svg> element:
 	cross = bytes.ReplaceAll(cross, []byte(`<?xml version="1.0" encoding="utf-8"?>`), nil)
 	// Overwrite position and size of the embedded <svg> element:
-	cross = bytes.ReplaceAll(cross, []byte(`x="0px" y="0px"`), []byte(`x="549" y="549" width="166" height="166"`))
+	cross = bytes.ReplaceAll(cross, []byte(`<svg x="0" y="0" width="166" height="166"`), []byte(`<svg x="549" y="549" width="166" height="166"`))
 
 	// Inject the swiss cross into the <svg> document:
 	return bytes.ReplaceAll(qrCodeSVG, []byte(`</g>`), append(cross, []byte("</g>")...)), nil
diff --git a/swisscross.svg b/swisscross.svg
new file mode 100644
index 0000000..68f4693
--- /dev/null
+++ b/swisscross.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg x="0" y="0" width="166" height="166" viewBox="0 0 166 166" version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
+  <rect x="0" y="0" width="166" height="166" fill="white"></rect>
+  <rect x="12" y="12" width="142" height="142" fill="black"></rect>
+  <rect x="36" y="66" width="94" height="28" fill="white"></rect>
+  <rect x="68" y="34" width="30" height="92" fill="white"></rect>
+</svg>