trans-coord/gnun/server/gnun ChangeLog NEWS gnu...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/05/21 10:18:34

Modified files:
        gnun/server/gnun: ChangeLog NEWS gnun-validate-html.in 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        New option, `--apache-vars'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.372&r2=1.373
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -b -r1.372 -r1.373
--- ChangeLog   19 May 2013 16:37:55 -0000      1.372
+++ ChangeLog   21 May 2013 10:18:34 -0000      1.373
@@ -1,3 +1,9 @@
+2013-05-21  Pavel Kharitonov  <address@hidden>
+
+       * gnun-validate-html.in: New option, `--apache-vars'.
+       * gnun.texi (gnun-validate-html): Update.
+       * NEWS: Likewise.
+
 2013-05-19  Pavel Kharitonov  <address@hidden>
 
        * diff-po.awk.in (print_entry): Escape `&' in `sub'

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- NEWS        19 May 2013 16:37:56 -0000      1.87
+++ NEWS        21 May 2013 10:18:34 -0000      1.88
@@ -16,6 +16,9 @@
 *** New option in `gnun-diff-po' not to output strings that don't
     differ: `--no-common'.
 
+*** New option in `gnun-validate-html' to specify emulated Apache
+    variables: `--apache-vars'.
+
 ** Bugs fixed in 0.8.
 
 *** `gnun-diff-po' didn't process empty comments correctly.

Index: gnun-validate-html.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnun-validate-html.in       18 Oct 2012 04:49:36 -0000      1.17
+++ gnun-validate-html.in       21 May 2013 10:18:34 -0000      1.18
@@ -34,6 +34,8 @@
 Options:
       --expand-to=FILE       Specify file to output expanded HTML
       --root=DIRECTORY       Specify top directory for working copy
+      --apache-vars="VAR1=VAL1;VAR2=VAL2..."
+                             Specify predefined Apache variables
   -v, --verbose              Produce more verbose output intended
                                for email reports
       --version              Display version info and exit
@@ -51,6 +53,7 @@
 params=$#
 ROOT=../..
 OUTPUT=
+MORE_VARS=
 verbose=no
 
 while [ ${params} -ge 1 ]; do
@@ -82,6 +85,14 @@
       --expand-to=* )
          OUTPUT="${1#--expand-to=}"
          ;;
+      --apache-vars )
+         shift
+         params=$((${params}-1))
+         MORE_VARS=";$1"
+         ;;
+      --apache-vars=* )
+         MORE_VARS=";${1#--apache-vars=}"
+         ;;
       * )
           break
          ;;
@@ -121,7 +132,7 @@
 if ! LANG=C @AWK@ -f @pkglibexecdir@/expand-ssi.awk -v root="${ROOT}" \
        -v passed_vars="DOCUMENT_NAME=${document_name};\
 DOCUMENT_URI=${dir_from_root}/${document_name};\
-REQUEST_URI=${dir_from_root}/${document_name}" $1 \
+REQUEST_URI=${dir_from_root}/${document_name}$MORE_VARS" $1 \
        > "${OUTPUT}" 2> $TMP2; then
   echo Failed to expand SSIs:
   cat $TMP2

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- doc/gnun.texi       4 Apr 2013 05:10:50 -0000       1.87
+++ doc/gnun.texi       21 May 2013 10:18:34 -0000      1.88
@@ -2580,6 +2580,10 @@
 @item address@hidden
 Save the expanded HTML as @var{file}.
 
address@hidden --apache-vars="@var{var1=val1;var2=val2...}"
+Specify additional (or override assumed) emulated predefined Apache
+variables.
+
 @item -v, --verbose
 Produce more detailed output intended for automatic email reports;
 essentially, it adds the expanded HTML to facilitate finding errors