Merge branch 'main' into 490-feature-request-use-uv-in-the-workflows-instead-of-pip

Author: egarciamendez

blueprints/checks/nominal_concrete_cover/constants/constants_nen_en_1992_1_1_c2_2011.py

@@ -51,6 +51,6 @@ def minimum_cover_with_regard_to_casting_surface_latex(casting_surface: CastingS
             case CastingSurface.PERMANENTLY_EXPOSED | CastingSurface.FORMWORK:
                 return f"0 (No additional requirements for {casting_surface.value})"
             case CastingSurface.PREPARED_GROUND:
-                return f"k1 ≥ c_{{min,dur}} + 40 mm for {casting_surface.value}"
+                return f"k1 \\ge c_{{min,dur}} + 40 mm for {casting_surface.value}"
             case CastingSurface.DIRECTLY_AGAINST_SOIL:
-                return f"k2 ≥ c_{{min,dur}} + 75 mm for {casting_surface.value}"
+                return f"k2 \\ge c_{{min,dur}} + 75 mm for {casting_surface.value}"

blueprints/checks/nominal_concrete_cover/nominal_concrete_cover.py

@@ -162,7 +162,7 @@ def value(self) -> MM:
 
     def latex(self) -> str:
         """Returns the lateX string representation for Nominal concrete cover check."""
-        return r"\newline ".join(
+        return r"\newline~".join(
             [
                 f"Nominal concrete cover according to art. 4.4.1 from NEN-EN 1992-1-1{self.constants.CODE_SUFFIX}:",
                 latex_max_curly_brackets(
@@ -172,21 +172,24 @@ def latex(self) -> str:
                 f"= {latex_max_curly_brackets(self.c_nom().latex().result, self.minimum_cover_with_regard_to_casting_surface())} = {self.value()} mm",
                 "",
                 "Where:",
-                f"{self.c_nom().latex().return_symbol} = {self.c_nom().latex().equation.replace('min', 'min,total')}"
+                f"\\hspace{{4ex}}{self.c_nom().latex().return_symbol} = {self.c_nom().latex().equation.replace('min', 'min,total')}"
                 f" = {self.c_nom().latex().numeric_equation} = {self.c_nom().latex().result} mm",
-                r"\Delta c_{dev} is determined according to art. 4.4.1.3 (1)",
-                r"c_{min,total} = c_{min} + \Delta c_{uneven surface}  + \Delta c_{abrasion class}"
+                r"\hspace{4ex}\Delta c_{dev} is determined according to art. 4.4.1.3 (1)",
+                r"\hspace{4ex}c_{min,total} = c_{min} + \Delta c_{uneven surface}  + \Delta c_{abrasion class}"
                 f" = {self.c_min().latex().result} + {self.cover_increase_for_uneven_surface()} + {self.cover_increase_for_abrasion_class()}"
                 f" = {self.c_min_total()} mm",
-                r"\Delta c_{uneven surface} and \Delta c_{abrasion class} are determined according to art. 4.4.1.2 (11) and (13)",
-                f"{self.c_min().latex().return_symbol} = {self.c_min().latex().equation}"
+                r"\hspace{4ex}\Delta c_{uneven surface} and \Delta c_{abrasion class} are determined according to art. 4.4.1.2 (11) and (13)",
+                f"\\hspace{{4ex}}{self.c_min().latex().return_symbol} = {self.c_min().latex().equation}"
                 f" = {self.c_min().latex().numeric_equation} = {self.c_min().latex().result} mm",
-                r"\Delta c_{dur,\gamma} , \Delta c_{dur,st} and \Delta c_{dur,add} are determined according to art. 4.4.1.2 (6), (7) and (8)",
-                f"{self.c_min_b().latex().return_symbol} is determined according to table 4.2 based on {self.c_min_b().latex().equation}"
+                r"\hspace{4ex}\Delta c_{dur,\gamma} , \Delta c_{dur,st} and \Delta c_{dur,add} "
+                r"are determined according to art. 4.4.1.2 (6), (7) and (8)",
+                f"\\hspace{{4ex}}{self.c_min_b().latex().return_symbol} is determined according to "
+                f"table 4.2 based on {self.c_min_b().latex().equation}"
                 f" = {self.c_min_b().latex().numeric_equation} = {self.c_min_b().latex().result} mm",
-                f"{self.c_min_dur().latex().return_symbol} is determined according to table 4.3 based on {self.c_min_dur().latex().equation}"
+                f"\\hspace{{4ex}}{self.c_min_dur().latex().return_symbol} is determined according to "
+                f"table 4.4 based on {self.c_min_dur().latex().equation}"
                 f" = {self.c_min_dur().latex().result} mm",
-                "Minimum cover with regard to casting surface according to art. 4.4.1.3 (4) = "
+                r"\hspace{4ex}Minimum cover with regard to casting surface according to art. 4.4.1.3 (4) = "
                 + self.constants.minimum_cover_with_regard_to_casting_surface_latex(self.casting_surface),
             ]
         ).replace(" ", "~")

tests/checks/nominal_concrete_cover/test_constants.py

@@ -120,8 +120,8 @@ def test_minimum_cover_with_regard_to_casting_surface(self, c_min_dur: MM, casti
         [
             (CastingSurface.PERMANENTLY_EXPOSED, "0 (No additional requirements for Permanently exposed)"),
             (CastingSurface.FORMWORK, "0 (No additional requirements for Formwork)"),
-            (CastingSurface.PREPARED_GROUND, "k1 ≥ c_{min,dur} + 40 mm for Prepared ground (including blinding)"),
-            (CastingSurface.DIRECTLY_AGAINST_SOIL, "k2 ≥ c_{min,dur} + 75 mm for Directly against soil"),
+            (CastingSurface.PREPARED_GROUND, "k1 \\ge c_{min,dur} + 40 mm for Prepared ground (including blinding)"),
+            (CastingSurface.DIRECTLY_AGAINST_SOIL, "k2 \\ge c_{min,dur} + 75 mm for Directly against soil"),
         ],
     )
     def test_minimum_cover_with_regard_to_casting_surface_latex(self, casting_surface: CastingSurface, expected_result: str) -> None:

tests/checks/nominal_concrete_cover/test_nominal_concrete_cover.py

@@ -243,20 +243,20 @@ def test_latex(self) -> None:
         )
 
         assert (
-            nominal_concrete_cover.latex() == r"Nominal~concrete~cover~according~to~art.~4.4.1~from~NEN-EN~1992-1-1+C2:2011:\newline"
-            r"~\max~\left\{Nominal~concrete~cover~according~to~art.~4.4.1~(c_{nom});~Minimum~cover~with~regard~to~casting~surface~according~to~art.~4.4.1.3~(4)\right\}\newline"
-            r"~=~\max~\left\{55.0;~110.0\right\}~=~110.0~mm\newline"
-            r"~\newline"
-            r"~Where:\newline"
-            r"~c_{nom}~=~c_{min,total}+\Delta~c_{dev}~=~45.0+10~=~55.0~mm\newline"
-            r"~\Delta~c_{dev}~is~determined~according~to~art.~4.4.1.3~(1)\newline"
-            r"~c_{min,total}~=~c_{min}~+~\Delta~c_{uneven~surface}~~+~\Delta~c_{abrasion~class}~=~35.0~+~5~+~5~=~45.0~mm\newline"
-            r"~\Delta~c_{uneven~surface}~and~\Delta~c_{abrasion~class}~are~determined~according~to~art.~4.4.1.2~(11)~and~(13)\newline"
-            r"~c_{min}~=~\max~\left\{c_{min,b};~c_{min,dur}+\Delta~c_{dur,\gamma}-\Delta~c_{dur,st}-\Delta~c_{dur,add};~10~\text{mm}\right\}~=~\max~\left\{30.0;~35.0+0-0-0;~10\right\}~=~35.0~mm\newline"
-            r"~\Delta~c_{dur,\gamma}~,~\Delta~c_{dur,st}~and~\Delta~c_{dur,add}~are~determined~according~to~art.~4.4.1.2~(6),~(7)~and~(8)\newline"
-            r"~c_{min,b}~is~determined~according~to~table~4.2~based~on~(equivalent)~rebar~diameter~+~5~=~25~+~5~=~30~mm\newline"
-            r"~c_{min,dur}~is~determined~according~to~table~4.3~based~on~structural~class~S4~\&~exposure~classes~(XC1,~XD1,~XS1)~=~35~mm\newline"
-            r"~Minimum~cover~with~regard~to~casting~surface~according~to~art.~4.4.1.3~(4)~=~k2~≥~c_{min,dur}~+~75~mm~for~Directly~against~soil"
+            nominal_concrete_cover.latex() == r"Nominal~concrete~cover~according~to~art.~4.4.1~from~NEN-EN~1992-1-1+C2:2011:\newline~"
+            r"\max~\left\{Nominal~concrete~cover~according~to~art.~4.4.1~(c_{nom});~Minimum~cover~with~regard~to~casting~surface~according~to~art.~4.4.1.3~(4)\right\}\newline~"
+            r"=~\max~\left\{55.0;~110.0\right\}~=~110.0~mm\newline~"
+            r"\newline~"
+            r"Where:\newline~"
+            r"\hspace{4ex}c_{nom}~=~c_{min,total}+\Delta~c_{dev}~=~45.0+10~=~55.0~mm\newline~"
+            r"\hspace{4ex}\Delta~c_{dev}~is~determined~according~to~art.~4.4.1.3~(1)\newline~"
+            r"\hspace{4ex}c_{min,total}~=~c_{min}~+~\Delta~c_{uneven~surface}~~+~\Delta~c_{abrasion~class}~=~35.0~+~5~+~5~=~45.0~mm\newline~"
+            r"\hspace{4ex}\Delta~c_{uneven~surface}~and~\Delta~c_{abrasion~class}~are~determined~according~to~art.~4.4.1.2~(11)~and~(13)\newline~"
+            r"\hspace{4ex}c_{min}~=~\max~\left\{c_{min,b};~c_{min,dur}+\Delta~c_{dur,\gamma}-\Delta~c_{dur,st}-\Delta~c_{dur,add};~10~\text{mm}\right\}~=~\max~\left\{30.0;~35.0+0-0-0;~10\right\}~=~35.0~mm\newline~"
+            r"\hspace{4ex}\Delta~c_{dur,\gamma}~,~\Delta~c_{dur,st}~and~\Delta~c_{dur,add}~are~determined~according~to~art.~4.4.1.2~(6),~(7)~and~(8)\newline~"
+            r"\hspace{4ex}c_{min,b}~is~determined~according~to~table~4.2~based~on~(equivalent)~rebar~diameter~+~5~=~25~+~5~=~30~mm\newline~"
+            r"\hspace{4ex}c_{min,dur}~is~determined~according~to~table~4.4~based~on~structural~class~S4~\&~exposure~classes~(XC1,~XD1,~XS1)~=~35~mm\newline~"
+            r"\hspace{4ex}Minimum~cover~with~regard~to~casting~surface~according~to~art.~4.4.1.3~(4)~=~k2~\ge~c_{min,dur}~+~75~mm~for~Directly~against~soil"
         )
 
         assert str(nominal_concrete_cover) == "Nominal concrete cover according to art. 4.4.1 = 110.0 mm"