diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-23 17:02:16 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-23 17:02:16 +0000 |
commit | 0f50d8ffa69e260b8b48ba3429297e2f7a7115ae (patch) | |
tree | 8f2248c99f8e3b31adac9eae983bec910ced6ff8 /xml | |
parent | 4d8b444c994469b2e27dcdee02aaf61ca379ae47 (diff) | |
download | ellinika-0f50d8ffa69e260b8b48ba3429297e2f7a7115ae.tar.gz ellinika-0f50d8ffa69e260b8b48ba3429297e2f7a7115ae.tar.bz2 |
Provide a WARNING block for use in the development version.
* style.css (div.warning): New class.
* xml/pl/ellinika.xml: Provide a WARNING block for
use in the development version.
* xml/uk/ellinika.xml: Likewise.
* xml/ru/ellinika.xml: Likewise.
* xml/lingua.conf.in: Provide a WARNING block for
use in development versions.
<GUILE>: Remove unneded now use-modules.
<IFEXP>: New tag.
<EL:WARNING>: New tag.
{THIS-REF}: New postprocessor handler.
* xml/Makefile.am (conf.sed): Provide replacements for
=IF..= keywords.
* configure.ac (PROD_URL, EXP_URL, STATE): New AC_VARs.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@546 941c8c0f-9102-463b-b60b-cd22ce0e6858
Diffstat (limited to 'xml')
-rw-r--r-- | xml/Makefile.am | 25 | ||||
-rw-r--r-- | xml/lingua.conf.in | 25 | ||||
-rw-r--r-- | xml/pl/ellinika.xml | 7 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 6 | ||||
-rw-r--r-- | xml/uk/ellinika.xml | 6 |
5 files changed, 57 insertions, 12 deletions
diff --git a/xml/Makefile.am b/xml/Makefile.am index ccb5d01..356c334 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am | |||
@@ -21,13 +21,24 @@ CLEANFILES=conf.sed | |||
21 | noinst_DATA= lingua.conf | 21 | noinst_DATA= lingua.conf |
22 | 22 | ||
23 | conf.sed: Makefile | 23 | conf.sed: Makefile |
24 | echo 's,=TMPDIR=,$(top_builddir)/../tmp,' > conf.sed | 24 | echo 's,=TMPDIR=,$(top_builddir)/../tmp,g' > conf.sed |
25 | echo 's,=OUTDIR=,$(top_builddir)/../html,' >> conf.sed | 25 | echo 's,=OUTDIR=,$(top_builddir)/../html,g' >> conf.sed |
26 | echo 's,=TARGET_DIR=,$(TARGET_DIR),' >> conf.sed | 26 | echo 's,=TARGET_DIR=,$(TARGET_DIR),g' >> conf.sed |
27 | echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),' >> conf.sed | 27 | echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g' >> conf.sed |
28 | echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),' >> conf.sed | 28 | echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g' >> conf.sed |
29 | echo 's,=BASE_HREF=,$(BASE_HREF),' >> conf.sed | 29 | echo 's,=BASE_HREF=,$(BASE_HREF),g' >> conf.sed |
30 | echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),' >> conf.sed | 30 | echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed |
31 | echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed | ||
32 | echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed | ||
33 | if test "$(STATE)" = "EXP"; then \ | ||
34 | echo 's,=IFEXP=,,' >> conf.sed; \ | ||
35 | echo 's,=END IFEXP=,,' >> conf.sed; \ | ||
36 | echo '/=IFPROD=/,/=END IFPROD=/d' >> conf.sed; \ | ||
37 | else \ | ||
38 | echo 's,=IFPROD=,,' >> conf.sed; \ | ||
39 | echo 's,=END IFPROD=,,' >> conf.sed; \ | ||
40 | echo '/=IFEXP=/,/=END IFEXP=/d' >> conf.sed; \ | ||
41 | fi | ||
31 | 42 | ||
32 | lingua.conf: $(srcdir)/lingua.conf.in conf.sed | 43 | lingua.conf: $(srcdir)/lingua.conf.in conf.sed |
33 | sed -f conf.sed $(srcdir)/lingua.conf.in > $@ | 44 | sed -f conf.sed $(srcdir)/lingua.conf.in > $@ |
diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in index 9ea3534..3cace9a 100644 --- a/xml/lingua.conf.in +++ b/xml/lingua.conf.in | |||
@@ -8,7 +8,7 @@ | |||
8 | <DIRECTORY SOUND="=TARGET_DIR=/sound" /> | 8 | <DIRECTORY SOUND="=TARGET_DIR=/sound" /> |
9 | 9 | ||
10 | <AUTHOR EMAIL="=PACKAGE_BUGREPORT=" HOMEPAGE="http://gray.gnu.org.ua" /> | 10 | <AUTHOR EMAIL="=PACKAGE_BUGREPORT=" HOMEPAGE="http://gray.gnu.org.ua" /> |
11 | 11 | ||
12 | <DICT PROG="dict.=SCRIPT_SUFFIX=" /> | 12 | <DICT PROG="dict.=SCRIPT_SUFFIX=" /> |
13 | <BASE HREF="=BASE_HREF=" /> | 13 | <BASE HREF="=BASE_HREF=" /> |
14 | <SEARCH ARGS="(list (lingua:gettext "Search"))"> | 14 | <SEARCH ARGS="(list (lingua:gettext "Search"))"> |
@@ -30,10 +30,7 @@ | |||
30 | </SEARCH> | 30 | </SEARCH> |
31 | <GUILE> | 31 | <GUILE> |
32 | <![CDATA[ | 32 | <![CDATA[ |
33 | (use-modules (xmltools xmltrans) | 33 | (use-modules (xmltools dict) |
34 | (xmltools gamlet) | ||
35 | (xmltrans lingua) | ||
36 | (xmltools dict) | ||
37 | (ice-9 format)) | 34 | (ice-9 format)) |
38 | 35 | ||
39 | (define-macro (install-nea) | 36 | (define-macro (install-nea) |
@@ -46,6 +43,17 @@ | |||
46 | (lingua:LANG args))))) | 43 | (lingua:LANG args))))) |
47 | (xmltrans:set-attr "LINGUA" "NEA" nea))) | 44 | (xmltrans:set-attr "LINGUA" "NEA" nea))) |
48 | 45 | ||
46 | (xmltrans:end-tag | ||
47 | "IFEXP" | ||
48 | (tag attr text) | ||
49 | =IFEXP= | ||
50 | text | ||
51 | =END IFEXP= | ||
52 | =IFPROD= | ||
53 | #f | ||
54 | =END IFPROD= | ||
55 | ) | ||
56 | |||
49 | (xmltrans:end-tag | 57 | (xmltrans:end-tag |
50 | "FOOTER" | 58 | "FOOTER" |
51 | (tag attr text) | 59 | (tag attr text) |
@@ -74,6 +82,8 @@ this notice is preserved.</p>\n" | |||
74 | "</div>" | 82 | "</div>" |
75 | 83 | ||
76 | )) | 84 | )) |
85 | |||
86 | (lingua:tag-ignore EL:WARNING) | ||
77 | 87 | ||
78 | (xmltrans:end-tag | 88 | (xmltrans:end-tag |
79 | "KATHAREVUSA" | 89 | "KATHAREVUSA" |
@@ -105,6 +115,11 @@ this notice is preserved.</p>\n" | |||
105 | (tag attr text) | 115 | (tag attr text) |
106 | (list "<div class=\"permanent-article\">" text "</div>")) | 116 | (list "<div class=\"permanent-article\">" text "</div>")) |
107 | 117 | ||
118 | (gamlet:set-handler "THIS-REF" | ||
119 | (lambda (. args) | ||
120 | (display "http://ellinika.gnu.org.ua/") | ||
121 | (display (gamlet:current-output-file-name)))) | ||
122 | |||
108 | (gamlet:set-handler "INFO" | 123 | (gamlet:set-handler "INFO" |
109 | (lambda (. args) | 124 | (lambda (. args) |
110 | (display "<ul class=\"menu\">") | 125 | (display "<ul class=\"menu\">") |
diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml index 9e3e6af..fc7e3a0 100644 --- a/xml/pl/ellinika.xml +++ b/xml/pl/ellinika.xml | |||
@@ -24,6 +24,13 @@ | |||
24 | <MSGSTR ID="Search">Szukaj</MSGSTR> | 24 | <MSGSTR ID="Search">Szukaj</MSGSTR> |
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | ||
28 | <IFEXP> | ||
29 | <PARA>Uwaga! To jest wersja eksperymentalna. Wersję stabilną | ||
30 | znajdziesz <XREF LIT="{THIS-REF}">tutaj</XREF>.</PARA> | ||
31 | </IFEXP> | ||
32 | </WARNING> | ||
33 | |||
27 | <COPYRIGHT> | 34 | <COPYRIGHT> |
28 | <FOOTER VCS-ID="$Id$"> | 35 | <FOOTER VCS-ID="$Id$"> |
29 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff | 36 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff |
diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml index 60866eb..76e8a82 100644 --- a/xml/ru/ellinika.xml +++ b/xml/ru/ellinika.xml | |||
@@ -24,6 +24,12 @@ | |||
24 | <MSGSTR ID="Search">Поиск</MSGSTR> | 24 | <MSGSTR ID="Search">Поиск</MSGSTR> |
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | ||
28 | <IFEXP> | ||
29 | <PARA>Предупреждение! Это - экспериментальная версия. Официальная версия <XREF LIT="{THIS-REF}">тут</XREF>.</PARA> | ||
30 | </IFEXP> | ||
31 | </WARNING> | ||
32 | |||
27 | <COPYRIGHT> | 33 | <COPYRIGHT> |
28 | <FOOTER VCS-ID="$Id$"> | 34 | <FOOTER VCS-ID="$Id$"> |
29 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff | 35 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff |
diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml index 2e79899..d5b4218 100644 --- a/xml/uk/ellinika.xml +++ b/xml/uk/ellinika.xml | |||
@@ -24,6 +24,12 @@ | |||
24 | <MSGSTR ID="Search">Пошук</MSGSTR> | 24 | <MSGSTR ID="Search">Пошук</MSGSTR> |
25 | </LOCALIZATION> | 25 | </LOCALIZATION> |
26 | 26 | ||
27 | <WARNING> | ||
28 | <IFEXP> | ||
29 | <PARA>Увага! Це експериментальна версія сайту. Офіційна версія <XREF LIT="{THIS-REF}">тут</XREF>.</PARA> | ||
30 | </IFEXP> | ||
31 | </WARNING> | ||
32 | |||
27 | <COPYRIGHT> | 33 | <COPYRIGHT> |
28 | <FOOTER VCS-ID="$Id$"> | 34 | <FOOTER VCS-ID="$Id$"> |
29 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff | 35 | Copyright <![CDATA[©]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff |