Remove version 2.12 specific parts from create-weblinks-itexi.py

2013-02-10 Thread Felix Janda
Hi,

when grepping for things which look like version numbers I noticed some
version 2.12 specific code in scripts/build/create-weblinks-itexi.py.

The attached patch removes code which won't be executed in lilypond
versions other than 2.12.

Felix
diff --git a/scripts/build/create-weblinks-itexi.py b/scripts/build/create-weblinks-itexi.py
index 7e0c655..95342d0 100644
--- a/scripts/build/create-weblinks-itexi.py
+++ b/scripts/build/create-weblinks-itexi.py
@@ -66,7 +66,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF der MusicXML Regressionstests für ',
 
 'Doc tarball for ': 'Dokumentation tar-gepackt für ',
-' (did not exist in 2.12)': ' (nicht existent in 2.12)',
 },
 'es': {
 'Source': 'Código fuente',
@@ -97,7 +96,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'Pruebas de MusicXML en PDF para ',
 
 'Doc tarball for ': 'Tarball de la documentación para ',
-' (did not exist in 2.12)': ' (no existía en la versión 2.12)',
  },
 'fr': {
 'Source': 'Sources',
@@ -128,7 +126,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF des tests de régression de MusicXML pour ',
 
 'Doc tarball for ': 'Archive de la documentation pour ',
-' (did not exist in 2.12)': ' (non disponible pour la version 2.12)',
 },
 'hu': {
 'Source': 'Forrás',
@@ -157,7 +154,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF formátumban - verzió: ',
 
 'Doc tarball for ': 'Tömörített csomag - verzió: ',
-' (did not exist in 2.12)': ' (nem létezett a 2.12-es verzióban)',
 },
 'it': {
 'Source': 'Sorgenti',
@@ -187,7 +183,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF dei test di collaudo di MusicXML per ',
 
 'Doc tarball for ': 'Archivio della documentazione per ',
-' (did not exist in 2.12)': ' (non disponibile per la versione 2.12)',
 },
 'ja': {
 'Source': 'ソース',
@@ -219,7 +214,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 回帰テスト (PDF 版) バージョン ',
 
 'Doc tarball for ': 'ドキュメント アーカイブ バージョン ',
-' (did not exist in 2.12)': ' (バージョン 2.12 には存在しません)',
 
 },
 'nl': {
@@ -251,7 +245,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML regressietesten voor ',
 
 'Doc tarball for ': 'Tarball met documentation voor ',
-' (did not exist in 2.12)': ' (bestond nog niet in 2.12)',
  },
 'zh': {
 'Source': '源码',
@@ -282,7 +275,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 的 PDF 回归测试 ',
 
 'Doc tarball for ': '为文档压缩包',
-' (did not exist in 2.12)': ' (在 2.12 中不存在)',
 },
 }
 
@@ -415,30 +407,7 @@ def translateNameToUrl(manual, version):
 ver_split = version.split('.')
 ver_minor = ver_split[0] + '.' + ver_split[1]
 url = depth + doc/v + ver_minor + /Documentation/
-
-if (ver_minor == '2.12'):
-if (manual=='learning'):
-return url+'user/lilypond-learning'
-elif (manual=='internals'):
-return url+'user/lilypond-internals'
-elif (manual=='notation'):
-return url+'user/lilypond'
-elif (manual=='usage'):
-return url+'user/lilypond-program'
-elif (manual=='snippets'):
-return url+'../input/lsr/lilypond-snippets'
-elif (manual=='changes'):
-return url+'topdocs/NEWS.html'
-elif (manual=='music-glossary'):
-return url+'user/music-glossary'
-elif (manual=='essay'):
-return url+'user/lilypond-learning/Background.html'
-elif (manual=='extending'):
-return url+'user/lilypond/Interfaces-for-programmers.html'
-else:
-return ''
-else:
-return url+manual
+return url+manual
 
 def addLang(url, lang):
 if lang:
@@ -464,52 +433,19 @@ def make_manual_links(name, version, lang):
 manual = 'Music glossary'
 url = translateNameToUrl(m, version)
 
