diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-22 17:53:50 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-22 17:53:50 +0000 |
commit | 0bad72ab8a3ccc80eab77dad4b727840674153a3 (patch) | |
tree | fd88c11dbdc8e393c2f39a2f6adcd650e7dd5393 | |
parent | 97cb49f1c40856804ccac5925459187b4d3724bb (diff) | |
download | ellinika-0bad72ab8a3ccc80eab77dad4b727840674153a3.tar.gz ellinika-0bad72ab8a3ccc80eab77dad4b727840674153a3.tar.bz2 |
Re-do element alignment in a cleaner way.
* style.css (h1,h2,h3,h4): Align to center.
(td.top-link,td.prev-link,td.next-link): New selectors
for bottom menu.
(table.align-center): New selector.
(table.frame,table.noframe): Remove margins and display settings.
* xml/uk/ellinika.xml: Add copyright year.
* xml/ru/ellinika.xml: Likewise.
* xml/pl/ellinika.xml: Likewise.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@543 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | configure.ac | 19 | ||||
-rw-r--r-- | src/cgi-bin/dict.scm4 | 4 | ||||
-rw-r--r-- | src/cgi-bin/nea.scm4 | 1 | ||||
-rw-r--r-- | style.css | 13 | ||||
-rw-r--r-- | xml/pl/arithmi.xml | 15 | ||||
-rw-r--r-- | xml/ru/arithmi.xml | 15 |
7 files changed, 57 insertions, 24 deletions
@@ -1,3 +1,17 @@ +2010-03-22 Sergey Poznyakoff <gray@gnu.org.ua> + + * configure.ac (BASE_HREF, TARGET_DIR): Redefine as + AC_VARs + <$APACHE_IFACE = "CGI">: Prepend SCRIPT_DIR with / if + TARGET_DIR is empty. + + * src/cgi-bin/dict.scm4: Minor fix. + * src/cgi-bin/nea.scm4: Remove leftover (gamma gettext). + * style.css (h1)L New style. + (span.example): Remove unneeded padding. + * xml/ru/arithmi.xml: Update. + * xml/pl/arithmi.xml: Update. + 2010-03-15 Sergey Poznyakoff <gray@gnu.org.ua> * src/ellinika/dico.scm (sql-error-handler): Update arguments diff --git a/configure.ac b/configure.ac index 2563fff..c74af0e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -AC_PREREQ(2.63) +AC_PREREQ(2.61) AC_REVISION($Revision$) AC_INIT(ellinika, 1.2, [gray@gnu.org.ua]) @@ -77,12 +77,22 @@ AC_ARG_ENABLE(cgi, *) AC_MSG_ERROR([unknown argument to --enable-cgi]) esac]) +AC_ARG_VAR([BASE_HREF], + [Set default <base href>]) +AC_ARG_VAR([TARGET_DIR], + [(Deprecated) Set target subdirectory (under prefix)]) + AC_SUBST(SCRIPT_SUFFIX) AC_SUBST(SCRIPT_DIR) AC_SUBST(CGIDIR) + if test $APACHE_IFACE = "CGI"; then SCRIPT_SUFFIX=cgi - SCRIPT_DIR=cgi-bin + if test -n "$TARGET_DIR"; then + SCRIPT_DIR=cgi-bin + else + SCRIPT_DIR=/cgi-bin + fi CGIDIR='$(prefix)/cgi-bin' else SCRIPT_SUFFIX=scm @@ -92,12 +102,9 @@ fi AC_ARG_WITH(cgi-bin, AC_HELP_STRING([--with-cgi-bin=DIR], - [install CGI programs in DIR [[PREFIX/cgi-bin]]]), + [install CGI programs in DIR [[PREFIX/cgi-bin]]]), [CGIDIR=$withval]) -AC_SUBST(BASE_HREF) -AC_SUBST(TARGET_DIR) - dnl Check for Emacs site-lisp directory AM_PATH_LISPDIR if test "$EMACS" != "no"; then diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4 index 9cd23a8..534a735 100644 --- a/src/cgi-bin/dict.scm4 +++ b/src/cgi-bin/dict.scm4 @@ -30,7 +30,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (ellinika-cgi-init dict-template-file-name) -;; Τα μέρη του λογου +;; Τα μέρη του λόγου (define part-of-speech '()) (define (sql-error-handler key func fmt fmtargs data) @@ -155,7 +155,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (let ((value (cgi:value "key"))) (if value (begin - (display "value=\"") + (display " value=\"") (display (protect value)) (display "\"")))) (display " /> diff --git a/src/cgi-bin/nea.scm4 b/src/cgi-bin/nea.scm4 index d6099d1..3c87b3e 100644 --- a/src/cgi-bin/nea.scm4 +++ b/src/cgi-bin/nea.scm4 @@ -21,7 +21,6 @@ (use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user)) (ice-9 rdelim) (gamma sql) - (gamma gettext) (xmltools dict) (ellinika xlat) (ellinika cgi)) @@ -13,6 +13,11 @@ h1,h2,h3,h4 { text-align: center; } +h1 { + padding-bottom: 1em; + border-bottom: 2px solid black; +} + .center { text-align: center; } @@ -109,6 +114,11 @@ ul.menu li > a:hover { color: white; } +ul.menu li > a.imgref:hover { + color: #002bb8; + background: none; +} + li.group { list-style-type: none; margin-left: -1em; @@ -256,10 +266,7 @@ td.example { } span.example { -/* color: purple;*/ font-weight: bold; - padding-left: 8px; - padding-right: 8px; } diff --git a/xml/pl/arithmi.xml b/xml/pl/arithmi.xml index 19806d8..e4a4959 100644 --- a/xml/pl/arithmi.xml +++ b/xml/pl/arithmi.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2004, 2006, 2007 Sergey Poznyakoff + Copyright (C) 2004, 2006, 2007, 2010 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -34,8 +34,12 @@ się omownie: </TABULAR> <PARA>Spośród liczebników głównych odmieniają się liczebniki -<EXAMPLE>jeden</EXAMPLE>, <EXAMPLE>trzy</EXAMPLE>, -<EXAMPLE>cztery</EXAMPLE>, <EXAMPLE>tysiąc</EXAMPLE> oraz wszystkie +<EXAMPLE>jeden</EXAMPLE> +(<DICTREF>ένα</DICTREF>), <EXAMPLE>trzy</EXAMPLE> +(<DICTREF>τρία</DICTREF>), <EXAMPLE>cztery</EXAMPLE> +(<DICTREF>τέσσερα</DICTREF>), <EXAMPLE>tysiąc</EXAMPLE> +(<DICTREF>χίλια</DICTREF>) + oraz wszystkie setki. </PARA> @@ -301,12 +305,11 @@ nijakiego.</PARA> <ROW> <ITEM>5 - 3 = 2</ITEM> - <ITEM>πέντε <DICTREF>μείον</DICTREF> (или πλην) τρία ίσον δύο - τρία από πέντε ίσον δύο</ITEM> + <ITEM>πέντε <DICTREF>μείον</DICTREF> (или πλην) τρία ίσον δύο</ITEM> </ROW> <ROW> - <ITEM>7 χ 4 = 28</ITEM> + <ITEM>7 x 4 = 28</ITEM> <ITEM>επτά <DICTREF>επί</DICTREF> τέσσερα δίνουν είκοσι οκτώ или επτά οι τέσσερες δίνουν είκοσι οκτώ</ITEM> </ROW> diff --git a/xml/ru/arithmi.xml b/xml/ru/arithmi.xml index 43d6b71..ad7ecf1 100644 --- a/xml/ru/arithmi.xml +++ b/xml/ru/arithmi.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2004, 2007 Sergey Poznyakoff + Copyright (C) 2004, 2007, 2010 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -31,8 +31,12 @@ </TABULAR> <PARA> -Из количественных числительных склоняются числительные "один", "три", "четыре", -"тысяча" а также все сотни. +Из количественных числительных склоняются числительные <EXAMPLE>один</EXAMPLE> +(<DICTREF>ένας</DICTREF>), <EXAMPLE>три</EXAMPLE> +(<DICTREF>τρία</DICTREF>), <EXAMPLE>четыре</EXAMPLE> +(<DICTREF>τέσσερα</DICTREF>), +<EXAMPLE>тысяча</EXAMPLE> +(<DICTREF>χίλια</DICTREF>) а также все сотни. </PARA> <PARA> @@ -290,12 +294,11 @@ <ROW> <ITEM>5 - 3 = 2</ITEM> - <ITEM>πέντε <DICTREF>μείον</DICTREF> (или πλην) τρία ίσον δύο - τρία από πέντε ίσον δύο</ITEM> + <ITEM>πέντε <DICTREF>μείον</DICTREF> (или πλην) τρία ίσον δύο</ITEM> </ROW> <ROW> - <ITEM>7 χ 4 = 28</ITEM> + <ITEM>7 x 4 = 28</ITEM> <ITEM>επτά <DICTREF>επί</DICTREF> τέσσερα δίνουν είκοσι οκτώ или επτά οι τέσσερες δίνουν είκοσι οκτώ</ITEM> </ROW> |