* и, й, п заменены на ссылки на n (#9)

Metrolog · Sep 24, 2017 · de85d00 · de85d00
1 parent 33ecb6c
commit de85d00
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 128 deletions.
diff --git a/fonts/GOST2930-62/GOST2930-62PART1.sfd b/fonts/GOST2930-62/GOST2930-62PART1.sfd
@@ -22,7 +22,7 @@ OS2Version: 1
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 0
 CreationTime: 1115562651
-ModificationTime: 1506252871
+ModificationTime: 1506253178
 PfmFamily: 17
 TTFWeight: 400
 TTFWidth: 5
@@ -1890,22 +1890,7 @@ HStem: 0 80<108.311 220.48> 512 20G<0 80 249 329>
 VStem: 0 80<108.318 532> 249 80<108.945 532>
 LayerCount: 2
 Fore
-SplineSet
-0 165 m 2
- 0 532 l 1
- 80 532 l 1
- 80 165 l 2
- 80 118 117 80 164 80 c 3
- 211 80 249 117 249 165 c 2
- 249 532 l 1
- 329 532 l 1
- 329 151 l 2
- 329 130 335 112 347 97 c 1
- 347 0 l 1
- 323 9 300 29 283 50 c 1
- 250 17 212 0 164 0 c 3
- 74 0 0 74 0 165 c 2
-EndSplineSet
+Refer: 64 110 S -1 0 0 -1 347 532 2
 EndChar
 
 StartChar: v
@@ -3741,55 +3726,27 @@ HStem: 0 80<108.311 220.48> 512 20G<0 80 249 329>
 VStem: 0 80<108.318 532> 249 80<108.945 532>
 LayerCount: 2
 Fore
-SplineSet
-0 165 m 2
- 0 532 l 1
- 80 532 l 1
- 80 165 l 2
- 80 118 117 80 164 80 c 0
- 211 80 249 117 249 165 c 2
- 249 532 l 1
- 329 532 l 1
- 329 151 l 2
- 329 130 335 112 347 97 c 1
- 347 0 l 1
- 323 9 300 29 283 50 c 1
- 250 17 212 0 164 0 c 0
- 74 0 0 74 0 165 c 2
-EndSplineSet
+Refer: 71 117 N 1 0 0 1 0 0 2
 EndChar
 
 StartChar: "+AOkA"
 Encoding: 1081 1081 154
 Width: 451
 VWidth: 1365
-Flags: W
+Flags: HW
 HStem: 0 80<108.311 220.48> 512 20G<0 80 249 329> 613 80<120 209>
 VStem: 0 80<108.318 532> 120 89<613 693> 249 80<108.945 532>
 CounterMasks: 1 1c
 LayerCount: 2
 Fore
 SplineSet
-0 165 m 2
- 0 532 l 1
- 80 532 l 1
- 80 165 l 2
- 80 118 117 80 164 80 c 0
- 211 80 249 117 249 165 c 2
- 249 532 l 1
- 329 532 l 1
- 329 151 l 2
- 329 130 335 112 347 97 c 1
- 347 0 l 1
- 323 9 300 29 283 50 c 1
- 250 17 212 0 164 0 c 0
- 74 0 0 74 0 165 c 2
 120 613 m 1
  120 693 l 1
  209 693 l 1
  209 613 l 1
  120 613 l 1
 EndSplineSet
+Refer: 153 1080 S 1 0 0 1 0 0 2
 EndChar
 
 StartChar: "+AOoA"
@@ -3934,22 +3891,7 @@ HStem: 0 21G<19 99 267 347> 453 79<128.307 236.392>
 VStem: 19 80<0 423.406> 267 80<0 421.27>
 LayerCount: 2
 Fore
-SplineSet
-183 532 m 3
- 273 532 347 459 347 369 c 2
- 347 0 l 1
- 267 0 l 1
- 267 369 l 2
- 267 414 228 453 183 453 c 3
- 138 453 99 414 99 369 c 2
- 99 0 l 1
- 19 0 l 1
- 19 383 l 2
- 19 404 13 421 0 436 c 1
- 0 532 l 1
- 26 523 48 504 65 483 c 1
- 98 516 136 532 183 532 c 3
-EndSplineSet
+Refer: 64 110 N 1 0 0 1 0 0 2
 EndChar
 
 StartChar: "+APAA"

diff --git a/fonts/GOST2930-62/ps3/GOST2930-62.pt3 b/fonts/GOST2930-62/ps3/GOST2930-62.pt3
@@ -1,7 +1,7 @@
 %!PS-AdobeFont-1.0: GOST2930-62 1.00
 %%Title: GOST2930-62
 %Version: 1.00
-%%CreationDate: Sun Sep 24 14:34:55 2017
+%%CreationDate: Sun Sep 24 14:40:06 2017
 %%Creator: Sergei.S.Betke
 % Generated by FontForge 20150827 (http://fontforge.sf.net/)
 %%EndComments
@@ -1134,7 +1134,7 @@ CharProcs begin
 	 92 520 124 532 161 532 curveto
 	closepath
   } bind def
-  /n { 451 0 0 0 347 532 setcachedevice
+  /n { dup -1 ne { 451 0 0 0 347 532 setcachedevice } if
 	183 532 moveto
 	 273 532 347 459 347 369 curveto
 	 347 0 lineto
@@ -1253,22 +1253,9 @@ CharProcs begin
 	 0 453 lineto
 	closepath
   } bind def
-  /u { 451 0 0 0 347 532 setcachedevice
-	0 165 moveto
-	 0 532 lineto
-	 80 532 lineto
-	 80 165 lineto
-	 80 118 117 80 164 80 curveto
-	 211 80 249 117 249 165 curveto
-	 249 532 lineto
-	 329 532 lineto
-	 329 151 lineto
-	 329 130 335 112 347 97 curveto
-	 347 0 lineto
-	 323 9 300 29 283 50 curveto
-	 250 17 212 0 164 0 curveto
-	 74 0 0 74 0 165 curveto
-	closepath
+  /u { dup -1 ne { 451 0 0 0 347 532 setcachedevice } if
+    pop -1
+    [ -1 0 0 -1 347 532 ] concat 1 index /CharProcs get /n get exec [ -1 -0 -0 -1 347 532 ] concat 
   } bind def
   /v { 432 0 0 0 329 532 setcachedevice
 	0 532 moveto
@@ -2381,45 +2368,19 @@ CharProcs begin
 	 23 391 lineto
 	closepath
   } bind def
-  /uni0438 { 451 0 0 0 347 532 setcachedevice
-	0 165 moveto
-	 0 532 lineto
-	 80 532 lineto
-	 80 165 lineto
-	 80 118 117 80 164 80 curveto
-	 211 80 249 117 249 165 curveto
-	 249 532 lineto
-	 329 532 lineto
-	 329 151 lineto
-	 329 130 335 112 347 97 curveto
-	 347 0 lineto
-	 323 9 300 29 283 50 curveto
-	 250 17 212 0 164 0 curveto
-	 74 0 0 74 0 165 curveto
-	closepath
+  /uni0438 { dup -1 ne { 451 0 0 0 347 532 setcachedevice } if
+    pop -1
+    1 index /CharProcs get /u get exec
   } bind def
   /uni0439 { 451 0 0 0 347 693 setcachedevice
-	0 165 moveto
-	 0 532 lineto
-	 80 532 lineto
-	 80 165 lineto
-	 80 118 117 80 164 80 curveto
-	 211 80 249 117 249 165 curveto
-	 249 532 lineto
-	 329 532 lineto
-	 329 151 lineto
-	 329 130 335 112 347 97 curveto
-	 347 0 lineto
-	 323 9 300 29 283 50 curveto
-	 250 17 212 0 164 0 curveto
-	 74 0 0 74 0 165 curveto
-	closepath
 	120 613 moveto
 	 120 693 lineto
 	 209 693 lineto
 	 209 613 lineto
 	 120 613 lineto
 	closepath
+    pop -1
+    1 index /CharProcs get /uni0438 get exec
   } bind def
   /uni043A { 432 0 0 0 329 532 setcachedevice
 	0 0 moveto
@@ -2506,21 +2467,8 @@ CharProcs begin
 	closepath
   } bind def
   /uni043F { 451 0 0 0 347 532 setcachedevice
-	183 532 moveto
-	 273 532 347 459 347 369 curveto
-	 347 0 lineto
-	 267 0 lineto
-	 267 369 lineto
-	 267 414 228 453 183 453 curveto
-	 138 453 99 414 99 369 curveto
-	 99 0 lineto
-	 19 0 lineto
-	 19 383 lineto
-	 19 404 13 421 0 436 curveto
-	 0 532 lineto
-	 26 523 48 504 65 483 curveto
-	 98 516 136 532 183 532 curveto
-	closepath
+    pop -1
+    1 index /CharProcs get /n get exec
   } bind def
   /uni0440 { 432 0 0 -268 329 532 setcachedevice
     pop -1