rescale images before inlining

diff --git a/.gitignore b/.gitignore
index 17388bd2d2492c4ebe880b674c0e25b591d6b1d9..274ce51f548f25d532249d163eb4247eb3128b30 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .*.swo
 *.html
 *.xwd
+IMG/*
+Logo/*

diff --git a/Thompson_Ritchie.jpg b/IMG/Thompson_Ritchie.jpg
similarity index 100%
rename from Thompson_Ritchie.jpg
rename to IMG/Thompson_Ritchie.jpg

diff --git a/Stallman.jpg b/IMG_Orig/Stallman.jpg
similarity index 100%
rename from Stallman.jpg
rename to IMG_Orig/Stallman.jpg

diff --git a/Torvalds.jpg b/IMG_Orig/Torvalds.jpg
similarity index 100%
rename from Torvalds.jpg
rename to IMG_Orig/Torvalds.jpg

diff --git a/Archlinux.png b/Logo_Orig/Archlinux.png
similarity index 100%
rename from Archlinux.png
rename to Logo_Orig/Archlinux.png

diff --git a/Awesome.png b/Logo_Orig/Awesome.png
similarity index 100%
rename from Awesome.png
rename to Logo_Orig/Awesome.png

diff --git a/Debian.png b/Logo_Orig/Debian.png
similarity index 100%
rename from Debian.png
rename to Logo_Orig/Debian.png

diff --git a/Enlightenment.png b/Logo_Orig/Enlightenment.png
similarity index 100%
rename from Enlightenment.png
rename to Logo_Orig/Enlightenment.png

diff --git a/Fedora.png b/Logo_Orig/Fedora.png
similarity index 100%
rename from Fedora.png
rename to Logo_Orig/Fedora.png

diff --git a/GNUstep.png b/Logo_Orig/GNUstep.png
similarity index 100%
rename from GNUstep.png
rename to Logo_Orig/GNUstep.png

diff --git a/Gentoo.png b/Logo_Orig/Gentoo.png
similarity index 100%
rename from Gentoo.png
rename to Logo_Orig/Gentoo.png

diff --git a/Gnome.png b/Logo_Orig/Gnome.png
similarity index 100%
rename from Gnome.png
rename to Logo_Orig/Gnome.png

diff --git a/I3.png b/Logo_Orig/I3.png
similarity index 100%
rename from I3.png
rename to Logo_Orig/I3.png

diff --git a/KDE.png b/Logo_Orig/KDE.png
similarity index 100%
rename from KDE.png
rename to Logo_Orig/KDE.png

diff --git a/Knoppix.png b/Logo_Orig/Knoppix.png
similarity index 100%
rename from Knoppix.png
rename to Logo_Orig/Knoppix.png

diff --git a/LXDE.png b/Logo_Orig/LXDE.png
similarity index 100%
rename from LXDE.png
rename to Logo_Orig/LXDE.png

diff --git a/LXQT.png b/Logo_Orig/LXQT.png
similarity index 100%
rename from LXQT.png
rename to Logo_Orig/LXQT.png

diff --git a/Mate.png b/Logo_Orig/Mate.png
similarity index 100%
rename from Mate.png
rename to Logo_Orig/Mate.png

diff --git a/RedHat.png b/Logo_Orig/RedHat.png
similarity index 100%
rename from RedHat.png
rename to Logo_Orig/RedHat.png

diff --git a/Suse.png b/Logo_Orig/Suse.png
similarity index 100%
rename from Suse.png
rename to Logo_Orig/Suse.png

diff --git a/Ubuntu.png b/Logo_Orig/Ubuntu.png
similarity index 100%
rename from Ubuntu.png
rename to Logo_Orig/Ubuntu.png

diff --git a/Xfce.png b/Logo_Orig/Xfce.png
similarity index 100%
rename from Xfce.png
rename to Logo_Orig/Xfce.png

diff --git a/Makefile b/Makefile
index 44f5fbf909b06d5f4e5de9023c4381f5dd3749ed..c139ca4ec9d79bb1a2ba8d7e5a6bc56eb625d513 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,19 @@
 CLICKSLIDE = clickslide/clickslide.sh
 
+.PHONY: default logos images
+
 default: $(addsuffix .html, $(basename $(wildcard *.short)))
+logos: $(addprefix Logo/, $(notdir $(wildcard Logo_Orig/*.png)))
+images: $(addprefix IMG/, $(notdir $(wildcard IMG_Orig/*.jpg IMG_Orig/*.jpeg)))
 
-%.html: %.short
+%.html: %.short logos images
        ${CLICKSLIDE} < $< > $@
+
+Logo/%.png: Logo_Orig/%.png
+       convert "$<" -resize x72 "$@"
+
+IMG/%.jpg: IMG_Orig/%.jpg
+       convert "$<" -resize x720 "$@"
+
+IMG/%.jpeg: IMG_Orig/%.jpeg
+       convert "$<" -resize x720 "$@"

diff --git a/Tag_1.short b/Tag_1.short
index f23c1e28022849582d35ba6d0ad22960756e9d56..f78ec63df2c72d071bcf41beaebb4659cd6ba8b2 100644 (file)
--- a/Tag_1.short
+++ b/Tag_1.short
@@ -84,7 +84,7 @@
 ]
 
 [slide [h2 Was ist Unix?]
-  [img src="Thompson_Ritchie.jpg" style="max-width: 40%; max-height: 80vh;"]
+  [img src="IMG/Thompson_Ritchie.jpg" style="max-width: 40%; max-height: 80vh;"]
   [ul style="display: inline-block; vertical-align:top;"
     [li 1969 von an den Bell Labs für [a href="https://en.wikipedia.org/wiki/PDP-7" PDP-7] konzipiert]
     [li Von "C"-Erfinder Dennis Ritchie und Ken Thompson]
@@ -103,7 +103,7 @@
 ]
 
 [slide [h2 Was ist GNU?]
-  [img src="Stallman.jpg" style="max-width: 40%; max-height: 80vh;"]
+  [img src="IMG/Stallman.jpg" style="max-width: 40%; max-height: 80vh;"]
   [ul style="display: inline-block; vertical-align:top;"
     [li 1983 am durch Richard M. Stallman am MIT begonnen]
     [li Auslöser war u.A. Missmut über Kopierschutzpraktiken]
@@ -130,7 +130,7 @@
     [li Lauffähig mit GNU-Dienstprogrammen]
     [p style="text-align: center; font-size: 2em; line-height: 1.25em;" GNU + Linux]
   ]
-  [img src="Torvalds.jpg" style="max-width: 40%; max-height: 80vh;"]
+  [img src="IMG/Torvalds.jpg" style="max-width: 40%; max-height: 80vh;"]
 ]
 
 [slide [h2 Was ist eine Distribution?]
@@ -147,12 +147,14 @@
 
 [slide [h2 Beispiele für Distributionen]
   [ul
-    [li [img src="Ubuntu.png" style="height:1em;"] Ubuntu - Kommerzielle Distribution basierend auf Debian]
-    [li [img src="Debian.png" style="height:1em;"] Debian - Frühe Distribution mit Online-Paketsystem]
-    [li [img src="Gentoo.png" style="height:1em;"] Gentoo - Zusammenstellung von Quellcode zum selbst anpassen]
-    [li [img src="Archlinux.png" style="height:1em;"] Arch - Verbreitete Distribution mit eigenem Paketsystem]
-    [li [img src="Knoppix.png" style="height:1em;"] Knoppix - Debian basiertes Live-System]
-    [li [img src="Fedora.png" style="height:1em;"] Fedora, [img src="RedHat.png" style="height:1em;"] RedHat, [img src="Suse.png" style="height:1em;"] Suse, Parabola, Puppy, Rebecca Black, ...]
+    [li [img src="Logo/Ubuntu.png" style="height:1em;"] Ubuntu - Kommerzielle Distribution basierend auf Debian]
+    [li [img src="Logo/Debian.png" style="height:1em;"] Debian - Frühe Distribution mit Online-Paketsystem]
+    [li [img src="Logo/Gentoo.png" style="height:1em;"] Gentoo - Zusammenstellung von Quellcode zum selbst anpassen]
+    [li [img src="Logo/Archlinux.png" style="height:1em;"] Arch - Verbreitete Distribution mit eigenem Paketsystem]
+    [li [img src="Logo/Knoppix.png" style="height:1em;"] Knoppix - Debian basiertes Live-System]
+    [li [img src="Logo/Fedora.png" style="height:1em;"] Fedora,
+        [img src="Logo/RedHat.png" style="height:1em;"] RedHat,
+        [img src="Logo/Suse.png" style="height:1em;"] Suse, Parabola, Puppy, Rebecca Black, ...]
     [li Tausende weitere]
   ]
 ]
@@ -160,16 +162,16 @@
 [slide [h2 Desktopumgebungen]
   Grafische Bedienoberflächen können sehr unterschiedlich aussehen
   [ul
-    [li [img src="Gnome.png" style="height:1em;"] Gnome]
-    [li [img src="KDE.png" style="height:1em;"] KDE]
-    [li [img src="LXDE.png" style="height:1em;"] LXDE]
-    [li [img src="Xfce.png" style="height:1em;"] Xfce]
-    [li [img src="Mate.png" style="height:1em;"] Maté,
-        [img src="I3.png" style="height:1em;"] i3,
-        [img src="Awesome.png" style="height:1em;"] Awesome,
-        [img src="GNUstep.png" style="height:1em;"] WindowMaker,
-        [img src="LXQT.png" style="height:1.375em; vertical-align: text-bottom;" alt="LXQT"],
-        [img src="Enlightenment.png" style="height:1em; background-color: #333;"] Enlightenment,
+    [li [img src="Logo/Gnome.png" style="height:1em;"] Gnome]
+    [li [img src="Logo/KDE.png" style="height:1em;"] KDE]
+    [li [img src="Logo/LXDE.png" style="height:1em;"] LXDE]
+    [li [img src="Logo/Xfce.png" style="height:1em;"] Xfce]
+    [li [img src="Logo/Mate.png" style="height:1em;"] Maté,
+        [img src="Logo/I3.png" style="height:1em;"] i3,
+        [img src="Logo/Awesome.png" style="height:1em;"] Awesome,
+        [img src="Logo/GNUstep.png" style="height:1em;"] WindowMaker,
+        [img src="Logo/LXQT.png" style="height:1.375em; vertical-align: text-bottom;" alt="LXQT"],
+        [img src="Logo/Enlightenment.png" style="height:1em; background-color: #333;"] Enlightenment,
         usw...]
     [li Unterscheidung: Window Manager, Toolkit, Softwaresuite]
   ]