Commit fca6e9b9 authored by Simon Will's avatar Simon Will
Browse files

Fix bug when importing meters

parent 01679bb7

allzweckmesser/meters.py

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ class Meter: 
                 short_name: str = None):

        self.name = name

        self.schema = schema

        # Convert condition functions to instance-bound methods.

        self.conditions = ([cond.__get__(self) for cond in conditions]

                           if conditions else [])

        self.short_name = short_name
@@ -41,7 +42,7 @@ ALL_METERS = [ 
    Meter(

        'Catalectic Dactylic Hexameter',

        r'(–)(⏑⏑|–)(–)(⏑⏑|–)(–)(⏑⏑|–)(–)(⏑⏑|–)(–)(⏑⏑|–)(⏑|–)',

        phenomena={

        conditions={

            caesurae_together([('mora', 6, 'Trithemimeral'),

                               ('mora', 14, 'Hephthemimeral')], 2),

            caesurae_together([('mora', 10, 'Penthemimeral')], 1),
@@ -53,7 +54,7 @@ ALL_METERS = [ 
    Meter(

        'Iambic Trimeter',

        r'(⏑|⏑⏑|–)(⏑⏑|–)(⏑)(⏑⏑|–)(⏑|⏑⏑|–)(⏑⏑|–)(⏑)(⏑⏑|–)(⏑|⏑⏑|–)(⏑⏑|–)(⏑)(⏑|–)',

        phenomena={

        conditions={

            caesurae_together([('element', 4, 'After fourth element')], 1),

            caesurae_together([('element', 8, 'After eighth element')], 1),

        },