diff --git a/Scripts/Bash/Functions/Html/html_updateHeadings.sh b/Scripts/Bash/Functions/Html/html_updateHeadings.sh index a94bc12..8d62049 100644 --- a/Scripts/Bash/Functions/Html/html_updateHeadings.sh +++ b/Scripts/Bash/Functions/Html/html_updateHeadings.sh @@ -135,53 +135,7 @@ function html_updateHeadings { for TOCENTRY in "${TOCENTRIES[@]}";do echo $TOCENTRY done \ - | awk 'BEGIN {FS=":"} - { - if ($1 == 0 && $2 == $3) { - opentags = "" - } - } - if ($1 > 0 && $2 >= $3 && $3 == 1) { - print "" - print "" - } - if ($1 > 0 && $2 < $3) { - for (i = 1; i <= $2; i++) { - print "" - } - } - print "" - }') - + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Style/output_forHeadingsToc.awk) # Update table of contents inside the current file being # processed. diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Brands/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Brands/render.conf.sh index f6d6020..69c313e 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Brands/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Brands/render.conf.sh @@ -29,11 +29,9 @@ function render_loadConfig { local TRANSLATION='' local TEMPLATE='' - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering action. - ACTIONS[1]='renderBrands: tif xpm pdf ppm' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderBrands: tif xpm pdf ppm' # Define matching list. MATCHINGLIST="\ diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Fonts/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Fonts/render.conf.sh index 85e7395..6f073c6 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Fonts/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Fonts/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: ps pdf' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: ps pdf' # Define matching list. MATCHINGLIST="fonts.svg" diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Models/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Models/render.conf.sh index 17da691..bda5ab8 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Models/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Models/render.conf.sh @@ -26,12 +26,10 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: pdf jpg' - ACTIONS[2]='groupByFormat: png pdf jpg' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: pdf jpg' + ACTIONS[2]='POST:groupByFormat: png pdf jpg' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Release/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Release/render.conf.sh index a27bb46..404e4f0 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Release/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Release/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderText' - - # Define post-rendering actions. - ACTIONS[1]='formatText: --width=70 --uniform-spacing' + # Define rendering actions. + ACTIONS[0]='BASE:renderText' + ACTIONS[1]='POST:formatText: --width=70 --uniform-spacing' # Defines matching list. MATCHINGLIST="\ diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Backgrounds/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Backgrounds/render.conf.sh index cc36620..b8af05e 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Backgrounds/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Backgrounds/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering action. - ACTIONS[1]='renderFormats: jpg' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: jpg' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Concept/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Concept/render.conf.sh index 9aa3ead..30e8c27 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Concept/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Concept/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: jpg ps pdf pnm' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: jpg ps pdf pnm' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Header/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Header/render.conf.sh index 07eff78..65ba0c4 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Header/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Header/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Progress/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Progress/render.conf.sh index 979ca39..821e68d 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Progress/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Progress/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST="\ diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Prompt/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Prompt/render.conf.sh index cf0a23f..95653fc 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Prompt/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Prompt/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderSyslinux' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderSyslinux' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Splash/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Splash/render.conf.sh index 2aa3296..1f70d23 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Splash/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Anaconda/Splash/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/Firstboot/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/Firstboot/render.conf.sh index f8fc409..2560648 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/Firstboot/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/Firstboot/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/build-targz.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/build-targz.sh index 37f6ffa..ca9c0fb 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/build-targz.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/build-targz.sh @@ -23,9 +23,6 @@ # $Id: build-targz.sh 42 2010-09-17 05:51:32Z al $ # ---------------------------------------------------------------------- -# Initialize functions -. ~/artwork/trunk/Scripts/Bash/initFunctions.sh - # Define artwork component ARTCOMP="Themes/Distro/BootUp/GDM" diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/render.conf.sh index b434d1f..eae40bc 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GDM/render.conf.sh @@ -26,11 +26,11 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='LAST:renderGdmTgz: 1024x768 1280x1024 1360x250 1360x768 + 160x600 1680x1050 2048x1536 2560x1240 2560x960 260x130 3271x1227 + 800x600' # Define matching list. #MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GRUB/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GRUB/render.conf.sh index 29ef753..2aa96e8 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GRUB/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GRUB/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderGrub' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderGrub' # Define matching list. #MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GSplash/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GSplash/render.conf.sh index 794f47d..9257783 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GSplash/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/GSplash/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KDM/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KDM/render.conf.sh index a7d198b..d67dace 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KDM/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KDM/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KSplash/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KSplash/render.conf.sh index befc54f..db44be3 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KSplash/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/KSplash/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderKSplash' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='LAST:renderKSplash' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/RHGB/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/RHGB/render.conf.sh index 2153596..7838391 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/RHGB/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/BootUp/RHGB/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Desktop/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Desktop/render.conf.sh index 24807c8..fbaae85 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Desktop/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Distro/Desktop/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: jpg' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: jpg' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Clothes/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Clothes/render.conf.sh index cf4b5b6..612c8d1 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Clothes/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Clothes/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. #MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Media/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Media/render.conf.sh index 364ae20..3bacac6 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Media/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Media/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST="\ diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Releases/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Releases/render.conf.sh index ee781ad..df348a5 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Releases/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Releases/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST="release.svg" diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/Posters/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/Posters/render.conf.sh index 8a54654..c065049 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/Posters/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/Posters/render.conf.sh @@ -26,11 +26,9 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: pdf jpg tif' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: pdf jpg tif' # Define matching list. MATCHINGLIST="" diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/render.conf.sh index c3a4f44..ee326af 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Stationery/render.conf.sh @@ -26,11 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - #ACTIONS[1]='' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Web/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Web/render.conf.sh index 9c1aafb..72b2057 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Web/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Themes/Promo/Web/render.conf.sh @@ -26,12 +26,10 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. - ACTIONS[1]='renderFormats: jpg' - ACTIONS[2]='groupByFormat: png jpg' + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' + ACTIONS[1]='POST:renderFormats: jpg' + ACTIONS[2]='POST:groupByFormat: png jpg' # Define matching list. MATCHINGLIST='' diff --git a/Scripts/Bash/Functions/Render/Config/Identity/Widgets/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Identity/Widgets/render.conf.sh index 9a2412b..7ca1b3a 100755 --- a/Scripts/Bash/Functions/Render/Config/Identity/Widgets/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Identity/Widgets/render.conf.sh @@ -26,10 +26,8 @@ function render_loadConfig { - # Define base rendering action. - ACTIONS[0]='renderImage' - - # Define post-rendering actions. + # Define rendering actions. + ACTIONS[0]='BASE:renderImage' # Define matching list. MATCHINGLIST="\ diff --git a/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh b/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh index 1a54223..cc31cf2 100755 --- a/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh +++ b/Scripts/Bash/Functions/Render/Config/Translations/Identity/Brands/render.conf.sh @@ -147,7 +147,5 @@ function render_loadConfig { done done \ - | awk 'BEGIN {FS=": "} \ - { if ( $0 ~ /^-+$/ ) print $0; else \ - printf "%-15s\t%s\n", $1, $2 }' + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Style/output_forRendering.awk } diff --git a/Scripts/Bash/Functions/Render/render_checkConfig.sh b/Scripts/Bash/Functions/Render/render_checkConfig.sh index 5e210a7..201f785 100755 --- a/Scripts/Bash/Functions/Render/render_checkConfig.sh +++ b/Scripts/Bash/Functions/Render/render_checkConfig.sh @@ -26,13 +26,47 @@ function render_checkConfig { - # Check base rendering action. - if [[ ${ACTIONS[0]} == '' ]] \ - || [[ ! ${ACTIONS[0]} =~ '^(renderImage|renderText)$' ]];then + local BASECOUNT=0 + local POSTCOUNT=0 + local LASTCOUNT=0 - cli_printMessage "`gettext "The ACTIONS[0] variable only supports the \\\"renderImage\\\" or \\\"renderText\\\" value."`" - cli_printMessage "$(caller)" "AsToKnowMoreLine" + # Re-define action variables in separated array variables. Once + # verification is done, we remove the BASE, POST, LAST parts from + # action definition in order to have the plain name of function to + # call. + for ACTION in "${ACTIONS[@]}"; do + + # Define base-rendering actions. + if [[ $ACTION =~ '^BASE:render(Text|Image)$' ]];then + ACTION=$(echo "$ACTION" | cut -d: -f2-) + BASEACTIONS[$BASECOUNT]="$ACTION" + BASECOUNT=$(($BASECOUNT + 1)) + + # Define post-rendering actions. + elif [[ $ACTION =~ '^POST:' ]];then + ACTION=$(echo "$ACTION" | cut -d: -f2-) + POSTACTIONS[$POSTCOUNT]="$ACTION" + POSTCOUNT=$(($POSTCOUNT + 1)) + + # Define last-rendering actions. + elif [[ $ACTION =~ '^LAST:' ]];then + ACTION=$(echo "$ACTION" | cut -d: -f2-) + LASTACTIONS[$LASTCOUNT]="$ACTION" + LASTCOUNT=$(($LASTCOUNT + 1)) + fi + done + + # Check base-rendering actions. The base-rendering action defines + # what kind of rendering does centos-art.sh script performs. + # Presently, we only support image rendering (renderImage) and + # text rendering (renderText) as base-rendering actions. + if [[ ${#BASEACTIONS[*]} -lt 1 ]];then + cli_printMessage "`gettext "The BASE action is not defined."`" + cli_printMessage "$(caller)" "AsToKnowMoreLine" + elif [[ ${#BASEACTIONS[*]} -gt 1 ]];then + cli_printMessage "`gettext "Just one definition for BASE action is supported."`" + cli_printMessage "$(caller)" "AsToKnowMoreLine" fi # Check post-rendering actions. Validation of post-rendering diff --git a/Scripts/Bash/Functions/Render/render_doIdentity.sh b/Scripts/Bash/Functions/Render/render_doIdentity.sh index 308a109..d5fdaae 100755 --- a/Scripts/Bash/Functions/Render/render_doIdentity.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentity.sh @@ -57,18 +57,22 @@ function render_doIdentity { # Define which type of rendering features does centos-art.sh # script is able to performs. - case ${ACTIONS[0]} in + for ACTION in "${BASEACTIONS[@]}"; do - 'renderText' ) - # Provides text rendering feature. - render_doIdentityTexts - ;; + case $ACTION in - 'renderImage' ) - # Provides image rendering feature. - render_doIdentityImages - ;; + 'renderText' ) + # Provides text rendering feature. + render_doIdentityTexts + ;; - esac + 'renderImage' ) + # Provides image rendering feature. + render_doIdentityImages + ;; + + esac + + done } diff --git a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh index e1c378b..bb87912 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityImages.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityImages.sh @@ -95,18 +95,8 @@ function render_doIdentityImages { rm $INSTANCE fi - # Check post-rendering actions. Do we have any? If we don't, - # then continue with the next file in the list. - if [[ ${#ACTIONS[@]} -lt 1 ]];then - continue - fi - # Execute post-rendering actions. - for ACTION in "${ACTIONS[@]}"; do - - if [[ "$ACTION" == '' ]] || [[ "$ACTION" == 'renderImage' ]];then - continue - fi + for ACTION in "${POSTACTIONS[@]}"; do case "$ACTION" in @@ -131,7 +121,7 @@ function render_doIdentityImages { ;; groupByFormat:* ) - groupByFormat "$FILE" "$ACTION" + render_doIdentityGroupByFormat "$FILE" "$ACTION" ;; esac @@ -141,8 +131,23 @@ function render_doIdentityImages { echo '----------------------------------------------------------------------' done \ - | awk 'BEGIN {FS=": "} \ - { if ( $0 ~ /^-+$/ ) print $0; else \ - printf "%-15s\t%s\n", $1, $2 }' + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Style/output_forRendering.awk + + # Execute post-rendering actions. + for ACTION in "${LASTACTIONS[@]}"; do + + case "$ACTION" in + + groupByFormat:* ) + render_doIdentityGroupByFormat "$FILE" "$ACTION" + ;; + + renderGdmTgz:* ) + render_doIdentityGdmTgz "$FILE" "$ACTION" + ;; + + esac + + done } diff --git a/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh b/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh index 9d8f58a..ad97791 100644 --- a/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh +++ b/Scripts/Bash/Functions/Render/render_doIdentityTexts.sh @@ -42,18 +42,8 @@ function render_doIdentityTexts { rm $INSTANCE fi - # Check post-rendering actions. Do we have any? If we don't, - # then continue with the next file in the loop. - if [[ ${#ACTIONS[@]} -lt 1 ]];then - continue - fi - # Execute post-rendering actions. - for ACTION in "${ACTIONS[@]}"; do - - if [[ "$ACTION" == '' ]];then - continue - fi + for ACTION in "${POSTACTIONS[@]}"; do case "$ACTION" in @@ -68,8 +58,15 @@ function render_doIdentityTexts { echo '----------------------------------------------------------------------' done \ - | awk 'BEGIN {FS=": "} \ - { if ( $0 ~ /^-+$/ ) print $0; else \ - printf "%s: \t%s\n", $1, $2 }' + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Style/output_forRendering.awk + + # Execute last-rendering actions. + #for ACTION in "${LASTACTIONS[@]}"; do + # + # case "$ACTION" in + # + # esac + # + #done } diff --git a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh index fbc069a..5035099 100755 --- a/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh +++ b/Scripts/Bash/Functions/Render/render_getActionsIdentity.sh @@ -59,10 +59,13 @@ function render_getActionsIdentity { # Output action message. cli_printMessage "`gettext "Reading configuration file:"` $FILE" - # Define artwork-specific actions array. We need to do this + # Define artwork-specific action arrays. We need to do this # here because ACTIONS variable is unset after # render_doIdentityImages execution. local -a ACTIONS + local -a BASEACTIONS + local -a POSTACTIONS + local -a LASTACTIONS # Initialize artwork-specific pre-rendering configuration # (function) scripts. @@ -111,6 +114,9 @@ function render_getActionsIdentity { # want ACTIONS to do what we exactly tell it to do inside each # artwork-specific pre-rendering configuration script. unset ACTIONS + unset BASEACTIONS + unset POSTACTIONS + unset LASTACTIONS done diff --git a/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh b/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh index e765292..b024105 100755 --- a/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh +++ b/Scripts/Bash/Functions/Render/render_getActionsTranslations.sh @@ -187,7 +187,5 @@ function render_getActionsTranslations { done done \ - | awk 'BEGIN {FS=": "} \ - { if ( $0 ~ /^-+$/ ) print $0; else \ - printf "%-15s\t%s\n", $1, $2 }' + | awk -f /home/centos/artwork/trunk/Scripts/Bash/Style/output_forRendering.awk } diff --git a/Scripts/Bash/Style/output_forHeadingsToc.awk b/Scripts/Bash/Style/output_forHeadingsToc.awk new file mode 100644 index 0000000..bcc0f21 --- /dev/null +++ b/Scripts/Bash/Style/output_forHeadingsToc.awk @@ -0,0 +1,79 @@ +#!/usr/bin/gawk +# +# output_forHadingsToc.awk -- This file provides the output format +# required by html_updateHeadings.sh function, inside centos-art.sh +# script. +# +# Copyright (C) 2009-2010 Alain Reguera Delgado +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. +# +# ---------------------------------------------------------------------- +# $Id$ +# ---------------------------------------------------------------------- + +BEGIN {FS=":"} + +{ + if ($1 == 0 && $2 == $3) { + opentags = "" + } + } + + if ($1 > 0 && $2 >= $3 && $3 == 1) { + print "" + print "" + } + + if ($1 > 0 && $2 < $3) { + for (i = 1; i <= $2; i++) { + print "" + } + } + + print "" +}