From bf78388b65bbe725e72408b340f7fe0b9ba285fb Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 1 Jul 2012 19:55:15 +0200 Subject: [PATCH 1/4] Updates version. --- README.md | 5 +++++ build.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e60e6c..77ef2b5 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT). Kudo ## Changelog +### v0.2 - *2012-??-??* + +* + + ### v0.1 - *2012-07-01* * Initial release diff --git a/build.properties b/build.properties index 6f61eb3..aa54407 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # project project.name = jquery.qrcode -project.version = 0.1 +project.version = 0.2-pre # src src.dir = src From 4196ded9094aaee0c458ad1a074835e2b5dd9620 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 2 Jul 2012 13:24:00 +0200 Subject: [PATCH 2/4] Extends type up to 40 in the QR Code Generator. --- src/qrcode.js | 182 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/src/qrcode.js b/src/qrcode.js index c80e817..a875c9d 100644 --- a/src/qrcode.js +++ b/src/qrcode.js @@ -1048,7 +1048,187 @@ var qrcode = function() { [2, 86, 68, 2, 87, 69], [4, 69, 43, 1, 70, 44], [6, 43, 19, 2, 44, 20], - [6, 43, 15, 2, 44, 16] + [6, 43, 15, 2, 44, 16], + + // 11 + [4, 101, 81], + [1, 80, 50, 4, 81, 51], + [4, 50, 22, 4, 51, 23], + [3, 36, 12, 8, 37, 13], + + // 12 + [2, 116, 92, 2, 117, 93], + [6, 58, 36, 2, 59, 37], + [4, 46, 20, 6, 47, 21], + [7, 42, 14, 4, 43, 15], + + // 13 + [4, 133, 107], + [8, 59, 37, 1, 60, 38], + [8, 44, 20, 4, 45, 21], + [12, 33, 11, 4, 34, 12], + + // 14 + [3, 145, 115, 1, 146, 116], + [4, 64, 40, 5, 65, 41], + [11, 36, 16, 5, 37, 17], + [11, 36, 12, 5, 37, 13], + + // 15 + [5, 109, 87, 1, 110, 88], + [5, 65, 41, 5, 66, 42], + [5, 54, 24, 7, 55, 25], + [11, 36, 12], + + // 16 + [5, 122, 98, 1, 123, 99], + [7, 73, 45, 3, 74, 46], + [15, 43, 19, 2, 44, 20], + [3, 45, 15, 13, 46, 16], + + // 17 + [1, 135, 107, 5, 136, 108], + [10, 74, 46, 1, 75, 47], + [1, 50, 22, 15, 51, 23], + [2, 42, 14, 17, 43, 15], + + // 18 + [5, 150, 120, 1, 151, 121], + [9, 69, 43, 4, 70, 44], + [17, 50, 22, 1, 51, 23], + [2, 42, 14, 19, 43, 15], + + // 19 + [3, 141, 113, 4, 142, 114], + [3, 70, 44, 11, 71, 45], + [17, 47, 21, 4, 48, 22], + [9, 39, 13, 16, 40, 14], + + // 20 + [3, 135, 107, 5, 136, 108], + [3, 67, 41, 13, 68, 42], + [15, 54, 24, 5, 55, 25], + [15, 43, 15, 10, 44, 16], + + // 21 + [4, 144, 116, 4, 145, 117], + [17, 68, 42], + [17, 50, 22, 6, 51, 23], + [19, 46, 16, 6, 47, 17], + + // 22 + [2, 139, 111, 7, 140, 112], + [17, 74, 46], + [7, 54, 24, 16, 55, 25], + [34, 37, 13], + + // 23 + [4, 151, 121, 5, 152, 122], + [4, 75, 47, 14, 76, 48], + [11, 54, 24, 14, 55, 25], + [16, 45, 15, 14, 46, 16], + + // 24 + [6, 147, 117, 4, 148, 118], + [6, 73, 45, 14, 74, 46], + [11, 54, 24, 16, 55, 25], + [30, 46, 16, 2, 47, 17], + + // 25 + [8, 132, 106, 4, 133, 107], + [8, 75, 47, 13, 76, 48], + [7, 54, 24, 22, 55, 25], + [22, 45, 15, 13, 46, 16], + + // 26 + [10, 142, 114, 2, 143, 115], + [19, 74, 46, 4, 75, 47], + [28, 50, 22, 6, 51, 23], + [33, 46, 16, 4, 47, 17], + + // 27 + [8, 152, 122, 4, 153, 123], + [22, 73, 45, 3, 74, 46], + [8, 53, 23, 26, 54, 24], + [12, 45, 15, 28, 46, 16], + + // 28 + [3, 147, 117, 10, 148, 118], + [3, 73, 45, 23, 74, 46], + [4, 54, 24, 31, 55, 25], + [11, 45, 15, 31, 46, 16], + + // 29 + [7, 146, 116, 7, 147, 117], + [21, 73, 45, 7, 74, 46], + [1, 53, 23, 37, 54, 24], + [19, 45, 15, 26, 46, 16], + + // 30 + [5, 145, 115, 10, 146, 116], + [19, 75, 47, 10, 76, 48], + [15, 54, 24, 25, 55, 25], + [23, 45, 15, 25, 46, 16], + + // 31 + [13, 145, 115, 3, 146, 116], + [2, 74, 46, 29, 75, 47], + [42, 54, 24, 1, 55, 25], + [23, 45, 15, 28, 46, 16], + + // 32 + [17, 145, 115], + [10, 74, 46, 23, 75, 47], + [10, 54, 24, 35, 55, 25], + [19, 45, 15, 35, 46, 16], + + // 33 + [17, 145, 115, 1, 146, 116], + [14, 74, 46, 21, 75, 47], + [29, 54, 24, 19, 55, 25], + [11, 45, 15, 46, 46, 16], + + // 34 + [13, 145, 115, 6, 146, 116], + [14, 74, 46, 23, 75, 47], + [44, 54, 24, 7, 55, 25], + [59, 46, 16, 1, 47, 17], + + // 35 + [12, 151, 121, 7, 152, 122], + [12, 75, 47, 26, 76, 48], + [39, 54, 24, 14, 55, 25], + [22, 45, 15, 41, 46, 16], + + // 36 + [6, 151, 121, 14, 152, 122], + [6, 75, 47, 34, 76, 48], + [46, 54, 24, 10, 55, 25], + [2, 45, 15, 64, 46, 16], + + // 37 + [17, 152, 122, 4, 153, 123], + [29, 74, 46, 14, 75, 47], + [49, 54, 24, 10, 55, 25], + [24, 45, 15, 46, 46, 16], + + // 38 + [4, 152, 122, 18, 153, 123], + [13, 74, 46, 32, 75, 47], + [48, 54, 24, 14, 55, 25], + [42, 45, 15, 32, 46, 16], + + // 39 + [20, 147, 117, 4, 148, 118], + [40, 75, 47, 7, 76, 48], + [43, 54, 24, 22, 55, 25], + [10, 45, 15, 67, 46, 16], + + // 40 + [19, 148, 118, 6, 149, 119], + [18, 75, 47, 31, 76, 48], + [34, 54, 24, 34, 55, 25], + [20, 45, 15, 61, 46, 16] ]; var qrRSBlock = function(totalCount, dataCount) { From e5cac4fba0e9647809674e9e002ce70fd8232c9c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 2 Jul 2012 14:49:07 +0200 Subject: [PATCH 3/4] Allows type autodetection up to level 40. --- src/jquery.qrcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jquery.qrcode.js b/src/jquery.qrcode.js index f6129b0..764d820 100644 --- a/src/jquery.qrcode.js +++ b/src/jquery.qrcode.js @@ -22,7 +22,7 @@ // is to long to be encoded. At the moment it should work with up to 271 characters. createBestQr = function (text) { - for (var type = 2; type <= 10; type += 1) { + for (var type = 2; type <= 40; type += 1) { try { return createQr(type, 'L', text); } catch (err) {} From 09058d084ac65376977e79a2c4e426db3ba15ac1 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 2 Jul 2012 14:58:12 +0200 Subject: [PATCH 4/4] version 0.2. --- README.md | 5 +++-- build.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77ef2b5..24c2038 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,10 @@ Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT). Kudo ## Changelog -### v0.2 - *2012-??-??* -* +### v0.2 - *2012-07-02* + +* now encodes up to ~2900 characters (8-bit) ### v0.1 - *2012-07-01* diff --git a/build.properties b/build.properties index aa54407..a2a746a 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # project project.name = jquery.qrcode -project.version = 0.2-pre +project.version = 0.2 # src src.dir = src