summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx/pmx-src/PATCH-pmx274.for
blob: 5a5a7179bcc30a066f61bef4a9dc6499bb12b0a1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
*** pmx274.for.orig	2016-02-20 22:48:43.793458913 -0500
--- pmx274.for	2016-02-20 23:08:55.803226069 -0500
***************
*** 11062,11068 ****
        end if
        go to 1
        end
!       subroutine getmidi(noinst,lineq,iccount,ibarcnt,ibaroff,nbars,
       *                   lenbar,
  c      subroutine getmidi(nv,lineq,iccount,ibarcnt,ibaroff,nbars,lenbar,
       *                    mtrdenl,first)
--- 11062,11068 ----
        end if
        go to 1
        end
!       subroutine getmidi(noinstarg,lineq,iccount,ibarcnt,ibaroff,nbars,
       *                   lenbar,
  c      subroutine getmidi(nv,lineq,iccount,ibarcnt,ibaroff,nbars,lenbar,
       *                    mtrdenl,first)
***************
*** 11091,11097 ****
       *       debugmidi
        logical debugmidi
        common /commvel/ midivel(nm),midvelc(0:nm),midibal(nm),midbc(0:nm)
!      *                ,miditran(nm),midtc(0:nm),noinstdum,iinsiv(nm)
        integer*2 iinsiv
        character*1 durq
        character*2 instq
--- 11091,11097 ----
       *       debugmidi
        logical debugmidi
        common /commvel/ midivel(nm),midvelc(0:nm),midibal(nm),midbc(0:nm)
!      *                ,miditran(nm),midtc(0:nm),noinst,iinsiv(nm)
        integer*2 iinsiv
        character*1 durq
        character*2 instq
***************
*** 11168,11174 ****
  c  Instrument numbers or letters.  Expect noinst of them.
  c
  c        do 2 ivx = 1 , nv
!         do 2 ivx = 1 , noinst
            call getchar(lineq,iccount,durq)
            if (ichar(durq) .gt. 96) then
  c
--- 11168,11174 ----
  c  Instrument numbers or letters.  Expect noinst of them.
  c
  c        do 2 ivx = 1 , nv
!         do 2 ivx = 1 , noinstarg
            call getchar(lineq,iccount,durq)
            if (ichar(durq) .gt. 96) then
  c
***************
*** 11213,11219 ****
  c    Follow same pattern as for insttrument numbers above.
  c 	
  c        do 7 ivx = 1 , nv
!         do 7 ivx = 1 , noinst
            call getchar(lineq,iccount,durq)
            if (index('123456789',durq) .eq. 0) then
              call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
--- 11213,11219 ----
  c    Follow same pattern as for insttrument numbers above.
  c 	
  c        do 7 ivx = 1 , nv
!         do 7 ivx = 1 , noinstarg
            call getchar(lineq,iccount,durq)
            if (index('123456789',durq) .eq. 0) then
              call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
***************
*** 11236,11242 ****
  c    Follow same pattern as for instrument numbers above.
  c 	
  c        do 8 ivx = 1 , nv
!         do 8 ivx = 1 , noinst
            call getchar(lineq,iccount,durq)
            if (index('123456789',durq) .eq. 0) then
              call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
--- 11236,11242 ----
  c    Follow same pattern as for instrument numbers above.
  c 	
  c        do 8 ivx = 1 , nv
!         do 8 ivx = 1 , noinstarg
            call getchar(lineq,iccount,durq)
            if (index('123456789',durq) .eq. 0) then
              call errmsg(lineq,iccount,ibarcnt-ibaroff+nbars+1,
***************
*** 11259,11265 ****
  c    Follow similar pattern as above, but separator is +|-.
  c 	
  c        do 9 ivx = 1 , nv
!         do 9 ivx = 1 , noinst
            call getchar(lineq,iccount,durq)
            ipm = index('-+',durq)
            if (ipm .eq. 0) then
--- 11259,11265 ----
  c    Follow similar pattern as above, but separator is +|-.
  c 	
  c        do 9 ivx = 1 , nv
!         do 9 ivx = 1 , noinstarg
            call getchar(lineq,iccount,durq)
            ipm = index('-+',durq)
            if (ipm .eq. 0) then
***************
*** 11592,11597 ****
--- 11592,11598 ----
        common /commidisig/ midisig
        common /comlyr/ inputmlyr
        logical inputmlyr
+       data inputmlyr /.false./
        cdot = .false.
  1     call getchar(lineq,iccount,charq)
        if (lastchar) return
***************
*** 14491,14497 ****
  c
  c 160130 Replace '\' by '/'
  c
! 12    ipos = index(pathnameq,'\')
        if (ipos .gt. 0) then
          pathnameq(ipos:ipos)='/'
          print*,'Changed pathname to ',pathnameq(1:lpath)
--- 14492,14498 ----
  c
  c 160130 Replace '\' by '/'
  c
! 12    ipos = index(pathnameq,'\\')
        if (ipos .gt. 0) then
          pathnameq(ipos:ipos)='/'
          print*,'Changed pathname to ',pathnameq(1:lpath)
***************
*** 19855,19861 ****
        common /comclefrests/ centrests
        logical newclef, centrests
        common /comlyr/ inputmlyr
!       logical inputmlyr /.false./
        if (.not.optimize) then
          print*
          print*,'Starting second PMX pass'
--- 19856,19862 ----
        common /comclefrests/ centrests
        logical newclef, centrests
        common /comlyr/ inputmlyr
!       logical inputmlyr 
        if (.not.optimize) then
          print*
          print*,'Starting second PMX pass'
***************
*** 24497,24503 ****
  c   (unless preceded with '\'), check length
  c
        character*128 lineq,lineqt
!       character*1 sq /'\'/
        iend = lenstr(lineq,128)
  c
  c      i2nd = iccount+index(lineq(iccount+1:128),'"')
--- 24498,24505 ----
  c   (unless preceded with '\'), check length
  c
        character*128 lineq,lineqt
!       character*1 sq 
!       data sq /'\\'/
        iend = lenstr(lineq,128)
  c
  c      i2nd = iccount+index(lineq(iccount+1:128),'"')