trans-coord/gnun/server/gnun ChangeLog expand-s...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/09/24 13:06:39

Modified files:
        gnun/server/gnun: ChangeLog expand-ssi.awk NEWS 

Log message:
        Fix expansion of nested conditionals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.290&r2=1.291
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/expand-ssi.awk?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -b -r1.290 -r1.291
--- ChangeLog   14 Sep 2012 04:24:19 -0000      1.290
+++ ChangeLog   24 Sep 2012 13:06:39 -0000      1.291
@@ -1,3 +1,8 @@
+2012-09-24  Pavel Kharitonov  <address@hidden>
+
+       * expand-ssi.awk: Fix expansion of nested conditionals.
+       * NEWS: Update.
+
 2012-09-14  Pavel Kharitonov  <address@hidden>
 
        * gnun-preconvert.in: Add options to po4a-gettextize

Index: expand-ssi.awk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/expand-ssi.awk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- expand-ssi.awk      31 May 2012 04:54:03 -0000      1.2
+++ expand-ssi.awk      24 Sep 2012 13:06:39 -0000      1.3
@@ -391,7 +391,8 @@
           while(ch_i <= ch_n && !finish)
             {
               exp_val = 1
-              # `Else' branches are output unconditionally.
+              # `Else' branches are output unconditionally
+              # (no matching `if'/`elif' found).
               if(chunks[ch_i] !~ /^else[[:blank:]\r\n]+-->/)
                 {
                   exp_l = index(chunks[ch_i], "expr=") + length("expr=")
@@ -420,14 +421,14 @@
                   # `Endif': break if we are at the initial depth.
                   if(chunks[ch_i] ~ /^endif[[:blank:]\r\n]+-->/)
                     {
-                      if(--d > 0)
+                      if(d-- > 0)
                         continue
                       finish = !0; process_endif(); break
                     }
                   # `Else' or `elif': break if we are at the initial depth.
-                  if(d == 0 && chunks[ch_i] ~ /^else[[:blank:]\r\n]+-->/ \
+                  if(d == 0 && (chunks[ch_i] ~ /^else[[:blank:]\r\n]+-->/ \
                      || chunks[ch_i] ~ /^elif[[:blank:]\r\n]+\
-expr=('.*'|".*")[[:blank:]\r\n]+-->/)
+expr=('.*'|".*")[[:blank:]\r\n]+-->/))
                     break
                 } # while (++ch_i <= ch_n)
             } # while(ch_i <= ch_n && !finish)

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- NEWS        14 Sep 2012 04:24:19 -0000      1.64
+++ NEWS        24 Sep 2012 13:06:39 -0000      1.65
@@ -32,6 +32,9 @@
 *** `gnun-preconvert' didn't work with HTML files from working copy
     because they are not well-formed HTML due to using SSI.
 
+*** `gnun-validate-html' didn't expand some nested conditional statements
+    correctly.
+
 * Changes in GNUnited Nations 0.6 (2012-06-28)
 
 ** New target in GNUmakefile: `validate-all'.