trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Pavel Kharitonov
Subject: trans-coord/gnun/server/gnun AUTHORS ChangeLog ...
Date: Sat, 05 Nov 2011 04:16:20 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       11/11/05 04:16:20

Modified files:
        gnun/server/gnun: AUTHORS ChangeLog GNUmakefile Makefile.am 
                          THANKS TODO config.mk.in configure.ac 
Added files:
        gnun/server/gnun: diff-page-head.html diff-page-tail.html 

Log message:
        Add `no-grace-items' target.
        
        Add staged versions for `no-grace' pages.
        
        Don't show outdated notice on `no-grace' pages.
        
        Save latest full translated revision of the English page
        and generate diff to current revision against it
        when the latter is available.
        
        * configure.ac: Detect wdiff.
        * config.mk (WDIFF): New variable.
        * diff-page-head.html:
        * diff-page-tail.html: New files.
        * GNUmakefile (staged-articles, no-grace-items, no-grace-pot)
        (no-grace-po, no-grace-translated, comma): New variables.
        (home-lang): Add $(rootdir)/home-staged.$(1).html.
        (no-grace-items, $(rootdir)/po/home-staged.pot):
        ($(rootdir)/po/home-staged.proto): New targets.
        (staged-rules): New function.
        (home-rules): Accept second argument, name of the page.
        * Makefile.am (edit): Substitute WDIFF.
        (dist_example_DATA): Add diff-page-head.html
        and diff-page-tail.html.
        * TODO: Remove outdated and complete items.
        * AUTHORS:
        * THANKS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/AUTHORS?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/THANKS?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/diff-page-head.html?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/diff-page-tail.html?cvsroot=trans-coord&rev=1.1

Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AUTHORS     24 Oct 2011 06:24:08 -0000      1.4
+++ AUTHORS     5 Nov 2011 04:16:17 -0000       1.5
@@ -5,7 +5,8 @@
 
 Pavel Kharitonov <address@hidden>
 
-    Add dtd/html5.dtd (based on W3C DTD), expand-m4-includes.in,
+    Add diff-page-head.html, diff-page-tail.html,
+        dtd/html5.dtd (based on W3C DTD), expand-m4-includes.in,
         languages.txt (compiled from www.gnu.org pages),
         translinks-head.html, translinks-tail.html.
 

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- ChangeLog   24 Oct 2011 06:24:08 -0000      1.209
+++ ChangeLog   5 Nov 2011 04:16:18 -0000       1.210
@@ -1,3 +1,33 @@
+2011-11-05  Pavel Kharitonov  <address@hidden>
+
+       Add `no-grace-items' target.
+
+       Add staged versions for `no-grace' pages.
+
+       Don't show outdated notice on `no-grace' pages.
+
+       Save latest full translated revision of the English page
+       and generate diff to current revision against it
+       when the latter is available.
+
+       * configure.ac: Detect wdiff.
+       * config.mk (WDIFF): New variable.
+       * diff-page-head.html:
+       * diff-page-tail.html: New files.
+       * GNUmakefile (staged-articles, no-grace-items, no-grace-pot)
+       (no-grace-po, no-grace-translated, comma): New variables.
+       (home-lang): Add $(rootdir)/home-staged.$(1).html.
+       (no-grace-items, $(rootdir)/po/home-staged.pot):
+       ($(rootdir)/po/home-staged.proto): New targets.
+       (staged-rules): New function.
+       (home-rules): Accept second argument, name of the page.
+       * Makefile.am (edit): Substitute WDIFF.
+       (dist_example_DATA): Add diff-page-head.html
+       and diff-page-tail.html.
+       * TODO: Remove outdated and complete items.
+       * AUTHORS:
+       * THANKS: Update.
+
 2011-10-24  Pavel Kharitonov  <address@hidden>
 
        Replace m4 with a sed script.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- GNUmakefile 27 Sep 2011 10:03:46 -0000      1.98
+++ GNUmakefile 5 Nov 2011 04:16:18 -0000       1.99
@@ -119,7 +119,7 @@
 ### End of variables declaration (whatsnew) ###
 
 ### Special variables for the home pages ###
-home-lang = $(rootdir)/home.$(1).html
+home-lang = $(rootdir)/home.$(1).html $(rootdir)/home-staged.$(1).html
 home-translated := $(foreach h-lang,$(HOME_LINGUAS), \
                     $(call home-lang,$(h-lang)))
 ifeq ($(VERBOSE),yes)
