Skip to content

Add FNC4 to encode high (160–255) characters #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add FNC4 to encode high (160–255) characters #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a434504
Add FNC4 to encode high (160–255) characters
Jul 29, 2022
2628d27
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion barcode/charsets/code128.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@
)
)

ALL = set(_common + _charset_a + _charset_b)
ISO_8859_1 = {bytes([i]).decode("latin1"): i - 128 for i in range(160, 256)}

ALL = set(_common + _charset_a + _charset_b + tuple(ISO_8859_1.keys()))

A = {c: i for i, c in enumerate(_charset_a)}
B = {c: i for i, c in enumerate(_charset_b)}
C = {"TO_B": 100, "TO_A": 101, "\xf1": 102}
Expand Down
26 changes: 17 additions & 9 deletions barcode/codex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def look_next():

codes = []
if self._charset == "C" and not char.isdigit():
if char in code128.B:
if char in code128.B or char in code128.ISO_8859_1:
codes = self._new_charset("B")
elif char in code128.A:
codes = self._new_charset("A")
Expand All @@ -183,31 +183,39 @@ def look_next():
elif self._charset == "B":
if look_next():
codes = self._new_charset("C")
elif char not in code128.B:
elif char not in code128.B and char not in code128.ISO_8859_1:
if char in code128.A:
codes = self._new_charset("A")
elif self._charset == "A":
if look_next():
codes = self._new_charset("C")
elif char not in code128.A:
elif char not in code128.A and char not in code128.ISO_8859_1:
if char in code128.B:
codes = self._new_charset("B")
return codes

def _convert(self, char):
if self._charset == "A":
return code128.A[char]
if char in code128.ISO_8859_1:
yield code128.A["\xf4"]
yield code128.ISO_8859_1[char]
else:
yield code128.A[char]
elif self._charset == "B":
return code128.B[char]
if char not in code128.B:
yield code128.B["\xf4"]
yield code128.ISO_8859_1[char]
else:
yield code128.B[char]
elif self._charset == "C":
if char in code128.C:
return code128.C[char]
yield code128.C[char]
elif char.isdigit():
self._buffer += char
if len(self._buffer) == 2:
value = int(self._buffer)
self._buffer = ""
return value
yield value

def _try_to_optimize(self, encoded):
if encoded[1] in code128.TO:
Expand All @@ -226,11 +234,11 @@ def _build(self):
encoded.extend(self._maybe_switch_charset(i))
code_num = self._convert(char)
if code_num is not None:
encoded.append(code_num)
encoded.extend(code_num)
# Finally look in the buffer
if len(self._buffer) == 1:
encoded.extend(self._new_charset("B"))
encoded.append(self._convert(self._buffer[0]))
encoded.extend(self._convert(self._buffer[0]))
self._buffer = ""
encoded = self._try_to_optimize(encoded)
return encoded
Expand Down