munchboka-edutools 0.1.13__py3-none-any.whl → 0.1.14__py3-none-any.whl

munchboka_edutools/_version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.1.13"
+__version__ = "0.1.14"

munchboka_edutools/directives/plot.py

@@ -885,17 +885,21 @@ class PlotDirective(SphinxDirective):
                 except Exception:
                     pass
             else:
-                # Support dynamic evaluation referencing previously defined function labels, e.g. (5, f(5))
+                # Support dynamic evaluation referencing previously defined function labels, e.g.
+                # (5, f(5)) or (2 - sqrt(2), f(2 - sqrt(2))).
                 # Simple pattern match for a parenthesized pair allowing arbitrary (non-comma) inner expressions.
                 ps = str(p).strip()
                 m_pair = re.match(r"^\(\s*([^,]+?)\s*,\s*([^,]+?)\s*\)$", ps)
                 if m_pair:
                     x_raw = m_pair.group(1).strip()
                     y_raw = m_pair.group(2).strip()
+                    # Evaluate x and y as full expressions first; this already
+                    # supports f(2 - sqrt(2)) via _eval_expr.
                     try:
                         x_val = _eval_expr(x_raw)
                     except Exception:
-                        # If x itself references a function call label(arg)
+                        # If x itself references a function call label(arg),
+                        # fall back to a simple numeric-argument pattern.
                         m_fx = re.match(
                             r"^([A-Za-z_][A-Za-z0-9_]*)\(\s*([+-]?(?:\d+(?:\.\d+)?))\s*\)$",
                             x_raw,
@@ -910,7 +914,9 @@ class PlotDirective(SphinxDirective):
                                 continue  # give up on this point
                         else:
                             continue
-                    # y may be a direct float or a function label call like f(5)
+
+                    # y may be a direct expression or a function label call
+                    # like f(2 - sqrt(2)). Try full expression evaluation first.
                     try:
                         y_val = _eval_expr(y_raw)
                     except Exception:

{munchboka_edutools-0.1.13.dist-info → munchboka_edutools-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: munchboka-edutools
-Version: 0.1.13
+Version: 0.1.14
 Summary: Sphinx/Jupyter Book directives and assets for Munchboka and VGS books
 Project-URL: Homepage, https://github.com/reneaas/munchboka-edutools
 Project-URL: Issues, https://github.com/reneaas/munchboka-edutools/issues

{munchboka_edutools-0.1.13.dist-info → munchboka_edutools-0.1.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
 munchboka_edutools/__init__.py,sha256=fgHZaxSDzU7Didm5UN2_H2-ZYZIUowU8MJaRYxNmKNA,7380
 munchboka_edutools/_plotmath_shim.py,sha256=kWZV-SO4idGHCVdBcfQmrhFF9DEgxPY5Xg8d1h1Bb6c,3348
-munchboka_edutools/_version.py,sha256=BrGyE0EGAAcw0ie-YqC8DUrNp9CZXcKoms53BtFY3f0,49
+munchboka_edutools/_version.py,sha256=N9x0dPNNIgG8onJijVEeDulgDj_3QJTk0cksf5Vs5IA,49
 munchboka_edutools/directives/__init__.py,sha256=wxsmI7Wt_Rpft925y9BmU7urgKhGNlpqnzN2cFbCtoI,83
 munchboka_edutools/directives/admonitions.py,sha256=yJB5F1Wlu_AZdiWQWFR7ArBO0OFE5bsx3DirLV_ujaw,10226
 munchboka_edutools/directives/cas_popup.py,sha256=WED8V1DT55sqYRr_CpgbkanadXRkNmddeW9KSw11IKA,9113
@@ -17,7 +17,7 @@ munchboka_edutools/directives/jeopardy.py,sha256=FoYvyuGbRXpF8KjjKJ-FUzonvPpqm3v
 munchboka_edutools/directives/multi_plot.py,sha256=q2ocaAWzf_ZnDcUi3vKAEt_M_d7zNTEJwveyHrEK5mc,42739
 munchboka_edutools/directives/pair_puzzle.py,sha256=8x6RXVT7I3EcEZEX2TJxPJxOIkwdhd-YPh_DnoKQarI,5277
 munchboka_edutools/directives/parsons.py,sha256=fpKcbyiHcJQlYsiMBaHKAy5vJ0eCUMUVV8h1clb5s7A,3384
-munchboka_edutools/directives/plot.py,sha256=Sysk58BrRNU_n1oavzMHVmrr8gRv4AlkhN4foq7WJs0,132101
+munchboka_edutools/directives/plot.py,sha256=oYnTUI5sbUn-A4pfYwBbd-TKif78l3i27NHXl6MhUok,132446
 munchboka_edutools/directives/poly_icon.py,sha256=hT0NUrgkcYqcHk4_lKGiqam4RT6LXTarTim08j4BsJc,3558
 munchboka_edutools/directives/polydiv.py,sha256=vd8rwNqpn6_Wu52P7_LAGRhL36hufFB1aRskuxEiko4,11735
 munchboka_edutools/directives/popup.py,sha256=Nni7uxmXD4YguC7L-tgiowkDNsXZ8S_XlKGU-LRroCY,8072
@@ -143,7 +143,7 @@ munchboka_edutools/static/js/skulpt/skulpt.js,sha256=xzS8AVz4mGi2v4lytAEeH0tm7Ip
 munchboka_edutools/static/js/timedQuiz/multipleChoiceQuestion.js,sha256=OleHi24leM3Ejc2dvHYSwQGarIA_ZoqjtA3WrPvaX8s,6571
 munchboka_edutools/static/js/timedQuiz/timedMultipleChoiceQuiz.js,sha256=TFKnF80ZsnYbzdSKuOsKcHfEg1ZiUok9vgraOTFE5gM,9030
 munchboka_edutools/static/js/timedQuiz/utils.js,sha256=CvlHVW3Uq-DQapRRuMC61q785GN5NZX5VmZj0zeP2hE,195
-munchboka_edutools-0.1.13.dist-info/METADATA,sha256=mUue8FMT04-T_iUEKKDil5u6TYrYQDzSpem6UyJNO4s,3270
-munchboka_edutools-0.1.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-munchboka_edutools-0.1.13.dist-info/licenses/LICENSE,sha256=7nP4mEfu9fXD-OFxavvJyiudI9LGiEvLk9a0ucEZ6NE,1079
-munchboka_edutools-0.1.13.dist-info/RECORD,,
+munchboka_edutools-0.1.14.dist-info/METADATA,sha256=qGTN1DDlkbi3jsEsorMheTP96cmc6Nf8n8TMn8zQKGs,3270
+munchboka_edutools-0.1.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+munchboka_edutools-0.1.14.dist-info/licenses/LICENSE,sha256=7nP4mEfu9fXD-OFxavvJyiudI9LGiEvLk9a0ucEZ6NE,1079
+munchboka_edutools-0.1.14.dist-info/RECORD,,