From cdb0773d172c61af0e859dcfb8df797f10b13688 Mon Sep 17 00:00:00 2001 From: Sergei Eremenko Date: Wed, 9 Aug 2023 00:00:05 +0300 Subject: [PATCH] ffsvg.sh: clean default values for Inkscape 1.2.2 --- tools/_clean_attrs.sed | 6 +++++- tools/_clean_style_attr.sed | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/_clean_attrs.sed b/tools/_clean_attrs.sed index 6e969fae0a..42e068aa07 100644 --- a/tools/_clean_attrs.sed +++ b/tools/_clean_attrs.sed @@ -91,10 +91,12 @@ s/[ ]font-variant-east-asian="normal"//gI s/[ ]font-variant-ligatures="normal"//gI s/[ ]font-variant-numeric="normal"//gI s/[ ]font-variant-position="normal"//gI +s/[ ]font-variation-settings="normal"//gI s/[ ]font-weight="normal"//gI s/[ ]glyph-orientation-horizontal="0deg"//gI s/[ ]glyph-orientation-vertical="auto"//gI s/[ ]image-rendering="auto"//gI +s/[ ]inline-size="0"//gI s/[ ]isolation="auto"//gI s/[ ]kerning="auto"//gI s/[ ]letter-spacing="normal"//gI @@ -113,8 +115,9 @@ s/[ ]pointer-events="visiblePainted"//gI s/[ ]shape-inside="auto"//gI s/[ ]shape-margin="0"//gI s/[ ]shape-outside="auto"//gI -s/[ ]shape-padding="none"//gI +s/[ ]shape-padding="(0|none)"//gI s/[ ]shape-rendering="auto"//gI +s/[ ]shape-subtract="auto"//gI s/[ ]solid-color="#000000"//gI s/[ ]solid-opacity="1"//gI s/[ ]stop-color="black"//gI @@ -138,6 +141,7 @@ s/[ ]text-transform="none"//gI s/[ ]transform="none"//gI s/[ ]transform-style="flat"//gI s/[ ]unicode-bidi="normal"//gI +s/[ ]vector-effect="none"//gI s/[ ]visibility="visible"//gI s/[ ]white-space="normal"//gI s/[ ]word-spacing="normal"//gI diff --git a/tools/_clean_style_attr.sed b/tools/_clean_style_attr.sed index 6e746a2e60..31a54ca6f1 100644 --- a/tools/_clean_style_attr.sed +++ b/tools/_clean_style_attr.sed @@ -68,10 +68,12 @@ s/font-variant-ligatures:normal;//gI s/font-variant-numeric:normal;//gI s/font-variant-position:normal;//gI + s/font-variation-settings:normal;//gI s/font-weight:normal;//gI s/glyph-orientation-horizontal:0deg;//gI s/glyph-orientation-vertical:auto;//gI s/image-rendering:auto;//gI + s/inline-size:0;//gI s/isolation:auto;//gI s/kerning:auto;//gI s/letter-spacing:normal;//gI @@ -90,8 +92,9 @@ s/shape-inside:auto;//gI s/shape-margin:0;//gI s/shape-outside:auto;//gI - s/shape-padding:none;//gI + s/shape-padding:(0|none);//gI s/shape-rendering:auto;//gI + s/shape-subtract:auto;//gI s/solid-color:#000000;//gI s/solid-opacity:1;//gI s/stop-color:black;//gI @@ -205,6 +208,7 @@ s/font-variant-numeric:[^;"]+;//gI s/font-variant-position:[^;"]+;//gI s/font-variant:[^;"]+;//gI + s/font-variation-settings:[^;"]+;//gI s/font-weight:[^;"]+;//gI s/glyph-orientation-horizontal:[^;"]+;//gI s/glyph-orientation-vertical:[^;"]+;//gI