@@ -127,6 +127,16 @@
 endif
 ### End of variables declaration (homepages) ###
 
+find-po = $(wildcard $(1).*.po)
+### Special variables for `no-grace' items ###
+staged-articles := $(no-grace-articles:%=%-staged)
+no-grace-items := $(no-grace-articles) $(staged-articles)
+no-grace-pot := $(no-grace-items:%=%.pot)
+no-grace-po := $(foreach pot, $(no-grace-pot),\
+                $(call find-po,$(basename $(pot))))
+no-grace-translated := $(subst /po/,/,$(no-grace-po:%.po=%.html))
+### End of variables declaration (`no-grace' items) ###
+
 ### Special variables for all other articles ###
 # FIXME: Variables' computatation could be optimized, but in any event
 # it is much better if translators do not have to add manually anything.
@@ -137,7 +147,6 @@
 root-articles-pot := $(root-articles:%=%.pot)
 ALL_POTS := $(articles-pot) $(root-articles-pot)
 ALL_BASE := $(ALL_POTS:%.pot=%)
-find-po = $(wildcard $(1).*.po)
 ALL_POS := $(foreach pot,$(ALL_POTS),$(call find-po,$(basename $(pot))))
 ALL_POS_BASE := $(ALL_POS:%.po=%)
 articles-translated := $(subst /po/,/,$(ALL_POS:%.po=%.html))
@@ -147,13 +156,23 @@
 endif
 ### End of variables declaration (all articles) ###
 
-.PHONY: all vcs-add-always
+.PHONY: all vcs-add-always no-grace-items
 ifeq ($(_have-Makefile),yes)
 include Makefile
 else
 all: $(template-pots) $(template-translated) $(gnunews) $(home-translated) \
      $(ALL_POTS) $(articles-translated) vcs-add-always
 endif
+no-grace-items: $(template-pots) $(template-translated) \
+               $(home-translated) $(no-grace-translated) vcs-add-always
+
+define staged-rules
+$(1)-staged.html: $(1).html
+       $$(addfile)
+       cp $$< $$@
+endef
+$(foreach article, $(subst /po/,/,$(no-grace-articles)) $(rootdir)/home,\
+  $(eval $(call staged-rules,$(article))))
 
 # The command to add a file to the repository.
 define add-file
@@ -227,6 +246,9 @@
   --master $$< --po $$$$PO --localized $$$$OUT
 endef
 
+comma := ,
+# Generate diff file against latest translated revision
+# when available.
 # Add notice about the translation being out of date.
 # The notice is inserted after every line beginning with
 # "<!--GNUN: OUT-OF-DATE NOTICE-->"
@@ -240,12 +262,40 @@
 marker='GNUN: OUT-OF-DATE NOTICE'; \
 $(GREP) -q '^<!--'"$$$${marker}-->" $(1) \
  || marker='#include virtual="\/server\/banner'; \
+original=$(1); original=$$$${original%$(2).html}html; \
+$(if $(WDIFF), \
+  saved_file=$$$${original%/*.html}/po/$$$${original##*/}; \
+  saved_file=$$$${saved_file%html}$(2);\
+  diff_file=$$$${saved_file}-diff.html; \
+  saved_file=$$$${saved_file}-en.html; \
+  if test -f $$$${saved_file}; then \
+    $(call add-file $(comma) $$$${diff_file}) \
+    $(SED) "s/</\&lt;/g;s/>/\&gt;/g" < $$$${saved_file} \
+          > $$$${saved_file}.tmp; \
+    $(SED) "s/</\&lt;/g;s/>/\&gt;/g" < $$$${original} \
+          > $$$${saved_file}.tmp1; \
+    $(SED) "s%<title></title>%<title>$$$${original#$(rootdir)}-diff</title>%" \
+          < diff-page-head.html > $$$${diff_file}; \
+    $(WDIFF) --start-delete '<span class="removed"><del><strong>' \
+            --end-delete '</em></strong></span>' \
+            --start-insert '<span class="inserted"><ins><em>' \
+            --end-insert '</em></ins></span>' \
+           $$$${saved_file}.tmp $$$${saved_file}.tmp1 \
+           >> $$$${diff_file}; \
+    cat diff-page-tail.html >> $$$${diff_file}; \
+    $(RM) $$$${saved_file}.tmp $$$${saved_file}.tmp1; \
+  fi; \
+  test -f "$$$${diff_file}" || diff_file=""; \
+ , diff_file=""; \
+ ) \
 $(SED) --in-place \
 '/^<!--#set var="PO_FILE"/,/<!--#include virtual="\/server\/outdated/d;\
  /^<!--'"$$$${marker}"'/a\
   <!--#set var="PO_FILE"\n \
     value='"'<a href=\"http://www.gnu.org$$$${PO#$(rootdir)}\">\n\
            http://www.gnu.org$$$${PO#$(rootdir)}</a>'"' -->\n\
+  <!--#set var="ORIGINAL_FILE" value="'"$$$${original#$(rootdir)}"'" -->\n \
+  <!--#set var="DIFF_FILE" value="'"$$$${diff_file#$(rootdir)}"'" -->\n \
 <!--#include virtual="/server/outdated.$(2).html" -->' $(1) \
  || true
 endef
