QuizGenerator 0.6.0__tar.gz → 0.6.1__tar.gz

{quizgenerator-0.6.0 → quizgenerator-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.6.0
+Version: 0.6.1
 Summary: Generate randomized quiz questions for Canvas LMS and PDF exams
 Project-URL: Homepage, https://github.com/OtterDen-Lab/QuizGenerator
 Project-URL: Documentation, https://github.com/OtterDen-Lab/QuizGenerator/tree/main/documentation

{quizgenerator-0.6.0 → quizgenerator-0.6.1}/QuizGenerator/contentast.py

@@ -2338,6 +2338,23 @@ class ContentAST:
           d = decimal.Decimal(f.numerator).quantize(q, rounding=decimal.ROUND_HALF_UP)
           outs.add(format(d, 'f'))
 
+      # Simple fraction
+      if allow_simple_fraction:
+        fr = f.limit_denominator(max_denominator)
+        if fr == f:
+          a, b = fr.numerator, fr.denominator
+          if fr.denominator > 1:
+            outs.add(f"{a}/{b}")
+            if include_spaces:
+              outs.add(f"{a} / {b}")
+            if allow_mixed and b != 1 and abs(a) > b:
+              sign = '-' if a < 0 else ''
+              A = abs(a)
+              whole, rem = divmod(A, b)
+              outs.add(f"{sign}{whole} {rem}/{b}")
+          else:
+            return sorted(outs, key=lambda s: (len(s), s))
+
       # Fixed-decimal form
       q = decimal.Decimal(1).scaleb(-ContentAST.Answer.DEFAULT_ROUNDING_DIGITS)
       d = (decimal.Decimal(f.numerator) / decimal.Decimal(f.denominator)).quantize(q, rounding=decimal.ROUND_HALF_UP)
@@ -2354,20 +2371,6 @@ class ContentAST:
           s = '0'
         outs.add(s)
 
-      # Simple fraction
-      if allow_simple_fraction:
-        fr = f.limit_denominator(max_denominator)
-        if fr == f:
-          a, b = fr.numerator, fr.denominator
-          outs.add(f"{a}/{b}")
-          if include_spaces:
-            outs.add(f"{a} / {b}")
-          if allow_mixed and b != 1 and abs(a) > b:
-            sign = '-' if a < 0 else ''
-            A = abs(a)
-            whole, rem = divmod(A, b)
-            outs.add(f"{sign}{whole} {rem}/{b}")
-
       return sorted(outs, key=lambda s: (len(s), s))
     
     @staticmethod

quizgenerator-0.6.0/pyproject_prev.toml → quizgenerator-0.6.1/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "QuizGenerator"
-version = "0.5.1"
+version = "0.6.1"
 description = "Generate randomized quiz questions for Canvas LMS and PDF exams"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}

{quizgenerator-0.6.0 → quizgenerator-0.6.1}/uv.lock

@@ -1214,7 +1214,7 @@ wheels = [
 
 [[package]]
 name = "quizgenerator"
-version = "0.6.0"
+version = "0.6.1"
 source = { editable = "." }
 dependencies = [
     { name = "canvasapi" },