From 539ce242c831b4a581ebdd6b74f3d9e361bd8902 Mon Sep 17 00:00:00 2001
From: Marc Sabatella <marc@outsideshore.com>
Date: Fri, 6 Mar 2015 21:07:57 -0700
Subject: [PATCH] fix #41761: beam angle too sharp

---
 libmscore/beam.cpp               |  56 ++++++++++++++++++++--------
 mtest/libmscore/beam/Beam-A.mscx |  40 ++++++++++----------
 mtest/libmscore/beam/Beam-B.mscx |  32 ++++++++--------
 mtest/libmscore/beam/Beam-C.mscx |  36 +++++++++---------
 mtest/libmscore/beam/Beam-D.mscx |  50 ++++++++++++-------------
 mtest/libmscore/beam/Beam-E.mscx |  62 +++++++++++++++----------------
 mtest/libmscore/beam/Beam-F.mscx |  52 +++++++++++++-------------
 mtest/libmscore/beam/Beam-G.mscx |  40 ++++++++++----------
 vtest/beams-16-ref.png           | Bin 0 -> 8888 bytes
 vtest/beams-16.mscz              | Bin 0 -> 8712 bytes
 vtest/gen                        |   2 +-
 vtest/gen.bat                    |   2 +-
 12 files changed, 199 insertions(+), 173 deletions(-)
 create mode 100644 vtest/beams-16-ref.png
 create mode 100644 vtest/beams-16.mscz

diff --git a/libmscore/beam.cpp b/libmscore/beam.cpp
index 0b107e642ffb..a0b61918fc9b 100644
--- a/libmscore/beam.cpp
+++ b/libmscore/beam.cpp
@@ -675,8 +675,8 @@ static void initBeamMetrics()
       B(0,  3,  4,  13, 1);
       B(0,  3,  5,  13, 2);
       B(0,  3,  6,  14, 4);
-      B(0,  3,  7,  13, 4);
-      B(0,  3,  8,  13, 6);
+      B(0,  3,  7,  14, 4);
+      B(0,  3,  8,  14, 6);
 
       B(0,  3,  2,  11, -1);
       B(0,  3,  1,  11, -2);
@@ -716,17 +716,17 @@ static void initBeamMetrics()
 
       B(0, -5,-4,   16, 2);
       B(0, -5,-3,   16, 2);
-      B(0, -5,-2,   16, 2);
-      B(0, -5,-1,   16, 2);
-      B(0, -5, 0,   16, 4);
-      B(0, -5, 1,   16, 5);
-      B(0, -5, 2,   16, 5);
+      B(0, -5,-2,   17, 2);
+      B(0, -5,-1,   17, 2);
+      B(0, -5, 0,   18, 4);
+      B(0, -5, 1,   18, 5);
+      B(0, -5, 2,   21, 5);
 
       B(0,  2, 3,   12, 1);
       B(0,  2, 4,   12, 4);
       B(0,  2, 5,   13, 4);  // F
       B(0,  2, 6,   15, 5);
-      B(0,  2, 7,   13, 6);
+      B(0,  2, 7,   15, 6);
       B(0,  2, 8,   16, 8);
       B(0,  2, 9,   16, 8);
 
@@ -741,7 +741,7 @@ static void initBeamMetrics()
       // =================================== E
       B(1, 8, 8,  -12, 0);
       B(0, 1, 1,   13, 0);
-      B(1, 1, 1,   -9, 0);
+      B(1, 1, 1,  -12, 0);
 
       B(1, 8, 7, -12, -1);
       B(1, 8, 6, -12, -4);
@@ -753,8 +753,8 @@ static void initBeamMetrics()
 
       B(1, 15, 11, -21, -1);
       B(1, 15, 10, -21, -1);
-      B(1, 15,  9, -21, -1);
-      B(1, 15,  8, -21, -1);
+      B(1, 15,  9, -21, -4);
+      B(1, 15,  8, -21, -5);
 
       B(1,  1,  8, -11,  6);
       B(1,  1,  7, -11,  6);