@@ -584,14 +634,29 @@
        $(fixperm)
        $(generate-pot)
 
+$(rootdir)/po/home-staged.proto: $(rootdir)/home-staged.html
+# Delete the target if the script exits with a non-zero status in
+# order to prevent further messing up in the chain.  For extra safety,
+# exit with an error so that make does not proceed to the next
+# command.
+       $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
+       $(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$< \
+         --generic=generic.html --output=$@ || ($(RM) $@ ; exit 1)
+       $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
+
+$(rootdir)/po/home-staged.pot: $(rootdir)/po/home-staged.proto
+       $(addfile)
+       $(fixperm)
+       $(generate-pot)
+
 define home-rules
-$(rootdir)/po/home.$(1).po: $(rootdir)/po/home.pot
+$(rootdir)/po/$(2).$(1).po: $(rootdir)/po/$(2).pot
        PO=$$@ ; $(check-po)
        $$(fixperm)
        $(call update-po,$$@,$$<)
 
-$(rootdir)/home.$(1).html: $(rootdir)/po/home.proto \
-                          $(rootdir)/po/home.$(1).po generic.$(1).html
+$(rootdir)/$(2).$(1).html: $(rootdir)/po/$(2).proto \
+                          $(rootdir)/po/$(2).$(1).po generic.$(1).html
 # Check if the language is present in TEMPLATE_LINGUAS.
 ifeq (,$(findstring $(1),$(TEMPLATE_LINGUAS)))
 ifndef NOTIFYSKIP
@@ -606,39 +671,40 @@
 # If $PO is not valid, then the generated page could be broken even
 # for the reader.  Ensure that the build still barfs next time if the
 # translator doesn't fix it quickly.
-       PO=$(rootdir)/po/home.$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
+       PO=$(rootdir)/po/$(2).$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
        $$(addfile)
 # Unconditionally update the PO file; see the comment in `article-rules'.
-       $(call update-po,$(rootdir)/po/home.$(1).po,$(rootdir)/po/home.pot)
+       $(call update-po,$(rootdir)/po/$(2).$(1).po,$(rootdir)/po/$(2).pot)
        $$(fixperm)
-       PO=$(rootdir)/po/home.$(1).po OUT=$(rootdir)/po/home.$(1).m4 ; \
+       PO=$(rootdir)/po/$(2).$(1).po OUT=$(rootdir)/po/$(2).$(1).m4 ; \
          $(generate-html)
        $(SED) --in-place \
          "s/\(<gnun>m4_include(\`.*\)\([.]html')<\/gnun>\)/\1.$(1)\2/g" \
-         $(rootdir)/po/home.$(1).m4
+         $(rootdir)/po/$(2).$(1).m4
        $(SED) --in-place "s/<gnun>\(.*\)<\/gnun>/\1/g" \
-         $(rootdir)/po/home.$(1).m4
+         $(rootdir)/po/$(2).$(1).m4
        $(SED) --in-place \
          ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' \
-         $(rootdir)/po/home.$(1).m4
+         $(rootdir)/po/$(2).$(1).m4
        for inc in $(localized-includes); do \
          $(SED) --in-place \
          "s/\(<!--#include virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(1)\2/g" \
-         $(rootdir)/po/home.$(1).m4; \
+         $(rootdir)/po/$(2).$(1).m4; \
        done
        [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place \
          "s/\(<!--#include file=\"gnusflashes*\)\(.include\" 
-->\)/\1.$(1)\2/g" \
-         $(rootdir)/po/home.$(1).m4
-       $(M4) $(rootdir)/po/home.$(1).m4 > $$@
-       if $(call extract-outdated-date,$(rootdir)/po/home.$(1).po) \
-           >/dev/null; then \
-         PO=$(rootdir)/po/home.$(1).po; $(call mark-outdated,$$@,$(1)); \
-       fi
+         $(rootdir)/po/$(2).$(1).m4
+       $(call extract-outdated-date,$(rootdir)/po/$(2).$(1).po) > /dev/null \
+       || ($(call add-file,$(rootdir)/po/$(2).$(1)-en.html); \
+           cp $(rootdir)/$(2).html $(rootdir)/po/$(2).$(1)-en.html)
+       $(M4) $(rootdir)/po/$(2).$(1).m4 > $$@
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(transl-addr) \
-         $$@ || (PO=$(rootdir)/po/home.$(1).po ; $$(touch-hook))
+         $$@ || (PO=$(rootdir)/po/$(2).$(1).po ; $$(touch-hook))
 endef
 
-$(foreach h-lang,$(HOME_LINGUAS),$(eval $(call home-rules,$(h-lang))))
+$(foreach h-name,home home-staged, \
+  $(foreach h-lang,$(HOME_LINGUAS), \
+    $(eval $(call home-rules,$(h-lang),$(h-name)))))
 ### End of the homepages-specific rules ###
 
 ### Rules for all other articles ###
@@ -740,9 +806,9 @@
 # builds, update the target and validate the result.
 ifndef GRACE
        $(output-article-html);
-# Check if the article is not in `no-grace-articles'.
+# Check if the article is not in `no-grace-items'.
 else ifneq ($(basename $(1)), \
-           $(findstring $(basename $(1)),$(no-grace-articles)))
+           $(findstring $(basename $(1)),$(no-grace-items)))
 # If there are no fuzzy strings, there might be untranslated or
 # obsolete, so proceed as usual.  If there are fuzzy strings, compare
 # the Outdated-Since in the $(1).po with the current time shifted by value
