trans-coord/gnun/server/gnun GNUmakefile Change...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/12/18 18:43:33

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog NEWS 

Log message:
        (extract-title): Look for `<title>' when there is no `<h2>'
        in the file, like in distros/screenshot.html.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.323&r2=1.324
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.75&r2=1.76

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- GNUmakefile 7 Dec 2012 13:25:53 -0000       1.147
+++ GNUmakefile 18 Dec 2012 18:43:32 -0000      1.148
@@ -691,8 +691,11 @@
 # (sysadmin RT #600797).  Used only in article-rules, and only if
 # ANNOUNCE=yes.
 define extract-title
-echo -n \`$(GREP) --max-count=1 '<h2' address@hidden \
-  | $(SED) '/<\/h2>/!s/$$$$/.../;s/.*<h2[^>]*>//;s/<\/h2>.*//' \
+title_tag='h2'; \
+if ! $(GREP) -q "<$$$$title_tag" $$@; then title_tag='title'; fi; \
+echo -n \`$(GREP) --max-count=1 "<$$$$title_tag" address@hidden \
+  | $(SED) '/<\/'$$$$title_tag'>/!s/$$$$/.../;\
+            s/.*<'$$$$title_tag'[^>]*>//;s/<\/'$$$$title_tag'>.*//' \
   | $(SED) 's/\&[mn]dash;/--/g; s/\&nbsp;/ /g' \
   | $(SED) 's/\&..quo;/"/g' | base64 --wrap=0
 endef

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -b -r1.323 -r1.324
--- ChangeLog   17 Dec 2012 18:44:58 -0000      1.323
+++ ChangeLog   18 Dec 2012 18:43:33 -0000      1.324
@@ -1,3 +1,9 @@
+2012-12-19  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (extract-title): Look for `<title>' when
+       there is no `<h2>' in the file, like in distros/screenshot.html.
+       * NEWS: Update.
+
 2012-12-17  Pavel Kharitonov  <address@hidden>
 
        * gnun-diff-po.in: Eliminate a msgattrib invocation; remove

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- NEWS        14 Dec 2012 17:56:37 -0000      1.75
+++ NEWS        18 Dec 2012 18:43:33 -0000      1.76
@@ -76,6 +76,9 @@
     library as per
     http://gnu.org/prep/maintain/html_node/FSF_002dCopyrighted-Package.html
 
+*** When extracting article's title for the announcement, look
+    for `<title>' when there is no `<h2>' in the file.
+
 * Changes in GNUnited Nations 0.6 (2012-06-28)
 
 ** New target in GNUmakefile: `validate-all'.