Merge commit 'origin/master'

* commit 'origin/master':
  Remove obsolete accordion code.
  Fix broken links in NR and LM
  Documentation nitpicks
  GDP NR 5.6.3 Modifying stencils
  Merge Jonathan's changes
  Add predefined-fretboards to NEWS, add harmonics to fretted-strings
  Fix links to BassFigure
  GDP NR 6.3.1 Move index entry
  News update.
  Really fix link to figured bass
  Fix glossary link for figured bass
  GDP NR 5.6.4 Needs utf8
  GDP NR 5.6.4 Modifying shape of slurs and ties
  Add \pointAndClick[Off, On]
  Noteheads ... note heads
  Documentation nitpicks
  Documentation nitpicks
  Documentation nitpicks

Conflicts:

	Documentation/topdocs/NEWS.tely

diff --cc Documentation/topdocs/NEWS.tely
index 1c291bc86b128e4dd1c675b6a5e55602e8b24f6d,0d820c7a28303462a921db3157c674542bcb5b55..cafa877cf104867ced2ad2109b5bf5a053bb2605
--- 1/Documentation/topdocs/NEWS.tely
--- 2/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@@ -65,37 -65,46 +65,56 @@@ which scares away people
  
  @end ignore
  
+ @item
+ Predefined, user-configurable, transposable fret diagrams
+ are now available in the FretBoards context:
+ @lilypond[]
+ \include "predefined-guitar-fretboards.ly"
+ <<
+   \new ChordNames {
+    \chordmode {
+       c1 \transpose c e { c }
+     }
+   }
+   \new FretBoards {
+     \chordmode {
+       c1 \transpose c e { c }
+     }
+   }
+ >>
+ @end lilypond
+ 
  @item
 -A few syntax changes were made:
 +The following syntax changes were made, in chronological order. In
 +addition, fret diagram properties have been moved to
 +@code{fret-diagram-details}, and @code{#'style} property is used to
 +select solid/dashed lines instead of @code{#'dash-fraction}.
 +
  @example
 -2.11.23: #'break-align-symbol -> #'break-align-symbols
 -2.11.35: scripts.caesura -> scripts.caesura.curved.
 -Use #'style not #'dash-fraction to select solid/dashed lines.
 -2.11.38: \setEasyHeads -> \easyHeadsOn, \fatText -> \textLengthOn,
 +#'break-align-symbol -> #'break-align-symbols
 +scripts.caesura -> scripts.caesura.curved
 +\setEasyHeads -> \easyHeadsOn
 +\easyHeadsOff (new command)
 +\fatText -> \textLengthOn
  \emptyText -> \textLengthOff
 -2.11.46: \set hairpinToBarline -> \override Hairpin #'to-barline
 -2.11.48: \compressMusic -> \scaleDurations
 -2.11.50: metronomeMarkFormatter uses text markup as second argument,
 -fret diagram properties moved to fret-diagram-details.
 -2.11.51: \octave -> \octaveCheck, \arpeggioUp -> \arpeggioArrowUp,
 -\arpeggioDown -> \arpeggioArrowDown, \arpeggioNeutral -> \arpeggioNormal,
 -\setTextCresc -> \crescTextCresc, \setTextDecresc -> \dimTextDecresc,
 -\setTextDecr -> \dimTextDecr, \setTextDim -> \dimTextDim,
 -\setHairpinCresc -> \crescHairpin, \setHairpinDecresc -> \dimHairpin,
 -\sustainUp -> \sustainOff, \sustainDown -> \sustainOn
 -\sostenutoDown -> \sostenutoOn, \sostenutoUp -> \sostenutoOff
 -2.11.53: infinite-spacing-height -> extra-spacing-height
 -2.11.55: #(set-octavation oct) -> \ottava #oct,
 +\set hairpinToBarline -> \override Hairpin #'to-barline
 +\compressMusic -> \scaleDurations
 +\octave -> \octaveCheck
 +\arpeggioUp -> \arpeggioArrowUp
 +\arpeggioDown -> \arpeggioArrowDown
 +\arpeggioNeutral -> \arpeggioNormal
 +\setTextCresc -> \crescTextCresc
 +\setTextDecresc -> \dimTextDecresc
 +\setTextDecr -> \dimTextDecr
 +\setTextDim -> \dimTextDim
 +\setHairpinCresc -> \crescHairpin
 +\setHairpinDecresc -> \dimHairpin
 +\sustainUp -> \sustainOff
 +\sustainDown -> \sustainOn
 +\sostenutoDown -> \sostenutoOn
 +\sostenutoUp -> \sostenutoOff
 +infinite-spacing-height -> extra-spacing-height
 +#(set-octavation oct) -> \ottava #oct
  \put-adjacent markup axis dir markup -> \put-adjacent axis dir markup markup
  @end example
  

diff --cc Documentation/user/changing-defaults.itely
index 0650193c30770b3784e17de41bcd05414f7187fc,e16eae1c004ab5202730dd60a123c552509cb313..0ba8be5d8377497587899420e86b2a402b3c308d
--- 1/Documentation/user/changing-defaults.itely
--- 2/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@@ -1737,17 -1737,12 +1737,12 @@@ restricted to a sub-set of the spanners
  @section Common properties
  
  @menu
 -* Controlling visibility of objects::
 -* Line styles::
 -* Rotating objects::
 -* Aligning objects::
 +* Controlling visibility of objects::  
 +* Line styles::                 
 +* Rotating objects::            
 +* Aligning objects::            
  @end menu
  
- @c TODO Add new subsection Shapes of objects
- @c which would include Slur shapes
- @c with a Known issue: can't modify shapes with 'control-points if there are
- @c more than one at the same musical moment
- 
  @node Controlling visibility of objects
  @subsection Controlling visibility of objects
  

diff --cc Documentation/user/chords.itely
Simple merge

diff --cc Documentation/user/editorial.itely
Simple merge

diff --cc Documentation/user/rhythms.itely
Simple merge