@@ -764,11 +830,15 @@
        @echo 'Ignoring grace period for article "$(notdir $(basename $(1)))"'
        $(output-article-html);
 endif
-       ($(if $(findstring $(basename $(1)),$(no-grace-articles)), \
+       $(if $(findstring $(basename $(1)),$(no-grace-items)), \
              echo 'Ignoring delay for article "$(notdir $(basename $(1)))"', \
-             $(call grace-is-over,$(1).po,$(OUTDATED-GRACE))) \
-        && (PO=$(1).po; $(call mark-outdated,$$@,$(2)))) || true
+           if $(call grace-is-over,$(1).po,$(OUTDATED-GRACE)); then \
+             PO=$(1).po; $(call mark-outdated,$$@,$(2)); \
+           fi)
        $(call generate-translinks,$(basename $(1)))
+       $(call extract-outdated-date,$(1).po) > /dev/null \
+       || ($(call add-file,$(1)-en.html); \
+           cp $(subst /po/,/,$(1:.$(2)=).html) $(1)-en.html)
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- Makefile.am 24 Oct 2011 06:24:08 -0000      1.21
+++ Makefile.am 5 Nov 2011 04:16:19 -0000       1.22
@@ -52,6 +52,7 @@
        -e 's|@address@hidden|$(GREP)|g' \
        -e 's|@address@hidden|$(pkglibexecdir)/expand-m4-includes|g' \
        -e 's|@address@hidden|$(SED)|g'
+       -e 's|@address@hidden|$(WDIFF)|g'
 
 expand-m4-includes gnun-validate-html validate-html-notify: Makefile
        $(AM_V_at)rm -f $@ address@hidden
@@ -69,7 +70,8 @@
 
 exampledir = $(docdir)/examples
 doc_DATA = TODO
-dist_example_DATA = gnun.mk GNUmakefile.team languages.txt \
+dist_example_DATA = diff-page-head.html diff-page-tail.html \
+              gnun.mk GNUmakefile.team languages.txt \
               initial-translations-list.html \
               translinks-head.html translinks-tail.html
 pkgdata_DATA = config.mk

Index: THANKS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/THANKS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- THANKS      3 Sep 2011 04:45:27 -0000       1.9
+++ THANKS      5 Nov 2011 04:16:19 -0000       1.10
@@ -8,12 +8,18 @@
 +------------------+---------------------------+
 |Dominik Smatana   |             address@hidden|
 +------------------+---------------------------+
