trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       14/01/10 14:49:39

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

Log message:
        Make `split-gnun' work in templates.
        
        * GNUmakefile (optional-template-lang-rules):
        (extra-template-lang-rules): Generate translated HTML from
        $(1).proto rather than from the original HTML.
        (merge-empty-lines, output-article-html): Substitute GNUN
        tags in `merge-empty-lines' rather than in `output-article-html'.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.398&r2=1.399
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.98&r2=1.99

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- ChangeLog   10 Jan 2014 07:16:37 -0000      1.398
+++ ChangeLog   10 Jan 2014 14:49:39 -0000      1.399
@@ -1,5 +1,17 @@
 2013-01-10  Pavel Kharitonov  <address@hidden>
 
+       Make `split-gnun' work in templates.
+
+       * GNUmakefile (optional-template-lang-rules):
+       (extra-template-lang-rules): Generate translated HTML from
+       $(1).proto rather than from the original HTML.
+       (merge-empty-lines, output-article-html): Substitute GNUN
+       tags in `merge-empty-lines' rather than in
+       `output-article-html'.
+       * NEWS: Update.
+
+2013-01-10  Pavel Kharitonov  <address@hidden>
+
        * doc/gnun.texi (Concepts): Fix reference to
        `Files and Directories'; reword a sentence more precisely.
        (Main Variables): Minor rewording.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- GNUmakefile 24 Dec 2013 07:12:56 -0000      1.175
+++ GNUmakefile 10 Jan 2014 14:49:39 -0000      1.176
@@ -481,10 +481,12 @@
   $(call substitute-localized-includes,$(1)) $(3)
 endef
 
-# Eliminate more than 1 subsequent empty lines before comments in file $(1).
+# Eliminate more than 1 subsequent empty lines before comments in file $(1);
+# remove GNUN tags.
 define merge-empty-lines
 $(SED) --in-place \
-  ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $(1)
+  ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $(1); \
+$(SED) --in-place 's/<gnun>\(.*\)<\/gnun>/\1/g' $(1)
 endef
 
 comma := ,
@@ -711,8 +713,7 @@
        [ -f $$@ ] || (cp $$< $$@ ; $(VCSSKIP) $(vcs) add $$@)
        $(call update-po,$$@,$$<,$(2))
 
-$(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
-                            $(1).$(2).po
+$(subst /po/,/,$(1)).$(2).html: $(1).proto $(1).$(2).po
        $(call update-po,$(1).$(2).po,$(1).pot,$(2))
        $$(addfile)
        $(call generate-html,$(2),$(1).$(2).po,$$@)
@@ -744,8 +745,7 @@
 $(1).$(2).po: $(1).pot.opt $(MASTER-$(2))
        $(call update-po,$$@,$$<,$(2))
 
-$(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
-                            $(1).$(2).po
+$(subst /po/,/,$(1)).$(2).html: $(1).proto $(1).$(2).po
        $(call update-po,$(1).$(2).po,$(1).pot.opt,$(2))
        $(call generate-html,$(2),$(1).$(2).po,$$@)
        $(call merge-empty-lines,$$@)
@@ -806,7 +806,6 @@
 define output-article-html
 $(call generate-html,$(2),$(1).po${po-suffix},address@hidden); \
 $(call insert-ssi-vars,address@hidden,$$@); \
-$(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" address@hidden; \
 $(call merge-empty-lines,address@hidden) \
 $(if $(findstring $(basename $(1)),$(no-validate-items)), , \
   && $(call validate-article,$(1)))

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- NEWS        31 Dec 2013 09:20:10 -0000      1.98
+++ NEWS        10 Jan 2014 14:49:39 -0000      1.99
@@ -1,5 +1,11 @@
 GNUnited Nations NEWS - User visible changes.
 
+* Changes in GNUnited Nations 0.9 (????-??-??)
+
+** Bugs fixed in 0.9.
+
+*** <span class="gnun-split"></span> didn't work in templates.
+
 * Changes in GNUnited Nations 0.8 (2013-12-31)
 
 *** `msgattrib --previous' is used when available.