Template:ZPI: Difference between revisions

@@ Line 3: / Line 3: @@
 ! colspan="3" | Tuning
 ! colspan="{{#if: {{{tempered height|}}}{{{pure height|}}}|4|3}}" | Strength
-! colspan="2" | Closest edo
+! colspan="3" | Closest edo
 ! colspan="2" | Integer limit
+|-
+! rowspan="2" | ZPI
+! rowspan="2" | Steps per octave
+! rowspan="2" | Step size ([[cent]]s)
+! {{#if: {{{tempered height|}}}{{{pure height|}}}|col|row}}span="2" | Height
+! rowspan="2" | Integral
+! rowspan="2" | Gap
+! rowspan="2" | Edo
+! colspan="2" | Octave (cents)
+! rowspan="2" | Consistent
+! rowspan="2" | Distinct
 |-
 {{#if: {{{tempered height|}}}{{{pure height|}}}
-| ! rowspan{{=}}"2" {{!}} ZPI
+| ! Tempered
-! rowspan{{=}}"2" {{!}} Steps per octave
-! rowspan{{=}}"2" {{!}} Step size ([[cent]]s)
-! colspan{{=}}"2" {{!}} Height
-! rowspan{{=}}"2" {{!}} Integral
-! rowspan{{=}}"2" {{!}} Gap
-! rowspan{{=}}"2" {{!}} Edo
-! rowspan{{=}}"2" {{!}} Octave (cents)
-! rowspan{{=}}"2" {{!}} Consistent
-! rowspan{{=}}"2" {{!}} Distinctly<br />consistent
-{{!-}}
-! Tempered
 ! Pure
-| ! ZPI
+|}}
-! Steps per octave
+! Size
-! Step size ([[cent]]s)
+! Stretch
-! Height
-! Integral
-! Gap
-! Edo
-! Octave (cents)
-! Consistent
-! Distinct
-}}
 |-
 | {{#if: {{{zpi|}}}|[[{{#regex: {{{zpi}}}|/\d+/}}zpi]]|}}
@@ Line 44: / Line 36: @@
 | {{{edo|{{ED title}}}}}
 | {{{octave}}}
+| {{#replace: {{#expr: {{{octave}}} - 1200}}|-|−}}
 | {{{consistent}}}
 | {{{distinct}}}