+|Dora Scilipoti    |    address@hidden|
++------------------+---------------------------+
 |George Zarkadas   |address@hidden|
 +------------------+---------------------------+
 |Hossam Hossny     |             address@hidden|
 +------------------+---------------------------+
 |Jan Owoc          |           address@hidden|
 +------------------+---------------------------+
+|Jason Self        |              address@hidden|
++------------------+---------------------------+
+|Joerg Kohne       |            address@hidden|
++------------------+---------------------------+
 |Karl Berry        |               address@hidden|
 +------------------+---------------------------+
 |Richard Stallman  |                address@hidden|

Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- TODO        9 Aug 2010 16:06:33 -0000       1.36
+++ TODO        5 Nov 2011 04:16:19 -0000       1.37
@@ -19,8 +19,6 @@
    gnu/gnu-user-groups.LANG.html or
    philosophy/words-to-avoid.LANG.html.
 
-** `gnun-validate-html' works only from the root of the repository.
-
 ** A testsuite is missing.
    Po4a, m4, and eventually gettext are prone to introduce regressions
    in GNUN.  An extensive testsuite should be developed, which must
@@ -34,8 +32,6 @@
 
 * General (when bugs are fixed)
 
-** Add support for windows7sins.org.
-
 ** The documentation is not complete, and should be improved.
 
 ** Experiment with msgmerge's `--previous' option and make it the
@@ -56,10 +52,6 @@
 
 ** Complicated articles like /philosophy/eldred-amicus.
 
-** Problems with ``'.
-   Some articles may contain ` legitimately, and gnun-validate-html
-   will spit an m4 error.
-
 * Non-essential
 
 ** Implement Git support for GNUmakefile.team.
@@ -93,19 +85,6 @@
   case of failure, it will not be deleted so that the accumulated
   messages will be used in the next run.
 
-** Figure out how to "inject" a language-specific warning, possibly
-   from /server/gnun/outdated.xx.html that will be displayed when the
-   page has 20% (or more) messages untranslated.  We have to think
-   also about a deprecation plan for all gnu.org translated pages, and
-   whether this software can help sorting all issues out.  Idea: We
-   can use the comment <!-- Automatically generated... --> to add a
-   fake #include directive, which will tell Apache that this page is
-   OK, but in its absence will direct to a separate page (like 404)
-   with a a notice that the translation is very outdated and
-   links/options like 1) Visit the English article; 2) Visit the
-   translation anyway; 3) Help the Foo translation team; 4) Whatever
-   we decide.
-
 ** PO mode a bit unsuitable for HTML translations.
    The window that gets opened when you hit <RET> on a msgstr in PO
    mode is in Fundamental mode, which leads to many typos that stem

Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- config.mk.in        24 Oct 2011 06:24:08 -0000      1.6
+++ config.mk.in        5 Nov 2011 04:16:19 -0000       1.7
@@ -14,6 +14,7 @@
 MSGMERGE       := @MSGMERGE@
 PO4A_GETTEXTIZE := @PO4A_GETTEXTIZE@
 PO4A_TRANSLATE  := @PO4A_TRANSLATE@
+WDIFF           := @WDIFF@
 
 prefix         := @prefix@
 -include @sysconfdir@/gnun.conf

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- configure.ac        24 Oct 2011 06:24:08 -0000      1.25
+++ configure.ac        5 Nov 2011 04:16:20 -0000       1.26
@@ -76,6 +76,9 @@
 AS_IF([test -n "$GUILE"], [have_guile=yes], [have_guile=no])
 AM_CONDITIONAL([HAVE_GUILE], [test -n "$GUILE"])
 
+AC_ARG_VAR([WDIFF], [the `wdiff' program])
+AC_PATH_PROG([WDIFF], [wdiff])
+
 # Po4a is useless for our purpose if Guile is missing.
 if test "$have_guile" = yes; then
   AC_ARG_VAR([PO4A_GETTEXTIZE], [the `po4a-gettextize' program])

Index: diff-page-head.html
===================================================================
RCS file: diff-page-head.html
diff -N diff-page-head.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ diff-page-head.html 5 Nov 2011 04:16:20 -0000       1.1
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title></title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>

Index: diff-page-tail.html
===================================================================
RCS file: diff-page-tail.html
diff -N diff-page-tail.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ diff-page-tail.html 5 Nov 2011 04:16:20 -0000       1.1
@@ -0,0 +1 @@
+</pre></body></html>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]