From 95844dbed0783921c1b4b0b8980a1cdf2285a4de Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 15 Mar 2005 10:45:54 +0000 Subject: [PATCH] (position_scripts): take priority from head position. Backport. --- ChangeLog | 5 ++ lily/new-fingering-engraver.cc | 4 +- stepmake/bin/add-html-footer.py | 98 ++++++++++++++++++++++++++++----- 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index c74844bb63..08f3cd1aea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-15 Han-Wen Nienhuys + + * lily/new-fingering-engraver.cc (position_scripts): take priority + from head position. Backport. + 2005-03-14 Jan Nieuwenhuizen * make/ly-rules.make ($(outdir)/%.nexi): Remove old makeinfo diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 681e61ba4e..4e4eddffb7 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -257,7 +257,7 @@ New_fingering_engraver::position_scripts () Grob* f = ft.script_; f->set_parent (ft.head_, X_AXIS); f->set_property ("script-priority", - scm_int2num (finger_prio + i)); + scm_int2num (finger_prio + ft.position_)); f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS); f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS); f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS); @@ -272,7 +272,7 @@ New_fingering_engraver::position_scripts () Grob* f = ft.script_; f->set_parent (ft.head_, X_AXIS); f->set_property ("script-priority", - scm_int2num (finger_prio + down.size () - i)); + scm_int2num (finger_prio + down.size () - ft.position_)); f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS); f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS); diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 6d0d756c0a..3946a73780 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -35,7 +35,8 @@ default_header = r""" """ -wiki_base = 'http://afavant.elte.hu/lywiki/' +#wiki_base = 'http://afavant.elte.hu/lywiki/' +wiki_base = None default_footer = r"""
Please take me back to the index @@ -44,8 +45,7 @@ of @PACKAGE_NAME@ built = r"""
-Read comments on this page, or -add one. +%(wiki_string)s

This page is for %(package_name)s-%(package_version)s (%(branch_str)s).
@@ -200,14 +200,6 @@ def do_file (f): s = gulp_file (f) s = re.sub ('%', '%%', s) - if changelog_file: - changes = gulp_file (changelog_file) - # urg? - #m = re.search ('^\\\\*\\\\*', changes) - m = re.search (r'\*\*\*', changes) - if m: - changes = changes[:m.start (0)] - s = re.sub ('top_of_ChangeLog', '

\n'+ changes  + '\n
\n', s) if re.search (header_tag, s) == None: body = '' @@ -235,6 +227,7 @@ def do_file (f): else: s = s + footer + s = i18n (f, s) #URUGRGOUSNGUOUNRIU index = index_url @@ -261,12 +254,18 @@ def do_file (f): wiki_page = re.sub (r'\.-', '', wiki_page) wiki_page = re.sub ('.html', '', wiki_page) + wiki_string = '' + + if wiki_base: + wiki_string = (r'''Read comments on this page, or + add one.''' % + { 'wiki_base': wiki_base, + 'wiki_page': wiki_page}) + subst = globals () subst.update (locals()) - - s = s % subst - + # urg # maybe find first node? fallback_web_title = '-- --' @@ -283,6 +282,77 @@ def do_file (f): open (f, 'w').write (s) + +localedir = 'out/locale' +try: + import gettext + gettext.bindtextdomain ('newweb', localedir) + gettext.textdomain ('newweb') + _ = gettext.gettext +except: + def _ (s): + return s +underscore = _ + + +LANGUAGES = ( + ('site', 'English'), + ('nl', 'Nederlands'), + ) + +language_available = _ ("Other languages: %s.") % "%(language_menu)s" +browser_language = _ ("Using automatic language selection.") \ + % "%(root_url)sabout/browser-language" + +LANGUAGES_TEMPLATE = '''\ +

+ %(language_available)s +
+ %(browser_language)s +

+''' % vars () + +def file_lang (file, lang): + (base, ext) = os.path.splitext (file) + base = os.path.splitext (base)[0] + if lang and lang != 'site': + return base + '.' + lang + ext + return base + ext + + +def i18n (file_name, page): + # ugh + root_url = "/web/" + + base_name = os.path.basename (file_name) + + lang = '' + m = re.match ('.*[.]([^.]*).html', file_name) + if m: + lang = m.group (1) + + # Find available translations of this page. + available = filter (lambda x: lang != x[0] \ + and os.path.exists (file_lang (file_name, x[0])), + LANGUAGES) + + # Strip .html, .png suffix for auto language selection. +# page = re.sub ('''(href|src)=[\'"]([^/][.]*[^.:\'"]*)(.html(#[^"]*)|.png)[\'"]''', +# '\\1="\\2"', page) + + # Create language menu. + language_menu = '' + for (prefix, name) in available: + lang_file = file_lang (base_name, prefix) + language_menu += '%(name)s' % vars () + + languages = '' + if language_menu: + languages = LANGUAGES_TEMPLATE % vars () + + return page + languages + ## end i18n + for f in files: do_file (f) -- 2.39.5