kernpy 1.0.2__tar.gz → 1.0.3__tar.gz

{kernpy-1.0.2 → kernpy-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kernpy
-Version: 1.0.2
+Version: 1.0.3
 Summary: Python Humdrum **kern and **mens utilities
 Project-URL: Homepage, https://github.com/OMR-PRAIG-UA-ES/kernpy
 Project-URL: Documentation, https://github.com/OMR-PRAIG-UA-ES/kernpy#readme
@@ -190,6 +190,8 @@ Select the proper Humdrum **kern encoding:
 |----------|--------------|----------------------------------------|
 | kern     | 2.bb-_L      | Traditional Humdrum **kern encoding    |
 | ekern    | 2@.@bb@-·_·L | Extended Humdrum **kern encoding       |
+| bkern    | 2.bb-        | Basic Humdrum **kern encoding          |
+| bekern   | 2@.@bb@-     | Basic Extended Humdrum **kern encoding |
 
 Use the `Encoding` enum class to select the encoding:
 
@@ -200,6 +202,8 @@ doc, _ = kp.load('resource_dir/legacy/chor048.krn')
 
 kern_content = kp.dumps(doc, encoding=kp.Encoding.normalizedKern)
 ekern_content = kp.dumps(doc, encoding=kp.Encoding.eKern)
+bkern_content = kp.dumps(doc, encoding=kp.KernTypeExporter.bKern)
+bekern_content = kp.dumps(doc, encoding=kp.KernTypeExporter.bEkern)
 ```
 
 - Use `from_measure` and `to_measure` to select the measures to export. By default, all the measures are exported.

{kernpy-1.0.2 → kernpy-1.0.3}/README.md

@@ -171,6 +171,8 @@ Select the proper Humdrum **kern encoding:
 |----------|--------------|----------------------------------------|
 | kern     | 2.bb-_L      | Traditional Humdrum **kern encoding    |
 | ekern    | 2@.@bb@-·_·L | Extended Humdrum **kern encoding       |
+| bkern    | 2.bb-        | Basic Humdrum **kern encoding          |
+| bekern   | 2@.@bb@-     | Basic Extended Humdrum **kern encoding |
 
 Use the `Encoding` enum class to select the encoding:
 
@@ -181,6 +183,8 @@ doc, _ = kp.load('resource_dir/legacy/chor048.krn')
 
 kern_content = kp.dumps(doc, encoding=kp.Encoding.normalizedKern)
 ekern_content = kp.dumps(doc, encoding=kp.Encoding.eKern)
+bkern_content = kp.dumps(doc, encoding=kp.KernTypeExporter.bKern)
+bekern_content = kp.dumps(doc, encoding=kp.KernTypeExporter.bEkern)
 ```
 
 - Use `from_measure` and `to_measure` to select the measures to export. By default, all the measures are exported.

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/basic_spine_importer.py

@@ -24,8 +24,11 @@ class BasicSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.OTHER)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/dynam_spine_importer.py

@@ -23,8 +23,11 @@ class DynamSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.DYNAMICS)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/fing_spine_importer.py

@@ -24,8 +24,11 @@ class FingSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.FINGERING)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/harm_spine_importer.py

@@ -23,8 +23,11 @@ class HarmSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.HARMONY)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/mhxm_spine_importer.py

@@ -4,7 +4,7 @@ from typing import Optional
 from .kern_spine_importer import KernSpineListener, KernSpineImporter
 from .base_antlr_spine_parser_listener import BaseANTLRSpineParserListener
 from .spine_importer import SpineImporter
-from .tokens import MHXMToken, Token, TokenCategory
+from .tokens import MHXMToken, Token, TokenCategory, SimpleToken
 
 
 class MxhmSpineImporter(SpineImporter):
@@ -23,8 +23,11 @@ class MxhmSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.HARMONY)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,
@@ -39,6 +42,3 @@ class MxhmSpineImporter(SpineImporter):
             return SimpleToken(encoding, TokenCategory.HARMONY)
 
         return token
-
-        return MHXMToken(encoding)
-

{kernpy-1.0.2 → kernpy-1.0.3}/kernpy/core/text_spine_importer.py

@@ -24,8 +24,11 @@ class TextSpineImporter(SpineImporter):
     def import_token(self, encoding: str) -> Token:
         self._raise_error_if_wrong_input(encoding)
 
-        kern_spine_importer = KernSpineImporter()
-        token = kern_spine_importer.import_token(encoding)
+        try:
+            kern_spine_importer = KernSpineImporter()
+            token = kern_spine_importer.import_token(encoding)
+        except Exception as e:
+            return SimpleToken(encoding, TokenCategory.LYRICS)
 
         ACCEPTED_CATEGORIES = {
             TokenCategory.STRUCTURAL,

{kernpy-1.0.2 → kernpy-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kernpy"
-version = "1.0.2"
+version = "1.0.3"
 authors = [
     { name = "David Rizo Valero", email = "drizo@ua.es"},
     { name = "Joan Cerveto Serrano", email = "joan.cerveto@ua.es"}