Update

JoKalliauer · Feb 10, 2023 · 12b6b55 · 12b6b55
1 parent b30dd54
commit 12b6b55
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 88 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.xml
 *.png
 *.svg
+node_modules/*
+*json
diff --git a/O2.sh b/O2.sh
@@ -3,7 +3,6 @@
 #npm i svgo
 
 for file in *.svg;do
-# export file=min.svg
 export fileN=$(echo $file | cut -f1 -d" ")
 export tmp=$(echo $fileN | cut -f1 -d".")
 export i=${tmp}O.svg
@@ -12,51 +11,12 @@ echo optizer ${file} to $i begin
 
 svgo -i "${file}" -o $i -p 5 --pretty --indent=1 --multipass  
 
-#--disable=convertPathData librsvgbug regarding arc-to-flags
 
-# --enable=removeElementsByAttr  # https://github.com/svg/svgo/issues/945 (option does not make sence)
 
-# --disable=mergePaths # https://github.com/svg/svgo/issues/872
-
-#--disable=removeXMLProcInst # valid (Warning)
-
-#--disable=removeUnknownsAndDefaults # removes Flowtext
-
-#  --disable=convertStyleToAttrs #https://commons.wikimedia.org/wiki/File:2016_Angola_and_DR_Congo_yellow_fever_outbreak.svg
-
-# --enable=prefixIds leads to mistakes
-
-## ==Precission ==
-# -p 5 #https://commons.wikimedia.org/wiki/File:Flag-map_of_the_world.svg
-
-## == keep id-names == # --disable=cleanupIDs
-
-# do not define: --enable=prefixIds #Extends the filename to the ID
-#--enable=cleanupListOfValues  https://github.com/svg/svgo/issues/923
-#--enable=convertPathData # https://github.com/svg/svgo/issues/880 and https://github.com/svg/svgo/issues/1053
-# --enable=removeElementsByAttr # https://github.com/svg/svgo/issues/945 (option does not make sence)
-# --enable=removeStyleElement # https://github.com/svg/svgo/issues/946
-# --enable=removeDimensions ##Changes size of view
-# --enable=removeXMLNS ## not valid 
-# --enable=addClassesToSVGElement ## i think i dont need to add any classes
-#--disable=removeUnknownsAndDefaults # removes Flowtext # https://github.com/svg/svgo/issues/959 (closed)
-
-#echo mv ./${file} ./${tmp}5.xml
+echo mv ./${file} ./${tmp}5.xml
 mv "./${file}" ./${tmp}5.xml
 
-#echo svgo $i finish
+echo svgo $i finish
 
 done
 
-DeactivateEverything=<<END
-
-svgo -i min.svg -o output.svg --disable=addAttributesToSVGElement --disable=addClassesToSVGElement --disable=cleanupAttrs --disable=cleanupEnableBackground --disable=cleanupIDs --disable=cleanupListOfValues --disable=cleanupNumericValues --disable=collapseGroups --disable=convertColors --disable=convertPathData --disable=convertShapeToPath --disable=convertStyleToAttrs --disable=convertTransform --disable=inlineStyles --disable=mergePaths --disable=minifyStyles --disable=moveElemsAttrsToGroup --disable=moveGroupAttrsToElems --disable=prefixIds --disable=removeAttrs --disable=removeComments --disable=removeDesc --disable=removeDimensions --disable=removeDoctype --disable=removeEditorsNSData --disable=removeElementsByAttr --disable=removeEmptyAttrs --disable=removeEmptyContainers --disable=removeEmptyText --disable=removeHiddenElems --disable=removeMetadata --disable=removeNonInheritableGroupAttrs --disable=removeRasterImages --disable=removeScriptElement --disable=removeStyleElement --disable=removeTitle --disable=removeUnknownsAndDefaults --disable=removeUnusedNS --disable=removeUselessDefs --disable=removeUselessStrokeAndFill --disable=removeViewBox --disable=removeXMLNS --disable=removeXMLProcInst --disable=sortAttrs --pretty --indent=1
-
-END
-
-
-ActivateEverything=<<END
-
-svgo -i min.svg -o output.svg --enable=cleanupAttrs --enable=cleanupEnableBackground --enable=cleanupIDs --enable=cleanupListOfValues --enable=cleanupNumericValues --enable=collapseGroups --enable=convertColors --enable=convertPathData --enable=convertShapeToPath --enable=convertStyleToAttrs --enable=convertTransform --enable=inlineStyles --enable=mergePaths --enable=minifyStyles --enable=moveElemsAttrsToGroup --enable=moveGroupAttrsToElems --disable=prefixIds --enable=removeAttrs --enable=removeComments --enable=removeDesc --enable=removeDimensions --enable=removeDoctype --enable=removeEditorsNSData --enable=removeElementsByAttr --enable=removeEmptyAttrs --enable=removeEmptyContainers --enable=removeEmptyText --enable=removeHiddenElems --enable=removeMetadata --enable=removeNonInheritableGroupAttrs --enable=removeRasterImages --enable=removeScriptElement --enable=removeStyleElement --enable=removeTitle --enable=removeUnknownsAndDefaults --enable=removeUnusedNS --enable=removeUselessDefs --enable=removeUselessStrokeAndFill --enable=removeViewBox --enable=removeXMLProcInst --enable=sortAttrs --pretty --indent=1  --disable=removeXMLNS
-
-END
diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ cargo install resvg
 #curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash - 
 sudo npm i -g npm
 sudo npm install -g svgo
+npm i svgo
 ```
 
 ## Install cleanupSVG (portable if prerequiary exits)

diff --git a/gitpush.sh b/gitpush.sh
@@ -11,7 +11,7 @@ git config pull.rebase false # Merge (Standard-Strategie)
 git pull
 #git status
 git add .
-git reset -- *.svg *.xml *.xsvg up3.txt  pattypan*.xls *.png *:Zone.Identifier *.pdf
+git reset -- *.svg *.xml *.xsvg up3.txt  pattypan*.xls *.png *:Zone.Identifier *.pdf node_modules/* *.json node_modules/.bin/* node_modules/.package-lock.json
 git status
 
 

diff --git a/svg2validsvg.sh b/svg2validsvg.sh
@@ -230,10 +230,7 @@ sed -ri "s/<style( id=\"[[:alnum:]]*\"|)>/<style type=\"text\/css\"\1>/" $i
 
 #solved librsvg-Bug T193929 https://phabricator.wikimedia.org/T193929
 #sed -i "s/ xlink:href=\"data:image\/jpg;base64,/ xlink:href=\"data:image\/jpeg;base64,/g" $i
-#sed -i "s/ xlink:href=\"data:;base64,\/9j\/4AAQSkZJRgABAgAAZABkAAD\/7AARRHVja3kAAQAEAAAAHgAA/ xlink:href=\"data:image\/jpeg;base64,\/9j\/4AAQSkZJRgABAgAAZABkAAD\/7AARRHVja3kAAQAEAAAAHgAA/" $i
-#sed -ri "s/ xlink:href=\"data:;base64,( |)iVBORw0KGgoAAAANSUhEUgAA/ xlink:href=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAA/" $i
-#sed -ri "s/ xlink:href=\"data:image\/png;base64,( |)\/9j\/4AAQSkZJRgABAQAAAQABAAD/ xlink:href=\"data:image\/jpeg;base64,\/9j\/4AAQSkZJRgABAQAAAQABAAD/" $i #png->jpeg
-sed -ri "s/ xlink:href=\"data:(|image\/png|image\/jpg);base64,( |)\/9j\/4AAQSkZJRgABAgAAZABkAAD\// xlink:href=\"data:image\/jpeg;base64,\/9j\/4AAQSkZJRgABAgAAZABkAAD\//" $i
+sed -ri "s/ xlink:href=\"data:(|image\/png|image\/jpg);base64,( |)\/9j\/4AAQSkZJRgABA/ xlink:href=\"data:image\/jpeg;base64,\/9j\/4AAQSkZJRgABA/" $i                               # xlink:href="data:image/jpg;base64, /9j/4AAQSkZJRgABAQEBJQElAAD/2wBDABALDA4MChAODQ4SERATGCgaGBYWGDEjJR0oOjM9PDkzODdASFxOQERXRTc4UG1RV19iZ2hnPk1xeXBkeFxlZ2P/2wBDARESEhgVGC8aGi9jQjhCY2NjY2NjY2NjY2NjY2NjY2
 sed -ri "s/ xlink:href=\"data:;base64,( |)iVBORw0KGgoAAAANSUhEUgAA/ xlink:href=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAA/" $i
 sed -ri "s/ xlink:href=\"data:;base64,\/9j\/7QAsUGhvdG9zaG9wIDMuMAA4QklNA\+0AAAAAABAASAAAAAEAAQBIAAAAAQAB\/\+4AJkFkb2Jl/data:image\/jpeg;base64,\/9j\/7QAsUGhvdG9zaG9wIDMuMAA4QklNA\+0AAAAAABAASAAAAAEAAQBIAAAAAQAB\/\+4AJkFkb2Jl/" $i  #https://wordpress.stackexchange.com/a/212334/197645
 

diff --git a/svgo.config.js.txt → svgo.config_all.js b/svgo.config.js.txt → svgo.config_all.js
@@ -89,6 +89,10 @@ module.exports = {
     {
       name: 'removeDesc',
       active: true
+    },
+	{
+      name: 'removeDimensions',
+      active: true //changes scaling of image
     },
     {
       name: 'removeDoctype',

diff --git a/svgo.config (copy).js → svgo.config_all_deactivated.js b/svgo.config (copy).js → svgo.config_all_deactivated.js
@@ -1,153 +1,160 @@
 'use strict'
 
-// const { extendDefaultPlugins } = require('svgo')
+const { extendDefaultPlugins } = require('svgo')
 
 module.exports = {
   multipass: true,
   js2svg: {
     pretty: true,
-    indent: 1
+    indent: 2
   },
-  plugins: ([
+  plugins: [
     {
       name: 'cleanupAttrs',
-      active: true
+      active: false
     },
     {
       name: 'cleanupEnableBackground',
-      active: true
+      active: false
     },
     {
-      name: 'cleanupIDs',
-      active: true
+      name: 'cleanupIds',
+      active: false
+    },
+    {
+      name: 'cleanupListOfValues',
+      active: false
     },
-/*    {
-      name: 'cleanupListOfValues',//https://github.com/svg/svgo/issues/1402
-    },*/
     {
       name: 'cleanupNumericValues',
-      active: true
+      active: false
     },
     {
       name: 'collapseGroups',
-      active: true
+      active: false
     },
     {
       name: 'convertColors',
-      active: true
+      active: false
     },
     {
       name: 'convertPathData',
-      active: true,
+      active: false,
       params: {
         noSpaceAfterFlags: false
       }
     },
     {
-      name: 'convertShapeToPath', //https://github.com/svg/svgo/issues/1466
-      active: true
+      name: 'convertShapeToPath',
+      active: false
     },
     {
       name: 'convertStyleToAttrs',
-      active: true
+      active: false
     },
     {
       name: 'convertTransform',
-      active: true
+      active: false
     },
     {
       name: 'inlineStyles',
-      active: true
+      active: false
     },
     {
       name: 'mergePaths',
-      active: true,
+      active: false,
       params: {
         noSpaceAfterFlags: false
       }
     },
     {
       name: 'minifyStyles',
-      active: true
+      active: false
     },
     {
       name: 'moveElemsAttrsToGroup',
-      active: true
+      active: false
     },
     {
       name: 'moveGroupAttrsToElems',
-      active: true
+      active: false
     },
     {
       name: 'removeAttrs',
-      active: true,
+      active: false,
+      params: {
+        attrs: [
+          'data-name',
+          'fill',
+          'clip-rule'
+        ]
+      }
     },
     {
       name: 'removeComments',
-      active: true
+      active: false
     },
     {
       name: 'removeDesc',
-      active: true
+      active: false
     },
     {
       name: 'removeDoctype',
       active: false
     },
     {
       name: 'removeEditorsNSData',
-      active: true
+      active: false
     },
     {
       name: 'removeEmptyAttrs',
-      active: true
+      active: false
     },
     {
       name: 'removeEmptyContainers',
-      active: true
+      active: false
     },
     {
       name: 'removeEmptyText',
-      active: true
+      active: false
     },
     {
       name: 'removeHiddenElems',
-      active: true
+      active: false
     },
     {
       name: 'removeMetadata',
-      active: true
+      active: false
     },
     {
       name: 'removeNonInheritableGroupAttrs',
-      active: true
+      active: false
     },
     {
       name: 'removeTitle',
-      active: true
+      active: false
     },
     {
       name: 'removeUnknownsAndDefaults',
-      active: true,
       params: {
         keepRoleAttr: true
       }
     },
     {
       name: 'removeUnusedNS',
-      active: true
+      active: false
     },
     {
       name: 'removeUselessDefs',
-      active: true
+      active: false
     },
     {
       name: 'removeUselessStrokeAndFill',
-      active: true
+      active: false
     },
     {
       name: 'removeViewBox',
-      active: true
+      active: false
     },
     {
       name: 'removeXMLNS',
@@ -159,7 +166,7 @@ module.exports = {
     },
     {
       name: 'sortAttrs',
-      active: true
+      active: false
     }
-  ])
+  ]
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Declare files that will always have LF line endings on checkout.
		*.sh text eol=lf