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

[Ineiev]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Ineiev <ineiev> 22/11/14 08:04:51

Modified files:
        gnun/server/gnun: ChangeLog NEWS Makefile.am 
Added files:
        gnun/server/gnun: make-prototype.awk.in 
Removed files:
        gnun/server/gnun: make-prototype.awk 

Log message:
        Configure make-prototype.awk.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.507&r2=1.508
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype.awk.in?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype.awk?cvsroot=trans-coord&r1=1.8&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -b -r1.507 -r1.508
--- ChangeLog   9 Nov 2022 09:43:40 -0000       1.507
+++ ChangeLog   14 Nov 2022 13:04:51 -0000      1.508
@@ -1,3 +1,13 @@
+2022-11-14  Pavel Kharitonov  <ineiev@gnu.org>
+
+       * confugure.ac: Configure make-prototype.awk.
+       * Makefile.am (EXTRA_DIST): Add make-prototype.awk.in.
+       (pkglibexec_SCRIPTS): Add make-prototype.awk.
+       (dist_pkglibexec_SCRIPTS): Remove variable assignment.
+       * make-prototype.awk:
+       * make-prototype.awk.in: Rename.
+       * NEWS: Update.
+
 2022-11-09  Pavel Kharitonov  <ineiev@gnu.org>
 
        Release 1.3.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- NEWS        9 Nov 2022 09:43:44 -0000       1.159
+++ NEWS        14 Nov 2022 13:04:51 -0000      1.160
@@ -1,5 +1,11 @@
 GNUnited Nations NEWS - User-visible changes.
 
+* Changes in GNUnited Nations 1.4 (????-??-??)
+
+** Bugs fixed in 1.4
+
+*** make-prototype.awk was used instead of make-prototype.awk.in.
+
 * Changes in GNUnited Nations 1.3 (2022-11-09)
 
 * The SSI expansion function in gnun-validate-html rudimentarily

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- Makefile.am 9 Nov 2022 08:23:48 -0000       1.52
+++ Makefile.am 14 Nov 2022 13:04:51 -0000      1.53
@@ -86,13 +86,11 @@
 if HAVE_SORT
 tests_enabled += collate
 endif
-pkglibexec_SCRIPTS += sort.awk
+pkglibexec_SCRIPTS += sort.awk make-prototype.awk
 
 tests_available += make-prototype localized-urls/1
 tests_enabled += make-prototype localized-urls/1
 
-dist_pkglibexec_SCRIPTS = make-prototype.awk
-
 installcheck-local:
        @failed=0; pass=0; skip=0; \
        for i in $(tests_available); do \
@@ -212,6 +210,7 @@
             expand-ssi.awk.in gnun-add-fuzzy-diff.in gnun-diff-po.in \
             gnun-init-po.in gnun-link-diff.in gnun-merge-preconverted.in \
             gnun-report.in gnun-validate-html.in link-diff.awk \
+            make-prototype.awk.in \
             mailfail.in sort.awk.in sort-linguas update-localized-urls.in \
             validate-html-notify.in \
             tests/add-fuzzy-diff tests/fuzzy-diff-0.po tests/fuzzy-diff-1.po \

Index: make-prototype.awk.in
===================================================================
RCS file: make-prototype.awk.in
diff -N make-prototype.awk.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make-prototype.awk.in       14 Nov 2022 13:04:51 -0000      1.1
@@ -0,0 +1,84 @@
+#! @AWK@ -f
+# make-prototype.awk: generate `prototype' HTML.
+
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
+#   2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations 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 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations 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 GNUnited Nations.  If not, see <http://www.gnu.org/licenses/>.
+
+# Fallback for awks who don't support RT.
+BEGIN { RT = "\n" }
+
+# Read whole file to `text'.
+{ text = text $0 RT }
+
+END {
+  # Program name to prepend error messages.
+  my_name = "make-prototype.awk: "
+
+  # As of 2022-11-07, 'one true' awk doesn't seem to support regular
+  # expressions split into lines with '\'.
+  regex = "<title>.*</div>.*<div[\t\r\n ]+([^>]*[\t\r\n ])?id[\t\r\n ]*" \
+    "=[\t\r\n ]*((\"footer\")|('footer'))[^>]*>"
+  if (!match(text, regex))
+    {
+      print my_name \
+        "`<title>' followed by `</div>' and `<div id=\"footer\"...>' not 
found" \
+         > "/dev/stderr"
+      exit 1
+    }
+  output = ""
+  parts[3] = substr (text, RSTART + RLENGTH)
+  text = substr (text, 1, RSTART + RLENGTH - 1)
+  if (RSTART > 1)
+    {
+      output = substr (text, 1, RSTART - 1)
+      text = substr (text, RSTART)
+    }
+  match(text, /.*<\/div>/)
+  parts[1] = substr (text, 1, RLENGTH - 6)
+  parts[2] = substr (text, RLENGTH + 1 - 6)
+  output = output "<gnun></gnun>"\
+    "<!-- This file is automatically generated by GNUnited Nations! -->\n" \
+    parts[1] \
+"<div class=\"translators-notes\">\n" \
+"<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->\n" \
+"*GNUN-SLOT: TRANSLATOR'S NOTES*</div>\n" \
+    parts[2]
+
+  if(!match (parts[3], /<p[^>]*>.*[$]Date:/))
+    {
+      print my_name \
+        "no `<p>' followed by `$Date:' after `<div id=\"footer\"...>' found" \
+         > "/dev/stderr"
+      exit 1
+    }
+  tail[1] = substr (parts[3], 1, RSTART + RLENGTH - 1)
+  tail[2] = substr (parts[3], RSTART + RLENGTH)
+  # Find the last <p> in tail[1].
+  match (tail[1], /.*<p[^>]*>/)
+  start = RSTART;
+  p = substr (tail[1], 1, RSTART + RLENGTH - 1);
+  match (p, /<p[^>]*>$/)
+  start = start + RSTART - 1;
+  # Insert translators' credits before the last <p>.
+  tail[2] = substr (tail[1], start) tail[2]
+  tail[1] = substr (tail[1], 1, start - 1)
+  printf "%s", output tail[1] \
+"<div class=\"translators-credits\">\n" \
+"<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->\n" \
+"*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>\n\n" tail[2]
+}

