From 76bd1c0210f3ffee876bb0ca07ba546ceb84dc23 Mon Sep 17 00:00:00 2001 From: ncondits3 Date: Wed, 27 Dec 2023 20:28:07 -0500 Subject: [PATCH] Added the humdrumR methods for harte(), which I forgot. --- NAMESPACE | 2 ++ R/Chords.R | 3 +++ man/pitchDeparsing.Rd | 36 ++++++++++++++++++------------------ man/pitchParsing.Rd | 36 ++++++++++++++++++------------------ 4 files changed, 41 insertions(+), 36 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 1c687bc9..6f97df0e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -71,6 +71,8 @@ S3method(grid,humdrumR) S3method(group_by,humdrumR) S3method(harm,default) S3method(harm,humdrumR) +S3method(harte,default) +S3method(harte,humdrumR) S3method(helmholtz,default) S3method(helmholtz,humdrumR) S3method(hint,default) diff --git a/R/Chords.R b/R/Chords.R index e1efc91e..c13d8d9b 100644 --- a/R/Chords.R +++ b/R/Chords.R @@ -1672,6 +1672,9 @@ humdrumRmethods('harm') #' @exportS3Method chord default #' @exportS3Method chord humdrumR humdrumRmethods('chord') +#' @exportS3Method harte default +#' @exportS3Method harte humdrumR +humdrumRmethods('harte') #' @exportS3Method tertian default #' @exportS3Method tertian humdrumR humdrumRmethods('tertian') diff --git a/man/pitchDeparsing.Rd b/man/pitchDeparsing.Rd index 2b846acb..edb29df1 100644 --- a/man/pitchDeparsing.Rd +++ b/man/pitchDeparsing.Rd @@ -419,19 +419,19 @@ For example, we might think of a ascending major 12th as being an ascending octa The following table illustrates how different \code{octave.round} arguments "partition" compound intervals into simple parts and octaves:\tabular{llllll}{ \tab round \tab floor \tab ceiling \tab trunc \tab expand \cr -P12: \tab -P15 + P4 \tab -P15 + P4 \tab -P8 - P5 \tab -P8 - P5 \tab -P15 + P4 \cr - +P12: \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \cr - +P8: \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \cr + -P11: \tab -P8 - P4 \tab -P15 + P5 \tab -P8 - P4 \tab -P8 - P4 \tab -P15 + P5 \cr + -P8: \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \cr -P5: \tab -P8 + P4 \tab -P8 + P4 \tab +P1 - P5 \tab +P1 - P5 \tab -P8 + P4 \cr - +P19: \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \cr - +P15: \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \cr + -P4: \tab +P1 - P4 \tab -P8 + P5 \tab +P1 - P4 \tab +P1 - P4 \tab -P8 + P5 \cr + P1: \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \cr +P4: \tab +P1 + P4 \tab +P1 + P4 \tab +P8 - P5 \tab +P1 + P4 \tab +P8 - P5 \cr - +P26: \tab +P29 - P4 \tab +P22 + P5 \tab +P29 - P4 \tab +P22 + P5 \tab +P29 - P4 \cr - +P22: \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \cr + +P5: \tab +P8 - P4 \tab +P1 + P5 \tab +P8 - P4 \tab +P1 + P5 \tab +P8 - P4 \cr + +P8: \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \cr +P11: \tab +P8 + P4 \tab +P8 + P4 \tab +P15 - P5 \tab +P8 + P4 \tab +P15 - P5 \cr - +P33: \tab +P36 - P4 \tab +P29 + P5 \tab +P36 - P4 \tab +P29 + P5 \tab +P36 - P4 \cr - +P29: \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \cr + +P12: \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \cr + +P15: \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \cr +P18: \tab +P15 + P4 \tab +P15 + P4 \tab +P22 - P5 \tab +P15 + P4 \tab +P22 - P5 \cr - +P40: \tab +P43 - P4 \tab +P36 + P5 \tab +P43 - P4 \tab +P36 + P5 \tab +P43 - P4 \cr + +P19: \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \cr } @@ -441,19 +441,19 @@ When parsing \link[=pitch]{"absolute" pitch} representations, the \code{octave.r The following table illustrates:\tabular{llllll}{ \tab round \tab floor \tab ceiling \tab trunc \tab expand \cr FF: \tab F2 \tab F2 \tab F3 \tab F3 \tab F2 \cr - gg: \tab G6 \tab G5 \tab G6 \tab G5 \tab G6 \cr - cc: \tab C5 \tab C5 \tab C5 \tab C5 \tab C5 \cr + GG: \tab G3 \tab G2 \tab G3 \tab G3 \tab G2 \cr + C: \tab C3 \tab C3 \tab C3 \tab C3 \tab C3 \cr F: \tab F3 \tab F3 \tab F4 \tab F4 \tab F3 \cr - ggg: \tab G7 \tab G6 \tab G7 \tab G6 \tab G7 \cr - ccc: \tab C6 \tab C6 \tab C6 \tab C6 \tab C6 \cr + G: \tab G4 \tab G3 \tab G4 \tab G4 \tab G3 \cr + c: \tab C4 \tab C4 \tab C4 \tab C4 \tab C4 \cr f: \tab F4 \tab F4 \tab F5 \tab F4 \tab F5 \cr - gggg: \tab G8 \tab G7 \tab G8 \tab G7 \tab G8 \cr - cccc: \tab C7 \tab C7 \tab C7 \tab C7 \tab C7 \cr + g: \tab G5 \tab G4 \tab G5 \tab G4 \tab G5 \cr + cc: \tab C5 \tab C5 \tab C5 \tab C5 \tab C5 \cr ff: \tab F5 \tab F5 \tab F6 \tab F5 \tab F6 \cr - ggggg: \tab G9 \tab G8 \tab G9 \tab G8 \tab G9 \cr - ccccc: \tab C8 \tab C8 \tab C8 \tab C8 \tab C8 \cr + gg: \tab G6 \tab G5 \tab G6 \tab G5 \tab G6 \cr + ccc: \tab C6 \tab C6 \tab C6 \tab C6 \tab C6 \cr fff: \tab F6 \tab F6 \tab F7 \tab F6 \tab F7 \cr - gggggg: \tab G10 \tab G9 \tab G10 \tab G9 \tab G10 \cr + ggg: \tab G7 \tab G6 \tab G7 \tab G6 \tab G7 \cr } } diff --git a/man/pitchParsing.Rd b/man/pitchParsing.Rd index 5af3e205..fabdefe3 100644 --- a/man/pitchParsing.Rd +++ b/man/pitchParsing.Rd @@ -435,19 +435,19 @@ For example, we might think of a ascending major 12th as being an ascending octa The following table illustrates how different \code{octave.round} arguments "partition" compound intervals into simple parts and octaves:\tabular{llllll}{ \tab round \tab floor \tab ceiling \tab trunc \tab expand \cr -P12: \tab -P15 + P4 \tab -P15 + P4 \tab -P8 - P5 \tab -P8 - P5 \tab -P15 + P4 \cr - +P12: \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \cr - +P8: \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \cr + -P11: \tab -P8 - P4 \tab -P15 + P5 \tab -P8 - P4 \tab -P8 - P4 \tab -P15 + P5 \cr + -P8: \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \tab -P8 + P1 \cr -P5: \tab -P8 + P4 \tab -P8 + P4 \tab +P1 - P5 \tab +P1 - P5 \tab -P8 + P4 \cr - +P19: \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \cr - +P15: \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \cr + -P4: \tab +P1 - P4 \tab -P8 + P5 \tab +P1 - P4 \tab +P1 - P4 \tab -P8 + P5 \cr + P1: \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \tab +P1 + P1 \cr +P4: \tab +P1 + P4 \tab +P1 + P4 \tab +P8 - P5 \tab +P1 + P4 \tab +P8 - P5 \cr - +P26: \tab +P29 - P4 \tab +P22 + P5 \tab +P29 - P4 \tab +P22 + P5 \tab +P29 - P4 \cr - +P22: \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \tab +P22 + P1 \cr + +P5: \tab +P8 - P4 \tab +P1 + P5 \tab +P8 - P4 \tab +P1 + P5 \tab +P8 - P4 \cr + +P8: \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \tab +P8 + P1 \cr +P11: \tab +P8 + P4 \tab +P8 + P4 \tab +P15 - P5 \tab +P8 + P4 \tab +P15 - P5 \cr - +P33: \tab +P36 - P4 \tab +P29 + P5 \tab +P36 - P4 \tab +P29 + P5 \tab +P36 - P4 \cr - +P29: \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \tab +P29 + P1 \cr + +P12: \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \tab +P8 + P5 \tab +P15 - P4 \cr + +P15: \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \tab +P15 + P1 \cr +P18: \tab +P15 + P4 \tab +P15 + P4 \tab +P22 - P5 \tab +P15 + P4 \tab +P22 - P5 \cr - +P40: \tab +P43 - P4 \tab +P36 + P5 \tab +P43 - P4 \tab +P36 + P5 \tab +P43 - P4 \cr + +P19: \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \tab +P15 + P5 \tab +P22 - P4 \cr } @@ -457,19 +457,19 @@ When parsing \link[=pitch]{"absolute" pitch} representations, the \code{octave.r The following table illustrates:\tabular{llllll}{ \tab round \tab floor \tab ceiling \tab trunc \tab expand \cr FF: \tab F2 \tab F2 \tab F3 \tab F3 \tab F2 \cr - gg: \tab G6 \tab G5 \tab G6 \tab G5 \tab G6 \cr - cc: \tab C5 \tab C5 \tab C5 \tab C5 \tab C5 \cr + GG: \tab G3 \tab G2 \tab G3 \tab G3 \tab G2 \cr + C: \tab C3 \tab C3 \tab C3 \tab C3 \tab C3 \cr F: \tab F3 \tab F3 \tab F4 \tab F4 \tab F3 \cr - ggg: \tab G7 \tab G6 \tab G7 \tab G6 \tab G7 \cr - ccc: \tab C6 \tab C6 \tab C6 \tab C6 \tab C6 \cr + G: \tab G4 \tab G3 \tab G4 \tab G4 \tab G3 \cr + c: \tab C4 \tab C4 \tab C4 \tab C4 \tab C4 \cr f: \tab F4 \tab F4 \tab F5 \tab F4 \tab F5 \cr - gggg: \tab G8 \tab G7 \tab G8 \tab G7 \tab G8 \cr - cccc: \tab C7 \tab C7 \tab C7 \tab C7 \tab C7 \cr + g: \tab G5 \tab G4 \tab G5 \tab G4 \tab G5 \cr + cc: \tab C5 \tab C5 \tab C5 \tab C5 \tab C5 \cr ff: \tab F5 \tab F5 \tab F6 \tab F5 \tab F6 \cr - ggggg: \tab G9 \tab G8 \tab G9 \tab G8 \tab G9 \cr - ccccc: \tab C8 \tab C8 \tab C8 \tab C8 \tab C8 \cr + gg: \tab G6 \tab G5 \tab G6 \tab G5 \tab G6 \cr + ccc: \tab C6 \tab C6 \tab C6 \tab C6 \tab C6 \cr fff: \tab F6 \tab F6 \tab F7 \tab F6 \tab F7 \cr - gggggg: \tab G10 \tab G9 \tab G10 \tab G9 \tab G10 \cr + ggg: \tab G7 \tab G6 \tab G7 \tab G6 \tab G7 \cr } }