@@ -766,7 +766,7 @@ static void initBeamMetrics()
       B(1,  8, 12, -12,  5);
       B(1,  8, 13, -12,  4);
       B(1,  8, 14, -12,  5);
-      B(1,  8, 15, -12,  1);
+      B(1,  8, 15, -12,  5);
 
       B(0,  1,  0, 11,  -1);
       B(0,  1, -1, 11,  -2);
@@ -796,7 +796,7 @@ static void initBeamMetrics()
       // =================================== F
       B(1, 7, 7,-13, 0);      //F
       B(0, 0, 0, 12, 0);
-      B(0, 7, 7, 10, 0);
+      B(0, 7, 7, 12, 0);
 
       B(1, 7, 6, -13, -1);
       B(1, 7, 5, -13, -2);
@@ -908,8 +908,8 @@ static void initBeamMetrics()
       B(1,  5,  4, -13, -1);
       B(1,  5,  3, -13, -2);
       B(1,  5,  2, -14, -4);
-      B(1,  5,  1, -14, -4);
-      B(1,  5,  0, -13, -6);
+      B(1,  5,  1, -15, -4);
+      B(1,  5,  0, -15, -6);
 
       B(1, 12, 11, -15, -1);
       B(1, 12, 10, -15, -2);
@@ -1164,6 +1164,28 @@ void Beam::computeStemLen(const QList<ChordRest*>& cl, qreal& py1, int beamLevel
             if (hasNoSlope())
                   bm.s = 0.0;
 
+            // special case for two beamed notes: flatten to max of 1sp
+            static int maxShortSlant = 4;
+            if (bm.l && elements().size() == 2) {
+                  //qDebug("computeStemLen: l = %d, s = %d", (int)bm.l, (int)bm.s);
+                  if (bm.s > maxShortSlant) {
+                        // slant downward
+                        // lengthen first stem if down
+                        if (bm.l > 0)
+                              bm.l += bm.s - maxShortSlant;
+                        // flatten beam
+                        bm.s = maxShortSlant;
+                        }
+                  else if (bm.s < -maxShortSlant) {
+                        // slant upward
+                        // lengthen first stem if up
+                        if (bm.l < 0)
+                              bm.l -= -maxShortSlant - bm.s;
+                        // flatten beam
+                        bm.s = -maxShortSlant;
+                        }
+                  }
+
             if (bm.l) {
                   if (bm.l > 0)
                         bm.l -= graceStemLengthCorrection;
@@ -1264,6 +1286,10 @@ void Beam::computeStemLen(const QList<ChordRest*>& cl, qreal& py1, int beamLevel
                   uint interval = qAbs((l2 - l1) / 2);
                   minS          = minSlant(interval);
                   maxS          = maxSlant(interval);
+                  if (elements().size() == 2) {
+                        minS = qMin(minS, 2);
+                        maxS = qMin(maxS, 4);
+                        }
                   }
             int ll1;
             if (_up) {
diff --git a/mtest/libmscore/beam/Beam-A.mscx b/mtest/libmscore/beam/Beam-A.mscx
index d156fa6f4fbb..befc90af70c8 100644
--- a/mtest/libmscore/beam/Beam-A.mscx
+++ b/mtest/libmscore/beam/Beam-A.mscx
@@ -260,8 +260,8 @@
           </Chord>
         <Beam id="7">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
-          <l2>-8</l2>
+          <l1>-5</l1>
+          <l2>-9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -288,8 +288,8 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
-          <l2>-9</l2>
+          <l1>-7</l1>
+          <l2>-11</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -420,7 +420,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>9</l1>
+          <l1>8</l1>
           <l2>4</l2>
           </Beam>
         <Chord>
@@ -444,7 +444,7 @@
       <Measure number="6">
         <Beam id="15">
           <StemDirection>up</StemDirection>
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -487,7 +487,7 @@
           </Chord>
         <Beam id="17">
           <StemDirection>up</StemDirection>
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -567,7 +567,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -588,7 +588,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -616,7 +616,7 @@
         <Beam id="22">
           <StemDirection>up</StemDirection>
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -636,7 +636,7 @@
           </Chord>
         <Beam id="23">
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -657,7 +657,7 @@
           </Chord>
         <Beam id="24">
           <l1>-1</l1>
-          <l2>4</l2>
+          <l2>3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -723,7 +723,7 @@
             </Note>
           </Chord>
         <Beam id="27">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -743,7 +743,7 @@
             </Note>
           </Chord>
         <Beam id="28">
-          <l1>11</l1>
+          <l1>12</l1>
           <l2>16</l2>
           </Beam>
         <Chord>
@@ -770,7 +770,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="29">
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -811,7 +811,7 @@
             </Note>
           </Chord>
         <Beam id="31">
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -1064,7 +1064,7 @@
           </Chord>
         <Beam id="42">
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1092,7 +1092,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1113,7 +1113,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1135,7 +1135,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>21</l1>
-          <l2>16</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-B.mscx b/mtest/libmscore/beam/Beam-B.mscx
index 408a5eb46fe9..bd04f946d15c 100644
--- a/mtest/libmscore/beam/Beam-B.mscx
+++ b/mtest/libmscore/beam/Beam-B.mscx
@@ -255,7 +255,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>9</l1>
+          <l1>8</l1>
           <l2>4</l2>
           </Beam>
         <Chord>
@@ -276,7 +276,7 @@
             </Note>
           </Chord>
         <Beam id="8">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -326,7 +326,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -348,7 +348,7 @@
           </Chord>
         <Beam id="11">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -626,7 +626,7 @@
         <Beam id="23">
           <StemDirection>up</StemDirection>
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -647,7 +647,7 @@
         <Beam id="24">
           <StemDirection>up</StemDirection>
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -675,7 +675,7 @@
         <Beam id="25">
           <StemDirection>up</StemDirection>
           <l1>-5</l1>
-          <l2>1</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -716,7 +716,7 @@
           </Chord>
         <Beam id="27">
           <l1>-4</l1>
-          <l2>1</l2>
+          <l2>0</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -783,7 +783,7 @@
           </Chord>
         <Beam id="30">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -803,7 +803,7 @@
           </Chord>
         <Beam id="31">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -830,7 +830,7 @@
           </LayoutBreak>
         <Beam id="32">
           <l1>21</l1>
-          <l2>15</l2>
+          <l2>17</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -871,7 +871,7 @@
           </Chord>
         <Beam id="34">
           <l1>20</l1>
-          <l2>15</l2>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1142,7 +1142,7 @@
             </Note>
           </Chord>
         <Beam id="46">
-          <l1>7</l1>
+          <l1>8</l1>
           <l2>12</l2>
           </Beam>
         <Chord>
@@ -1162,7 +1162,7 @@
             </Note>
           </Chord>
         <Beam id="47">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -1211,7 +1211,7 @@
           </Chord>
         <Beam id="49">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -1233,7 +1233,7 @@
           </Chord>
         <Beam id="50">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
diff --git a/mtest/libmscore/beam/Beam-C.mscx b/mtest/libmscore/beam/Beam-C.mscx
index 4ace955ec9a7..5ea0ff481a82 100644
--- a/mtest/libmscore/beam/Beam-C.mscx
+++ b/mtest/libmscore/beam/Beam-C.mscx
@@ -233,7 +233,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -254,7 +254,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -281,7 +281,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="8">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -323,7 +323,7 @@
             </Note>
           </Chord>
         <Beam id="10">
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -533,7 +533,7 @@
           </Chord>
         <Beam id="19">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -560,7 +560,7 @@
           </LayoutBreak>
         <Beam id="20">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -580,7 +580,7 @@
           </Chord>
         <Beam id="21">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -601,7 +601,7 @@
           </Chord>
         <Beam id="22">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -686,7 +686,7 @@
             </Note>
           </Chord>
         <Beam id="26">
-          <l1>7</l1>
+          <l1>8</l1>
           <l2>12</l2>
           </Beam>
         <Chord>
@@ -713,7 +713,7 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="27">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -754,7 +754,7 @@
             </Note>
           </Chord>
         <Beam id="29">
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -841,7 +841,7 @@
           </Chord>
         <Beam id="33">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -864,7 +864,7 @@
       <Measure number="13">
         <Beam id="34">
           <l1>-5</l1>
-          <l2>0</l2>
+          <l2>-1</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -943,7 +943,7 @@
           </Chord>
         <Beam id="37">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -963,7 +963,7 @@
           </Chord>
         <Beam id="38">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -990,7 +990,7 @@
           </LayoutBreak>
         <Beam id="39">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1010,7 +1010,7 @@
           </Chord>
         <Beam id="40">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1031,7 +1031,7 @@
           </Chord>
         <Beam id="41">
           <l1>17</l1>
-          <l2>12</l2>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-D.mscx b/mtest/libmscore/beam/Beam-D.mscx
index 49ab30cd7ed2..b5cc5f1bcdec 100644
--- a/mtest/libmscore/beam/Beam-D.mscx
+++ b/mtest/libmscore/beam/Beam-D.mscx
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>2</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -563,7 +563,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>-8</l1>
-          <l2>-3</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -591,7 +591,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>-7</l1>
-          <l2>-2</l2>
+          <l2>-3</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -611,7 +611,7 @@
           </Chord>
         <Beam id="22">
           <l1>-8</l1>
-          <l2>-3</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -632,7 +632,7 @@
           </Chord>
         <Beam id="23">
           <l1>-8</l1>
-          <l2>0</l2>
+          <l2>-4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -698,8 +698,8 @@
             </Note>
           </Chord>
         <Beam id="26">
-          <l1>6</l1>
-          <l2>8</l2>
+          <l1>7</l1>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -718,8 +718,8 @@
             </Note>
           </Chord>
         <Beam id="27">
-          <l1>6</l1>
-          <l2>8</l2>
+          <l1>7</l1>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -745,8 +745,8 @@
           <pause>3</pause>
           </LayoutBreak>
         <Beam id="28">
-          <l1>6</l1>
-          <l2>10</l2>
+          <l1>8</l1>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -765,8 +765,8 @@
             </Note>
           </Chord>
         <Beam id="29">
-          <l1>6</l1>
-          <l2>11</l2>
+          <l1>9</l1>
+          <l2>13</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -786,8 +786,8 @@
             </Note>
           </Chord>
         <Beam id="30">
-          <l1>6</l1>
-          <l2>11</l2>
+          <l1>12</l1>
+          <l2>16</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -874,7 +874,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -898,8 +898,8 @@
       <Measure number="13">
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>17</l1>
-          <l2>23</l2>
+          <l1>21</l1>
+          <l2>25</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -978,7 +978,7 @@
           </Chord>
         <Beam id="38">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -998,7 +998,7 @@
           </Chord>
         <Beam id="39">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1066,7 +1066,7 @@
           </Chord>
         <Beam id="42">
           <l1>16</l1>
-          <l2>11</l2>
+          <l2>12</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-E.mscx b/mtest/libmscore/beam/Beam-E.mscx
index d98f2e895207..fa78fc3bb059 100644
--- a/mtest/libmscore/beam/Beam-E.mscx
+++ b/mtest/libmscore/beam/Beam-E.mscx
@@ -159,8 +159,8 @@
           </Chord>
         <Beam id="3">
           <StemDirection>up</StemDirection>
-          <l1>-7</l1>
-          <l2>-7</l2>
+          <l1>-10</l1>
+          <l2>-10</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>4</l1>
+          <l1>3</l1>
           <l2>-1</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
+          <l1>-5</l1>
           <l2>-9</l2>
           </Beam>
         <Chord>
@@ -399,7 +399,7 @@
           </Chord>
         <Beam id="13">
           <l1>9</l1>
-          <l2>8</l2>
+          <l2>5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -418,8 +418,8 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>9</l1>
-          <l2>8</l2>
+          <l1>8</l1>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -442,7 +442,7 @@
       <Measure number="6">
         <Beam id="15">
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -463,7 +463,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -485,7 +485,7 @@
         <Beam id="17">
           <StemDirection>up</StemDirection>
           <l1>-10</l1>
-          <l2>-4</l2>
+          <l2>-6</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -564,7 +564,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -585,7 +585,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -633,7 +633,7 @@
           </Chord>
         <Beam id="23">
           <l1>4</l1>
-          <l2>9</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -654,7 +654,7 @@
           </Chord>
         <Beam id="24">
           <l1>4</l1>
-          <l2>5</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -721,7 +721,7 @@
           </Chord>
         <Beam id="27">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -741,7 +741,7 @@
           </Chord>
         <Beam id="28">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -768,7 +768,7 @@
           </LayoutBreak>
         <Beam id="29">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -788,7 +788,7 @@
           </Chord>
         <Beam id="30">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -809,7 +809,7 @@
           </Chord>
         <Beam id="31">
           <l1>13</l1>
-          <l2>8</l2>
+          <l2>9</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -875,7 +875,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
@@ -896,7 +896,7 @@
           </Chord>
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -920,7 +920,7 @@
       <Measure number="13">
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>17</l1>
+          <l1>18</l1>
           <l2>22</l2>
           </Beam>
         <Chord>
@@ -940,7 +940,7 @@
             </Note>
           </Chord>
         <Beam id="37">
-          <l1>19</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -962,7 +962,7 @@
           </Chord>
         <Beam id="38">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>23</l1>
           <l2>27</l2>
           </Beam>
         <Chord>
@@ -1058,7 +1058,7 @@
             </Note>
           </Chord>
         <Beam id="42">
-          <l1>8</l1>
+          <l1>9</l1>
           <l2>13</l2>
           </Beam>
         <Chord>
@@ -1087,7 +1087,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1108,7 +1108,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>28</l1>
-          <l2>20</l2>
+          <l2>24</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1130,7 +1130,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>28</l1>
-          <l2>20</l2>
+          <l2>24</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-F.mscx b/mtest/libmscore/beam/Beam-F.mscx
index 8d6fde05e47e..4391f8ac90b1 100644
--- a/mtest/libmscore/beam/Beam-F.mscx
+++ b/mtest/libmscore/beam/Beam-F.mscx
@@ -159,8 +159,8 @@
           </Chord>
         <Beam id="3">
           <StemDirection>down</StemDirection>
-          <l1>24</l1>
-          <l2>24</l2>
+          <l1>26</l1>
+          <l2>26</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -237,7 +237,7 @@
             </Note>
           </Chord>
         <Beam id="6">
-          <l1>1</l1>
+          <l1>0</l1>
           <l2>-4</l2>
           </Beam>
         <Chord>
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>0</l1>
+          <l1>-1</l1>
           <l2>-5</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-3</l1>
           <l2>-7</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-3</l1>
+          <l1>-5</l1>
           <l2>-9</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -418,7 +418,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -443,7 +443,7 @@
         <Beam id="15">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -464,7 +464,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -486,7 +486,7 @@
         <Beam id="17">
           <StemDirection>up</StemDirection>
           <l1>-9</l1>
-          <l2>-3</l2>
+          <l2>-5</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -565,7 +565,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -586,7 +586,7 @@
         <Beam id="21">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -614,7 +614,7 @@
         <Beam id="22">
           <StemDirection>up</StemDirection>
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -634,7 +634,7 @@
           </Chord>
         <Beam id="23">
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -655,7 +655,7 @@
           </Chord>
         <Beam id="24">
           <l1>3</l1>
-          <l2>8</l2>
+          <l2>7</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -722,7 +722,7 @@
           </Chord>
         <Beam id="27">
           <l1>12</l1>
-          <l2>7</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -742,7 +742,7 @@
           </Chord>
         <Beam id="28">
           <l1>12</l1>
-          <l2>7</l2>
+          <l2>8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -876,7 +876,7 @@
           </Chord>
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -897,7 +897,7 @@
           </Chord>
         <Beam id="35">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>16</l1>
           <l2>20</l2>
           </Beam>
         <Chord>
@@ -921,7 +921,7 @@
       <Measure number="13">
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -941,7 +941,7 @@
             </Note>
           </Chord>
         <Beam id="37">
-          <l1>17</l1>
+          <l1>18</l1>
           <l2>22</l2>
           </Beam>
         <Chord>
@@ -963,7 +963,7 @@
           </Chord>
         <Beam id="38">
           <StemDirection>down</StemDirection>
-          <l1>19</l1>
+          <l1>21</l1>
           <l2>25</l2>
           </Beam>
         <Chord>
@@ -1088,7 +1088,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>26</l1>
-          <l2>20</l2>
+          <l2>22</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1109,7 +1109,7 @@
         <Beam id="44">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1131,7 +1131,7 @@
         <Beam id="45">
           <StemDirection>down</StemDirection>
           <l1>25</l1>
-          <l2>19</l2>
+          <l2>21</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/mtest/libmscore/beam/Beam-G.mscx b/mtest/libmscore/beam/Beam-G.mscx
index d3a254e14daf..7c602419c87e 100644
--- a/mtest/libmscore/beam/Beam-G.mscx
+++ b/mtest/libmscore/beam/Beam-G.mscx
@@ -258,7 +258,7 @@
             </Note>
           </Chord>
         <Beam id="7">
-          <l1>-3</l1>
+          <l1>-4</l1>
           <l2>-8</l2>
           </Beam>
         <Chord>
@@ -286,7 +286,7 @@
           </LayoutBreak>
         <Beam id="8">
           <StemDirection>up</StemDirection>
-          <l1>-1</l1>
+          <l1>-4</l1>
           <l2>-8</l2>
           </Beam>
         <Chord>
@@ -308,7 +308,7 @@
           </Chord>
         <Beam id="9">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -330,7 +330,7 @@
           </Chord>
         <Beam id="10">
           <StemDirection>up</StemDirection>
-          <l1>-4</l1>
+          <l1>-8</l1>
           <l2>-12</l2>
           </Beam>
         <Chord>
@@ -418,7 +418,7 @@
             </Note>
           </Chord>
         <Beam id="14">
-          <l1>8</l1>
+          <l1>7</l1>
           <l2>3</l2>
           </Beam>
         <Chord>
@@ -442,7 +442,7 @@
       <Measure number="6">
         <Beam id="15">
           <StemDirection>up</StemDirection>
-          <l1>5</l1>
+          <l1>4</l1>
           <l2>0</l2>
           </Beam>
         <Chord>
@@ -464,7 +464,7 @@
         <Beam id="16">
           <StemDirection>up</StemDirection>
           <l1>-12</l1>
-          <l2>-4</l2>
+          <l2>-8</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -547,7 +547,7 @@
         <Beam id="19">
           <StemDirection>up</StemDirection>
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -568,7 +568,7 @@
         <Beam id="20">
           <StemDirection>up</StemDirection>
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -616,7 +616,7 @@
           </Chord>
         <Beam id="22">
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -637,7 +637,7 @@
           </Chord>
         <Beam id="23">
           <l1>0</l1>
-          <l2>5</l2>
+          <l2>4</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -844,7 +844,7 @@
           </Chord>
         <Beam id="32">
           <StemDirection>down</StemDirection>
-          <l1>11</l1>
+          <l1>12</l1>
           <l2>16</l2>
           </Beam>
         <Chord>
@@ -865,7 +865,7 @@
           </Chord>
         <Beam id="33">
           <StemDirection>down</StemDirection>
-          <l1>12</l1>
+          <l1>13</l1>
           <l2>17</l2>
           </Beam>
         <Chord>
@@ -889,7 +889,7 @@
       <Measure number="13">
         <Beam id="34">
           <StemDirection>down</StemDirection>
-          <l1>15</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -909,7 +909,7 @@
             </Note>
           </Chord>
         <Beam id="35">
-          <l1>16</l1>
+          <l1>17</l1>
           <l2>21</l2>
           </Beam>
         <Chord>
@@ -931,7 +931,7 @@
           </Chord>
         <Beam id="36">
           <StemDirection>down</StemDirection>
-          <l1>16</l1>
+          <l1>20</l1>
           <l2>24</l2>
           </Beam>
         <Chord>
@@ -1032,7 +1032,7 @@
         <Beam id="40">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>18</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1060,7 +1060,7 @@
         <Beam id="41">
           <StemDirection>down</StemDirection>
           <l1>23</l1>
-          <l2>17</l2>
+          <l2>19</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
@@ -1081,7 +1081,7 @@
         <Beam id="42">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>17</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <BeamMode>begin</BeamMode>
@@ -1103,7 +1103,7 @@
         <Beam id="43">
           <StemDirection>down</StemDirection>
           <l1>24</l1>
-          <l2>16</l2>
+          <l2>20</l2>
           </Beam>
         <Chord>
           <durationType>eighth</durationType>
diff --git a/vtest/beams-16-ref.png b/vtest/beams-16-ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..7015a238d8d35db87ded1ea655c4e5f05d35d39d
GIT binary patch
literal 8888
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
PBc^Dm>ZnvGSx5d4FQf!M

literal 0
HcmV?d00001

diff --git a/vtest/beams-16.mscz b/vtest/beams-16.mscz
new file mode 100644
index 0000000000000000000000000000000000000000..3d2bbcda04e80ce14a4100f129355a032abae514
GIT binary patch
literal 8712
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
WSXB`o;lGw)Kl<Ru$o%EMwEqR}K<BRj

literal 0
HcmV?d00001

diff --git a/vtest/gen b/vtest/gen
index 44dee6f5ec04..306ef267112e 100755
--- a/vtest/gen
+++ b/vtest/gen
@@ -47,7 +47,7 @@ else
        tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4 tuplets-1 breath-1\
        harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7 harmony-8 harmony-9 harmony-10 harmony-11\
        beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7 beams-8 beams-9 beams-10\
-       beams-11 beams-12 beams-13 beams-14 beams-15\
+       beams-11 beams-12 beams-13 beams-14 beams-15 beams-16\
        user-offset-1 user-offset-2 chord-space-1 chord-space-2 tablature-1 image-1\
        lyrics-1 lyrics-2 lyrics-3 lyrics-4 voice-1 voice-2 slash-1 slash-2 system-1 system-2 system-3"
 fi
diff --git a/vtest/gen.bat b/vtest/gen.bat
index df94840aaf3f..95608cb33c6c 100644
--- a/vtest/gen.bat
+++ b/vtest/gen.bat
@@ -22,7 +22,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,tuplets-1,breath-1, ^
  harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7,harmony-8,harmony-9,harmony-10,harmony-11, ^
  beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8,beams-9,beams-10, ^
- beams-11,beams-12,beams-13,beams-14,beams-15, ^
+ beams-11,beams-12,beams-13,beams-14,beams-15,beams-16, ^
  user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^
  lyrics-1,lyrics-2,lyrics-3,lyrics-4,voice-1,voice-2,slash-1,slash-2,system-1,system-2,system-3