Index: make-prototype.awk
===================================================================
RCS file: make-prototype.awk
diff -N make-prototype.awk
--- make-prototype.awk  9 Nov 2022 08:23:50 -0000       1.8
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,84 +0,0 @@
-#! @AWK@ -f
-# make-prototype.awk: generate `prototype' HTML.
-
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-#   2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
-
-# This file is part of GNUnited Nations.
-
-# GNUnited Nations 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 3 of the
-# License, or (at your option) any later version.
-
-# GNUnited Nations 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 GNUnited Nations.  If not, see <http://www.gnu.org/licenses/>.
-
-# Fallback for awks who don't support RT.
-BEGIN { RT = "\n" }
-
-# Read whole file to `text'.
-{ text = text $0 RT }
-
-END {
-  # Program name to prepend error messages.
-  my_name = "make-prototype.awk: "
-
-  # As of 2022-11-07, 'one true' awk doesn't seem to support regular
-  # expressions split into lines with '\'.
-  regex = "<title>.*</div>.*<div[\t\r\n ]+([^>]*[\t\r\n ])?id[\t\r\n ]*" \
-    "=[\t\r\n ]*((\"footer\")|('footer'))[^>]*>"
-  if (!match(text, regex))
-    {
-      print my_name \
-        "`<title>' followed by `</div>' and `<div id=\"footer\"...>' not 
found" \
-         > "/dev/stderr"
-      exit 1
-    }
-  output = ""
-  parts[3] = substr (text, RSTART + RLENGTH)
-  text = substr (text, 1, RSTART + RLENGTH - 1)
-  if (RSTART > 1)
-    {
-      output = substr (text, 1, RSTART - 1)
-      text = substr (text, RSTART)
-    }
-  match(text, /.*<\/div>/)
-  parts[1] = substr (text, 1, RLENGTH - 6)
-  parts[2] = substr (text, RLENGTH + 1 - 6)
-  output = output "<gnun></gnun>"\
-    "<!-- This file is automatically generated by GNUnited Nations! -->\n" \
-    parts[1] \
-"<div class=\"translators-notes\">\n" \
-"<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->\n" \
-"*GNUN-SLOT: TRANSLATOR'S NOTES*</div>\n" \
-    parts[2]
-
-  if(!match (parts[3], /<p[^>]*>.*[$]Date:/))
-    {
-      print my_name \
-        "no `<p>' followed by `$Date:' after `<div id=\"footer\"...>' found" \
-         > "/dev/stderr"
-      exit 1
-    }
-  tail[1] = substr (parts[3], 1, RSTART + RLENGTH - 1)
-  tail[2] = substr (parts[3], RSTART + RLENGTH)
-  # Find the last <p> in tail[1].
-  match (tail[1], /.*<p[^>]*>/)
-  start = RSTART;
-  p = substr (tail[1], 1, RSTART + RLENGTH - 1);
-  match (p, /<p[^>]*>$/)
-  start = start + RSTART - 1;
-  # Insert translators' credits before the last <p>.
-  tail[2] = substr (tail[1], start) tail[2]
-  tail[1] = substr (tail[1], 1, start - 1)
-  printf "%s", output tail[1] \
-"<div class=\"translators-credits\">\n" \
-"<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->\n" \
-"*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>\n\n" tail[2]
-}