From d6da69347186407c609babd7e7e6cd80d2593322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Sams=C3=B3?= Date: Thu, 27 Jun 2024 15:54:45 +0200 Subject: [PATCH 1/2] allow multiple font styles in var names --- pysd/translators/vensim/parsing_grammars/sketch.peg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysd/translators/vensim/parsing_grammars/sketch.peg b/pysd/translators/vensim/parsing_grammars/sketch.peg index 14f69e2d..4decd221 100644 --- a/pysd/translators/vensim/parsing_grammars/sketch.peg +++ b/pysd/translators/vensim/parsing_grammars/sketch.peg @@ -35,7 +35,7 @@ other_objects = other_objects_code "," anything # fonts font_properties = font_name? "|" font_size? "|" font_style? "|" color -font_style = "B" / "I" / "U" / "S" / "V" # italics, bold, underline, etc +font_style = ("B" / "I" / "U" / "S" / "V")+ # italics, bold, underline, etc font_size = ~r"\d+" # this needs to be made a regex to match any font font_name = ~r"(?<=,)[^\|\d]+(?=\|)" From 10d597268b832f967ea0e43f73452f5f77a4db6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Sams=C3=B3?= Date: Thu, 27 Jun 2024 16:26:01 +0200 Subject: [PATCH 2/2] upgrade openpyxl --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2e14f4ea..8d35a4d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ lxml regex chardet black -openpyxl>=3.1 +openpyxl>=3.1.2 scipy progressbar2 portion