[presentation] Added font sizing options and a float right option

2 files changed, 69 insertions, 20 deletions

diff --git a/generate-hooks/create-presentation.awk b/generate-hooks/create-presentation.awk
index fe10d0b..04fb6d0 100644
--- a/generate-hooks/create-presentation.awk
+++ b/generate-hooks/create-presentation.awk
@@ -1,4 +1,27 @@
 BEGIN {
+	names[ 1] = "slide"
+	ended[ 1] = 1
+	names[ 2] = "centered"
+	ended[ 2] = 1
+	names[ 3] = "flexer"
+	ended[ 3] = 0
+	names[ 4] = "fow"
+	ended[ 4] = 1
+	names[ 5] = "fol"
+	ended[ 5] = 1
+	names[ 6] = "font18"
+	ended[ 6] = 1
+	names[ 7] = "font20"
+	ended[ 7] = 1
+	names[ 8] = "font27"
+	ended[ 8] = 1
+	names[ 9] = "font30"
+	ended[ 9] = 1
+	names[10] = "font35"
+	ended[10] = 1
+	names[11] = "fright"
+	ended[11] = 1
+
 	pres = ORS \
 "<nav id=\"presentCont\">" ORS \
 "	<img id=\"prevSlideBtn\" class=\"unzoomable btn setting-btn icon nodisplay\" src=\"/img/arrow-left-tabler.svg\" alt=\"Previous\">" ORS \
@@ -8,28 +31,24 @@ BEGIN {
 "		</nav>" ORS \
 "		<script type=\"text/javascript\" src=\"/scripts/presentation.js\" integrity=\"sha512-79MwfB0EQJMdVjVnd3PA0Cn9fo4JaMUmNuyZNEGSbaMEGcqdE8sWWAbMLheaoptDyb/KuYgNw0pKwvR5Dw+lJw==\" crossorigin=\"anonymous\"></script>"
 
-	names[1] = "slide"
-	ended[1] = 1
-	names[2] = "centered"
-	ended[2] = 1
-	names[3] = "flexer"
-	ended[3] = 0
-	names[4] = "fow"
-	ended[4] = 1
-	names[5] = "fol"
-	ended[5] = 1
-	names[6] = "font18"
-	ended[6] = 1
+	for (i = 1; i <= length(names); i++) {
+		pat[i] = "<p>&#38;&#38;" names[i] "</p>"
+		rep[i] = "<div class=\"" names[i] "\">"
+
+		if (ended[i] == 1) {
+			cpat[i] = "<p>&#38;&#38;&#47;" names[i] "</p>"
+			crep[i] = "</div>"
+		}
+		else {
+			rep[i] = rep[i] "</div>"
+		}
+	}
 }
 
 function substitute(ind) {
-	if (ended[ind] == 1) {
-		gsub("<p>&#38;&#38;" names[ind] "</p>", "<div class=\"" names[ind] "\">")
-		gsub("<p>&#38;&#38;&#47;" names[ind] "</p>", "</div>")
-	}
-	else {
-		gsub("<p>&#38;&#38;" names[ind] "</p>", "<div class=\"" names[ind] "\"></div>")
-	}
+	gsub(pat[ind], rep[ind])
+	if (ended[ind] == 1)
+		gsub(cpat[ind], crep[ind])
 }
 
 {
@@ -37,7 +56,7 @@ function substitute(ind) {
 	gsub("<p>&#38;&#38;&#47;font</p>", "</div>")
 
 	for (i = 1; i <= length(names); i++) {
-		if (index($0, names[i] "<") != 0)
+		if (index($0, names[i]) != 0)
 			substitute(i)
 	}
 
diff --git a/src/presentation.css b/src/presentation.css
index 312423b..4d680d4 100644
--- a/src/presentation.css
+++ b/src/presentation.css
@@ -5,6 +5,7 @@ article {
 }
 
 h2, h3, h4, h5, h6 {
+  display: block;
   margin-block-start: 0;
   margin-block-end: 0.5em;
 }
@@ -73,6 +74,35 @@ h2, h3, h4, h5, h6 {
   flex: 1;
 }
 
+.font35 {
+  font-size: 35px;
+}
+
+.font30 {
+  font-size: 30px;
+}
+
+.font27 {
+  font-size: 27px;
+}
+
+.font20 {
+  font-size: 20px;
+}
+
+.font18 {
+  font-size: 18px;
+}
+
+.font35, .font30, .font27, .font20, .font18 {
+  line-height: 1.5em;
+}
+
+.fright {
+  float: right;
+  text-align: right;
+}
+
 /* Media specific stylings */
 
 @media screen {