Some tweaks to colour FAXing and some alterations to the supervisory tones

tables.

libs/spandsp/spandsp/tones.dtd

 <!-- Global PSTN supervisory tones -->
 <!ELEMENT global-tones (tone-set)* >
-<!ELEMENT tone-set (dial-tone|ringback-tone|busy-tone|congestion-tone|number-unobtainable-tone|special-information-tone|call-waiting-tone|waiting-tone|payphone-recognition-tone|test-number-tone|end-of-three-party-service-tone|service-activated-tone|record-tone|facilities-tone|offering-tone|positive-indication-tone|negative-indication-tone|route-tone|pay-tone|confirmation-tone|intrusion-tone|intercept-tone|warning-tone|holding-tone|search-tone|acceptance-tone|executive-override-tone|function-acknowledge-tone|queue-tone|valid-tone-radio-paging|notify-tone|re-order-tone|preemption-tone|comfort-tone|connection-tone|refusal-tone|line-lockout-tone|permanent-signal-tone|identification-tone|reorder-tone|recall-dial-tone|special-ringback-tone|busy-verification-tone)* >
-
+<!ELEMENT tone-set (dial-tone
+                   |ringing-tone
+                   |busy-tone
+                   |congestion-tone
+                   |number-unobtainable-tone
+                   |special-information-tone
+                   |call-waiting-tone
+                   |waiting-tone
+                   |pay-tone
+                   |payphone-recognition-tone
+                   |warning-tone
+                   |test-number-tone
+                   |end-of-three-party-service-tone
+                   |service-activated-tone
+                   |record-tone
+                   |facilities-tone
+                   |offering-tone
+                   |route-tone
+                   |confirmation-tone
+                   |intrusion-tone
+                   |intercept-tone
+                   |reorder-tone
+                   |holding-tone
+                   |search-tone
+                   |acceptance-tone
+                   |executive-override-tone
+                   |function-acknowledge-tone
+                   |queue-tone
+                   |valid-tone-radio-paging
+                   |notify-tone
+                   |preemption-tone
+                   |comfort-tone
+                   |connection-tone
+                   |refusal-tone
+                   |line-lockout-tone
+                   |permanent-signal-tone
+                   |identification-tone
+                   |positive-indication-tone
+                   |negative-indication-tone)* >
 <!ATTLIST tone-set
   country   CDATA   #REQUIRED
   uncode    CDATA   #REQUIRED
   >
 
+<!-- Dialing tones -->
 <!ELEMENT dial-tone (step)* >
 <!ATTLIST dial-tone
   domain    CDATA   #IMPLIED
   type      CDATA   #IMPLIED
   >
-<!ELEMENT ringback-tone (step)* >
-<!ATTLIST ringback-tone
+
+<!-- Post-dialing tones -->
+<!ELEMENT ringing-tone (step)* >
+<!ATTLIST ringing-tone
   domain    CDATA   #IMPLIED
+  type      CDATA   #IMPLIED
   >
+
+<!-- Dial result tones -->
 <!ELEMENT busy-tone (step)* >
 <!ATTLIST busy-tone
   domain    CDATA   #IMPLIED
@@ -32,11 +75,14 @@
 <!ATTLIST special-information-tone
   domain    CDATA   #IMPLIED
   >
+
 <!ELEMENT call-waiting-tone (step)* >
 <!ATTLIST call-waiting-tone
   domain    CDATA   #IMPLIED
   type      CDATA   #IMPLIED
   >
+
+<!-- Payment related tones -->
 <!ELEMENT pay-tone (step)* >
 <!ATTLIST pay-tone
   domain    CDATA   #IMPLIED
@@ -45,6 +91,7 @@
 <!ATTLIST payphone-recognition-tone
   domain    CDATA   #IMPLIED
   >
+
 <!ELEMENT warning-tone (step)* >
 <!ATTLIST warning-tone
   type      CDATA   #IMPLIED
@@ -54,19 +101,6 @@
 <!ATTLIST reorder-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT recall-dial-tone (step)* >
-<!ATTLIST recall-dial-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT special-ringback-tone (step)* >
-<!ATTLIST special-ringback-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT busy-verification-tone (step)* >
-<!ATTLIST busy-verification-tone
-  domain    CDATA   #IMPLIED
-  >
-
 <!ELEMENT waiting-tone (step)* >
 <!ATTLIST waiting-tone
   domain    CDATA   #IMPLIED
@@ -95,14 +129,6 @@
 <!ATTLIST offering-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT positive-indication-tone (step)* >
-<!ATTLIST positive-indication-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT negative-indication-tone (step)* >
-<!ATTLIST negative-indication-tone
-  domain    CDATA   #IMPLIED
-  >
 <!ELEMENT route-tone (step)* >
 <!ATTLIST route-tone
   domain    CDATA   #IMPLIED
@@ -151,10 +177,6 @@
 <!ATTLIST notify-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT re-order-tone (step)* >
-<!ATTLIST re-order-tone
-  domain    CDATA   #IMPLIED
-  >
 <!ELEMENT preemption-tone (step)* >
 <!ATTLIST preemption-tone
   domain    CDATA   #IMPLIED
@@ -183,6 +205,14 @@
 <!ATTLIST identification-tone
   domain    CDATA   #IMPLIED
   >
+<!ELEMENT positive-indication-tone (step)* >
+<!ATTLIST positive-indication-tone
+  domain    CDATA   #IMPLIED
+  >
+<!ELEMENT negative-indication-tone (step)* >
+<!ATTLIST negative-indication-tone
+  domain    CDATA   #IMPLIED
+  >
 
 <!ELEMENT step (step|EMPTY)* >
 <!ATTLIST step

libs/spandsp/spandsp/tsb85.xml

@@ -2534,7 +2534,7 @@
         <!-- UNKNOWN_BCS_3 -->
         <step dir="T" type="PREAMBLE" modem="V.21" value="37"/>
         <step dir="T" type="HDLC" tag="GARBAGE" value="A2 02 B5 C9 7E 67"/>
- 
+
         <step dir="R" type="HDLC" modem="V.21" tag="DIS" value="FF C8 01 ..." timeout="60000"/>
         <step dir="R" type="SILENCE"/>
 
@@ -6123,7 +6123,7 @@
         <step type="ANSWER" value="etsi_300_242_a4_white.tif"/>
 
         <step dir="R" type="CNG"/>
- 
+
         <step dir="T" type="CED"/>
         <step type="WAIT" value="75"/>
         <step dir="T" type="PREAMBLE" modem="V.21"/>