Skip to content

Commit

Permalink
Merge pull request #1058 from rpspringuel/feature/fontdimen
Browse files Browse the repository at this point in the history
Addresses #1036
  • Loading branch information
rpspringuel committed Apr 6, 2016
2 parents 294a3f6 + 33321b4 commit 1189420
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- Penalties must now be changed using the `\grechangecount` command. See GregorioRef and [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#1021](https://github.com/gregorio-project/gregorio/issues/1021)).
- `\greemergencystretch` must now be set by changing `emergencystretch` using `\grechangedim` instead of redefining the macro.
- An isolated stropha will now be considered part of the previous neume group and line breaks will be prevented at that point. In order to force a line break there, use a breaking space such as `/` before the stropha in gabc. See [#1056](https://github.com/gregorio-project/gregorio/issues/1056).
- `interwordspacetext` and it's related distances have been redefined to be smaller and dependent on a font based distance (`ex`). They are also no longer scale with the staff size by default. See [#1036](https://github.com/gregorio-project/gregorio/issues/1036) & [gregoriot-test#208](https://github.com/gregorio-project/gregorio-test/pull/208).

### Removed
- `\grescorereference`
Expand Down
2 changes: 1 addition & 1 deletion doc/Command_Index_User.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ \subsection{Distances}\label{distances}
Distance to place a ``rare'' sign above the top space in a score.
\end{gdimension}

\subsubsection*{Bar distances}
\subsubsection{Bar distances}

\begin{gdimension}{bar@finalfinalis}
This space is added before the final divisio final of a score (old bar spacing algorithm only).
Expand Down
2 changes: 1 addition & 1 deletion doc/GregorioRef.tex
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
\ifbreakable%
\filbreak%
\else%
\breakabletrue%
\global\breakabletrue%
\fi%
\makebox[\linewidth]{\ttfamily\bfseries #1#2%
\hspace{\fill}\normalfont\itshape #3}%
Expand Down
15 changes: 7 additions & 8 deletions tex/gsp-default.tex
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,11 @@
% stretching added in the case where the text of two syllables of the same word are
% separated with an automatic hyphen
\grecreatedim{intersyllablespacestretchhyphen}{0cm plus 0.05cm}{scalable}%
% minimal space between letters of different words. Makes sense to have
% the same plus and minus as interwordspacenotes.
\grecreatedim{interwordspacetext}{0.38 cm plus 0.15 cm minus 0.05 cm}{scalable}%
% minimal space between letters of different words.
\grecreatedim{interwordspacetext}{1ex plus 0.15cm minus 0.05cm}{fixed}%
% Versions of interword spaces for euouae blocks
\grecreatedim{interwordspacenotes@euouae}{0.19 cm plus 0.1 cm minus 0.05 cm}{scalable}%
\grecreatedim{interwordspacetext@euouae}{0.27 cm plus 0.1 cm minus 0.05 cm}{scalable}%
\grecreatedim{interwordspacetext@euouae}{0.8ex plus 01.cm minus 0.05cm}{fixed}%
% versions of note spaces when the first note of the second syllable is an alteration
% those are used in euouae blocks
\grecreatedim{interwordspacenotes@alteration}{0.1 cm plus 0.07 cm minus 0.01 cm}{scalable}%
Expand Down Expand Up @@ -224,14 +223,14 @@
%
% minimal space between letters of different syllable texts for text around bars
% (new bar spacing algorithm only)
\grecreatedim{interwordspacetext@bars}{0.15 cm}{scalable}%
\grecreatedim{interwordspacetext@bars}{0.7ex}{fixed}%
% minimal space between letters of different syllable texts for text around bars,
% euouae context
\grecreatedim{interwordspacetext@bars@euouae}{0.15 cm}{scalable}%
\grecreatedim{interwordspacetext@bars@notext}{0.4 cm}{scalable}%
\grecreatedim{interwordspacetext@bars@euouae}{0.7ex}{fixed}%
\grecreatedim{interwordspacetext@bars@notext}{1ex}{fixed}%
% minimal space between letters of different syllable texts for text around bars,
% euouae context
\grecreatedim{interwordspacetext@bars@notext@euouae}{0.3 cm}{scalable}%
\grecreatedim{interwordspacetext@bars@notext@euouae}{0.7ex}{fixed}%
% rubber length that will be added around bars in new bar spacing algorithm
\grecreatedim{bar@rubber}{0 cm plus 0.22787 cm minus 0.02 cm}{scalable}%
% additional space that will appear around bars that are preceded by a custos and followed by a key.
Expand Down

0 comments on commit 1189420

Please sign in to comment.