Revamp WARNING declarations.

* xml/pl/ellinika.xml <WARNING>: Use <IF>.
* xml/uk/ellinika.xml: Likewise.
* xml/ru/ellinika.xml: Likewise.
* xml/pl/Makefile.am (stamp-lingua): Define STATE
* xml/uk/Makefile.am: Likewise.
* xml/ru/Makefile.am: Likewise.
* xml/lingua.conf.in <IFEXP>,<EL:WARNING>: Remove.
* xml/Makefile.am (conf.sed): Revert r546.


git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@549 941c8c0f-9102-463b-b60b-cd22ce0e6858

8 files changed, 17 insertions, 37 deletions

diff --git a/xml/Makefile.am b/xml/Makefile.am
index 356c334..3ec5c4d 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -30,15 +30,6 @@ conf.sed: Makefile
 	echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed
 	echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed
 	echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed
-	if test "$(STATE)" = "EXP"; then \
-	  echo 's,=IFEXP=,,' >> conf.sed; \
-	  echo 's,=END IFEXP=,,' >> conf.sed; \
-          echo '/=IFPROD=/,/=END IFPROD=/d'  >> conf.sed; \
-        else \
-	  echo 's,=IFPROD=,,' >> conf.sed; \
-	  echo 's,=END IFPROD=,,' >> conf.sed; \
-          echo '/=IFEXP=/,/=END IFEXP=/d'  >> conf.sed; \
-        fi
 
 lingua.conf: $(srcdir)/lingua.conf.in conf.sed
 	sed -f conf.sed $(srcdir)/lingua.conf.in > $@
diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in
index 3cace9a..098d063 100644
--- a/xml/lingua.conf.in
+++ b/xml/lingua.conf.in
@@ -43,17 +43,6 @@
 		     (lingua:LANG args)))))
       (xmltrans:set-attr "LINGUA" "NEA" nea)))
 
- (xmltrans:end-tag
- "IFEXP"
- (tag attr text)
-=IFEXP=
-  text
-=END IFEXP=
-=IFPROD=
-  #f
-=END IFPROD=
-  )
-
 (xmltrans:end-tag
  "FOOTER"
  (tag attr text)
@@ -83,8 +72,6 @@ this notice is preserved.</p>\n"
 	
 ))
 
-(lingua:tag-ignore EL:WARNING)
-      
 (xmltrans:end-tag
  "KATHAREVUSA"
  (tag attr text)
diff --git a/xml/pl/Makefile.am b/xml/pl/Makefile.am
index 03f100e..c4a74ed 100644
--- a/xml/pl/Makefile.am
+++ b/xml/pl/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2006, 2007 Sergey Poznyakoff
+# Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
 
diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml
index fc7e3a0..8dcd1f3 100644
--- a/xml/pl/ellinika.xml
+++ b/xml/pl/ellinika.xml
@@ -25,12 +25,12 @@
 </LOCALIZATION>
 
 <WARNING>
-  <IFEXP>
+  <IF DEF="STATE" EQ="EXP">
     <PARA>Uwaga! To jest wersja eksperymentalna.  Wersję stabilną
     znajdziesz <XREF LIT="{THIS-REF}">tutaj</XREF>.</PARA>
-  </IFEXP>
+  </IF>
 </WARNING>
- 
+
 <COPYRIGHT>
 <FOOTER VCS-ID="$Id$">
 Copyright <![CDATA[&copy;]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff
diff --git a/xml/ru/Makefile.am b/xml/ru/Makefile.am
index 6b11f40..a4dcd1e 100644
--- a/xml/ru/Makefile.am
+++ b/xml/ru/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2010 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
 
diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml
index 76e8a82..65abe4d 100644
--- a/xml/ru/ellinika.xml
+++ b/xml/ru/ellinika.xml
@@ -25,9 +25,10 @@
 </LOCALIZATION>
 
 <WARNING>
-  <IFEXP>
-    <PARA>Предупреждение! Это - экспериментальная версия. Официальная версия <XREF LIT="{THIS-REF}">тут</XREF>.</PARA>
-  </IFEXP>
+  <IF DEF="STATE" EQ="EXP">
+    <PARA>Предупреждение! Это - экспериментальная версия. Официальная
+    версия <XREF LIT="{THIS-REF}">находится тут</XREF>.</PARA>
+  </IF>
 </WARNING>
 
 <COPYRIGHT>
diff --git a/xml/uk/Makefile.am b/xml/uk/Makefile.am
index 03f100e..c4a74ed 100644
--- a/xml/uk/Makefile.am
+++ b/xml/uk/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2006, 2007 Sergey Poznyakoff
+# Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	xmlt lingua -D STATE=$(STATE) --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
 
diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml
index d5b4218..cb614b7 100644
--- a/xml/uk/ellinika.xml
+++ b/xml/uk/ellinika.xml
@@ -25,9 +25,10 @@
 </LOCALIZATION>
 
 <WARNING>
-  <IFEXP>
-    <PARA>Увага! Це експериментальна версія сайту. Офіційна версія <XREF LIT="{THIS-REF}">тут</XREF>.</PARA>
-  </IFEXP>
+  <IF DEF="STATE" EQ="EXP">
+    <PARA>Увага! Це експериментальна версія сайту. Офіційну
+    версію <XREF LIT="{THIS-REF}">дивись тут</XREF>.</PARA>
+  </IF>
 </WARNING>
 
 <COPYRIGHT>