-if (url == ''):
-# can't have a comma here due to texinfo
-make_ver_link(macroLang(manual+name+mshort+'Pdf',lang),
-http://lilypond.org;,
-mshort+getTrans( (did not exist in 2.12),lang))
-make_ver_link(macroLang(manual+name+mshort+'Split',lang),
-http://lilypond.org;,
-mshort+getTrans( (did not exist in 2.12),lang))
-make_ver_link(macroLang(manual+name+mshort+'Big',lang),
-http://lilypond.org;,
-mshort+getTrans( (did not exist in 2.12),lang))
-make_ver_link(macroLang(manual+name+mshort+'SplitNoName',lang),
-http://lilypond.org;,
-mshort+getTrans( (did not exist in 2.12),lang))
-continue
-# this is stupid and I shouldn't have bothered trying
-  

Re: Remove version 2.12 specific parts from create-weblinks-itexi.py

2013-02-10 Thread Phil Holmes
- Original Message - 
From: Felix Janda felix.ja...@posteo.de

To: lilypond-devel@gnu.org
Sent: Sunday, February 10, 2013 1:59 PM
Subject: Remove version 2.12 specific parts from create-weblinks-itexi.py



Hi,

when grepping for things which look like version numbers I noticed some
version 2.12 specific code in scripts/build/create-weblinks-itexi.py.

The attached patch removes code which won't be executed in lilypond
versions other than 2.12.

Felix



Thanks.  I'm currently looking at some of the language specific stuff in 
that script, so I'll apply this patch at the same time.


--
Phil Holmes 



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Add Czech translations (issue 7307088)

2013-02-10 Thread PhilEHolmes

Reviewers: ,

Message:
Please review.

Description:
This patch adds many Czech translations as I can manage, and gets rid of
a lot of warnings in make website and make doc.  Also deletes some old
2.12 code.

Please review this at https://codereview.appspot.com/7307088/

Affected files:
  M scripts/build/create-weblinks-itexi.py


Index: scripts/build/create-weblinks-itexi.py
diff --git a/scripts/build/create-weblinks-itexi.py  
b/scripts/build/create-weblinks-itexi.py
index  
7e0c6551a32d130d7a4a2e7955303b9c709cba8f..e7caa311610f8dc8f282b4099ce1459cf5e1f813  
100644

