Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Fix 591.
  Fix 585.
  MusicXML: Use indentation in PostScript for better structuring
  Update from Neil in input/new
  @internalsref -> @rinternals update.
  Update from Francisco
  Test of LSR commenting-out.
  Policy updates.
  Update from Francisco.

diff --combined Documentation/user/macros.itexi
index 0706c522395fb126c74c117f3516466b84c64461,8298e9e4a5c17a4208ded7eca04a1405f4efdfe0..599a89727699a02d2ebe6e622d3db102c021ccf2
--- 1/Documentation/user/macros.itexi
--- 2/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@@ -106,11 -106,6 +106,11 @@@
  
  @end macro
  
 +@macro lydoctitle {TEXT}
 +@emph{\TEXT\}
 +
 +@end macro
 +
  @macro funindex {TEXT}
  @findex \TEXT\
  @kindex \TEXT\
@@@ -120,18 -115,6 +120,6 @@@
  
  @c   **** Links and references ****
  
- @c  TO BE DEPRECATED
- @c usage: @lsrdir{ancient,Ancient-notation}
- @macro lsrdir{SECTION,DIR}
- @ifhtml
- @uref{source/input/lsr/lilypond-snippets/\DIR\.html,\SECTION\}
- @end ifhtml
- @ifnothtml
- \DIR\
- @end ifnothtml
- @end macro
- 
- 
  @c  Definitions for references:
  @c     @rglos
  @c     @rlearning
@@@ -145,13 -128,6 +133,6 @@@
  
  @ifset bigpage
  
- @c TO BE DEPRECATED
- @macro internalsref{TEXT}
- @vindex \TEXT\
- @ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
- @end macro
- 
- 
  @macro rglos{TEXT}
  @vindex \TEXT\
  @ref{\TEXT\,,,music-glossary-big-page,Music Glossary}
@@@ -186,13 -162,6 +167,6 @@@
  
  @ifclear bigpage
  
- @c  DEPRECATED
- @macro internalsref{TEXT}
- @vindex \TEXT\
- @ref{\TEXT\,,,lilypond-internals,Internals Reference}
- @end macro
- 
- 
  @macro rglos{TEXT}
  @vindex \TEXT\
  @ref{\TEXT\,,,music-glossary,Music Glossary}
@@@ -230,14 -199,6 +204,6 @@@
  @ifdocbook
  @c ***** DOCBOOK-XML *****
  
- @c  DEPRECATED
- @macro internalsref{TEXT}
- @vindex \TEXT\
- @ref{\TEXT\,,,lilypond-internals,Internals Reference}
- @end macro
- 
- 
- 
  @macro rglos{TEXT}
  @vindex \TEXT\
  @ref{\TEXT\,,,music-glossary,Music Glossary}
@@@ -273,14 -234,6 +239,6 @@@
  @ifinfo
  @c **** INFO ****
  
- @c DEPRECATED
- @macro internalsref{TEXT}
- @vindex \TEXT\
- @inforef{\TEXT\,,lilypond-internals,Internals Reference}
- @end macro
- 
- 
- 
  @macro rglos{TEXT}
  @vindex \TEXT\
  @inforef{\TEXT\,,music-glossary,Music Glossary}
@@@ -316,14 -269,6 +274,6 @@@
  @c **** TEX ****
  @iftex
  
- @c DEPRECATED
- @macro internalsref{TEXT}
- @vindex \TEXT\
- @code{\TEXT\}
- @end macro
- 
- 
- 
  @macro rglos{TEXT}
  @vindex \TEXT\
  @ref{\TEXT\,,,music-glossary,Music Glossary}
@@@ -352,3 -297,5 +302,3 @@@ program usage manual, @ref{\TEXT\,,,lil
  
  @end iftex
  
 -
 -@c EOF