diff options
Merge branch 'talks/linuxgraphy-by-strabo' into 'master'
[talks/lbs] Updated slide text to not be so close to edge and doubled...
See merge request Syndamia/syndamiadotcom!5
3 files changed, 68 insertions, 22 deletions
| -rw-r--r-- | awk-edits/Flags.awk | 2 | ||||
| -rw-r--r-- | awk-edits/Pagenav.awk | 2 | ||||
| -rw-r--r-- | awk-edits/Presentation.awk | 86 |
diff --git a/awk-edits/Flags.awk b/awk-edits/Flags.awk index 6f62916..928b586 100644 --- a/awk-edits/Flags.awk +++ b/awk-edits/Flags.awk @@ -16,6 +16,8 @@ BEGIN { flag[1] = "gb" flagTitle[1] = "ENG" + flag[2] = "bg" + flagTitle[2] = "BG" for (i = 1; i <= length(flag); i++) { flagExp[i] = "&&" flag[i] diff --git a/awk-edits/Pagenav.awk b/awk-edits/Pagenav.awk index 46589fb..ddf74ff 100644 --- a/awk-edits/Pagenav.awk +++ b/awk-edits/Pagenav.awk @@ -14,7 +14,7 @@ BEGIN { fileCheck = ARGV[1] # FILENAME isn't available in BEGIN - if (match(fileCheck, /(blog|tutorials)\/.*\//) == 0) { + if (match(fileCheck, /(blog|tutorials|talks)\/.*\//) == 0) { found = 1 } else { diff --git a/awk-edits/Presentation.awk b/awk-edits/Presentation.awk index f0bbb4a..171ec7e 100644 --- a/awk-edits/Presentation.awk +++ b/awk-edits/Presentation.awk @@ -48,6 +48,14 @@ # Available values for SIZE: 18, 20, 27, 30, 37 # &&/font Text between &&fontSIZE and &&/font is sized accordingly # +# &&frcen Shorthand for "&&frow &&flexer &¢ered" +# Useful for horizontally centered items +# &&/frcen Shorthand for "&&/centered &&flexer &&/frow" +# +# &&clide Shorthand for "&&slide &&flexer &¢ered" +# Useful for section pages +# &&/clide Shorthand for "&&/centered &&flexer &&/slide" +# # -- Surroundings -- # # As stated, there can only be one presentation per page. @@ -74,29 +82,58 @@ BEGIN { ended[ 1] = 0 names[ 2] = "/font" # all font ftags can be closed with a &&/font ended[ 2] = 0 - - names[ 3] = "slide" + names[ 3] = "table" ended[ 3] = 1 - names[ 4] = "centered" + names[ 4] = "ftable" ended[ 4] = 1 - names[ 5] = "flexer" - ended[ 5] = 2 - names[ 6] = "frow" - ended[ 6] = 1 - names[ 7] = "fcol" - ended[ 7] = 1 - names[ 8] = "font18" - ended[ 8] = 0 - names[ 9] = "font20" - ended[ 9] = 0 - names[10] = "font27" - ended[10] = 0 - names[11] = "font30" - ended[11] = 0 - names[12] = "font35" - ended[12] = 0 - names[13] = "fright" - ended[13] = 1 + names[ 5] = "tarow" + ended[ 5] = 0 + + # Line breaks + names[ 6] = "lineb1" + ended[ 6] = 2 + names[ 7] = "lineb2" + ended[ 7] = 2 + names[ 8] = "lineb3" + ended[ 8] = 2 + names[ 9] = "lineb4" + ended[ 9] = 2 + names[10] = "lineb5" + ended[10] = 2 + names[11] = "lineb6" + ended[11] = 2 + names[12] = "lineb7" + ended[12] = 2 + names[13] = "lineb8" + ended[13] = 2 + names[14] = "lineb9" + ended[14] = 2 + + # Font sizes + names[15] = "font18" + ended[15] = 0 + names[16] = "font20" + ended[16] = 0 + names[17] = "font25" + ended[17] = 0 + names[18] = "font27" + ended[18] = 0 + names[19] = "font30" + ended[19] = 0 + names[20] = "font35" + ended[20] = 0 + + # Everything else + names[21] = "slide" + ended[21] = 1 + names[22] = "clide" + ended[22] = 1 + names[23] = "centered" + ended[23] = 1 + names[24] = "cont" + ended[24] = 1 + names[25] = "fright" + ended[25] = 1 pres = ORS \ "<nav id=\"presentCont\">" ORS \ @@ -124,6 +161,13 @@ BEGIN { rep[i] = rep[i] "</div>" } } + + rep[3] = "<div class=\"layout-table\"><div class=\"layout-row\">" + crep[3] = "</div></div>" + rep[4] = "<div class=\"layout-table fixed-layout\"><div class=\"layout-row\">" + rep[5] = "</div><div class=\"layout-row\">" + rep[22] = "<div class=\"slide clide\"><div></div><div>" + crep[22] = "</div><div></div></div>" } function presentationSubstitute(ind) { |