--- a/scripts/build/create-weblinks-itexi.py
+++ b/scripts/build/create-weblinks-itexi.py
@@ -38,6 +38,35 @@ done
 '''

 translations = {
+'cs': {
+'Source': 'Source',
+'Learning': 'Učení',
+'Music glossary': 'Slovníček',
+'Essay': 'Článek',
+'Notation': 'Notový zápis',
+'Usage': 'Používání',
+'Snippets': 'Úryvky',
+'Web': 'Web',
+'Changes': 'Změny',
+
+'Extending': 'Rozšíření',
+'Internals': 'Vnitřnosti',
+'Contributor': 'Vývojářské',
+
+' (split HTML)': ' (rozdělené HTML)',
+' (big HTML)': ' (velké HTML)',
+
+'Regression tests for ': 'Zkoušky regresí ',
+'PDF of regtests for ': 'PDF zkoušky regresí ',
+'abc2ly Regression tests for ': 'abc2ly zkoušky regresí ',
+'PDF of abc2ly regtests for ': 'PDF abc2ly zkoušky regresí ',
+'lilypond-book Regression tests for ': 'lilypond-book zkoušky  
regresí ',
+'PDF of lilypond-book regtests for ': 'PDF lilypond-book zkoušky  
regresí ',

+'MusicXML Regression tests for ': 'MusicXML zkoušky regresí ',
+'PDF of MusicXML regtests for ': 'PDF MusicXML zkoušky regresí ',
+
+'Doc tarball for ': 'Doc tarball for ',
+},
 'de': {
 'Source': 'Quellen',
 'Learning': 'Einführung',
@@ -66,7 +95,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF der MusicXML  
Regressionstests für ',


 'Doc tarball for ': 'Dokumentation tar-gepackt für ',
-' (did not exist in 2.12)': ' (nicht existent in 2.12)',
 },
 'es': {
 'Source': 'Código fuente',
@@ -97,7 +125,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'Pruebas de MusicXML en PDF  
para ',


 'Doc tarball for ': 'Tarball de la documentación para ',
-' (did not exist in 2.12)': ' (no existía en la versión 2.12)',
  },
 'fr': {
 'Source': 'Sources',
@@ -128,7 +155,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF des tests de régression de  
MusicXML pour ',


 'Doc tarball for ': 'Archive de la documentation pour ',
-' (did not exist in 2.12)': ' (non disponible pour la version  
2.12)',

 },
 'hu': {
 'Source': 'Forrás',
@@ -157,7 +183,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF formátumban - verzió: ',

 'Doc tarball for ': 'Tömörített csomag - verzió: ',
-' (did not exist in 2.12)': ' (nem létezett a 2.12-es verzióban)',
 },
 'it': {
 'Source': 'Sorgenti',
@@ -187,7 +212,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF dei test di collaudo di  
MusicXML per ',


 'Doc tarball for ': 'Archivio della documentazione per ',
-' (did not exist in 2.12)': ' (non disponibile per la versione  
2.12)',

 },
 'ja': {
 'Source': 'ソース',
@@ -219,7 +243,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 回帰テスト (PDF 版) バー 
ジョン ',


 'Doc tarball for ': 'ドキュメント アーカイブ バージョン ',
-' (did not exist in 2.12)': ' (バージョン 2.12 には存在しません)',

 },
 'nl': {
@@ -251,7 +274,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML regressietesten voor ',

 'Doc tarball for ': 'Tarball met documentation voor ',
-' (did not exist in 2.12)': ' (bestond nog niet in 2.12)',
  },
 'zh': {
 'Source': '源码',
@@ -282,7 +304,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 的 PDF 回归测试 ',

 'Doc tarball for ': '为文档压缩包',
-' (did not exist in 2.12)': ' (在 2.12 中不存在)',
 },
 }

@@ -416,29 +437,7 @@ def translateNameToUrl(manual, version):
 ver_minor = ver_split[0] + '.' + ver_split[1]
 url = depth + doc/v + ver_minor + /Documentation/

-if (ver_minor == '2.12'):
-if (manual=='learning'):
-return url+'user/lilypond-learning'
-elif (manual=='internals'):
-return url+'user/lilypond-internals'
-elif (manual=='notation'):
-return url+'user/lilypond'
-elif (manual=='usage'):
-return url+'user/lilypond-program'
-elif (manual=='snippets'):
-return url+'../input/lsr/lilypond-snippets'
-elif (manual=='changes'):
-return url+'topdocs/NEWS.html'
-elif 

Re: Add Czech translations (issue 7307088)

2013-02-10 Thread lilyfan

On 2013/02/10 16:51:30, PhilEHolmes wrote:

The Czech strings resemble what I deduced from reading what is in
Documentation/cs

LGTM

https://codereview.appspot.com/7307088/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Includes empty skylines in minimum translation calculations (issue 7304068)

2013-02-10 Thread k-ohara5a5a

Doesn't this have the same problem as my attempted patch for issue 1669
?

https://codereview.appspot.com/7304068/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Includes empty skylines in minimum translation calculations (issue 7304068)

2013-02-10 Thread m...@mikesolomon.org

On 10 févr. 2013, at 20:45, k-ohara5...@oco.net wrote:

 Doesn't this have the same problem as my attempted patch for issue 1669
 ?
 
 https://codereview.appspot.com/7304068/
 
 ___
 lilypond-devel mailing list
 lilypond-devel@gnu.org
 https://lists.gnu.org/mailman/listinfo/lilypond-devel

Hadn't seen this.
Issue 3160 is then a duplicate...worth merging into this issue, no?

Cheers,
SM
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Standardizes use of empty extents in pure heights and skylines. (issue 7310075)

2013-02-10 Thread Keith OHara

On Sat, 09 Feb 2013 23:24:41 -0800, mts...@gmail.com wrote:


https://codereview.appspot.com/7310075/diff/10/lily/grob.cc#newcode488
lily/grob.cc:488: Interval iv = robust_scm2interval (iv_scm, Interval
());
On 2013/02/10 03:08:04, Keith wrote:

I assume you will apply this change and the change in

separation-item.cc in a

separate commit, the empty extents in pure-heights part of the patch

set.

I'm not sure if these changes can be separated from the skyline stuff
without causing regtest havoc.


Oh, right.
If zero-horizon-dimension boxes are included in skylines they would be included 
in the skylines for note-spacing as well, so the default height should be 
empty, not zero, and a special kind of empty so that extra-spacing-height still 
applies.
OK


https://codereview.appspot.com/7310075/



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


This is actually a whole bunch of commits: (issue 7303067)

2013-02-10 Thread k-ohara5a5a


https://codereview.appspot.com/7303067/diff/1/Documentation/notation/editorial.itely
File Documentation/notation/editorial.itely (right):

https://codereview.appspot.com/7303067/diff/1/Documentation/notation/editorial.itely#newcode157
Documentation/notation/editorial.itely:157: Markup texts or strings may
be used for finger changes.
Not strings in general, because the font is the music font by default.
General strings would have a in some default font, but p in the font for
the dynamic 'piano'

https://codereview.appspot.com/7303067/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Spacing with empty contexts; issue 1669 (issue 4515158)

2013-02-10 Thread mtsolo


https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc
File lily/align-interface.cc (right):

https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc#newcode222
lily/align-interface.cc:222: dy = max (dy, min_distance);
On 2011/06/09 02:55:55, Keith wrote:

On 2011/06/07 04:48:01, joeneeman wrote:
 If pure is true, there may be some staves that are going to be

removed.

However,
 these staves won't be removed until after line-breaking.



... and, as you say, these staves are not yet removed when

Y-extent-estimates

for the page breaker are calculated, so this patch messes up the page

breaker.


If the page breaker depends on empty, but living, staves disappearing

for

vertical spacing purposes, then maybe empty staves should be treated

that way

consistently. That would be tantamount to giving all empty-able

contexts the

hara-kiri engraver, as you suggested much earlier.



The obvious alternative would be to have the empty staves decide

whether to

suicide before page breaking, but my suspicion is that is awkward, or

it would

have been done that way at first.



Having minimum_distances() change behavior based on whether 'pure' is

true is

too tricky for me. (how do we know that any staff that is empty we are

pure will

suicide later)



I'll think on it, but mark the patch as abandoned for now.


Couldn't there just be a vectorbool ignore_me that contains the result
request_suicide for all elements (when pure)?  Then, the for loop would
be continued for these elements and they wouldn't have to be removed in
get_skylines.

https://codereview.appspot.com/4515158/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Spacing with empty contexts; issue 1669 (issue 4515158)

2013-02-10 Thread k-ohara5a5a


https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc
File lily/align-interface.cc (right):

https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc#newcode222
lily/align-interface.cc:222: dy = max (dy, min_distance);
On 2013/02/11 05:01:28, MikeSol wrote:


Couldn't there just be a vectorbool ignore_me that contains the

result

request_suicide for all elements (when pure)?  Then, the for loop

would be

continued for these elements and they wouldn't have to be removed in
get_skylines.


I think yes. ('removed_as_empty' would be a good name)
That array could be built by get_skylines(), since it already calls
pure_height(), which in turn calls request_suicide(..., start, end).

To truly distinguish the concepts of 'empty' versus 'removed', we could,
in get_skylines line 98
else if ( !(removed_as_empty[i] = request_suicide(elements[i], start,
end)))
but that results in an additional call to request_suicide() per
VertAxisGroup per pass through the line-breaking

https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc#newcode229
lily/align-interface.cc:229: // So if stretchability=0, treat
basic-distance as a minimum-distance.
On 2011/06/07 04:48:01, joeneeman wrote:

This is no longer needed, right?


This chunk is now no longer needed.

https://codereview.appspot.com/4515158/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Spacing with empty contexts; issue 1669 (issue 4515158)

2013-02-10 Thread m...@mikesolomon.org
On 11 févr. 2013, at 06:41, k-ohara5...@oco.net wrote:

 
 https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc
 File lily/align-interface.cc (right):
 
 https://codereview.appspot.com/4515158/diff/2009/lily/align-interface.cc#newcode222
 lily/align-interface.cc:222: dy = max (dy, min_distance);
 On 2013/02/11 05:01:28, MikeSol wrote:
 
 Couldn't there just be a vectorbool ignore_me that contains the
 result
 request_suicide for all elements (when pure)?  Then, the for loop
 would be
 continued for these elements and they wouldn't have to be removed in
 get_skylines.
 
 I think yes. ('removed_as_empty' would be a good name)
 That array could be built by get_skylines(), since it already calls
 pure_height(), which in turn calls request_suicide(..., start, end).
 
 To truly distinguish the concepts of 'empty' versus 'removed', we could,
 in get_skylines line 98
 else if ( !(removed_as_empty[i] = request_suicide(elements[i], start,
 end)))
 but that results in an additional call to request_suicide() per
 VertAxisGroup per pass through the line-breaking

Ok - I'll be able to work on this once the assertion error clears up from 
annotate-spacing (reported to the bug list a few minutes ago).

Cheers,
MS
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel