summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx/pmx-src/PATCH-pmx284.for
blob: c1262cfa78a79ff4dfbafdbd15b67e86984d4c16 (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
*** pmx284.for.orig	2018-02-12 13:36:14.825209815 -0500
--- pmx284.for	2018-02-12 13:36:14.848209816 -0500
***************
*** 11875,11881 ****
        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)
--- 11875,11881 ----
        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)
***************
*** 11981,11987 ****
  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
--- 11981,11987 ----
  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
***************
*** 12026,12032 ****
  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,
--- 12026,12032 ----
  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,
***************
*** 12049,12055 ****
  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,
--- 12049,12055 ----
  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,
***************
*** 12072,12078 ****
  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
--- 12072,12078 ----
  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
***************
*** 20724,20736 ****
        common /comclefrests/ centrests
        logical newclef, centrests
        common /comlyr/ inputmlyr
!       logical inputmlyr /.false./
        common /combottop/ botamt,topamt,bottopgap
        logical bottopgap
        common /comis4bignv/ is4bignv,AIset
        logical is4bignv,AIset
        common /comhair/ idhairuse,idhair(nm)
        bottopgap = .false.
        idhairuse = 0
        if (.not.optimize) then
          print*
--- 20724,20737 ----
        common /comclefrests/ centrests
        logical newclef, centrests
        common /comlyr/ inputmlyr
!       logical inputmlyr 
        common /combottop/ botamt,topamt,bottopgap
        logical bottopgap
        common /comis4bignv/ is4bignv,AIset
        logical is4bignv,AIset
        common /comhair/ idhairuse,idhair(nm)
        bottopgap = .false.
+       inputmlyr = .false.
        idhairuse = 0
        if (.not.optimize) then
          print*
***************
*** 25399,25405 ****
  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),'"')
--- 25400,25407 ----
  c   (unless preceded with '\'), check length
  c
        character*128 lineq,lineqt
!       character*1 sq 
!       sq = '\'
        iend = lenstr(lineq,128)
  c
  c      i2nd = iccount+index(lineq(iccount+1:128),'"')