开源软件构建与测试

_service:tar_scm:transfig.spec Changed

_service Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/cs_CZ.ps Deleted

@@ -1,74 +0,0 @@
-%% Begining of cs_CZ.ps
-%%
-%% Author: Radim Gelner <radim.gelner@suse.cz>
-%%
-%% This is the encoding for the Czech language.
-%%
-%%BeginResource: encoding ISOLatin2Encoding
-/isol2vec 
-8#0 /.notdef 8#1 /.notdef 8#2 /.notdef 8#3 /.notdef 8#4 /.notdef 8#5 /.notdef 8#6 /.notdef 8#7 /.notdef
-8#10 /.notdef 8#11 /.notdef 8#12 /.notdef 8#13 /.notdef 8#14 /.notdef 8#15 /.notdef 8#16 /.notdef 8#17 /.notdef
-8#20 /.notdef 8#21 /.notdef 8#22 /.notdef 8#23 /.notdef 8#24 /.notdef 8#25 /.notdef 8#26 /.notdef 8#27 /.notdef
-8#30 /.notdef 8#31 /.notdef 8#32 /.notdef 8#33 /.notdef 8#34 /.notdef 8#35 /.notdef 8#36 /.notdef 8#37 /.notdef
-8#40 /space 8#41 /exclam 8#42 /quotedbl 8#43 /numbersign 8#44 /dollar 8#45 /percent 8#46 /ampersand 8#47 /quoteright
-8#50 /parenleft 8#51 /parenright 8#52 /asterisk 8#53 /plus 8#54 /comma 8#55 /minus 8#56 /period 8#57 /slash
-8#60 /zero 8#61 /one 8#62 /two 8#63 /three 8#64 /four 8#65 /five 8#66 /six 8#67 /seven
-8#70 /eight 8#71 /nine 8#72 /colon 8#73 /semicolon 8#74 /less 8#75 /equal 8#76 /greater 8#77 /question
-8#100 /at 8#101 /A 8#102 /B 8#103 /C 8#104 /D 8#105 /E 8#106 /F 8#107 /G
-8#110 /H 8#111 /I 8#112 /J 8#113 /K 8#114 /L 8#115 /M 8#116 /N 8#117 /O
-8#120 /P 8#121 /Q 8#122 /R 8#123 /S 8#124 /T 8#125 /U 8#126 /V 8#127 /W
-8#130 /X 8#131 /Y 8#132 /Z 8#133 /bracketleft 8#134 /backslash 8#135 /bracketright 8#136 /asciicircum 8#137 /underscore
-8#140 /quoteleft 8#141 /a 8#142 /b 8#143 /c 8#144 /d 8#145 /e 8#146 /f 8#147 /g
-8#150 /h 8#151 /i 8#152 /j 8#153 /k 8#154 /l 8#155 /m 8#156 /n 8#157 /o
-8#160 /p 8#161 /q 8#162 /r 8#163 /s 8#164 /t 8#165 /u 8#166 /v 8#167 /w
-8#170 /x 8#171 /y 8#172 /z 8#173 /braceleft 8#174 /bar 8#175 /braceright 8#176 /asciitilde 8#177 /.notdef
-8#200 /.notdef 8#201 /.notdef 8#202 /.notdef 8#203 /.notdef 8#204 /.notdef 8#205 /.notdef 8#206 /.notdef 8#207 /.notdef
-8#210 /.notdef 8#211 /.notdef 8#212 /.notdef 8#213 /.notdef 8#214 /.notdef 8#215 /.notdef 8#216 /.notdef 8#217 /.notdef
-8#220 /.notdef 8#221 /.notdef 8#222 /.notdef 8#223 /.notdef 8#224 /.notdef 8#225 /.notdef 8#226 /.notdef 8#227 /.notdef
-8#230 /.notdef 8#231 /.notdef 8#232 /.notdef 8#233 /.notdef 8#234 /.notdef 8#235 /.notdef 8#236 /.notdef 8#237 /.notdef
-8#240 /space 8#241 /Aogonek 8#242 /breve 8#243 /Lslash 8#244 /currency 8#245 /Lcaron 8#246 /Sacute 8#247 /section
-8#250 /dieresis 8#251 /Scaron 8#252 /Scedilla 8#253 /Tcaron 8#254 /Zacute 8#255 /hyphen 8#256 /Zcaron 8#257 /Zdotaccent
-8#260 /degree 8#261 /aogonek 8#262 /ogonek 8#263 /lslash 8#264 /acute 8#265 /lcaron 8#266 /sacute 8#267 /caron
-8#270 /cedilla 8#271 /scaron 8#272 /scedilla 8#273 /tcaron 8#274 /zacute 8#275 /hungarumlaut 8#276 /zcaron 8#277 /zdotaccent
-8#300 /Racute 8#301 /Aacute 8#302 /Acircumflex 8#303 /Abreve 8#304 /Adieresis 8#305 /Lacute 8#306 /Cacute 8#307 /Ccedilla
-8#310 /Ccaron 8#311 /Eacute 8#312 /Eogonek 8#313 /Edieresis 8#314 /Ecaron 8#315 /Iacute 8#316 /Icircumflex 8#317 /Dcaron
-8#320 /Dbar 8#321 /Nacute 8#322 /Ncaron 8#323 /Oacute 8#324 /Ocircumflex 8#325 /Ohungarumlaut 8#326 /Odieresis 8#327 /multiply
-8#330 /Rcaron 8#331 /Uring 8#332 /Uacute 8#333 /Uhungarumlaut 8#334 /Udieresis 8#335 /Yacute 8#336 /Tcedilla 8#337 /germandbls
-8#340 /racute 8#341 /aacute 8#342 /acircumflex 8#343 /abreve 8#344 /adieresis 8#345 /lacute 8#346 /cacute 8#347 /ccedilla
-8#350 /ccaron 8#351 /eacute 8#352 /eogonek 8#353 /edieresis 8#354 /ecaron 8#355 /iacute 8#356 /icircumflex 8#357 /dcaron
-8#360 /dbar 8#361 /nacute 8#362 /ncaron 8#363 /oacute 8#364 /ocircumflex 8#365 /ohungarumlaut 8#366 /odieresis 8#367 /divide
-8#370 /rcaron 8#371 /uring 8#372 /uacute 8#373 /uhungarumlaut 8#374 /udieresis 8#375 /yacute 8#376 /tcedilla 8#377 /dotaccent def
-%%EndResource
-/Times-Roman /Times-Roman-iso isol2vec ReEncode
-/Times-Italic /Times-Italic-iso isol2vec ReEncode
-/Times-Bold /Times-Bold-iso isol2vec ReEncode
-/Times-BoldItalic /Times-BoldItalic-iso isol2vec ReEncode
-/AvantGarde-Book /AvantGarde-Book-iso isol2vec ReEncode
-/AvantGarde-BookOblique /AvantGarde-BookOblique-iso isol2vec ReEncode
-/AvantGarde-Demi /AvantGarde-Demi-iso isol2vec ReEncode
-/AvantGarde-DemiOblique /AvantGarde-DemiOblique-iso isol2vec ReEncode
-/Bookman-Light /Bookman-Light-iso isol2vec ReEncode
-/Bookman-LightItalic /Bookman-LightItalic-iso isol2vec ReEncode
-/Bookman-Demi /Bookman-Demi-iso isol2vec ReEncode
-/Bookman-DemiItalic /Bookman-DemiItalic-iso isol2vec ReEncode
-/Courier /Courier-iso isol2vec ReEncode
-/Courier-Oblique /Courier-Oblique-iso isol2vec ReEncode
-/Courier-Bold /Courier-Bold-iso isol2vec ReEncode
-/Courier-BoldOblique /Courier-BoldOblique-iso isol2vec ReEncode
-/Helvetica /Helvetica-iso isol2vec ReEncode
-/Helvetica-Oblique /Helvetica-Oblique-iso isol2vec ReEncode
-/Helvetica-Bold /Helvetica-Bold-iso isol2vec ReEncode
-/Helvetica-BoldOblique /Helvetica-BoldOblique-iso isol2vec ReEncode
-/Helvetica-Narrow /Helvetica-Narrow-iso isol2vec ReEncode
-/Helvetica-Narrow-Oblique /Helvetica-Narrow-Oblique-iso isol2vec ReEncode
-/Helvetica-Narrow-Bold /Helvetica-Narrow-Bold-iso isol2vec ReEncode
-/Helvetica-Narrow-BoldOblique /Helvetica-Narrow-BoldOblique-iso isol2vec ReEncode
-/NewCenturySchlbk-Roman /NewCenturySchlbk-Roman-iso isol2vec ReEncode
-/NewCenturySchlbk-Italic /NewCenturySchlbk-Italic-iso isol2vec ReEncode
-/NewCenturySchlbk-Bold /NewCenturySchlbk-Bold-iso isol2vec ReEncode
-/NewCenturySchlbk-BoldItalic /NewCenturySchlbk-BoldItalic-iso isol2vec ReEncode
-/Palatino-Roman /Palatino-Roman-iso isol2vec ReEncode
-/Palatino-Italic /Palatino-Italic-iso isol2vec ReEncode
-/Palatino-Bold /Palatino-Bold-iso isol2vec ReEncode
-/Palatino-BoldItalic /Palatino-BoldItalic-iso isol2vec ReEncode
-%% End of cs_CZ.ps

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/ru_RU.CP1251.ps Deleted

@@ -1,298 +0,0 @@
-%% Begining of ru_RU.CP1251.ps
-%%
-%% Author: Yura Zotov <yz@altlinux.ru>
-%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@suse.cz>
-%%
-%%BeginResource: encoding ISOLatin2Encoding
-
-/isol2vec 
-10#0 /.notdef
-10#1 /.notdef
-10#2 /.notdef
-10#3 /.notdef
-10#4 /.notdef
-10#5 /.notdef
-10#6 /.notdef
-10#7 /.notdef
-10#8 /.notdef
-10#9 /.notdef
-10#10 /.notdef
-10#11 /.notdef
-10#12 /.notdef
-10#13 /.notdef
-10#14 /.notdef
-10#15 /.notdef
-10#16 /.notdef
-10#17 /.notdef
-10#18 /.notdef
-10#19 /.notdef
-10#20 /.notdef
-10#21 /.notdef
-10#22 /.notdef
-10#23 /.notdef
-10#24 /.notdef
-10#25 /.notdef
-10#26 /.notdef
-10#27 /.notdef
-10#28 /.notdef
-10#29 /.notdef
-10#30 /.notdef
-10#31 /.notdef
-10#32 /space
-10#33 /exclam
-10#34 /quotedbl
-10#35 /numbersign
-10#36 /dollar
-10#37 /percent
-10#38 /ampersand
-10#39 /quoteright
-10#40 /parenleft
-10#41 /parenright
-10#42 /asterisk
-10#43 /plus
-10#44 /comma
-10#45 /hyphen
-10#46 /period
-10#47 /slash
-10#48 /zero
-10#49 /one
-10#50 /two
-10#51 /three
-10#52 /four
-10#53 /five
-10#54 /six
-10#55 /seven
-10#56 /eight
-10#57 /nine
-10#58 /colon
-10#59 /semicolon
-10#60 /less
-10#61 /equal
-10#62 /greater
-10#63 /question
-10#64 /at
-10#65 /A
-10#66 /B
-10#67 /C
-10#68 /D
-10#69 /E
-10#70 /F
-10#71 /G
-10#72 /H
-10#73 /I
-10#74 /J
-10#75 /K
-10#76 /L
-10#77 /M
-10#78 /N
-10#79 /O
-10#80 /P
-10#81 /Q
-10#82 /R
-10#83 /S
-10#84 /T
-10#85 /U
-10#86 /V
-10#87 /W
-10#88 /X
-10#89 /Y
-10#90 /Z
-10#91 /bracketleft
-10#92 /backslash
-10#93 /bracketright
-10#94 /asciicircum
-10#95 /underscore
-10#96 /quoteleft
-10#97 /a
-10#98 /b
-10#99 /c
-10#100 /d
-10#101 /e
-10#102 /f
-10#103 /g
-10#104 /h
-10#105 /i
-10#106 /j
-10#107 /k
-10#108 /l
-10#109 /m
-10#110 /n
-10#111 /o
-10#112 /p
-10#113 /q
-10#114 /r
-10#115 /s
-10#116 /t
-10#117 /u
-10#118 /v
-10#119 /w
-10#120 /x
-10#121 /y
-10#122 /z
-10#123 /braceleft
-10#124 /bar
-10#125 /braceright
-10#126 /asciitilde
-10#127 /.notdef
-10#128 /afii10051
-10#129 /afii10052
-10#130 /quotesinglbase
-10#131 /afii10100
-10#132 /quotedblbase
-10#133 /ellipsis
-10#134 /dagger
-10#135 /daggerdbl
-10#136 /Euro
-10#137 /perthousand
-10#138 /afii10058
-10#139 /guilsinglleft
-10#140 /afii10059
-10#141 /afii10061
-10#142 /afii10060
-10#143 /afii10145
-10#144 /afii10099
-10#145 /quoteleft
-10#146 /quoteright
-10#147 /quotedblleft
-10#148 /quotedblright
-10#149 /bullet
-10#150 /endash
-10#151 /emdash
-10#152 /tilde
-10#153 /trademark
-10#154 /afii10106
-10#155 /guilsinglright
-10#156 /afii10107
-10#157 /afii10109
-10#158 /afii10108
-10#159 /afii10193
-10#160 /.notdef
-10#161 /afii10062
-10#162 /afii10110
-10#163 /afii10057
-10#164 /currency
-10#165 /afii10050
-10#166 /brokenbar
-10#167 /section
-10#168 /afii10023
-10#169 /copyright
-10#170 /afii10053
-10#171 /guillemotleft
-10#172 /logicalnot
-10#173 /hyphen
-10#174 /registered
-10#175 /afii10056
-10#176 /degree
-10#177 /plusminus
-10#178 /afii10055
-10#179 /afii10103
-10#180 /afii10098
-10#181 /mu
-10#182 /paragraph
-10#183 /periodcentered
-10#184 /afii10071
-10#185 /afii61352
-10#186 /afii10101
-10#187 /guillemotright
-10#188 /afii10105
-10#189 /afii10054
-10#190 /afii10102

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/ru_RU.KOI8-R.ps Deleted

@@ -1,298 +0,0 @@
-%% Begining of ru_RU.KOI8-R.ps
-%%
-%% Author: Yura Zotov <yz@altlinux.ru>
-%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@suse.cz>
-%%
-%%BeginResource: encoding ISOLatin2Encoding
-
-/isol2vec 
-10#0 /.notdef
-10#1 /.notdef
-10#2 /.notdef
-10#3 /.notdef
-10#4 /.notdef
-10#5 /.notdef
-10#6 /.notdef
-10#7 /.notdef
-10#8 /.notdef
-10#9 /.notdef
-10#10 /.notdef
-10#11 /.notdef
-10#12 /.notdef
-10#13 /.notdef
-10#14 /.notdef
-10#15 /.notdef
-10#16 /.notdef
-10#17 /.notdef
-10#18 /.notdef
-10#19 /.notdef
-10#20 /.notdef
-10#21 /.notdef
-10#22 /.notdef
-10#23 /.notdef
-10#24 /.notdef
-10#25 /.notdef
-10#26 /.notdef
-10#27 /.notdef
-10#28 /.notdef
-10#29 /.notdef
-10#30 /.notdef
-10#31 /.notdef
-10#32 /space
-10#33 /exclam
-10#34 /quotedbl
-10#35 /numbersign
-10#36 /dollar
-10#37 /percent
-10#38 /ampersand
-10#39 /quotesingle
-10#40 /parenleft
-10#41 /parenright
-10#42 /asterisk
-10#43 /plus
-10#44 /comma
-10#45 /hyphen
-10#46 /period
-10#47 /slash
-10#48 /zero
-10#49 /one
-10#50 /two
-10#51 /three
-10#52 /four
-10#53 /five
-10#54 /six
-10#55 /seven
-10#56 /eight
-10#57 /nine
-10#58 /colon
-10#59 /semicolon
-10#60 /less
-10#61 /equal
-10#62 /greater
-10#63 /question
-10#64 /at
-10#65 /A
-10#66 /B
-10#67 /C
-10#68 /D
-10#69 /E
-10#70 /F
-10#71 /G
-10#72 /H
-10#73 /I
-10#74 /J
-10#75 /K
-10#76 /L
-10#77 /M
-10#78 /N
-10#79 /O
-10#80 /P
-10#81 /Q
-10#82 /R
-10#83 /S
-10#84 /T
-10#85 /U
-10#86 /V
-10#87 /W
-10#88 /X
-10#89 /Y
-10#90 /Z
-10#91 /bracketleft
-10#92 /backslash
-10#93 /bracketright
-10#94 /asciicircum
-10#95 /underscore
-10#96 /grave
-10#97 /a
-10#98 /b
-10#99 /c
-10#100 /d
-10#101 /e
-10#102 /f
-10#103 /g
-10#104 /h
-10#105 /i
-10#106 /j
-10#107 /k
-10#108 /l
-10#109 /m
-10#110 /n
-10#111 /o
-10#112 /p
-10#113 /q
-10#114 /r
-10#115 /s
-10#116 /t
-10#117 /u
-10#118 /v
-10#119 /w
-10#120 /x
-10#121 /y
-10#122 /z
-10#123 /braceleft
-10#124 /bar
-10#125 /braceright
-10#126 /asciitilde
-10#127 /.notdef
-10#128 /SF100000
-10#129 /SF110000
-10#130 /SF010000
-10#131 /SF030000
-10#132 /SF020000
-10#133 /SF040000
-10#134 /SF080000
-10#135 /SF090000
-10#136 /SF060000
-10#137 /SF070000
-10#138 /SF050000
-10#139 /upblock
-10#140 /dnblock
-10#141 /block
-10#142 /lfblock
-10#143 /rtblock
-10#144 /ltshade
-10#145 /shade
-10#146 /dkshade
-10#147 /integraltp
-10#148 /filledbox
-10#149 /uni2219
-10#150 /radical
-10#151 /approxequal
-10#152 /lessequal
-10#153 /greaterequal
-10#154 /uni00A0
-10#155 /integralbt
-10#156 /degree
-10#157 /twosuperior
-10#158 /periodcentered
-10#159 /divide
-10#160 /SF430000
-10#161 /SF240000
-10#162 /SF510000
-10#163 /afii10071
-10#164 /SF520000
-10#165 /SF390000
-10#166 /SF220000
-10#167 /SF210000
-10#168 /SF250000
-10#169 /SF500000
-10#170 /SF490000
-10#171 /SF380000
-10#172 /SF280000
-10#173 /SF270000
-10#174 /SF260000
-10#175 /SF360000
-10#176 /SF370000
-10#177 /SF420000
-10#178 /SF190000
-10#179 /afii10023
-10#180 /SF200000
-10#181 /SF230000
-10#182 /SF470000
-10#183 /SF480000
-10#184 /SF410000
-10#185 /SF450000
-10#186 /SF460000
-10#187 /SF400000
-10#188 /SF540000
-10#189 /SF530000
-10#190 /SF440000

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/uk_UA.KOI8-U.ps Deleted

@@ -1,298 +0,0 @@
-%% Begining of uk_UA.KOI8-U.ps
-%%
-%% Author: Yura Zotov <yz@altlinux.ru>
-%% based on cs_CZ.ps made by Radim Gelner <radim.gelner@suse.cz>
-%%
-%%BeginResource: encoding ISOLatin2Encoding
-
-/isol2vec 
-10#0 /.notdef
-10#1 /.notdef
-10#2 /.notdef
-10#3 /.notdef
-10#4 /.notdef
-10#5 /.notdef
-10#6 /.notdef
-10#7 /.notdef
-10#8 /.notdef
-10#9 /.notdef
-10#10 /.notdef
-10#11 /.notdef
-10#12 /.notdef
-10#13 /.notdef
-10#14 /.notdef
-10#15 /.notdef
-10#16 /.notdef
-10#17 /.notdef
-10#18 /.notdef
-10#19 /.notdef
-10#20 /.notdef
-10#21 /.notdef
-10#22 /.notdef
-10#23 /.notdef
-10#24 /.notdef
-10#25 /.notdef
-10#26 /.notdef
-10#27 /.notdef
-10#28 /.notdef
-10#29 /.notdef
-10#30 /.notdef
-10#31 /.notdef
-10#32 /space
-10#33 /exclam
-10#34 /quotedbl
-10#35 /numbersign
-10#36 /dollar
-10#37 /percent
-10#38 /ampersand
-10#39 /quotesingle
-10#40 /parenleft
-10#41 /parenright
-10#42 /asterisk
-10#43 /plus
-10#44 /comma
-10#45 /hyphen
-10#46 /period
-10#47 /slash
-10#48 /zero
-10#49 /one
-10#50 /two
-10#51 /three
-10#52 /four
-10#53 /five
-10#54 /six
-10#55 /seven
-10#56 /eight
-10#57 /nine
-10#58 /colon
-10#59 /semicolon
-10#60 /less
-10#61 /equal
-10#62 /greater
-10#63 /question
-10#64 /at
-10#65 /A
-10#66 /B
-10#67 /C
-10#68 /D
-10#69 /E
-10#70 /F
-10#71 /G
-10#72 /H
-10#73 /I
-10#74 /J
-10#75 /K
-10#76 /L
-10#77 /M
-10#78 /N
-10#79 /O
-10#80 /P
-10#81 /Q
-10#82 /R
-10#83 /S
-10#84 /T
-10#85 /U
-10#86 /V
-10#87 /W
-10#88 /X
-10#89 /Y
-10#90 /Z
-10#91 /bracketleft
-10#92 /backslash
-10#93 /bracketright
-10#94 /asciicircum
-10#95 /underscore
-10#96 /grave
-10#97 /a
-10#98 /b
-10#99 /c
-10#100 /d
-10#101 /e
-10#102 /f
-10#103 /g
-10#104 /h
-10#105 /i
-10#106 /j
-10#107 /k
-10#108 /l
-10#109 /m
-10#110 /n
-10#111 /o
-10#112 /p
-10#113 /q
-10#114 /r
-10#115 /s
-10#116 /t
-10#117 /u
-10#118 /v
-10#119 /w
-10#120 /x
-10#121 /y
-10#122 /z
-10#123 /braceleft
-10#124 /bar
-10#125 /braceright
-10#126 /asciitilde
-10#127 /.notdef
-10#128 /SF100000
-10#129 /SF110000
-10#130 /SF010000
-10#131 /SF030000
-10#132 /SF020000
-10#133 /SF040000
-10#134 /SF080000
-10#135 /SF090000
-10#136 /SF060000
-10#137 /SF070000
-10#138 /SF050000
-10#139 /upblock
-10#140 /dnblock
-10#141 /block
-10#142 /lfblock
-10#143 /rtblock
-10#144 /ltshade
-10#145 /shade
-10#146 /dkshade
-10#147 /integraltp
-10#148 /filledbox
-10#149 /uni2219
-10#150 /radical
-10#151 /approxequal
-10#152 /lessequal
-10#153 /greaterequal
-10#154 /uni00A0
-10#155 /integralbt
-10#156 /degree
-10#157 /twosuperior
-10#158 /periodcentered
-10#159 /divide
-10#160 /SF430000
-10#161 /SF240000
-10#162 /SF510000
-10#163 /afii10071
-10#164 /afii10101
-10#165 /SF390000
-10#166 /afii10103
-10#167 /afii10104
-10#168 /SF250000
-10#169 /SF500000
-10#170 /SF490000
-10#171 /SF380000
-10#172 /SF280000
-10#173 /afii10098
-10#174 /SF260000
-10#175 /SF360000
-10#176 /SF370000
-10#177 /SF420000
-10#178 /SF190000
-10#179 /afii10023
-10#180 /afii10053
-10#181 /SF230000
-10#182 /afii10055
-10#183 /afii10056
-10#184 /SF410000
-10#185 /SF450000
-10#186 /SF460000
-10#187 /SF400000
-10#188 /SF540000
-10#189 /afii10050
-10#190 /SF440000

_service:tar_scm:fig2dev-3.2.8b.tar.xz/man/i18n.man Deleted

_service:tar_scm:fig2dev-3.2.8b.tar.xz/CHANGES -> _service:tar_scm:fig2dev-3.2.9.tar.xz/CHANGES Changed

@@ -2,6 +2,21 @@
 ===============================================================================
 Version 3.2
 ===============================================================================
+Patchlevel 9 (Aug 2023)
+
+NEW FEATURES:
+	o Write utf8-encoded postscript and tex-outputs.
+
+BUGS FIXED:
+	Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
+	o Include sys/wait.h to build on some bsds.
+	o Process crafted input files, tickets #142, #145, #146, #147, #148,
+	  and #152.
+	o Correctly scale dxf output, ticket #91.
+	o Correct a typo causing incorrect eps import, ticket #137.
+	o Regression, pass driver names to driver, ticket #139.
+
+-------------------------------------
 Patchlevel 8b (Aug 2021)
 
 NEW FEATURES:
@@ -10,7 +25,6 @@
 	  to standard input or standard output.
 
 BUGS FIXED:
-	Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
 	o Correct buffer overflows and segfaults, mainly due to maliciously
 	  crafted input files, tickets #113-117, #122, #123, #125-#135.
 	o With -Lepic -P, generate a complete tex file.

_service:tar_scm:fig2dev-3.2.8b.tar.xz/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -169,9 +169,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = fig2dev man transfig
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/fig2dev/tests/data/fillswclip.svg.in \
@@ -235,6 +232,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -242,6 +241,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -486,7 +486,6 @@
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:fig2dev-3.2.8b.tar.xz/aclocal.m4 -> _service:tar_scm:fig2dev-3.2.9.tar.xz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@
 am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.16.3, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -51,12 +51,12 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.16.3)dnl
+AM_AUTOMAKE_VERSION(1.16.5)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -118,7 +118,7 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -170,7 +170,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -201,7 +201,7 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -392,7 +392,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -460,7 +460,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -488,6 +488,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -524,7 +528,7 @@
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(AC_PACKAGE_VERSION, ok),
   ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
@@ -576,6 +580,20 @@
 		  m4_define(AC_PROG_OBJCXX,
 			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
 )
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST(CTAGS)
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST(ETAGS)
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST(CSCOPE)
+
 AC_REQUIRE(AM_SILENT_RULES)dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -657,7 +675,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -678,7 +696,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -699,7 +717,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -742,7 +760,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -776,7 +794,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -805,7 +823,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -852,7 +870,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -871,7 +889,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

_service:tar_scm:fig2dev-3.2.8b.tar.xz/ar-lib -> _service:tar_scm:fig2dev-3.2.9.tar.xz/ar-lib Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/compile -> _service:tar_scm:fig2dev-3.2.9.tar.xz/compile Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/config.h.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/config.h.in Changed

@@ -13,18 +13,12 @@
 /* Define to 1 if you have the `fdopen' function. */
 #undef HAVE_FDOPEN
 
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
 /* Define to 1 if you have the `getline' function. */
 #undef HAVE_GETLINE
 
 /* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
-/* Define to 1 if you have the `getpwuid' function. */
-#undef HAVE_GETPWUID
-
 /* Define to 1 if you have the <iconv.h> header and libiconv. */
 #undef HAVE_ICONV
 
@@ -37,6 +31,9 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
 /* Define to 1 if you have the <png.h> header file. */
 #undef HAVE_PNG_H
 
@@ -98,9 +95,6 @@
    to text or binary. */
 #undef HAVE__SETMODE
 
-/* Define to 1 to use internationalization of text input for some drivers. */
-#undef I18N
-
 /* Define to 1 if the ibmgl-driver should create instructions for the IBM
    Graphics Enhancement Cartridge. */
 #undef IBMGEC

_service:tar_scm:fig2dev-3.2.8b.tar.xz/configure -> _service:tar_scm:fig2dev-3.2.9.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for fig2dev 3.2.8b.
+# Generated by GNU Autoconf 2.71 for fig2dev 3.2.9.
 #
 # Report bugs to <thomas.loimer@tuwien.ac.at>.
 #
@@ -8,7 +8,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -627,8 +627,8 @@
 # Identity of this package.
 PACKAGE_NAME='fig2dev'
 PACKAGE_TARNAME='fig2dev'
-PACKAGE_VERSION='3.2.8b'
-PACKAGE_STRING='fig2dev 3.2.8b'
+PACKAGE_VERSION='3.2.9'
+PACKAGE_STRING='fig2dev 3.2.9'
 PACKAGE_BUGREPORT='thomas.loimer@tuwien.ac.at'
 PACKAGE_URL='https://sourceforge.net/projects/mcj'
 
@@ -713,6 +713,9 @@
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -776,8 +779,7 @@
 PATH_SEPARATOR
 SHELL
 am__quote'
-ac_subst_files='i18nman
-nfssman'
+ac_subst_files='nfssman'
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
@@ -785,7 +787,6 @@
 enable_versioning
 enable_transfig
 enable_letterpaper
-enable_i18n
 enable_NFSS
 enable_latex2e_graphicx
 enable_scale_pict2e
@@ -1352,7 +1353,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fig2dev 3.2.8b to adapt to many kinds of systems.
+\`configure' configures fig2dev 3.2.9 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1419,7 +1420,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fig2dev 3.2.8b:";;
+     short | recursive ) echo "Configuration of fig2dev 3.2.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1438,8 +1439,6 @@
   --enable-transfig       build the transfig program (default: do not build)
   --enable-letterpaper    set default papersize to letter for dxf and
                           ibmgl-drivers (default: A4)
-  --disable-i18n          disable internationalization of text input for some
-                          drivers (default: enable)
   --disable-NFSS          disable LaTeX New Font Selection Scheme (default:
                           enable)
   --disable-latex2e_graphicx
@@ -1540,7 +1539,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-fig2dev configure 3.2.8b
+fig2dev configure 3.2.9
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1551,7 +1550,7 @@
 Copyright (c) 1991 by Micah Beck
 Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 Parts Copyright (c) 1989-2015 by Brian V. Smith
-Parts Copyright (c) 2015-2020 by Thomas Loimer
+Parts Copyright (c) 2015-2023 by Thomas Loimer
 
 Any party obtaining a copy of these files is granted, free of charge, a
 full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -1874,7 +1873,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fig2dev $as_me 3.2.8b, which was
+It was created by fig2dev $as_me 3.2.9, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2462,11 +2461,10 @@
 as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
 as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
 as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-as_fn_append ac_func_c_list " gethostname HAVE_GETHOSTNAME"
-as_fn_append ac_func_c_list " strerror HAVE_STRERROR"
-as_fn_append ac_func_c_list " getpwuid HAVE_GETPWUID"
-as_fn_append ac_func_c_list " mkstemp HAVE_MKSTEMP"
 as_fn_append ac_func_c_list " fdopen HAVE_FDOPEN"
+as_fn_append ac_func_c_list " mkstemp HAVE_MKSTEMP"
+as_fn_append ac_func_c_list " nl_langinfo HAVE_NL_LANGINFO"
+as_fn_append ac_func_c_list " strerror HAVE_STRERROR"
 
 # Auxiliary files required by this configure script.
 ac_aux_files="ar-lib compile missing install-sh"
@@ -3150,7 +3148,7 @@
 
 # Define the identity of the package.
  PACKAGE='fig2dev'
- VERSION='3.2.8b'
+ VERSION='3.2.9'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3196,6 +3194,20 @@
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -3250,7 +3262,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-RELEASE_DATE="Aug 2021"
+RELEASE_DATE="Aug 2023"
 
 
 #
@@ -5428,23 +5440,11 @@
      ALTERNATE_PAPERSIZE="ISO A4"
 
 fi
-# Check whether --enable-i18n was given.
-if test ${enable_i18n+y}
-then :
-  enableval=$enable_i18n; i18nman="/dev/null"
-else $as_nop
-  enableval=yes; i18nman="$srcdir/man/i18n.man"
-fi
-if test "x$enableval" = xyes
-then :
-
-printf "%s\n" "#define I18N 1" >>confdefs.h
 # The directory where internationalization data is installed to.
 # fig2dev/dev/Makefile.am defines -DI18N_DATADIR
 # i18ndir is used in fig2dev/i18n/Makefile.am
-     i18ndir='$(pkgdatadir)/i18n'
+i18ndir='$(pkgdatadir)/i18n'
 
-fi
  if test "x$enableval" = xyes; then
   ENABLE_I18N_TRUE=
   ENABLE_I18N_FALSE='#'
@@ -5454,7 +5454,6 @@
 fi
 
 
-
 # Check whether --enable-NFSS was given.
 if test ${enable_NFSS+y}
 then :
@@ -6179,9 +6178,8 @@
 
 # Check for functions and set, e.g., HAVE_STRERROR if found.

_service:tar_scm:fig2dev-3.2.8b.tar.xz/configure.ac -> _service:tar_scm:fig2dev-3.2.9.tar.xz/configure.ac Changed

@@ -5,7 +5,7 @@
 Copyright (c) 1991 by Micah Beck
 Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 Parts Copyright (c) 1989-2015 by Brian V. Smith
-Parts Copyright (c) 2015-2020 by Thomas Loimer
+Parts Copyright (c) 2015-2023 by Thomas Loimer
 
 Any party obtaining a copy of these files is granted, free of charge, a
 full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,7 +19,7 @@
 
 #
 # configure.ac
-# Author: Thomas Loimer, 2015-2020.
+# Author: Thomas Loimer
 #
 
 dnl Define m4 variables for use in AC_INIT and AC_DEFINE below.
@@ -178,23 +178,11 @@
     AC_SUBST(DEFAULT_PAPERSIZE, "ANSI A")dnl
      AC_SUBST(ALTERNATE_PAPERSIZE, "ISO A4"))dnl
 
-AC_ARG_ENABLE(i18n, AS_HELP_STRING(--disable-i18n,
-	disable internationalization of text input \
-		for some drivers (default: enable)),
-    i18nman="/dev/null",
-    enableval=yes; i18nman="$srcdir/man/i18n.man")dnl
-AS_IF(test "x$enableval" = xyes,dnl
-    AC_DEFINE(I18N, 1,dnl
-	Define to 1 to use internationalization of text input \
-		for some drivers.)dnl
 # The directory where internationalization data is installed to.
 # fig2dev/dev/Makefile.am defines -DI18N_DATADIR
 # i18ndir is used in fig2dev/i18n/Makefile.am
-     AC_SUBST(i18ndir,'$(pkgdatadir)/i18n'))
+AC_SUBST(i18ndir,'$(pkgdatadir)/i18n')
 AM_CONDITIONAL(ENABLE_I18N,test "x$enableval" = xyes)
-dnl Substitute the file fragment named by i18nman, defined above,
-dnl into man/fig1dev.1 (or not)
-AC_SUBST_FILE(i18nman)
 
 AC_ARG_ENABLE(NFSS, AS_HELP_STRING(--disable-NFSS,
 	disable LaTeX New Font Selection Scheme (default: enable)),
@@ -301,10 +289,9 @@
 
 # Check for functions and set, e.g., HAVE_STRERROR if found.
 # Assume that errno.h exists if strerror() is available. Otherwise, do
-# not use strerror() at all. Do not try to replace strerror() with the
-# obsolete sys_nerr, sys_errlist and the declaration "int errno".
-# If getpwuid() is found, <pwd.h> is assumed to exist.
-AC_CHECK_FUNCS_ONCE(gethostname strerror getpwuid mkstemp fdopen)
+# not use strerror() at all.
+# If nl_langinfo() is found, <nl_langinfo.h> is assumed to exist.
+AC_CHECK_FUNCS_ONCE(fdopen mkstemp nl_langinfo strerror)
 
 # Under Windows, the _setmode() function is defined in io.h. It accepts two
 # arguments and sets the file access mode to text or binary. O_TEXT and O_BINARY

_service:tar_scm:fig2dev-3.2.8b.tar.xz/depcomp -> _service:tar_scm:fig2dev-3.2.9.tar.xz/depcomp Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/Makefile.am -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/Makefile.am Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -30,7 +30,7 @@
 # and this permission notice remain intact.
 
 # fig2dev/Makefile.am
-# Author: Thomas Loimer, 2015-2020.
+# Author: Thomas Loimer
 
 
 VPATH = @srcdir@
@@ -105,7 +105,6 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@ENABLE_I18N_TRUE@am__append_1 = i18n
 bin_PROGRAMS = fig2dev$(EXEEXT)
 subdir = fig2dev
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -239,9 +238,7 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = dev i18n tests
+DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
 	$(top_srcdir)/fig2dev/lib/getline.c \
 	$(top_srcdir)/fig2dev/lib/getopt.c \
@@ -292,6 +289,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -299,6 +298,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -380,7 +380,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 DISTCLEANFILES = config.vc
 CLEANFILES = config.log
-SUBDIRS = dev $(am__append_1) tests
+SUBDIRS = dev i18n tests
 EXTRA_DIST = fig2ps2tex.csh config.vc config.vc.in Nmakefile
 fig2dev_SOURCES = alloc.h bool.h bound.h bound.c colors.h colors.c \
     creationdate.h creationdate.c drivers.h fig2dev.h fig2dev.c free.h free.c \
@@ -467,15 +467,15 @@
 ../fig2dev/lib/$(am__dirstamp):
 	@$(MKDIR_P) ../fig2dev/lib/
 	@: > ../fig2dev/lib/$(am__dirstamp)
-../fig2dev/lib/strncasecmp.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
+../fig2dev/lib/getline.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
 ../fig2dev/lib/getopt.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
-../fig2dev/lib/strchr.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
-../fig2dev/lib/strstr.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
-../fig2dev/lib/strcasecmp.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
 ../fig2dev/lib/isascii.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
+../fig2dev/lib/strcasecmp.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
+../fig2dev/lib/strchr.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
 ../fig2dev/lib/strdup.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
-../fig2dev/lib/getline.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
+../fig2dev/lib/strncasecmp.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
 ../fig2dev/lib/strrchr.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
+../fig2dev/lib/strstr.$(OBJEXT): ../fig2dev/lib/$(am__dirstamp)
 
 fig2dev$(EXEEXT): $(fig2dev_OBJECTS) $(fig2dev_DEPENDENCIES) $(EXTRA_fig2dev_DEPENDENCIES) 
 	@rm -f fig2dev$(EXEEXT)
@@ -663,7 +663,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/alloc.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/alloc.h Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1985 by  Supoj Sutantavibul
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2019 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,15 +19,15 @@
 #ifndef ALLOC_H
 #define ALLOC_H
 
-#define		Line_malloc(z)		z = malloc(LINOBJ_SIZE)
-#define		Pic_malloc(z)		z = malloc(PIC_SIZE)
-#define		Spline_malloc(z)	z = malloc(SPLOBJ_SIZE)
-#define		Ellipse_malloc(z)	z = malloc(ELLOBJ_SIZE)
-#define		Arc_malloc(z)		z = malloc(ARCOBJ_SIZE)
-#define		Compound_malloc(z)	z = malloc(COMOBJ_SIZE)
-#define		Text_malloc(z)		z = malloc(TEXOBJ_SIZE)
-#define		Point_malloc(z)		z = malloc(POINT_SIZE)
-#define		Control_malloc(z)	z = malloc(CONTROL_SIZE)
-#define		Arrow_malloc(z)		z = malloc(ARROW_SIZE)
+#define		Line_malloc(z)		((z) = malloc(LINOBJ_SIZE))
+#define		Pic_malloc(z)		((z) = malloc(PIC_SIZE))
+#define		Spline_malloc(z)	((z) = malloc(SPLOBJ_SIZE))
+#define		Ellipse_malloc(z)	((z) = malloc(ELLOBJ_SIZE))
+#define		Arc_malloc(z)		((z) = malloc(ARCOBJ_SIZE))
+#define		Compound_malloc(z)	((z) = malloc(COMOBJ_SIZE))
+#define		Text_malloc(z)		((z) = malloc(TEXOBJ_SIZE))
+#define		Point_malloc(z)		((z) = malloc(POINT_SIZE))
+#define		Control_malloc(z)	((z) = malloc(CONTROL_SIZE))
+#define		Arrow_malloc(z)		((z) = malloc(ARROW_SIZE))
 
 #endif /* ALLOC_H */

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/bound.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/bound.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1985 Supoj Sutanthavibul
  * Copyright (c) 1991 Micah Beck
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 Thomas Loimer
+ * Parts Copyright (c) 2015-2023 Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -196,52 +196,52 @@
 	sy = min(arc->point2.y, sy);
 
 	if (arc->direction == 1) { /* counter clockwise */
-	    if (alpha > beta) {
-		if (alpha <= 0 || 0 <= beta)
-		    bx = (int)(arc->center.x + radius + 1.0);
-		if (alpha <= M_PI_2 || M_PI_2 <= beta)
-		    sy = (int)(arc->center.y - radius - 1.0);
-		if (alpha <= M_PI || M_PI <= beta)
-		    sx = (int)(arc->center.x - radius - 1.0);
-		if (alpha <= Two_seventy_deg || Two_seventy_deg <= beta)
-		    by = (int)(arc->center.y + radius + 1.0);
-	    } else {
-		if (0 <= beta && alpha <= 0)
-		    bx = (int)(arc->center.x + radius + 1.0);
-		if (M_PI_2 <= beta && alpha <= M_PI_2)
-		    sy = (int)(arc->center.y - radius - 1.0);
-		if (M_PI <= beta && alpha <= M_PI)
-		    sx = (int)(arc->center.x - radius - 1.0);
-		if (Two_seventy_deg <= beta && alpha <= Two_seventy_deg)
-		    by = (int)(arc->center.y + radius + 1.0);
-	    }
+		if (alpha > beta) {
+			if (alpha <= 0 || 0 <= beta)
+				bx = (int)(arc->center.x + radius + 1.0);
+			if (alpha <= M_PI_2 || M_PI_2 <= beta)
+				sy = (int)(arc->center.y - radius - 1.0);
+			if (alpha <= M_PI || M_PI <= beta)
+				sx = (int)(arc->center.x - radius - 1.0);
+			if (alpha <= Two_seventy_deg || Two_seventy_deg <= beta)
+				by = (int)(arc->center.y + radius + 1.0);
+		} else {
+			if (0 <= beta && alpha <= 0)
+				bx = (int)(arc->center.x + radius + 1.0);
+			if (M_PI_2 <= beta && alpha <= M_PI_2)
+				sy = (int)(arc->center.y - radius - 1.0);
+			if (M_PI <= beta && alpha <= M_PI)
+				sx = (int)(arc->center.x - radius - 1.0);
+			if (Two_seventy_deg <= beta && alpha <= Two_seventy_deg)
+				by = (int)(arc->center.y + radius + 1.0);
+		}
 	} else {	/* clockwise	*/
-	    if (alpha > beta) {
-		if (beta <= 0 && 0 <= alpha)
-		    bx = (int)(arc->center.x + radius + 1.0);
-		if (beta <= M_PI_2 && M_PI_2 <= alpha)
-		    sy = (int)(arc->center.y - radius - 1.0);
-		if (beta <= M_PI && M_PI <= alpha)
-		    sx = (int)(arc->center.x - radius - 1.0);
-		if (beta <= Two_seventy_deg && Two_seventy_deg <= alpha)
-		    by = (int)(arc->center.y + radius + 1.0);
-	    } else {
-		if (0 <= alpha || beta <= 0)
-		    bx = (int)(arc->center.x + radius + 1.0);
-		if (M_PI_2 <= alpha || beta <= M_PI_2)
-		    sy = (int)(arc->center.y - radius - 1.0);
-		if (M_PI <= alpha || beta <= M_PI)
-		    sx = (int)(arc->center.x - radius - 1.0);
-		if (Two_seventy_deg <= alpha || beta <= Two_seventy_deg)
-		    by = (int)(arc->center.y + radius + 1.0);
-	    }
+		if (alpha > beta) {
+			if (beta <= 0 && 0 <= alpha)
+				bx = (int)(arc->center.x + radius + 1.0);
+			if (beta <= M_PI_2 && M_PI_2 <= alpha)
+				sy = (int)(arc->center.y - radius - 1.0);
+			if (beta <= M_PI && M_PI <= alpha)
+				sx = (int)(arc->center.x - radius - 1.0);
+			if (beta <= Two_seventy_deg && Two_seventy_deg <= alpha)
+				by = (int)(arc->center.y + radius + 1.0);
+		} else {
+			if (0 <= alpha || beta <= 0)
+				bx = (int)(arc->center.x + radius + 1.0);
+			if (M_PI_2 <= alpha || beta <= M_PI_2)
+				sy = (int)(arc->center.y - radius - 1.0);
+			if (M_PI <= alpha || beta <= M_PI)
+				sx = (int)(arc->center.x - radius - 1.0);
+			if (Two_seventy_deg <= alpha || beta <= Two_seventy_deg)
+				by = (int)(arc->center.y + radius + 1.0);
+		}
 	}
 	/* if pie-wedge type, account for the center point */
 	if(arc->type == T_PIE_WEDGE_ARC) {
-	    sx = min((int)arc->center.x, sx);
-	    bx = max((int)arc->center.x, bx);
-	    sy = min((int)arc->center.y, sy);
-	    by = max((int)arc->center.y, by);
+		sx = min((int)arc->center.x, sx);
+		bx = max((int)arc->center.x, bx);
+		sy = min((int)arc->center.y, sy);
+		by = max((int)arc->center.y, by);
 	}
 
 	*xmin = sx;
@@ -269,96 +269,117 @@
 	llx = lly =  10000000;
 	urx = ury = -10000000;
 	while(compound != NULL) {
-	    for (a = compound->arcs; a != NULL; a = a->next) {
-		if (adjust_boundingbox && !depth_filter(a->depth))
-		  continue;
-		arc_bound(a, &sx, &sy, &bx, &by);
-		half_wd = (a->thickness + 1) / 2;
-		if (first) {
-		    first = 0;
-		    llx = sx - half_wd; lly = sy - half_wd;
-		    urx = bx + half_wd; ury = by + half_wd;
-		} else {
-		    llx = min(llx, sx - half_wd); lly = min(lly, sy - half_wd);
-		    urx = max(urx, bx + half_wd); ury = max(ury, by + half_wd);
+		for (a = compound->arcs; a != NULL; a = a->next) {
+			if (adjust_boundingbox && !depth_filter(a->depth))
+				continue;
+			arc_bound(a, &sx, &sy, &bx, &by);
+			half_wd = (a->thickness + 1) / 2;
+			if (first) {
+				first = 0;
+				llx = sx - half_wd;
+				lly = sy - half_wd;
+				urx = bx + half_wd;
+				ury = by + half_wd;
+			} else {
+				llx = min(llx, sx - half_wd);
+				lly = min(lly, sy - half_wd);
+				urx = max(urx, bx + half_wd);
+				ury = max(ury, by + half_wd);
+			}
 		}
-	    }
 
-	    if (compound->compounds) {
-		compound_bound(compound->compounds, &sx, &sy, &bx, &by, include);
-		if (first) {
-		    first = 0;
-		    llx = sx; lly = sy;
-		    urx = bx; ury = by;
-		} else {
-		    llx = min(llx, sx); lly = min(lly, sy);
-		    urx = max(urx, bx); ury = max(ury, by);
+		if (compound->compounds) {
+			compound_bound(compound->compounds, &sx, &sy, &bx, &by,
+					include);
+			if (first) {
+				first = 0;
+				llx = sx;
+				lly = sy;
+				urx = bx;
+				ury = by;
+			} else {
+				llx = min(llx, sx);
+				lly = min(lly, sy);
+				urx = max(urx, bx);
+				ury = max(ury, by);
+			}
 		}
-	    }
 
-	    for (e = compound->ellipses; e != NULL; e = e->next) {
-		if (adjust_boundingbox && !depth_filter(e->depth))
-		  continue;
-		ellipse_bound(e, &sx, &sy, &bx, &by);
-		if (first) {
-		    first = 0;
-		    llx = sx; lly = sy;
-		    urx = bx; ury = by;
-		} else {
-		    llx = min(llx, sx); lly = min(lly, sy);
-		    urx = max(urx, bx); ury = max(ury, by);
+		for (e = compound->ellipses; e != NULL; e = e->next) {
+			if (adjust_boundingbox && !depth_filter(e->depth))
+				continue;
+			ellipse_bound(e, &sx, &sy, &bx, &by);
+			if (first) {
+				first = 0;
+				llx = sx;
+				lly = sy;
+				urx = bx;
+				ury = by;
+			} else {
+				llx = min(llx, sx);
+				lly = min(lly, sy);
+				urx = max(urx, bx);
+				ury = max(ury, by);
+			}
 		}
-	    }
 
-	    for (l = compound->lines; l != NULL; l = l->next) {
-		if (adjust_boundingbox && !depth_filter(l->depth))
-		  continue;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/config.vc -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/config.vc Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/creationdate.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/creationdate.c Changed

@@ -1,6 +1,9 @@
 /*
  * Fig2dev: Translate Fig code to various Devices
- * Parts Copyright (c) 2016, 2017 by Thomas Loimer
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -22,6 +25,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "creationdate.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,55 +35,80 @@
 #endif
 #include <time.h>
 #include <limits.h>
-#include "bool.h"
-
-#include "creationdate.h"
 
 
-int
-creation_date(char *buf)
+static struct tm*
+parse_time(void)
 {
-    time_t now;
+	time_t			now;
 
 #ifdef	HAVE_STRERROR
-    char *source_date_epoch;
-    unsigned long long epoch;
-    char *endptr;
+	char			*source_date_epoch;
+	unsigned long long	epoch;
+	char			*endptr;
 
-    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
-    if (source_date_epoch) {
-	errno = 0;
-	epoch = strtoull(source_date_epoch, &endptr, 10);
-	if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
-		|| (errno != 0 && epoch == 0)) {
-	    fprintf(stderr,
-		"Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n",
-		strerror(errno));
-	} else if (endptr == source_date_epoch) {
-	    fprintf(stderr,
-		"Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n",
-		endptr);
-	} else if (*endptr != '\0') {
-	    fprintf(stderr,
-		"Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n",
-		endptr);
-	} else if (epoch > ULONG_MAX) {
-	    fprintf(stderr,
-		"Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu \n",
-		ULONG_MAX, epoch);
-	} else {
-	    /* no errors, epoch is valid */
-	    now = epoch;
-	    strftime(buf, CREATION_TIME_LEN, "%F %H:%M:%S", gmtime(&now));
-	    return true;
+	source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+	if (source_date_epoch) {
+		errno = 0;
+		epoch = strtoull(source_date_epoch, &endptr, 10);
+		if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ||
+				(errno != 0 && epoch == 0)) {
+			fprintf(stderr,"Environment variable SOURCE_DATE_EPOCH:"
+				       " strtoull: %s\n", strerror(errno));
+		} else if (endptr == source_date_epoch) {
+			fprintf(stderr,"Environment variable SOURCE_DATE_EPOCH:"
+					" No digits were found: %s\n", endptr);
+		} else if (*endptr != '\0') {
+			fprintf(stderr,"Environment variable SOURCE_DATE_EPOCH:"
+					" Trailing garbage: %s\n", endptr);
+		} else if (epoch > ULONG_MAX) {
+			fprintf(stderr,"Environment variable SOURCE_DATE_EPOCH:"
+					" value must be smaller than or equal "
+					"to: %lu but was found to be: %llu \n",
+					ULONG_MAX, epoch);
+		} else {
+			/* no errors, epoch is valid */
+			now = epoch;
+			return gmtime(&now);
+		}
 	}
-    }
 #endif
 
-    /* fall trough on errors or !source_date_epoch */
-    time(&now);
-    if (strftime(buf, CREATION_TIME_LEN, "%F %H:%M:%S", localtime(&now)))
-	return true;
-    else
-	return false;
+	/* fall trough on errors or !source_date_epoch */
+	time(&now);
+	return localtime(&now);
+}
+
+static struct tm*
+get_time(void)
+{
+	static struct tm	time;
+	static int		initialized = 0;
+	if (!initialized) {
+		time = *parse_time();
+		initialized = 1;
+	}
+	return &time;
+}
+
+int
+creation_date(char *restrict buf)
+{
+	if (strftime(buf, CREATION_TIME_LEN, "%F %H:%M:%S", get_time()))
+		return 1;
+	else
+		return 0;
+}
+
+int
+creation_date_pdfmark(char *restrict buf)
+{
+	/*
+	 * Pdfmark format should be D:YYYYMMDDHHmmSSOHH’mm’.
+	 * Timezone offset (O...) may be omitted
+	 */
+	if (strftime(buf, CREATION_TIME_LEN, "D:%Y%m%d%H%M%S", get_time()))
+		return 1;
+	else
+		return 0;
 }

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/creationdate.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/creationdate.h Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/Makefile.am -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/Makefile.am Changed

@@ -4,7 +4,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -16,7 +16,7 @@
 # and this permission notice remain intact.
 
 # fig2dev/dev/Makefile.am
-# Author: Thomas Loimer, 2015-2018.
+# Author: Thomas Loimer
 
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -38,9 +38,8 @@
 ## objects like libdrivers_a-as85ec.o etc. are created
 # i18ndir is defined and AC_SUBST'd in configure.ac
 AM_CPPFLAGS = -I"$(top_srcdir)/fig2dev"
-if ENABLE_I18N
 AM_CPPFLAGS += -DI18N_DATADIR="\"$(i18ndir)\""
-endif
+
 ## libraries do not need LDFLAGS - they need not be linked
 ## libdrivers_a_LIBADD is appended to the link-command
 
@@ -51,8 +50,9 @@
     gensvg.c gentextyl.c gentikz.h gentikz.c gentk.c gentpic.c picfonts.h \
     picpsfonts.h psfonts.h psfonts.c \
     psprolog.h readeps.c readgif.c readjpg.c readpcx.c readpics.h readpics.c \
-    readppm.c readtif.c readxbm.c readxpm.c texfonts.h texfonts.c setfigfont.h \
-    setfigfont.c tkpattern.h tkpattern.c xtmpfile.h xtmpfile.c
+    readppm.c readtif.c readxbm.c readxpm.c texfonts.h texfonts.c \
+    textconvert.h textconvert.c setfigfont.h setfigfont.c \
+    tkpattern.h tkpattern.c xtmpfile.h xtmpfile.c
 
 # These contain PACKAGE_VERSION, hence depend on $(CONFIG_HEADER) = config.h.
 encode.h genps.$(OBJEXT) gensvg.$(OBJEXT) genemf.$(OBJEXT) gengbx.$(OBJEXT) \

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -30,7 +30,7 @@
 # and this permission notice remain intact.
 
 # fig2dev/dev/Makefile.am
-# Author: Thomas Loimer, 2015-2018.
+# Author: Thomas Loimer
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
@@ -104,8 +104,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@ENABLE_I18N_TRUE@am__append_1 = -DI18N_DATADIR="\"$(i18ndir)\""
-@WITH_PNG_TRUE@am__append_2 = readpng.c
+@WITH_PNG_TRUE@am__append_1 = readpng.c
 subdir = fig2dev/dev
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/tl_search_libs_source.m4 \
@@ -133,8 +132,8 @@
 	picfonts.h picpsfonts.h psfonts.h psfonts.c psprolog.h \
 	readeps.c readgif.c readjpg.c readpcx.c readpics.h readpics.c \
 	readppm.c readtif.c readxbm.c readxpm.c texfonts.h texfonts.c \
-	setfigfont.h setfigfont.c tkpattern.h tkpattern.c xtmpfile.h \
-	xtmpfile.c readpng.c
+	textconvert.h textconvert.c setfigfont.h setfigfont.c \
+	tkpattern.h tkpattern.c xtmpfile.h xtmpfile.c readpng.c
 @WITH_PNG_TRUE@am__objects_1 = readpng.$(OBJEXT)
 am_libdrivers_a_OBJECTS = encode.$(OBJEXT) genbitmaps.$(OBJEXT) \
 	genbox.$(OBJEXT) gencgm.$(OBJEXT) gendxf.$(OBJEXT) \
@@ -149,8 +148,8 @@
 	readeps.$(OBJEXT) readgif.$(OBJEXT) readjpg.$(OBJEXT) \
 	readpcx.$(OBJEXT) readpics.$(OBJEXT) readppm.$(OBJEXT) \
 	readtif.$(OBJEXT) readxbm.$(OBJEXT) readxpm.$(OBJEXT) \
-	texfonts.$(OBJEXT) setfigfont.$(OBJEXT) tkpattern.$(OBJEXT) \
-	xtmpfile.$(OBJEXT) $(am__objects_1)
+	texfonts.$(OBJEXT) textconvert.$(OBJEXT) setfigfont.$(OBJEXT) \
+	tkpattern.$(OBJEXT) xtmpfile.$(OBJEXT) $(am__objects_1)
 libdrivers_a_OBJECTS = $(am_libdrivers_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -187,8 +186,8 @@
 	./$(DEPDIR)/readpng.Po ./$(DEPDIR)/readppm.Po \
 	./$(DEPDIR)/readtif.Po ./$(DEPDIR)/readxbm.Po \
 	./$(DEPDIR)/readxpm.Po ./$(DEPDIR)/setfigfont.Po \
-	./$(DEPDIR)/texfonts.Po ./$(DEPDIR)/tkpattern.Po \
-	./$(DEPDIR)/xtmpfile.Po
+	./$(DEPDIR)/texfonts.Po ./$(DEPDIR)/textconvert.Po \
+	./$(DEPDIR)/tkpattern.Po ./$(DEPDIR)/xtmpfile.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -226,8 +225,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -244,6 +241,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -251,6 +250,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -334,7 +334,8 @@
 noinst_LIBRARIES = libdrivers.a
 
 # i18ndir is defined and AC_SUBST'd in configure.ac
-AM_CPPFLAGS = -I"$(top_srcdir)/fig2dev" $(am__append_1)
+AM_CPPFLAGS = -I"$(top_srcdir)/fig2dev" \
+	-DI18N_DATADIR="\"$(i18ndir)\""
 libdrivers_a_SOURCES = encode.c encode.h genbitmaps.c genbox.c \
 	gencgm.c gendxf.c genemf.h genemf.c genepic.c gengbx.c genge.c \
 	genibmgl.c genlatex.h genlatex.c genmap.c genmf.c genmp.c \
@@ -344,8 +345,8 @@
 	picpsfonts.h psfonts.h psfonts.c psprolog.h readeps.c \
 	readgif.c readjpg.c readpcx.c readpics.h readpics.c readppm.c \
 	readtif.c readxbm.c readxpm.c texfonts.h texfonts.c \
-	setfigfont.h setfigfont.c tkpattern.h tkpattern.c xtmpfile.h \
-	xtmpfile.c $(am__append_2)
+	textconvert.h textconvert.c setfigfont.h setfigfont.c \
+	tkpattern.h tkpattern.c xtmpfile.h xtmpfile.c $(am__append_1)
 all: all-am
 
 .SUFFIXES:
@@ -435,6 +436,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readxpm.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setfigfont.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texfonts.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textconvert.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tkpattern.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtmpfile.Po@am__quote@ # am--include-marker
 
@@ -511,7 +513,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -626,6 +627,7 @@
 	-rm -f ./$(DEPDIR)/readxpm.Po
 	-rm -f ./$(DEPDIR)/setfigfont.Po
 	-rm -f ./$(DEPDIR)/texfonts.Po
+	-rm -f ./$(DEPDIR)/textconvert.Po
 	-rm -f ./$(DEPDIR)/tkpattern.Po
 	-rm -f ./$(DEPDIR)/xtmpfile.Po
 	-rm -f Makefile
@@ -714,6 +716,7 @@
 	-rm -f ./$(DEPDIR)/readxpm.Po
 	-rm -f ./$(DEPDIR)/setfigfont.Po
 	-rm -f ./$(DEPDIR)/texfonts.Po
+	-rm -f ./$(DEPDIR)/textconvert.Po
 	-rm -f ./$(DEPDIR)/tkpattern.Po
 	-rm -f ./$(DEPDIR)/xtmpfile.Po
 	-rm -f Makefile

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genbitmaps.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genbitmaps.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gencgm.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gencgm.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -93,7 +93,7 @@
 static	char	 *cgmcom;
 
 static struct	_rgb {
-  float r, g, b;
+	float r, g, b;
 }
 stdcolsNUM_STD_COLS = {		/* standard colors */
 	{0, 0, 0},
@@ -128,7 +128,7 @@
 	{1, .75, .75},
 	{1, .88, .88},
 	{1, .84, 0}
-    };
+};
 
 /* CGM patterns are numbered 1-6 (I use 0 for nonexistant patterns) */
 
@@ -143,59 +143,61 @@
 void
 gencgm_start(F_compound *objects)
 {
-  int	 i;
-  char	*p, *figname;
-  char	*figname_buf = NULL;
-
-  if (from) {
-	figname_buf = strdup(from);
-	figname = figname_buf;
-	p = strrchr(figname, '/');
-	if (p)
-	    figname = p+1;	/* remove path from name for comment in file */
-	p = strchr(figname, '.');
-	if (p)
-	    *p = '\0';		/* and extension */
-  } else {
-	figname = "(stdin)";
-  }
-  if (binary_output) {
-    /* pipe output through "ralcgm -b" to produce binary CGM */
-    /* but first close the output file that main() opened */
-    saveofile = tfp;
-    if (tfp != stdout)
-	fclose(tfp);
-    if (to) {
-	cgmcom = malloc(strlen(to) + 13);
-	strcpy(cgmcom, "ralcgm -b - ");
-	strcat(cgmcom, to);
-    } else {
-	cgmcom = malloc((size_t) 14);
-	strcpy(cgmcom, "ralcgm -b - -");
-    }
-    /* open pipe to ralcgm */
-    if ((tfp = popen(cgmcom,"w")) == 0) {
-	fprintf(stderr,
-		"fig2dev: Can't open pipe to ralcgm, producing ASCII CGM instead.\n");
-	fprintf(stderr, "Command was: %s\n", cgmcom);
-	/* failed, revert back to ASCII */
-	tfp = saveofile;
-	free(cgmcom);
-	binary_output = false;
-    }
-  }
-
-  fprintf(tfp, "BEGMF '%s';\n", figname);
-  fprintf(tfp, "mfversion 1;\n");
-  fprintf(tfp, "mfdesc 'Converted from %s using fig2dev -Lcgm';\n", from? from: "(stdin)");
-  fprintf(tfp, "mfelemlist 'DRAWINGPLUS';\n");
-  fprintf(tfp, "vdctype integer;\n");
+	int	 i;
+	char	*p, *figname;
+	char	*figname_buf = NULL;
+
+	if (from) {
+		figname_buf = strdup(from);
+		figname = figname_buf;
+		p = strrchr(figname, '/');
+		if (p)
+			/* remove path from name for comment in file */
+			figname = p+1;
+		p = strchr(figname, '.');
+		if (p)
+			*p = '\0';		/* and extension */
+	} else {
+		figname = "(stdin)";
+	}
+	if (binary_output) {
+		/* pipe output through "ralcgm -b" to produce binary CGM */
+		/* but first close the output file that main() opened */
+		saveofile = tfp;
+		if (tfp != stdout)
+			fclose(tfp);
+		if (to) {
+			cgmcom = malloc(strlen(to) + 13);
+			strcpy(cgmcom, "ralcgm -b - ");
+			strcat(cgmcom, to);
+		} else {
+			cgmcom = malloc((size_t) 14);
+			strcpy(cgmcom, "ralcgm -b - -");
+		}
+		/* open pipe to ralcgm */
+		if ((tfp = popen(cgmcom,"w")) == 0) {
+			fprintf(stderr, "fig2dev: Can't open pipe to ralcgm, "
+					"producing ASCII CGM instead.\n");
+			fprintf(stderr, "Command was: %s\n", cgmcom);
+			/* failed, revert back to ASCII */
+			tfp = saveofile;
+			free(cgmcom);
+			binary_output = false;
+		}
+	}
+
+	fprintf(tfp, "BEGMF '%s';\n", figname);
+	fprintf(tfp, "mfversion 1;\n");
+	fprintf(tfp, "mfdesc 'Converted from %s using fig2dev -Lcgm';\n",
+			from? from : "(stdin)");
+	fprintf(tfp, "mfelemlist 'DRAWINGPLUS';\n");
+	fprintf(tfp, "vdctype integer;\n");
 
 #define LATEX_FONT_BASE 2	/* index of first LaTeX-like text font */
 #define NUM_LATEX_FONTS 5	/* number of LaTeX like text fonts */
 #define PS_FONT_BASE 7		/* index of first PostScript text font */
 #define NUM_PS_FONTS 35		/* number of PostScript fonts */
-  fprintf(tfp, "fontlist 'Hardware',\n\
+	fprintf(tfp, "fontlist 'Hardware',\n\
   'Times New Roman', 'Times New Roman Bold', 'Times New Roman Italic',\n\
   'Helvetica', 'Courier',\n\
   'Times-Roman', 'Times-Italic',\n\
@@ -216,67 +218,67 @@
   'Palatino-Bold', 'Palatino-BoldItalic',\n\
   'Symbol', 'ZapfChancery-MediumItalic', 'ZapfDingbats';\n");
 
-  fprintf(tfp, "BEGMFDEFAULTS;\n");
-  fprintf(tfp, "  vdcext (0,0) (%d,%d);\n", urx-llx, ury-lly);
-				/* see _pos() below */
-  fprintf(tfp, "  clip off;\n");
-  fprintf(tfp, "  colrmode indexed;\n");
-  fprintf(tfp, "  colrtable 1");	/* color table */
-  for (i=0; i<NUM_STD_COLS; i++) {	/* standard colors */
-    fprintf(tfp, "\n	%d %d %d",
-	    (int)(stdcolsi.r * 255.),
-	    (int)(stdcolsi.g * 255.),
-	    (int)(stdcolsi.b * 255.));
-  }
-  for (i=0; i<num_usr_cols; i++) {	/* user defined colors */
-    fprintf(tfp, "\n	%d %d %d",
-	    user_colorsi.r,
-	    user_colorsi.g,
-	    user_colorsi.b);
-  }
-  fprintf(tfp, ";\n");
-  fprintf(tfp, "  linewidthmode abs;\n");
-  fprintf(tfp, "  edgewidthmode abs;\n");
-  fprintf(tfp, "  backcolr 255 255 255;\n");
-  fprintf(tfp, "  textprec stroke;\n");
-  fprintf(tfp, "  transparency ON;\n");
-  fprintf(tfp, "ENDMFDEFAULTS;\n");
-
-  fprintf(tfp, "BEGPIC '%s';\n", figname);
-  fprintf(tfp, "BEGPICBODY;\n");
-
-  /* print any whole-figure comments prefixed with "%" */
-  if (objects->comments) {
-    fprintf(tfp,"%% %%\n");
-    print_comments("% ",objects->comments, " %");
-    fprintf(tfp,"%% %%\n");
-  }
-  if (figname_buf)
-    free(figname_buf);
+	fprintf(tfp, "BEGMFDEFAULTS;\n");
+	fprintf(tfp, "  vdcext (0,0) (%d,%d);\n", urx-llx, ury-lly);
+	/* see _pos() below */
+	fprintf(tfp, "  clip off;\n");
+	fprintf(tfp, "  colrmode indexed;\n");
+	fprintf(tfp, "  colrtable 1");	/* color table */
+	for (i=0; i<NUM_STD_COLS; i++) {	/* standard colors */
+		fprintf(tfp, "\n	%d %d %d",
+				(int)(stdcolsi.r * 255.),
+				(int)(stdcolsi.g * 255.),
+				(int)(stdcolsi.b * 255.));
+	}
+	for (i=0; i<num_usr_cols; i++) {	/* user defined colors */
+		fprintf(tfp, "\n	%d %d %d",
+				user_colorsi.r,
+				user_colorsi.g,
+				user_colorsi.b);
+	}
+	fprintf(tfp, ";\n");
+	fprintf(tfp, "  linewidthmode abs;\n");
+	fprintf(tfp, "  edgewidthmode abs;\n");
+	fprintf(tfp, "  backcolr 255 255 255;\n");

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gendxf.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gendxf.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2022 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -25,8 +25,6 @@
  *	  adapted from:
  *
  *  genibmgl.c:	IBMGL driver for fig2dev
- *		  IBM 6180 Color Plotter with
- *		  IBM Graphics Enhancement Cartridge
  *   Author E. Robert Tisdale, University of California, 1/92
  *  (edwin@cs.ucla.edu)
  *
@@ -34,20 +32,50 @@
  *
  *  genpictex.c:	PiCTeX driver for fig2dev
  *   Author Micah Beck, Cornell University, 4/88
- *  Color, rotated text and ISO-chars added by Herbert Bauer 11/91
- *  PCL job control option added Brian V. Smith 1/2001
+ *
  */
 
+/*
+ * TODO
+ * insert Limits into the header,
+ *	$LIMMIN
+ *	10
+ *	-2		* min. x-coord (default mm)
+ *	20
+ *	-2		* min y-coord
+ *	9
+ *	$LIMMAX
+ *	10
+ *	2		* x-coord
+ *	20
+ *	2		* y-coord
+ *	9
+ *	$PLIMMIN	* paper limits ?
+ *	10
+ *	0		* x-coord
+ *	20
+ *	0		* y-coord
+ *	9
+ *	$PLIMMAX
+ *	10
+ *	210		* x-coord
+ *	20
+ *	297		* y-coord
+ */
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef	HAVE_STRINGS_H
+#include <strings.h>			/* strcasecmp */
+#endif
 #include <math.h>
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
-//#include "object.h"
 #include "localmath.h"
 #include "messages.h"
 #include "pi.h"
@@ -59,37 +87,15 @@
 #define PATTERNS	21
 #define DPR		180.0/M_PI	/* degrees/radian */
 #define DELTA		M_PI/36.0	/* radians */
-#define POINT_PER_INCH	72.27		/* points/inch */
-#define CMPP		254.0/7227.0	/* centimeters/point */
-#define UNITS_PER_INCH	1016.0		/* plotter units/inch */
-#define HEIGHT		7650.0		/* plotter units */
-#define ISO_A4		10900.0		/* plotter units */
-#define ANSI_A		10300.0		/* plotter units */
-#define SPEED_LIMIT	128.0		/* centimeters/second */
-
-#ifdef IBMGEC
-static int	ibmgec = true;
-#else
-static int	ibmgec = false;
-#endif
 
-static bool	reflected = false;
 static int	fonts = FONTS;
 static int	colors = COLORS;
 static int	patterns = PATTERNS;
 static int	line_style = SOLID_LINE;
-static int	fill_pattern = DEFAULT;
-static double	dash_length = DEFAULT;		/* in pixels */
-#ifdef A4
-static double	pagelength = ISO_A4/UNITS_PER_INCH;
-#else
-static double	pagelength = ANSI_A/UNITS_PER_INCH;
-#endif
-static double	pageheight = HEIGHT/UNITS_PER_INCH;
-static double	xl =  0.0;		/* inches */
-static double	yl =  0.0;		/* inches */
-static double	xu = 32.25;		/* inches */
-static double	yu = 32.25;		/* inches */
+static double	dash_length = DEFAULT;
+static double	figtodxf;		/* dxf (mm|in) per fig unit */
+					/* fig unit: usually 1200 / inch */
+static double	paperheight;
 
 static int	pen_number = { 1, 2, 3, 4, 5, 6, 7, 8, 1};
 static double	pen_thickness = {.3,.3,.3,.3,.3,.3,.3,.3,.3};
@@ -119,26 +125,18 @@
 static void
 gendxf_option(char opt, char *optarg)
 {
-	// (void)	optarg;
 	FILE	*ffp;
 	int	font;
 	int	pattern;
 
 	switch (opt) {
 	case 'a':				/* paper size */
-#ifdef A4
-		pagelength = ANSI_A/UNITS_PER_INCH;
-#else
-		pagelength = ISO_A4/UNITS_PER_INCH;
-#endif
 		break;
 
-	case 'c':		/* Graphics Enhancement Cartridge emulation */
-		ibmgec = !ibmgec;
+	case 'c':
 		break;
 
 	case 'd':				/* position and window, inches*/
-		sscanf(optarg, "%lf,%lf,%lf,%lf", &xl,&yl,&xu,&yu);
 		break;
 
 	case 'f':				/* user's characters */
@@ -194,7 +192,6 @@
 		break;
 
 	case 'v':
-		reflected = true;		/* mirror image */
 		break;
 
 	default:
@@ -203,63 +200,52 @@
 	}
 }
 
-static double	cpi;		/* cent/inch */
-static double	cpp;		/* cent/pixel */
-static double	hcmpp = CMPP;	/* centimeter/point */
+static double	cm;		/* dxf unit (in|mm) per cm */
+static double	styletodxf;	/* dxf unit per in/80 (base line thickness) */
 
 void
 gendxf_start(F_compound *objects)
 {
-	(void)	objects;
+	(void)objects;
+	int	i = -1;
 
 	if (fabs(mag) < 1.0/2048.0){
 	    fprintf(stderr, "|mag| < 1/2048\n");
 	    exit(1);
 	    }
 
-	if (xl < xu)
-	    if (0.0 < xu)
-		if (xl < pagelength) {
-		    xl = (0.0 < xl) ? xl: 0.0;
-		    xu = (xu < pagelength) ? xu: pagelength;
-		    }
-		else {
-		    fprintf(stderr, "xll >= %.2f\n", pagelength);
-		    exit(1);
-		    }
-	    else {
-		fprintf(stderr, "xur <= 0.0\n");
-		exit(1);
-		}
-	else {
-	    fprintf(stderr, "xur <= xll\n");
-	    exit(1);
-	    }
+	if (metric) {
+		figtodxf = mag * 25.4 / ppi;	/* mm per fig unit */
+		cm = mag * 10;			/* mm per cm */
+		styletodxf = mag * 25.4 / 80.;	/* mm per in/80
+							(line thickness) */
+	} else {
+		figtodxf = mag / ppi;		/* inch per fig unit */
+		cm = mag / 2.54;		/* inch per cm */
+		styletodxf = mag / 80.;		/* in per in/80 */
+	}

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genemf.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genemf.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -71,12 +71,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef	HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 #include <strings.h>		/* isascii() */
 #endif
 #include <ctype.h>
 #include <math.h>
-#if defined(I18N) && defined(HAVE_ICONV)
+#ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
 
@@ -114,25 +114,25 @@
 static unsigned lasthandleEMFH_MAX;	/* Last device handle */
 
 struct emfhandle {
-    struct emfhandle *next;	/* This field must be first */
-    struct emfhandle **prev;
-    enum emfhandletype type;
-    bool	is_current;	/* true: currently selected */
-    unsigned	handle;
-    union {
-	struct pen {
-	    int pstyle, pwidth, prgb;
-	} p;
-	struct brush {
-	    int bstyle;
-	    int brgb, bpattern, bhatchbkrgb;
-	} b;
-	struct font {
-	    int ffont;
-	    int fsize;
-	    int fangle;
-	} f;
-    } eh_un;
+	struct emfhandle *next;	/* This field must be first */
+	struct emfhandle **prev;
+	enum emfhandletype type;
+	bool	is_current;	/* true: currently selected */
+	unsigned	handle;
+	union {
+		struct pen {
+			int pstyle, pwidth, prgb;
+		} p;
+		struct brush {
+			int bstyle;
+			int brgb, bpattern, bhatchbkrgb;
+		} b;
+		struct font {
+			int ffont;
+			int fsize;
+			int fangle;
+		} f;
+	} eh_un;
 };
 
 static struct emfhandle *handles;
@@ -148,9 +148,9 @@
 
 /* EMF compatibility level */
 static enum emfcompatlevel {
-    EMF_LEVEL_WIN95,	/* Windows 95 */
-    EMF_LEVEL_WIN98,	/* Windows 98/Me */
-    EMF_LEVEL_WINNT	/* Windows NT/2000/XP (Windows NT 3.1 and later) */
+	EMF_LEVEL_WIN95,	/* Windows 95 */
+	EMF_LEVEL_WIN98,	/* Windows 98/Me */
+	EMF_LEVEL_WINNT	/* Windows NT/2000/XP (Windows NT 3.1 and later) */
 } emflevel = EMF_LEVEL_WINNT;
 const char *const emflevelname = { "win95", "win98", "winnt" };
 
@@ -181,19 +181,22 @@
 #define pat0_width 8
 #define pat0_height 4
 static unsigned char pat0_bits = {
-   0x03, 0x0c, 0x30, 0xc0};
+	0x03, 0x0c, 0x30, 0xc0
+};
 
 /* pat1.xbm */
 #define pat1_width 8
 #define pat1_height 4
 static unsigned char pat1_bits = {
-   0xc0, 0x30, 0x0c, 0x03};
+	0xc0, 0x30, 0x0c, 0x03
+};
 
 /* pat2.xbm */
 #define pat2_width 8
 #define pat2_height 4
 static unsigned char pat2_bits = {
-   0x81, 0x66, 0x18, 0x66};
+	0x81, 0x66, 0x18, 0x66
+};
 
 #if 0	/* mapped to EMF pattern */
 /* pat3.xbm */
@@ -219,17 +222,19 @@
 #define pat6_width 16
 #define pat6_height 16
 static unsigned char pat6_bits = {
-   0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80,
-   0x00, 0x80, 0xff, 0xff, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00,
-   0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xff, 0xff};
+	0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80,
+	0x00, 0x80, 0xff, 0xff, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00,
+	0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xff, 0xff
+};
 
 /* pat7.xbm */
 #define pat7_width 16
 #define pat7_height 16
 static unsigned char pat7_bits = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
+	0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
+};
 
 #if 0	/* mapped to EMF pattern */
 /* pat8.xbm */
@@ -255,124 +260,135 @@
 #define pat11_width 24
 #define pat11_height 24
 static unsigned char pat11_bits = {
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,
-   0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0xff, 0xff, 0xff,
-   0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
-   0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0x00, 0x00, 0xff, 0xff, 0xff,
-   0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00,
-   0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0x00, 0xff, 0xff, 0xff};
+	0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,
+	0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0xff, 0xff, 0xff,
+	0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
+	0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00,
+	0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0x00, 0xff, 0xff, 0xff
+};
 
 /* pat12.xbm */
 #define pat12_width 24
 #define pat12_height 24
 static unsigned char pat12_bits = {
-   0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20,
-   0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff,
-   0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00,
-   0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x00, 0xff, 0xff, 0xff,
-   0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00,
-   0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x00, 0x00, 0xff, 0xff, 0xff};
+	0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20,
+	0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff,
+	0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00,
+	0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x00, 0xff, 0xff, 0xff,
+	0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00,
+	0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x00, 0x00, 0xff, 0xff, 0xff
+};
 
 /* pat13.xbm */
 #define pat13_width 24
 #define pat13_height 24
 static unsigned char pat13_bits = {
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0x80, 0x80, 0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0,
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0x80, 0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0, 0x80,
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0, 0x80, 0x80};
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x81, 0x80, 0x80, 0x86, 0x80, 0x80, 0x98, 0x80, 0x80, 0xe0, 0x80, 0x80
+};
 
 /* pat14.xbm */
 #define pat14_width 24
 #define pat14_height 24
 static unsigned char pat14_bits = {
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0x80, 0xc0, 0x80, 0x80, 0xb0, 0x80, 0x80, 0x8c, 0x80, 0x80, 0x83, 0x80,
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0x80, 0x80, 0xc0, 0x80, 0x80, 0xb0, 0x80, 0x80, 0x8c, 0x80, 0x80, 0x83,
-   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-   0xc0, 0x80, 0x80, 0xb0, 0x80, 0x80, 0x8c, 0x80, 0x80, 0x83, 0x80, 0x80};
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0xc0, 0x80, 0x80, 0xb0, 0x80, 0x80, 0x8c, 0x80, 0x80, 0x83, 0x80,

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genepic.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genepic.c Changed

@@ -4,7 +4,7 @@
  * Copyright (c) 1988 by Conrad Kwok
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -109,14 +109,10 @@
 #include "localmath.h"
 #include "messages.h"
 #include "pi.h"
-#include "psfonts.h"
-#include "setfigfont.h"
 #include "texfonts.h"
+#include "textconvert.h"
 
 extern float	THICK_SCALE;	/* ratio of dpi/80 */
-extern bool	FontSizeOnly;	/* defined in setfigfont.c */
-extern char	*ISO1toTeX;	/* iso2tex.c */
-extern char	*ISO2toTeX;	/* iso2tex.c */
 
 #define DrawOutLine
 #ifdef DrawOutLine
@@ -168,9 +164,9 @@
 static char *FillCommands(int style, int color);
 
 /* Local to the file only */
-static int	encoding;
 static double	Threshold;
 static bool	linew_spec = false;
+static bool	select_fontsize = true;
 static int	CurWidth = 0;
 static int	LineStyle = SOLID_LINE;
 static int	LLX = 0, LLY = 0;
@@ -180,55 +176,34 @@
 static int	PageMode = false;
 static int	PatternType=UNFILLED;
 static int	PatternColor=WHITE_COLOR;
+
 static struct {
-    double mag;
-    int size;
+	double mag;
+	int size;
 } ScaleTbl5 = {
-    { 0.6667, 8 },
-    { 0.75  , 9 },
-    { 0.8333, 10 },
-    { 0.9167, 11 },
-    { 1.0   , 12 }
+	{ 0.6667, 8 },
+	{ 0.75  , 9 },
+	{ 0.8333, 10 },
+	{ 0.9167, 11 },
+	{ 1.0   , 12 }
 };
 
 /* Definition of Keywords for some of the configurable parameter */
 char *Tlangkw = { /* The order must match the definition of corr. constants */
-    "Epic", "EEpicemu", "EEpic", NULL
+	"Epic", "EEpicemu", "EEpic", NULL
 };
 
 char *EllCmdkw = {
-    "ellipse", "oval", NULL
+	"ellipse", "oval", NULL
 };
 
 char *EllCmdstr = {
-    "\\%s%s{%d}{%d}}\n", "\\%s%s(%d,%d)}\n"
+	"\\%s%s{%d}{%d}}\n", "\\%s%s(%d,%d)}\n"
 };
 
 /* Shading that is used instead of hatchings */
 #define DEFAULT_SHADING 8
 
-#define TEXT_LINE_SEP '\n'
-/* The following two arrays are used to translate characters which
-   are special to LaTeX into characters that print as one would expect.
-   Note that the <> characters aren't really special LaTeX characters
-   but they will not print as themselves unless one is using a font
-   like tt. */
-char latex_text_specials = "\\{}><^~$&#_%";
-char *latex_text_mappings = {
-  "$\\backslash$",
-  "$\\{$",
-  "$\\}$",
-  "$>$",
-  "$<$",
-  "\\^{}",
-  "\\~{}",
-  "\\$",
-  "\\&",
-  "\\#",
-  "\\_",
-  "\\%"};
-
-
 /* Configurable parameters */
 int	LowerLeftX=0, LowerLeftY=0;
 double	SegLen = 0.0625; /* inch */
@@ -242,8 +217,8 @@
 int	EllipseCmd=0;
 int	UseBox=BoxTypeNone;
 int	DashType=Normal;
-char
-*Preamble="\\documentclass{minimal}\n\\usepackage{epic,eepic}\\pagestyle{empty}\n\\begin{document}\\begin{center}\n";
+char *Preamble="\\documentclass{minimal}\n\\usepackage{epic,eepic}"
+		"\\pagestyle{empty}\n\\begin{document}\\begin{center}\n";
 char	*Postamble="\\end{center}\n\\end{document}\n";
 int	VarWidth=false;
 int	DashStretch=30;
@@ -256,9 +231,6 @@
 {
 	int loop, i;
 
-	linew_spec = false;
-	FontSizeOnly = false;
-
 	switch (opt) {
 
 	case 'G':	/* processed in fig2dev.c */
@@ -272,12 +244,6 @@
 		fprintf(stderr, "warning: genepic option -a obsolete\n");
 		break;
 
-	case 'E':
-		encoding = atoi(optarg);
-		if (encoding < 0 || encoding > 2)
-			encoding = 1;
-		break;
-
 	case 'f':
 		for ( i = 1; i <= MAX_FONT; i++ )
 			if ( !strcmp(optarg, texfontnamesi) ) break;
@@ -339,7 +305,7 @@
 		break;
 
 	case 'F':
-		FontSizeOnly = true;
+		select_fontsize = false;
 		break;
 
 	case 'R':
@@ -355,567 +321,589 @@
 static void
 fconvertCS(FPoint *fpt)
 {
-    fpt->y = TopCoord - fpt->y;
-    fpt->x -= LLX;
-    fpt->y -= LLY;
+	fpt->y = TopCoord - fpt->y;
+	fpt->x -= LLX;
+	fpt->y -= LLY;
 }
 
 static void
 convertCS(F_point *pt)
 {
-    pt->y = TopCoord - pt->y;
-    pt->x -= LLX;
-    pt->y -= LLY;
+	pt->y = TopCoord - pt->y;
+	pt->x -= LLX;
+	pt->y -= LLY;
 }
 
 void
 genepic_start(F_compound *objects)
 {
-    int temp;
-    F_point pt1, pt2;
+	int temp;
+	F_point pt1, pt2;
 
-    texfontsizes0 = texfontsizes1 =
+	texfontsizes0 = texfontsizes1 =
 		TEXFONTSIZE(font_size != 0.0? font_size : DEFAULT_FONT_SIZE);
 
-    /* print any whole-figure comments prefixed with "%" */
-    if (objects->comments) {
-	fprintf(tfp,"%%\n");
-	print_comments("% ",objects->comments,"");
-	fprintf(tfp,"%%\n");
-    }
-
-    switch (TeXLang) {
-      case Epic:
-	EllipseCmd = 1; /* Oval */
-	LnCmd = "drawline";
-	break;
-      case EEpic_emu:
-      case EEpic:
-	LnCmd = "path";
-	break;
-      default:
-	put_msg("Program error in main");
-	break;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gengbx.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gengbx.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -764,8 +764,9 @@
 		else if (strcmp(optarg,"in") == 0 )
 			gbx_dimensions = units_inches;
 		else
-			fprintf(stderr,
-				"Dimensions should be given in 'mm' for millimeters or 'in' for inches respectively\n");
+			fprintf(stderr, "Dimensions should be given in 'mm' for"
+				       " millimeters or 'in' for inches, "
+				       "respectively\n");
 		break;
 
 	case 'p':
@@ -775,8 +776,11 @@
 		else if (strcmp(optarg,"neg") == 0 || strcmp(optarg,"-") == 0)
 			gbx_image_polarity = 1;
 		else
-			fprintf(stderr,
-				"Polarity option should be +,pos for positive images (marks add material making it opaque) or -,neg for negative images (marks remove material, making it transparent)\n");
+			fprintf(stderr, "Polarity option should be +,pos for "
+					"positive images (marks add material "
+					"making it opaque) or -,neg for "
+					"negative images (marks remove "
+					"material, making it transparent)\n");
 		break;
 
 	case 'g':
@@ -785,24 +789,28 @@
 		if ( sscanf(optarg, "%fx%f+%f+%f", &gbx_scale_factor_a,
 				&gbx_scale_factor_b, &gbx_offset_a,
 				&gbx_offset_b) == 0)
-			fprintf(stderr,
-				"Error in scaling format, expect <double>x<double>+<double>+<double> for X and Y scale and x, y offset respectively.\n");
+			fprintf(stderr, "Error in scaling format, expect "
+					"<double>x<double>+<double>+<double> "
+					"for X and Y scale and x, y offset, "
+					"respectively.\n");
 		break;
 
 	case 'f':
 		/* Numerical format, ofrm -f <integer>.<integer> */
 		if ( sscanf(optarg,"%u.%u", &gbx_before, &gbx_after) == 0 )
-			fprintf(stderr,
-				"Error in numeric format, expect form  <unsigned int>.<unsigned int> for degree of precision.\n");
+			fprintf(stderr, "Error in numeric format, expect form "
+					"<unsigned int>.<unsigned int> for "
+					"degree of precision.\n");
 		if (gbx_before > 4u)
-			fprintf(stderr,
-				"Warning: Having more than 4 digits before the decimal place is unusual\n");
+			fprintf(stderr, "Warning: Having more than 4 digits "
+					"before the decimal place is unusual\n");
 		if (gbx_after > 5u)
-			fprintf(stderr,
-				"Warning: Having more than 5 digits after the decimal place is unusual\n");
+			fprintf(stderr, "Warning: Having more than 5 digits "
+					"after the decimal place is unusual\n");
 		if (gbx_before + gbx_after > 9u)
-			fprintf(stderr,
-				"Warning: Having more than nine significant figures is usually unrealistic\n");
+			fprintf(stderr, "Warning: Having more than nine "
+					"significant figures is usually "
+					"unrealistic\n");
 		break;
 
 	case 'i':
@@ -814,8 +822,8 @@
 		else if ( strcmp(optarg,"on") == 0)
 			gbx_debug_comments = 1;
 		else
-			fprintf(stderr,
-				"Error: Debug comments option should be 'on' or 'off'\n");
+			fprintf(stderr, "Error: Debug comments option should be"
+				       " 'on' or 'off'\n");
 		break;
 
 	case 'v':
@@ -880,7 +888,8 @@
 		fprintf(tfp, "%%IPPOS*%%\n");
 	fprintf(tfp, "%%LPD*%%\n");
 
-	write_comment("The following is an aperture definition of width pi/10.  It should never be used.");
+	write_comment("The following is an aperture definition of width pi/10."
+		       " It should never be used.");
 	ad_aperture_define_square(0.314159);
 }
 
@@ -1210,7 +1219,9 @@
 		 */
 		if (l->thickness > 0.0 ) {
 			warn_once(warn_filled_poly_with_line,
-				"You have specified a filled polygon with a finite edge thickness.  Check this is what you want");
+				"You have specified a filled polygon with a "
+				"finite edge thickness. "
+				"Check if this is what you want");
 
 
 			l->fill_style = fill_style_none;
@@ -1236,7 +1247,8 @@
 		   misrepresentation errors. */
 		if (x1 != x2 || y1 != y2 )
 			warn_once(warn_open_filled_polygon,
-				"A filled polygon is not closed.  This can appear different in the Gerber file.");
+				"A filled polygon is not closed. This can "
+				"appear different in the Gerber file.");
 		write_trace("## END:POLYGON:FILLED");
 	}
 	if (l->for_arrow || l->back_arrow )
@@ -1362,7 +1374,7 @@
 			return;
 
 		write_trace("## START:CIRCLE");
-		if (NULL == (Arc_malloc(a))) {
+		if (!Arc_malloc(a)) {
 			put_msg(Err_mem);
 			exit (2);
 		}

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genibmgl.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genibmgl.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -64,7 +64,7 @@
 #include "pi.h"
 
 
-static void set_style();
+static void set_style(int style, double length);
 
 #define		FONTS			35
 #define		COLORS			8
@@ -87,7 +87,8 @@
 static	int	ibmgec		 = false;
 #endif
 
-static	bool	pcljcl		 = false;  /* flag to precede IBMGL (HP/GL) output with PCL job control */
+		/* flag to precede IBMGL (HP/GL) output with PCL job control */
+static	bool	pcljcl		 = false;
 static	bool	reflected	 = false;
 static	bool	correct_font_size = false;
 static	int	fonts		 = FONTS;
@@ -151,44 +152,43 @@
 /* Map of Postscript font number to HPGL/2 Fonts
  */
 static struct {
-    int font, italic, bold;
-} psfont2hpgl =
-{
-    /* "Times-Roman",			0 */  { 5, 0, 0 },
-    /* "Times-Italic",			1 */  { 5, 1, 0 },
-    /* "Times-Bold",			2 */  { 5, 0, 3 },
-    /* "Times-BoldItalic",		3 */  { 5, 1, 3 },
-    /* "AvantGarde-Book",		4 */  { 31, 0, 0 },
-    /* "AvantGarde-BookOblique",	5 */  { 31, 1, 0 },
-    /* "AvantGarde-Demi",		6 */  { 31, 0, 3 },
-    /* "AvantGarde-DemiOblique",	7 */  { 31, 1, 3 },
-    /* "Bookman-Light",			8 */  { 47, 0, 0 },
-    /* "Bookman-LightItalic",		9 */  { 47, 1, 0 },
-    /* "Bookman-Demi",			10 */ { 47, 0, 3 },
-    /* "Bookman-DemiItalic",		11 */ { 47, 1, 3 },
-    /* "Courier",			12 */ { 3, 0, 0 },
-    /* "Courier-Oblique",		13 */ { 3, 1, 0 },
-    /* "Courier-Bold",			14 */ { 3, 0, 3 },
-    /* "Courier-BoldOblique",		15 */ { 3, 1, 3 },
-    /* "Helvetica",			16 */ { 4, 0, 0 },
-    /* "Helvetica-Oblique",		17 */ { 4, 1, 0 },
-    /* "Helvetica-Bold",		18 */ { 4, 0, 3 },
-    /* "Helvetica-BoldOblique",		19 */ { 4, 1, 3 },
-    /* "Helvetica-Narrow",		20 */ { 4, 0, 0 },
-    /* "Helvetica-Narrow-Oblique",	21 */ { 4, 1, 0 },
-    /* "Helvetica-Narrow-Bold",		22 */ { 4, 0, 3 },
-    /* "Helvetica-Narrow-BoldOblique",	23 */ { 4, 1, 3 },
-    /* "NewCenturySchlbk-Roman",	24 */ { 23, 0, 0},
-    /* "NewCenturySchlbk-Italic",	25 */ { 23, 1, 0},
-    /* "NewCenturySchlbk-Bold",		26 */ { 23, 0, 3},
-    /* "NewCenturySchlbk-BoldItalic",	27 */ { 23, 1, 3},
-    /* "Palatino-Roman",		28 */ { 15, 0, 0 },
-    /* "Palatino-Italic",		29 */ { 15, 1, 0 },
-    /* "Palatino-Bold",			30 */ { 15, 0, 3 },
-    /* "Palatino-BoldItalic",		31 */ { 15, 1, 3 },
-    /* "Symbol",			32 */ { 52, 0, 0 }, /* Univers */
-    /* "ZapfChancery-MediumItalic",	33 */ { 43, 0, 0 },
-    /* "ZapfDingbats",			34 */ { 45, 0, 0 },
+	int font, italic, bold;
+} psfont2hpgl = {
+	/* "Times-Roman",		0 */  { 5, 0, 0 },
+	/* "Times-Italic",		1 */  { 5, 1, 0 },
+	/* "Times-Bold",		2 */  { 5, 0, 3 },
+	/* "Times-BoldItalic",		3 */  { 5, 1, 3 },
+	/* "AvantGarde-Book",		4 */  { 31, 0, 0 },
+	/* "AvantGarde-BookOblique",	5 */  { 31, 1, 0 },
+	/* "AvantGarde-Demi",		6 */  { 31, 0, 3 },
+	/* "AvantGarde-DemiOblique",	7 */  { 31, 1, 3 },
+	/* "Bookman-Light",		8 */  { 47, 0, 0 },
+	/* "Bookman-LightItalic",	9 */  { 47, 1, 0 },
+	/* "Bookman-Demi",		10 */ { 47, 0, 3 },
+	/* "Bookman-DemiItalic",	11 */ { 47, 1, 3 },
+	/* "Courier",			12 */ { 3, 0, 0 },
+	/* "Courier-Oblique",		13 */ { 3, 1, 0 },
+	/* "Courier-Bold",		14 */ { 3, 0, 3 },
+	/* "Courier-BoldOblique",	15 */ { 3, 1, 3 },
+	/* "Helvetica",			16 */ { 4, 0, 0 },
+	/* "Helvetica-Oblique",		17 */ { 4, 1, 0 },
+	/* "Helvetica-Bold",		18 */ { 4, 0, 3 },
+	/* "Helvetica-BoldOblique",	19 */ { 4, 1, 3 },
+	/* "Helvetica-Narrow",		20 */ { 4, 0, 0 },
+	/* "Helvetica-Narrow-Oblique",	21 */ { 4, 1, 0 },
+	/* "Helvetica-Narrow-Bold",	22 */ { 4, 0, 3 },
+	/* "Helvetica-Narrow-BoldOblique", 23 */ { 4, 1, 3 },
+	/* "NewCenturySchlbk-Roman",	24 */ { 23, 0, 0},
+	/* "NewCenturySchlbk-Italic",	25 */ { 23, 1, 0},
+	/* "NewCenturySchlbk-Bold",	26 */ { 23, 0, 3},
+	/* "NewCenturySchlbk-BoldItalic", 27 */ { 23, 1, 3},
+	/* "Palatino-Roman",		28 */ { 15, 0, 0 },
+	/* "Palatino-Italic",		29 */ { 15, 1, 0 },
+	/* "Palatino-Bold",		30 */ { 15, 0, 3 },
+	/* "Palatino-BoldItalic",	31 */ { 15, 1, 3 },
+	/* "Symbol",			32 */ { 52, 0, 0 }, /* Univers */
+	/* "ZapfChancery-MediumItalic",	33 */ { 43, 0, 0 },
+	/* "ZapfDingbats",		34 */ { 45, 0, 0 },
 };
 
 static void
@@ -321,28 +321,29 @@
 	const struct paperdef	*pd;
 
 	if (fabs(mag) < 1.0/2048.0){
-	    fprintf(stderr, "|mag| < 1/2048\n");
-	    exit(1);
-	    }
+		fprintf(stderr, "|mag| < 1/2048\n");
+		exit(1);
+	}
 
 	if (paperspec) {
-	    /* convert ledger (deprecated) to tabloid */
-	    if (strcasecmp(papersize, "ledger") == 0)
-		strcpy(papersize, "tabloid");
-
-	    for (pd = paperdef; pd->name != NULL; pd++)
-		if (strcasecmp (papersize, pd->name) == 0) {
-		    pagewidth = pd->width;	/* in points, 1/72" */
-		    pageheight = pd->height;
-		    strcpy(papersize,pd->name);	/* use the "nice" form */
-		    break;
-		    }
-
-	    if (pagewidth < 0 || pageheight < 0) {
-		fprintf (stderr, "Unknown paper size `%s'\n", papersize);
-		exit (1);
+		/* convert ledger (deprecated) to tabloid */
+		if (strcasecmp(papersize, "ledger") == 0)
+			strcpy(papersize, "tabloid");
+
+		for (pd = paperdef; pd->name != NULL; pd++)
+			if (strcasecmp (papersize, pd->name) == 0) {
+				pagewidth = pd->width;	/* in points, 1/72" */
+				pageheight = pd->height;
+				strcpy(papersize,pd->name); /* use the "nice" form */
+				break;
+			}
+
+		if (pagewidth < 0 || pageheight < 0) {
+			fprintf (stderr, "Unknown paper size `%s'\n",
+					papersize);
+			exit (1);
 		}
-	    }
+	}
 
 	points_per_inch = 72;
 	pagewidth  /= points_per_inch;	/* convert to inches */
@@ -350,107 +351,111 @@
 	wcmpp = hcmpp = 2.54/points_per_inch;
 
 	if (xl < xu)
-	    if (0.0 < xu)
-		if (xl < pageheight) {
-		    xl	 = (0.0 < xl) ? xl: 0.0;
-		    xu	 = (xu < pageheight) ? xu: pageheight;
-		    }
+		if (0.0 < xu)
+			if (xl < pageheight) {
+				xl	 = (0.0 < xl) ? xl: 0.0;
+				xu	 = (xu < pageheight) ? xu: pageheight;
+			}
+			else {
+				fprintf(stderr, "xll >= %.2f\n", pageheight);
+				exit(1);
+			}
 		else {
-		    fprintf(stderr, "xll >= %.2f\n", pageheight);
-		    exit(1);
-		    }
-	    else {
-		fprintf(stderr, "xur <= 0.0\n");
-		exit(1);
+			fprintf(stderr, "xur <= 0.0\n");
+			exit(1);
 		}
 	else {
-	    fprintf(stderr, "xur <= xll\n");
-	    exit(1);
-	    }
+		fprintf(stderr, "xur <= xll\n");
+		exit(1);
+	}
 
 	if (yl < yu)
-	    if (0.0 < yu)
-		if (yl < pagewidth) {
-		    yl	 = (0.0 < yl) ? yl: 0.0;
-		    yu	 = (yu < pagewidth) ? yu: pagewidth;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genlatex.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genlatex.c Changed

@@ -4,7 +4,7 @@
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1988 by Frank Schmuck
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -38,6 +38,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "genlatex.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,15 +49,11 @@
 #include <math.h>
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
-//#include "object.h"
-#include "genlatex.h"
 #include "messages.h"
 #include "pi.h"
-#include "psfonts.h"
-#include "setfigfont.h"
 #include "texfonts.h"
+#include "textconvert.h"	/* check_conversion() */
 
-extern bool	FontSizeOnly;	/* defined in setfigfont.c */
 
 /*
  *  Installation dependent constants:
@@ -113,14 +110,14 @@
 char		thin_ldot  = THIN_LDOT;
 char		thick_ldot = THICK_LDOT;
 
-static	int	encoding = 1;
+static bool	select_fontsize = true;
 static	int	verbose = 0;
 double		dash_mag = 1.0;
 int		thick_width = 2;
 double		tolerance = 2.0;
 double		arc_tolerance = 1.0;
-void		(*translate_coordinates)() = NULL;
-void		(*translate_coordinates_d)() = NULL;
+void		(*translate_coordinates)(int *x, int *y) = NULL;
+void		(*translate_coordinates_d)(double *x, double *y) = NULL;
 double		unitlength;
 static int	cur_thickness = -1;
 double		ldot_diameter = 1.0/72.0;
@@ -133,9 +130,6 @@
 static int	border_margin = 0;
 static double	rad2deg = 57.295779513082320877;
 
-extern char *ISO1toTeX;	/* iso2tex.c */
-extern char *ISO2toTeX;	/* iso2tex.c */
-
 /*
  *	struct angle_table line_angles, arrow_angles and get_slope()
  *	from latex_line.c:
@@ -215,76 +209,71 @@
 {
 	*xp = *xp + 1;
 	*yp = (double)(TOP - *yp -1);
-	}
+}
 
 static void
 translate2_d(double *xp, double *yp)
 {
 	*xp = *xp + 1.0;
 	*yp = (double)TOP - *yp -1.0;
-	}
+}
 
 void
 genlatex_option(char opt, char *optarg)
 {
-    int i;
+	int	i;
 
-    FontSizeOnly = false;
-    switch (opt) {
+	switch (opt) {
 	case 'a':
-	    fprintf(stderr, "warning: latex option -a obsolete");
-	    break;
+		fprintf(stderr, "warning: latex option -a obsolete");
+		break;
 
 	case 'b':			/* border margin around figure */
-	    sscanf(optarg,"%d",&border_margin);
-	    break;
+		sscanf(optarg,"%d",&border_margin);
+		break;
 
 	case 'd':
-	    dash_mag = atof(optarg);	/* set dash magnification */
-	    break;
+		dash_mag = atof(optarg);	/* set dash magnification */
+		break;
 
 	case 'F':
-	    FontSizeOnly = true;
-	    break;
+		select_fontsize = false;
+		break;
 
 	case 'f':			/* set default text font */
-	    for ( i = 1; i <= MAX_FONT; i++ )
-		if ( !strcmp(optarg, texfontnamesi) ) break;
+		for ( i = 1; i <= MAX_FONT; i++ )
+			if ( !strcmp(optarg, texfontnamesi) ) break;
 
-	    if ( i > MAX_FONT) {
-		  fprintf(stderr, "warning: non-standard font name %s ignored\n", optarg);
-	    } else {
-		  texfontnames0 = texfontnamesi;
+		if ( i > MAX_FONT) {
+			fprintf(stderr,
+				"warning: non-standard font name %s ignored\n",
+				optarg);
+		} else {
+			texfontnames0 = texfontnamesi;
 #ifdef NFSS
-		  texfontfamily0 = texfontfamilyi;
-		  texfontseries0 = texfontseriesi;
-		  texfontshape0 = texfontshapei;
+			texfontfamily0 = texfontfamilyi;
+			texfontseries0 = texfontseriesi;
+			texfontshape0 = texfontshapei;
 #endif
-	    }
-	    break;
+		}
+		break;
 
 	case 'l':			/* set thin/thick line threshold */
-	    thick_width = atoi(optarg);
-	    break;
+		thick_width = atoi(optarg);
+		break;
 
 	case 'v':
-	    verbose = 1;		/* verbose mode */
-	    break;
-
-	case 'E':
-	    encoding = atoi(optarg);
-	    if (encoding < 0 || encoding > 2)
-		encoding = 1;
-	    break;
+		verbose = 1;		/* verbose mode */
+		break;
 
 	case 'G':
 	case 'L':
-	    break;
+		break;
 
 	default:
-	    put_msg(Err_badarg, opt, "latex");
-	    exit(1);
-    }
+		put_msg(Err_badarg, opt, "latex");
+		exit(1);
+	}
 }
 
 void
@@ -311,23 +300,22 @@
 
 	TRANS2(llx, lly, urx, ury);
 	if (llx > urx) SWAP(llx, urx)
-	if (lly > ury) SWAP(lly, ury)
+		if (lly > ury) SWAP(lly, ury)
 
-	/* LaTeX start */
+			/* LaTeX start */
 
-	/* print any whole-figure comments prefixed with "%" */
-	if (objects->comments) {
-	    fprintf(tfp,"%%\n");
-	    print_comments("% ",objects->comments, "");
-	    fprintf(tfp,"%%\n");
-	}
+			/* print any whole-figure comments prefixed with "%" */
+			if (objects->comments) {
+				fprintf(tfp,"%%\n");
+				print_comments("% ",objects->comments, "");
+				fprintf(tfp,"%%\n");
+			}
 
 	fprintf(tfp, "\\setlength{\\unitlength}{%lisp}%%\n",
-				(long) (round(4736286.72*unitlength)));
+			(long) (round(4736286.72*unitlength)));
 	/* define the SetFigFont macro */
-	define_setfigfont(tfp);

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genmp.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genmp.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2019 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -303,96 +303,96 @@
 void
 genmp_start(F_compound *objects)
 {
-    FILE *in;
-    fprintf(tfp,
-	    "%%\n%% fig2dev (version %s) -L (m)mp version %.2lf --- Preamble\n%%\n",
-	    PACKAGE_VERSION, GENMP_VERSION);
+	FILE *in;
+	fprintf(tfp, "%%\n%% fig2dev (version %s) -L (m)mp version %.2lf --- "
+			"Preamble\n%%\n", PACKAGE_VERSION, GENMP_VERSION);
 	fprintf(tfp,"\n");
 
-    fprintf(tfp,"%%\n%% mp output driver options:\n%% %s\n%%\n\n", options);
+	fprintf(tfp,"%%\n%% mp output driver options:\n%% %s\n%%\n\n", options);
 
 	/* print any whole-figure comments prefixed with "%" */
 	if (objects->comments) {
-	    fprintf(tfp,"%%\n");
-	    print_comments("% ",objects->comments, "");
-	    fprintf(tfp,"%%\n");
+		fprintf(tfp,"%%\n");
+		print_comments("% ",objects->comments, "");
+		fprintf(tfp,"%%\n");
 	}
 
-    /* print the "prologues:=n;" line */
-    if (has_prologues) {
-	fprintf(tfp,"prologues:=%ld;\n\n",prologues_nr);
-    }
+	/* print the "prologues:=n;" line */
+	if (has_prologues) {
+		fprintf(tfp,"prologues:=%ld;\n\n",prologues_nr);
+	}
 
 
-    fprintf(tfp,"%% +MP-ADDITIONAL-HEADER\n");
-    if (latexmode || immediate_insert_filename!=NULL || include_filename!=NULL) {
-	fprintf(tfp,"verbatimtex\n");
+	fprintf(tfp,"%% +MP-ADDITIONAL-HEADER\n");
+	if (latexmode || immediate_insert_filename!=NULL ||
+			include_filename!=NULL) {
+		fprintf(tfp,"verbatimtex\n");
 
-	if (latexmode) {
-	   fprintf(tfp,"%%&latex\n");
-	}
+		if (latexmode) {
+			fprintf(tfp,"%%&latex\n");
+		}
 
-	if (immediate_insert_filename!=NULL &&
-	    (in=fopen(immediate_insert_filename,"r"))!=NULL) {
-	    /* We do not want to restrict line buffer sizes.
-	     * Furthermore we do not expect huge files here.
-	     * So just read the contents character by character.
-	     */
-
-	    int c;
-	    fprintf(tfp,"%% start of included material from %s\n",
-		    immediate_insert_filename);
-	    while ((c=getc(in))!=EOF) {
-		putc(c,tfp);
-	    }
-	    fprintf(tfp,"%% end of included material\n");
-	    fclose(in);
-	} else if (latexmode) {
-	    /* standard header text */
-	    fprintf(tfp,"\\documentclass{article}\n");
-	    fprintf(tfp,"\\begin{document}\n");
-	}
+		if (immediate_insert_filename!=NULL &&
+				(in = fopen(immediate_insert_filename,"r"))) {
+			/* We do not want to restrict line buffer sizes.
+			 * Furthermore we do not expect huge files here.
+			 * So just read the contents character by character.
+			 */
+
+			int c;
+			fprintf(tfp,"%% start of included material from %s\n",
+					immediate_insert_filename);
+			while ((c=getc(in))!=EOF) {
+				putc(c,tfp);
+			}
+			fprintf(tfp,"%% end of included material\n");
+			fclose(in);
+		} else if (latexmode) {
+			/* standard header text */
+			fprintf(tfp,"\\documentclass{article}\n");
+			fprintf(tfp,"\\begin{document}\n");
+		}
 
 
-	if (include_filename!=NULL) {
-	    fprintf(tfp,"\\input %s\n",include_filename);
-	}
+		if (include_filename!=NULL) {
+			fprintf(tfp,"\\input %s\n",include_filename);
+		}
 
-	fprintf(tfp,"etex\n");
+		fprintf(tfp,"etex\n");
 
-    }
-    fprintf(tfp,"%% -MP-ADDITIONAL-HEADER\n\n");
+	}
+	fprintf(tfp,"%% -MP-ADDITIONAL-HEADER\n\n");
 
-    /* latexmode: write the font macros. */
-    if (latexmode) {
-	fprintf(tfp, "\n%%SetFigFont macros for latex\n");
-	fprintf(tfp, "verbatimtex\n");
-	define_setfigfont(tfp);
-	fprintf(tfp, "\\ifx\\SetFigFontSize\\undefined%%\n");
-	fprintf(tfp, "\\gdef\\SetFigFontSize#1#2{%%\n");
-	fprintf(tfp, "	\\fontsize{#1}{#2pt}%%\n");
-	fprintf(tfp, "	\\selectfont}%%\n");
-	fprintf(tfp, "\\fi%%\n");
-	fprintf(tfp,"etex\n\n");
-    }
+	/* latexmode: write the font macros. */
+	if (latexmode) {
+		fprintf(tfp, "\n%%SetFigFont macros for latex\n");
+		fprintf(tfp, "verbatimtex\n");
+		define_setfigfont(tfp);
+		fprintf(tfp, "\\ifx\\SetFigFontSize\\undefined%%\n");
+		fprintf(tfp, "\\gdef\\SetFigFontSize#1#2{%%\n");
+		fprintf(tfp, "	\\fontsize{#1}{#2pt}%%\n");
+		fprintf(tfp, "	\\selectfont}%%\n");
+		fprintf(tfp, "\\fi%%\n");
+		fprintf(tfp,"etex\n\n");
+	}
 
 	if (split) {
-	      /*
-	       * We need a bounding box around all objects in all
-	       * partial figures. Otherwise overlapping them will not
-	       * work properly. We create this bounding area here once
-	       * and for all. It will be included in each figure.
-	       */
-	      fprintf(tfp,"path allbounds;\n");
-	      fprintf(tfp,"allbounds = (%.2lf,%.2lf)--(%.2lf,%.2lf)",
-		      fig2bp(llx),y_off(fig2bp(lly)),fig2bp(urx),
-		      y_off(fig2bp(lly)));
-	      fprintf(tfp,"--(%.2lf,%.2lf)--(%.2lf,%.2lf)--cycle;\n",
-		      fig2bp(urx),y_off(fig2bp(ury)),
-		      fig2bp(llx),y_off(fig2bp(ury)));
+		/*
+		 * We need a bounding box around all objects in all
+		 * partial figures. Otherwise overlapping them will not
+		 * work properly. We create this bounding area here once
+		 * and for all. It will be included in each figure.
+		 */
+		fprintf(tfp,"path allbounds;\n");
+		fprintf(tfp,"allbounds = (%.2lf,%.2lf)--(%.2lf,%.2lf)",
+				fig2bp(llx),y_off(fig2bp(lly)),fig2bp(urx),
+				y_off(fig2bp(lly)));
+		fprintf(tfp,"--(%.2lf,%.2lf)--(%.2lf,%.2lf)--cycle;\n",
+				fig2bp(urx),y_off(fig2bp(ury)),
+				fig2bp(llx),y_off(fig2bp(ury)));
 	} else {
-	   fprintf(tfp,"%% Now draw the figure\n");
-	   fprintf(tfp,"beginfig(0)\n");
+		fprintf(tfp,"%% Now draw the figure\n");
+		fprintf(tfp,"beginfig(0)\n");
 	}
 
 	fprintf(tfp,"%% Some reasonable defaults\n");
@@ -404,14 +404,14 @@
 	 */
 	fprintf(tfp,"  truecorners:=%d;\n",split==0);
 	fprintf(tfp,"  bboxmargin:=0;\n");
-	}
+}
 
 int
 genmp_end(void)
 {
 	if (split) {
-	    /* We must add the bounds for the last figure */
-	    fprintf(tfp,"setbounds currentpicture to allbounds;\n");
+		/* We must add the bounds for the last figure */
+		fprintf(tfp,"setbounds currentpicture to allbounds;\n");
 	}
 	/* Close the (last) figure and terminate MetaPost program */
 	fprintf(tfp,"endfig;\nend\n");
@@ -450,7 +450,7 @@
 			prologues_nr = atoi(optarg);
 		} else {
 			fprintf(stderr,
-			    "Warning: missing argument for '-p'. Ignored.\n");

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genpdf.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genpdf.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genpict2e.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genpict2e.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,7 +19,7 @@
 /*
  * genpict2e.c: convert fig to pict2e macro language for LaTeX
  *
- * Author: Thomas Loimer, Wien, Austria, 2014-2015
+ * Author: Thomas Loimer, 2014-2023
  * Based on the latex picture driver, genlatex.c
  *
  */
@@ -33,14 +33,14 @@
 #include <string.h>
 #include <math.h>
 
-#include "fig2dev.h"	/* includes bool.h and object.h */
-//#include "object.h"
+#include "fig2dev.h"		/* includes bool.h and object.h */
 #include "bound.h"
 #include "free.h"		/* free_linestorage() */
 #include "messages.h"
 #include "pi.h"
 #include "psfonts.h"
 #include "texfonts.h"		/* texfontnames */
+#include "textconvert.h"
 #include "trans_spline.h"	/* create_line_with_spline() */
 
 #undef M_PI_2
@@ -48,68 +48,17 @@
 #define	M_PI_2	1.57079632679489661923
 #define	M_PI_4	0.78539816339744830962
 
-/* String arrays */
-extern char	*ISO1toTeX;	/* iso2tex.c */
-extern char	*ISO2toTeX;	/* iso2tex.c */
-static char	*texfonts = {
-	"",			/* default */
-	"\\rmfamily",		/* roman */
-	"\\bfseries",		/* bold */
-	"\\itshape",		/* italic */
-	"\\sffamily",		/* sans serif */
-	"\\ttfamily",		/* typewriter */
-};
-static char	*texpsfonts = {
-	"{T1}{ptm}{m}{n}",	/* Times-Roman, default */
-	"{T1}{ptm}{m}{n}",	/* Times-Roman */
-	"{T1}{ptm}{m}{it}",     /* Times-Italic */
-	"{T1}{ptm}{b}{n}",      /* Times-Bold */
-	"{T1}{ptm}{b}{it}",     /* Times-BoldItalic */
-	"{T1}{pag}{m}{n}",      /* AvantGarde */
-	"{T1}{pag}{m}{sl}",     /* AvantGarde-BookOblique */
-	"{T1}{pag}{db}{n}",     /* AvantGarde-Demi */
-	"{T1}{pag}{db}{sl}",    /* AvantGarde-DemiOblique */
-	"{T1}{pbk}{l}{n}",      /* Bookman-Light */
-	"{T1}{pbk}{l}{it}",     /* Bookman-LightItalic */
-	"{T1}{pbk}{db}{n}",     /* Bookman-Demi */
-	"{T1}{pbk}{db}{it}",    /* Bookman-DemiItalic */
-	"{T1}{pcr}{m}{n}",      /* Courier */
-	"{T1}{pcr}{m}{sl}",     /* Courier-Oblique */
-	"{T1}{pcr}{b}{n}",      /* Courier-Bold */
-	"{T1}{pcr}{b}{sl}",     /* Courier-BoldItalic */
-	"{T1}{phv}{m}{n}",      /* Helvetica */
-	"{T1}{phv}{m}{sl}",     /* Helvetica-Oblique */
-	"{T1}{phv}{b}{n}",      /* Helvetica-Bold */
-	"{T1}{phv}{b}{sl}",     /* Helvetica-BoldOblique */
-	"{T1}{phv}{mc}{n}",     /* Helvetica-Narrow */
-	"{T1}{phv}{mc}{sl}",    /* Helvetica-Narrow-Oblique */
-	"{T1}{phv}{bc}{n}",     /* Helvetica-Narrow-Bold */
-	"{T1}{phv}{bc}{sl}",    /* Helvetica-Narrow-BoldOblique */
-	"{T1}{pnc}{m}{n}",      /* NewCenturySchlbk-Roman */
-	"{T1}{pnc}{m}{it}",     /* NewCenturySchlbk-Italic */
-	"{T1}{pnc}{b}{n}",      /* NewCenturySchlbk-Bold */
-	"{T1}{pnc}{b}{it}",     /* NewCenturySchlbk-BoldItalic */
-	"{T1}{ppl}{m}{n}",      /* Palatino-Roman */
-	"{T1}{ppl}{m}{it}",     /* Palatino-Italic */
-	"{T1}{ppl}{b}{n}",      /* Palatino-Bold */
-	"{T1}{ppl}{b}{it}",     /* Palatino-BoldItalic */
-	"{U}{psy}{m}{n}",       /* Symbol */
-	"{T1}{pzc}{mb}{it}",    /* ZapfChancery-MediumItalic */
-	"{U}{pzd}{m}{n}"	/* ZapfDingbats */
-};
-
 /* Variables */
-static bool	nofontsize = false;
-static bool	nofontname = false;
+static bool	select_fontsize = true;
+static bool	select_fontname = true;
 static bool	epiccompatible = true;
 static bool	removesuffix = false;
-static bool	usetexfonts = false;
+static bool	only_texfonts = false;
 static bool	allspecial = false;
 static bool	pagemode = false;
 static bool	allarrowsltx = false;
 static char	*prepend = NULL;
 static int	ltxarrow = -1;	/* arrow index to be replaced by a latex-vector */
-static int	encoding = 1;
 static int	verbose = 0;
 static double	unitlength;
 static int	cur_thickness = 0;
@@ -131,7 +80,8 @@
 
 struct pict2earrow {
 	double	hfac;	/* the line should end at hfac times the arrow height */
-	double	tfac;	/* plus tfac times arrow line thickness from the last point */
+	double	tfac;	/* plus tfac times arrow line thickness from
+			   the last point */
 } pict2earrow = {
 	/* type 0 */
 	{ 0., 0.5},
@@ -200,9 +150,7 @@
 #define YDIR(y)		-(y)
 #define EQUAL(p,q)	(p->x == q->x && p->y == q->y)
 			/* cast to double, to not have the integers overflow */
-#define LENGTH(p,q)	sqrt(((double) (q->x - p->x))*(q->x - p->x) \
-			     + ((double)(q->y - p->y))*(q->y - p->y))
-#define THICKNESS(T)	(T <= THICK_SCALE ? 0.5*T : T - THICK_SCALE)
+#define THICKNESS(T)	(T <= THICK_SCALE ? T/2 : T - THICK_SCALE)
 			/* THICK_SCALE is of type float, see fig2dev.h */
 /* #define round	(int)... see fig2dev.h */
 #define PUTPOINT(p)	fprintf(tfp,"(%d,%d)", XCOORD(p->x), YCOORD(p->y))
@@ -218,123 +166,118 @@
 void
 genpict2e_option(char opt, char *optarg)
 {
-    int i;
-
-    switch (opt) {
-    case 'b':			/* border margin around figure */
-	border_margin = atoi(optarg);
-	/* atoi() is slightly faster than sscanf(), but returns 0 if there
-	 * is no int; Use atoi if the default value is 0 anyway. */
-	/* sscanf(optarg,"%d",&border_margin); */
-	break;
-
-    case 'C':			/* default color */
-	default_color = atoi(optarg);
-	break;
-
-    case 'e':
-	epiccompatible = false;
-	break;
-
-    case 'F':
-	nofontname = true;
-	break;
-
-    case 'i':	/* prepend this string to included graphics file */
-	prepend = optarg;
-	break;
-
-    case 'f':			/* set default text font */
-	for (i = 1; i <= MAX_FONT; ++i )
-	    if (!strcmp(optarg,texfontnamesi) || !strcmp(optarg,texfontsi))
+	int i;
+
+	switch (opt) {
+	case 'b':			/* border margin around figure */
+		border_margin = atoi(optarg);
+		/* atoi() is slightly faster than sscanf(), but returns 0 if
+		   there is no int; Use atoi if the default value is 0 anyway.*/
+		/* sscanf(optarg,"%d",&border_margin); */
 		break;
-	if (i <= MAX_FONT) {
-	      texfonts0 = texfontsi;
-	} else {
-	    for (i = 1; i <= MAX_PSFONT; ++i )
-		if (!strcmp(optarg, PSfontnamesi)) break;
-	    if (i > MAX_PSFONT)
-		fprintf(stderr, "warning: non-standard font name %s ignored\n",
-			optarg);
-	    else
-		texpsfonts0 = optarg;
-	}
-	break;
-
-    case 'o':
-	nofontsize = true;
-	break;
-
-    case 'T':
-	usetexfonts = true;
-	break;
-
-    case 'O':
-	allspecial = true;
-	break;
-
-    case 'P':
-	pagemode = true;
-	epiccompatible = false;
-	break;
-

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genpictex.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genpictex.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -34,9 +34,6 @@
 #include <unistd.h>
 #endif
 #include <math.h>
-#ifdef HAVE_GETPWUID
-#include <pwd.h>
-#endif
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
 //#include "object.h"
@@ -46,8 +43,8 @@
 #include "messages.h"
 #include "pi.h"
 #include "psfonts.h"
-#include "setfigfont.h"
 #include "texfonts.h"
+#include "textconvert.h"
 
 #define UNIT "cm"	/* dip */
 #define CONVUNIT 2.54	/* dip */
@@ -56,22 +53,26 @@
 extern char	*ISO2toTeX;
 extern bool	 FontSizeOnly;	/* defined in setfigfont.c */
 
-static void	genpictex_ctl_spline(), genpictex_itp_spline();
-static void	bezier_spline();
-static void	put_box();
-static void	set_style();
-static void	putline();
-static void	rtop();
-static void	draw_arrow_head();
-static void	set_linewidth();
+static void	genpictex_ctl_spline(F_spline *s);
+static void	genpictex_itp_spline(F_spline *s);
+static void	bezier_spline(double a0, double b0, double a1, double b1,
+			double a2, double b2, double a3, double b3);
+static void	put_box(int llx, int lly, int urx, int ury, F_line *l);
+static void	set_style(int style, double dash_len);
+static void	putline(int start_x, int start_y, double end_x, double end_y,
+			int next_x, int next_y,
+			int first_start_x, int first_start_y,
+			int first_end_x, int first_end_y);
+static void	rtop(double x, double y, double *r, double *th);
+static void	draw_arrow_head(double x1, double y1, double x2, double y2,
+			double arrowht, double arrowwid);
+static void	set_linewidth(int w);
 
-static int	encoding = 1;
 static double	dash_length = -1;
 static int	line_style = SOLID_LINE;
 static char	*linethick = "1pt";
 static char	*plotsymbol = "\\makebox(0,0)l{\\tencirc\\symbol{'160}}";
 static int	cur_thickness = -1;
-static bool	anonymous = true;
 static bool	rotate = true;
 
 static void
@@ -82,10 +83,6 @@
 	FontSizeOnly = false;
 
 	switch (opt) {
-	case 'a':			/* anonymous (don't output user name) */
-		anonymous = true;
-		break;
-
 	case 'f':			/* set default text font */
 		for (i = 1; i <= MAX_FONT; ++i)
 			if (!strcmp(optarg, texfontnamesi))
@@ -116,12 +113,6 @@
 		rotate = false;
 		break;
 
-	case 'E':
-		encoding = atoi(optarg);
-		if (encoding < 0 || encoding > 2)
-			encoding = 1;
-		break;
-
 	case 'G':
 	case 'L':
 		break;
@@ -143,9 +134,7 @@
 void
 genpictex_start(F_compound *objects)
 {
-	char		host256;
-	struct passwd	*who;
-	char		date_bufCREATION_TIME_LEN;
+	char	date_bufCREATION_TIME_LEN;
 
 	texfontsizes0 = texfontsizes1 =
 		TEXFONTSIZE(font_size != 0.0? font_size : DEFAULT_FONT_SIZE);
@@ -160,18 +149,6 @@
 			prog, PACKAGE_VERSION);
 	if (creation_date(date_buf))
 		fprintf(tfp, "%%%%CreationDate: %s\n", date_buf);
-#ifdef HAVE_GETHOSTNAME
-	if (gethostname(host, sizeof(host)) == -1)
-#endif
-		(void)strcpy(host, "unknown-host!?!?");
-#ifdef HAVE_GETPWUID
-	if (!anonymous) {
-		who = getpwuid(getuid());
-		if (who)
-			fprintf(tfp, "%%%%User: %s@%s (%s)\n",
-					who->pw_name, host, who->pw_gecos);
-	}
-#endif
 
 	/* print any whole-figure comments prefixed with "% " */
 	if (objects->comments) {
@@ -180,7 +157,6 @@
 		fprintf(tfp, "%%\n");
 	}
 	fprintf(tfp, "\\font\\thinlinefont=cmr5\n");
-	define_setfigfont(tfp);
 	fprintf(tfp, "\\mbox{\\beginpicture\n");
 	fprintf(tfp, "\\setcoordinatesystem units <%6.5f%s,%6.5f%s>\n",
 			mag, UNIT, mag, UNIT);
@@ -614,9 +590,12 @@
 void
 genpictex_text(F_text *t)
 {
-	double	x, y;
-	char *tpos;
-	unsigned char *cp;
+	double		x, y;
+	char		*tpos;
+	static int	need_conversion = -1;
+
+	if (need_conversion == -1)
+		need_conversion = check_conversion("UTF-8", input_encoding);
 
 	/* print any comments */
 	print_comments("% ",t->comments, "");
@@ -646,24 +625,7 @@
 		return;
 	}
 
-	unpsfont(t);
-	{
-		int texsize;
-		double baselineskip;
-
-		texsize = TEXFONTMAG(t);
-		baselineskip = (texsize * 1.2);
-
-#ifdef NFSS
-		fprintf(tfp, "\\put{\\SetFigFont{%d}{%.1f}{%s}{%s}{%s}",
-				texsize, baselineskip,
-				TEXFAMILY(t->font), TEXSERIES(t->font),
-				TEXSHAPE(t->font));
-#else
-		fprintf(tfp, "\\put{\\SetFigFont{%d}{%.1f}{%s}",
-				texsize, baselineskip, TEXFONT(t->font));
-#endif
-	}
+	select_font(t, true, true, true);
 
 	if(rotate && t->angle && t->type == T_LEFT_JUSTIFIED)
 		fprintf(tfp,
@@ -672,43 +634,7 @@
 
 	set_color(t->color);
 
-	if (!special_text(t))
-		/* this loop escapes characters "$&%#_{}" */
-		/* and deleted characters "~^\" */
-		for(cp = (unsigned char*)t->cstring; *cp; cp++) {
-			if (strchr("$&%#_{}", *cp))
-				(void)fputc('\\', tfp);
-			if (strchr("~^\\", *cp))
-				fprintf(stderr,
-					"Bad character in text object '%c'\n",
-					*cp);
-			else
-				(void)fputc(*cp, tfp);
-		}
-	else
-		for(cp = (unsigned char*)t->cstring; *cp; cp++) {
-#ifdef I18N
-			if (support_i18n && (t->font <= 2))
-				fputc(*cp, tfp);
-			else
-#endif
-				if (*cp >= 0xa0) {
-					switch (encoding) {
-					case 0: /* no escaping */
-						fputc(*cp, tfp);
-						break;
-					case 1: /* iso-8859-1 */

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genps.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genps.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -50,11 +50,8 @@
 #include <unistd.h>
 #endif
 #include <math.h>
-#include <ctype.h>
+#include <ctype.h>	/* tolower() */
 #include <sys/stat.h>	/* struct stat */
-#ifdef HAVE_GETPWUID
-#include <pwd.h>
-#endif
 #include <locale.h>
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
@@ -67,15 +64,13 @@
 #include "pi.h"
 #include "psfonts.h"
 #include "readpics.h"
+#include "textconvert.h"
 #include "xtmpfile.h"
 
 /* include the PostScript preamble, patterns etc */
 #include "psprolog.h"
 
 extern int	v2_flag, v21_flag, v30_flag;		/* read.c */
-#ifdef I18N
-extern bool	support_i18n;				/* fig2dev.c */
-#endif
 
 /* exported symbols */
 bool		epsflag = false;	/* to distinguish PS and EPS */
@@ -83,11 +78,8 @@
 
 /*
  * The procedures to embed image files into ps code are defined in a number of
- * source files (readgif.c, readjpg.c, readeps.c,...). These procedures could
- * simply be included here in genps.c, which would result in an overwhelmingly
- * big file. Reading procedures are separated into their respective files, but
- * since they are used only here, the functions are declared here and separate
- * header files are not written.
+ * source files (readgif.c, readjpg.c, readeps.c,...) although these procedures
+ * are only needed in genps.c. The function declarations are given here below.
  */
 #define READ_SIGNATURE \
 	F_pic *pic, struct xfig_stream *restrict pic_stream, int *llx, int *lly
@@ -115,12 +107,9 @@
 extern int  read_xbm(READ_SIGNATURE);
 /* readxpm.c */
 extern int  read_xpm(READ_SIGNATURE);
-#undef READ_SIGNATURE
 
-#ifdef I18N
 static bool	enable_composite_font = false;
-static bool	append_find_composite(FILE *restrict out, FILE *restrict in);
-#endif
+static bool	append_find_composite(FILE *restrict out);
 
 #define		POINT_PER_INCH		72
 #define		ULIMIT_FONT_SIZE	300
@@ -133,7 +122,6 @@
 							obj->thickness > 0)
 
 /* variables obtained from command line options */
-static bool	anonymous = true;
 static bool	asciipreview = false;	/* add ASCII preview? */
 static bool	tiffpreview = false;	/* add a TIFF preview? */
 static bool	tiffcolor = false;	/* color or b/w TIFF preview */
@@ -192,13 +180,12 @@
 				F_pos *fillpoints, int nfillpoints, int col);
 static void	draw_gridline(float x1, float y1, float x2, float y2);
 static bool	ellipse_exist(F_compound *ob);
-static void	encode_all_fonts(F_compound *ob);
 static void	fill_area(int fill, int pen_color, int fill_color);
 static void	genps_ctl_spline(F_spline *s);
 static void	genps_itp_spline(F_spline *s);
 static void	genps_std_colors(void);
 static void	genps_usr_colors(void);
-static bool	iso_text_exist(F_compound *ob);
+static int	note_text_needing_cmap(F_compound *obj);
 static void	putword(int word, FILE *file);
 static void	set_linewidth(double w);
 
@@ -249,6 +236,7 @@
 	"Courier"			/* typewriter */
 };
 
+
 #define PS_FONTNAMES(T)	\
 	(((v2_flag&&!(v21_flag||v30_flag)) || \
 		psfont_text(T)) ? PSfontnames : psfontnames)
@@ -274,7 +262,7 @@
 static	 struct hdr {
 	    char	*type;
 	    char	*bytes;
-	    int		(*readfunc)();
+	    int		(*readfunc)(READ_SIGNATURE);
 	    bool	pipeok;
 	    /* buf12 below must be large enough for the file signature */
 	} headers = {	{"GIF", "GIF",			read_gif,	false},
@@ -439,10 +427,6 @@
 	case 'P':		/* pagemode */
 		break;
 
-	case 'a':		/* anonymous (don't output user name) */
-	      anonymous = true;
-	      break;
-
 	case 'A':		/* add ASCII preview */
 		asciipreview = true;
 		break;
@@ -504,6 +488,10 @@
 		}
 		break;
 
+	case 'j':
+		enable_composite_font = true;
+		break;
+
 	case 'l':			/* landscape mode */
 		if (!epsflag) {
 		    landscape = true;	/* override the figure file setting */
@@ -585,19 +573,15 @@
 void
 genps_start(F_compound *objects)
 {
-	char		 host256;
 	char		 date_bufCREATION_TIME_LEN;
-	struct passwd	*who;
 	int		 itmp, jtmp;
 	int		 i;
 	int		 cliplx, cliply, clipux, clipuy;
 	int		 userllx, userlly, userurx, userury;
+	int		 needs_cmap;
 	const struct paperdef	*pd;
 	char		 psize20;
 
-	char		*libdir;
-	char		 filename512;
-
 	/* make sure user isn't asking for both TIFF and ASCII preview */
 	if (tiffpreview && asciipreview) {
 		put_msg("Only one type of preview allowed: -A or -T/-C");
@@ -626,10 +610,6 @@
 
 	scalex = scaley = mag * POINT_PER_INCH / ppi;
 
-	/* this seems to work around Solaris' cc optimizer bug */
-	/* the problem was that llx had garbage in it - this "fixes" it */
-	sprintf(host,"llx=%d\n",llx);
-
 	/* convert to point unit */
 	fllx = llx * scalex;
 	flly = lly * scaley;
@@ -661,74 +641,74 @@
 	}
 
 	if (epsflag) {
-	    /* shift figure to 0,0 */
-	    origx = -fllx;
-	    origy =  fury;
-	    if (boundingboxspec) {
-		    jtmp = sscanf(boundingbox, "%lf %lf %lf %lf",
-				    &userwidthx, &userwidthy,
-				    &userorigx, &userorigy);
-		    switch (jtmp) {
-		    case 0:
-			    userwidthx=(furx-fllx)/POINT_PER_INCH;
-			    if (metric)
-				    userwidthx *= 2.54;
-			    /* the comment below silences gcc's
-			       -Wimplicit-fallthrough warning */
-			    /* intentionally fall through */
-			    /* and set the other user... vars */
-		    case 1:
-			    userwidthy=(fury-flly)/POINT_PER_INCH;
-			    if (metric)
-				    userwidthy *= 2.54;
-			    /* intentionally fall through */
-			    /* and set the other user... vars */
-		    case 2:
-			    userorigx=0;
-			    /* intentionally fall through */
-			    /* and set the last user... var */
-		    case 3:
-			    userorigy=0;
-		    }
-		    if (userwidthx <= 0) {
-			    userwidthx=(furx-fllx)/POINT_PER_INCH;
-			    if (metric)
-				    userwidthx *= 2.54;
-		    }
-		    if (userwidthy <= 0) {

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genpstricks.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genpstricks.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/genptk.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/genptk.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -54,7 +54,8 @@
 
 static void
 	drawBitmap(F_line *),
-	drawFilledShape(void (*)(), void *, int, int, int, int, int, double),
+	drawFilledShape(void (*)(void *), void *, int, int, int, int, int,
+			double),
 	niceLine(char *),
 	ptkArc(void *),
 	ptkEllipse(void *),
@@ -1023,7 +1024,7 @@
  * as necessary, and close the object.
  */
 static void
-drawFilledShape(void (*tkShape)(), void *p, int thickness, int penColor,
+drawFilledShape(void (*tkShape)(void *), void *p, int thickness, int penColor,
 	int fillColor, int fillStyle, int style, double style_val)
 {
 	char	sftp256;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gentextyl.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gentextyl.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -41,13 +41,16 @@
 #include "pi.h"
 #include "texfonts.h"
 
-static void putline();
+static void putline(int start_x, int start_y, int end_x, int end_y);
 
-static void gentextyl_ctl_spline(), gentextyl_itp_spline();
-static void bezier_spline();
-static void draw_arrow_head();
-static void set_style();
-static void rtop();
+static void gentextyl_ctl_spline(F_spline *s);
+static void gentextyl_itp_spline(F_spline *s);
+static void bezier_spline(double a0, double b0, double a1, double b1,
+			double a2, double b2, double a3, double b3);
+static void draw_arrow_head(double x1, double y1, double x2, double y2,
+			double arrowht, double arrowwid);
+static void set_style(int style);
+static void rtop(double x, double y, double *r, double *th);
 /* static void set_linewidth();	*/
 
 static int	line_style = 0; /* Textyl solid line style */
@@ -57,45 +60,44 @@
 static void
 gentextyl_option(char opt, char *optarg)
 {
-  int i;
+	int i;
 
 	switch (opt) {
-		case 'a':
-		    /* capfonts = 1; */
-		    break;
+	case 'a':
+		/* capfonts = 1; */
+		break;
 
-		case 'f':			/* set default text font */
-		    for ( i = 1; i <= MAX_FONT; i++ )
+	case 'f':			/* set default text font */
+		for ( i = 1; i <= MAX_FONT; i++ )
 			if ( !strcmp(optarg, texfontnamesi) ) break;
 
-		    if ( i > MAX_FONT)
-			{
-			  fprintf(stderr,
-				 "warning: non-standard font name %s ignored\n",
-				 optarg);
-			}
-		 else
-			{
-			  texfontnames0 = texfontnamesi;
+		if ( i > MAX_FONT)
+		{
+			fprintf(stderr, "warning: non-standard font name %s "
+					"ignored\n", optarg);
+		}
+		else
+		{
+			texfontnames0 = texfontnamesi;
 #ifdef NFSS
-			  texfontfamily0 = texfontfamilyi;
-			  texfontseries0 = texfontseriesi;
-			  texfontshape0 = texfontshapei;
+			texfontfamily0 = texfontfamilyi;
+			texfontseries0 = texfontseriesi;
+			texfontshape0 = texfontshapei;
 #endif
-			}
-		    break;
+		}
+		break;
 
-		case 'l':			/* set line thickness */
-		    linethick = atoi(optarg);
-		    if (linethick < 1 || linethick > 12) {
-		      put_msg("Line thickness must be between 1 and 12.");
-		      exit(1);
-		    }
-		    break;
+	case 'l':			/* set line thickness */
+		linethick = atoi(optarg);
+		if (linethick < 1 || linethick > 12) {
+			put_msg("Line thickness must be between 1 and 12.");
+			exit(1);
+		}
+		break;
 
-		case 'G':
-		case 'L':
-		    break;
+	case 'G':
+	case 'L':
+		break;
 
 	default:
 		put_msg(Err_badarg, opt, "textyl");
@@ -103,9 +105,9 @@
 	}
 }
 
-#define			TOP	(10.5)	/* top of page is 10.5 inch */
-#define SCALE (65536.0*72.27)
-#define measure 'S'
+#define TOP	(10.5)	/* top of page is 10.5 inch */
+#define SCALE	(65536.0*72.27)
+#define measure	'S'
 
 static int
 convy(double a)
@@ -162,7 +164,7 @@
 
 	fputs("%\n% Fig POLYLINE object\n%\n", tfp);
 
-/*	set_linewidth(l->thickness);	*/
+	/*	set_linewidth(l->thickness);	*/
 	set_style(l->style);
 
 	p = l->points;
@@ -170,32 +172,34 @@
 
 
 	if (q == NULL) { /* A single point line */
-	    fprintf(tfp, "\\special{tyl line %c %d L %d %u %u; %u %u}\n",
-	       measure,linethick,line_style,
-			convx((double)p->x), convy((double)p->y),
-			convx((double)p->x), convy((double)p->y));
-	    return;
-	    }
+		fprintf(tfp, "\\special{tyl line %c %d L %d %u %u; %u %u}\n",
+				measure,linethick,line_style,
+				convx((double)p->x), convy((double)p->y),
+				convx((double)p->x), convy((double)p->y));
+		return;
+	}
 	if (l->back_arrow)
-	    draw_arrow_head((double)q->x, (double)q->y, (double)p->x,
-		(double)p->y, l->back_arrow->ht, l->back_arrow->wid);
+		draw_arrow_head((double)q->x, (double)q->y,
+				(double)p->x, (double)p->y,
+				l->back_arrow->ht, l->back_arrow->wid);
 	set_style(l->style);
 
 	while (q->next != NULL) {
 
-	    putline(p->x, p->y, q->x, q->y);
-	    p = q;
-	    q = q->next;
-	    }
+		putline(p->x, p->y, q->x, q->y);
+		p = q;
+		q = q->next;
+	}
 
 	putline(p->x, p->y, q->x, q->y);
 	if (l->for_arrow)
-	    draw_arrow_head((double)p->x, (double)p->y, (double)q->x,
-		(double)q->y, l->for_arrow->ht, l->for_arrow->wid);
+		draw_arrow_head((double)p->x, (double)p->y,
+				(double)q->x, (double)q->y,
+				l->for_arrow->ht, l->for_arrow->wid);
 
 	if (l->fill_style && (int)l->fill_style != DEFAULT)
 		fputs("Line area fill not implemented\n", stderr);
-	}
+}
 
 /*
  * set_style - issue style commands as appropriate
@@ -238,7 +242,7 @@
 	/* print any comments prefixed with "%" */
 	print_comments("% ",s->comments, "");
 
-/*	set_linewidth(s->thickness);	*/
+	/*	set_linewidth(s->thickness);	*/
 	set_style(s->style);
 
 	if (int_spline(s))
@@ -261,35 +265,36 @@
 
 	fputs("%\n% Fig ELLIPSE\n%\n", tfp);
 
-/*	set_linewidth(e->thickness);	*/
+	/*	set_linewidth(e->thickness);	*/
 	set_style(e->style);
 
 	if (e->radiuses.x == e->radiuses.y) {
 		fprintf(tfp, "\\special{tyl arc %c %d L 0 %u @ %u,%u 0 360}\n",
-			measure, linethick, convx((double)e->radiuses.x),
-			convx((double)e->center.x), convy((double)e->center.y));

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gentikz.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gentikz.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2019 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -37,62 +37,14 @@
 #include "pi.h"
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
-//#include "object.h"
 #include "bound.h"
 #include "gentikz.h"
 #include "messages.h"
 #include "psfonts.h"
-#include "texfonts.h"		/* texfontnames */
-
-/* String arrays and structs */
-extern char	*ISO1toTeX;	/* iso2tex.c */
-extern char	*ISO2toTeX;	/* iso2tex.c */
-static const char	*texfonts = {
-	"",			/* default */
-	"\\rmfamily",		/* roman */
-	"\\bfseries",		/* bold */
-	"\\itshape",		/* italic */
-	"\\sffamily",		/* sans serif */
-	"\\ttfamily",		/* typewriter */
-};
-static const char	*texpsfonts = {
-	"{T1}{ptm}{m}{n}",	/* Times-Roman, default */
-	"{T1}{ptm}{m}{n}",	/* Times-Roman */
-	"{T1}{ptm}{m}{it}",	/* Times-Italic */
-	"{T1}{ptm}{b}{n}",	/* Times-Bold */
-	"{T1}{ptm}{b}{it}",	/* Times-BoldItalic */
-	"{T1}{pag}{m}{n}",	/* AvantGarde */
-	"{T1}{pag}{m}{sl}",	/* AvantGarde-BookOblique */
-	"{T1}{pag}{db}{n}",	/* AvantGarde-Demi */
-	"{T1}{pag}{db}{sl}",	/* AvantGarde-DemiOblique */
-	"{T1}{pbk}{l}{n}",	/* Bookman-Light */
-	"{T1}{pbk}{l}{it}",	/* Bookman-LightItalic */
-	"{T1}{pbk}{db}{n}",	/* Bookman-Demi */
-	"{T1}{pbk}{db}{it}",	/* Bookman-DemiItalic */
-	"{T1}{pcr}{m}{n}",	/* Courier */
-	"{T1}{pcr}{m}{sl}",	/* Courier-Oblique */
-	"{T1}{pcr}{b}{n}",	/* Courier-Bold */
-	"{T1}{pcr}{b}{sl}",	/* Courier-BoldItalic */
-	"{T1}{phv}{m}{n}",	/* Helvetica */
-	"{T1}{phv}{m}{sl}",	/* Helvetica-Oblique */
-	"{T1}{phv}{b}{n}",	/* Helvetica-Bold */
-	"{T1}{phv}{b}{sl}",	/* Helvetica-BoldOblique */
-	"{T1}{phv}{mc}{n}",	/* Helvetica-Narrow */
-	"{T1}{phv}{mc}{sl}",	/* Helvetica-Narrow-Oblique */
-	"{T1}{phv}{bc}{n}",	/* Helvetica-Narrow-Bold */
-	"{T1}{phv}{bc}{sl}",	/* Helvetica-Narrow-BoldOblique */
-	"{T1}{pnc}{m}{n}",	/* NewCenturySchlbk-Roman */
-	"{T1}{pnc}{m}{it}",	/* NewCenturySchlbk-Italic */
-	"{T1}{pnc}{b}{n}",	/* NewCenturySchlbk-Bold */
-	"{T1}{pnc}{b}{it}",	/* NewCenturySchlbk-BoldItalic */
-	"{T1}{ppl}{m}{n}",	/* Palatino-Roman */
-	"{T1}{ppl}{m}{it}",	/* Palatino-Italic */
-	"{T1}{ppl}{b}{n}",	/* Palatino-Bold */
-	"{T1}{ppl}{b}{it}",	/* Palatino-BoldItalic */
-	"{U}{psy}{m}{n}",	/* Symbol */
-	"{T1}{pzc}{mb}{it}",	/* ZapfChancery-MediumItalic */
-	"{U}{pzd}{m}{n}"	/* ZapfDingbats */
-};
+#include "texfonts.h"	/* texfontnames, select_font(), put_string() */
+#include "textconvert.h"
+
+
 static const struct color_table {
 	char name9;
 	float r, g, b;
@@ -162,7 +114,7 @@
  *  -hullpoint		.tiphull    true or false: if to use (0,0)
  *  -upperhullpoint	.nhull	    positive: number of upper hull points
  *				    negative: number of hull points
- *  -upperhullpoint	.hullp    upperhull (nhull > 0) or hull points (nhull < 0)
+ *  -upperhullpoint	.hullp    upperhull (nhull>0) or hull points (nhull<0)
  *  -hullpoint		.endhull    true or false, if to use .lendl
  * The tipend is always at 0.
  * The backend is often at -1 (times length).
@@ -245,17 +197,16 @@
 };
 
 /* Variables */
-static bool	nofontsize = false;
-static bool	nofontname = false;
+static bool	select_fontsize = true;
+static bool	select_fontname = true;
 static bool	removesuffix = false;
-static bool	usetexfonts = false;
+static bool	only_texfonts = false;
 static bool	allspecial = false;
 static bool	pagemode = false;
 static bool	figscaling = true;
 static char	*prepend = NULL;
 static int	xshift = 0;		/* translate figure, if necessary */
 static int	yshift = 0;		/* translate figure, if necessary */
-static int	encoding = 1;
 static int	verbose = 0;
 static double	unitlength;
 static int	default_color = DEFAULT;
@@ -296,82 +247,78 @@
 	int i;
 	switch (opt) {
 	case 'b':			/* border margin around figure */
-	    border_margin = atoi(optarg);
-	    /* atoi() is slightly faster than sscanf(), but returns 0 if there
-	     * is no int; Use atoi if the default value is 0 anyway. */
-	    /* sscanf(optarg,"%d",&border_margin); */
-	    break;
+		border_margin = atoi(optarg);
+		/* atoi() is slightly faster than sscanf() but returns 0 if
+		 * there is no int; Use atoi if the default value is 0 anyway.*/
+		/* sscanf(optarg,"%d",&border_margin); */
+		break;
 
 	case 'C':			/* default color */
-	    default_color = atoi(optarg);
-	    break;
+		default_color = atoi(optarg);
+		break;
 
 	case 'F':
-	    nofontname = true;
-	    break;
+		select_fontname = false;
+		break;
 
 	case 'i':	/* prepend this string to included graphics file */
-	    prepend = optarg;
-	    break;
+		prepend = optarg;
+		break;
 
 	case 'f':			/* set default text font */
-	    for (i = 1; i <= MAX_FONT; ++i)
-		if (!strcmp(optarg,texfontnamesi) || !strcmp(optarg,texfontsi))
-		    break;
-	    if (i <= MAX_FONT) {
-		  texfonts0 = texfontsi;
-	    } else {
-		for (i = 1; i <= MAX_PSFONT; ++i )
-		    if (!strcmp(optarg, PSfontnamesi)) break;
-		if (i > MAX_PSFONT)
-		    fprintf(stderr, "warning: non-standard font name %s ignored\n",
-			    optarg);
-		else
-		    texpsfonts0 = optarg;
-	    }
-	    break;
+		for (i = 1; i <= MAX_FONT; ++i)
+			if (!strcmp(optarg,texfontnamesi) ||
+					!strcmp(optarg,texfontsi))
+				break;
+		if (i <= MAX_FONT) {
+			texfonts0 = texfontsi;
+		} else {
+			for (i = 1; i <= MAX_PSFONT; ++i )
+				if (!strcmp(optarg, PSfontnamesi))
+					break;
+			if (i > MAX_PSFONT)
+				fprintf(stderr, "warning: non-standard font "
+						"name %s ignored\n", optarg);
+			else
+				texpsfonts0 = optarg;
+		}
+		break;
 
 	case 'o':
-	    nofontsize = true;
-	    break;
+		select_fontsize = false;
+		break;
 
 	case 'T':
-	    usetexfonts = true;
-	    break;
+		only_texfonts = true;
+		break;
 
 	case 'O':
-	    allspecial = true;
-	    break;
+		allspecial = true;
+		break;
 
 	case 'P':
-	    pagemode = true;
-	    break;
+		pagemode = true;
+		break;
 
 	case 'v':
-	    verbose = 1;		/* verbose mode */
-	    break;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/gentk.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/gentk.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -52,7 +52,8 @@
 		unsigned char **data_ret);	/* readxbm.c */
 
 static void
-	drawFilledShape(void (*)(), void *, int, int, int, int, int, double),
+	drawFilledShape(void (*)(void *), void *, int, int, int, int, int,
+			double),
 	drawBitmap(F_line *),
 	tkLine(F_line *, int, int, int, double),
 	tkArc(void *),
@@ -274,7 +275,7 @@
  */
 
 int
-gentk_end()
+gentk_end(void)
 {
 	fprintf(tfp, "focus %s\n", canvas);
 
@@ -985,7 +986,7 @@
  */
 
 static void
-drawFilledShape(void (*tkShape)(), void *p, int thickness, int penColor,
+drawFilledShape(void (*tkShape)(void *), void *p, int thickness, int penColor,
 	int fillColor, int fillStyle, int style, double style_val)
 {
 	char	sftp256;
@@ -1226,33 +1227,33 @@
 	tk_setstyle(style, style_val);
 
 	switch (l->join_style) {
-	    case 0:	/* Miter (Tk default). */
+	case 0:	/* Miter (Tk default). */
 		break;
-	    case 1:	/* Round. */
+	case 1:	/* Round. */
 		sprintf(stfp, " -joinstyle round");
 		niceLine(stfp);
 		break;
-	    case 2:	/* Bevel. */
+	case 2:	/* Bevel. */
 		sprintf(stfp, " -joinstyle bevel");
 		niceLine(stfp);
 		break;
-	    default:
+	default:
 		fputs("tkLine: unknown join style.\n", stderr);
 		break;
 	}
 
 	switch (l->cap_style) {
-	    case 0:	/* Butt (Tk default). */
+	case 0:	/* Butt (Tk default). */
 		break;
-	    case 1:	/* Round. */
+	case 1:	/* Round. */
 		sprintf(stfp, " -capstyle round");
 		niceLine(stfp);
 		break;
-	    case 2: /* Projecting. */
+	case 2: /* Projecting. */
 		sprintf(stfp, " -capstyle projecting");
 		niceLine(stfp);
 		break;
-	    default:
+	default:
 		fputs("tkLine: unknown cap style.\n", stderr);
 		break;
 	}

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/psfonts.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/psfonts.c Changed

@@ -2,8 +2,8 @@
  * Fig2dev: Translate Fig code to various Devices
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
- * Parts Copyright (c) 1989-2007 by Brian V. Smith
- * Parts Copyright (c) 2015,2016 by Thomas Loimer
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -144,43 +144,44 @@
 		true			/* ZapfDingbats */
 };
 
-int	PSisomap = {
-		false, false,		/* Times-Roman */
-		false,			/* Times-Italic */
-		false,			/* Times-Bold */
-		false,			/* Times-BoldItalic */
-		false,			/* AvantGarde */
-		false,			/* AvantGarde-BookOblique */
-		false,			/* AvantGarde-Demi */
-		false,			/* AvantGarde-DemiOblique */
-		false,			/* Bookman-Light */
-		false,			/* Bookman-LightItalic */
-		false,			/* Bookman-Demi */
-		false,			/* Bookman-DemiItalic */
-		false,			/* Courier */
-		false,			/* Courier-Oblique */
-		false,			/* Courier-Bold */
-		false,			/* Courier-BoldItalic */
-		false,			/* Helvetica */
-		false,			/* Helvetica-Oblique */
-		false,			/* Helvetica-Bold */
-		false,			/* Helvetica-BoldOblique */
-		false,			/* Helvetica-Narrow */
-		false,			/* Helvetica-Narrow-Oblique */
-		false,			/* Helvetica-Narrow-Bold */
-		false,			/* Helvetica-Narrow-BoldOblique */
-		false,			/* NewCenturySchlbk-Roman */
-		false,			/* NewCenturySchlbk-Italic */
-		false,			/* NewCenturySchlbk-Bold */
-		false,			/* NewCenturySchlbk-BoldItalic */
-		false,			/* Palatino-Roman */
-		false,			/* Palatino-Italic */
-		false,			/* Palatino-Bold */
-		false,			/* Palatino-BoldItalic */
-#define NO 2
-		NO,			/* Symbol */
-		false,			/* ZapfChancery-MediumItalic */
-		NO			/* ZapfDingbats */
+/* 0 for only ascii characters, 1 beyond ascii,
+   2 for Symbol or Zapf Dingbats requiring latin1 encoding */
+int	PSneedsutf8 = {
+		0, 0,			/* Times-Roman */
+		0,			/* Times-Italic */
+		0,			/* Times-Bold */
+		0,			/* Times-BoldItalic */
+		0,			/* AvantGarde */
+		0,			/* AvantGarde-BookOblique */
+		0,			/* AvantGarde-Demi */
+		0,			/* AvantGarde-DemiOblique */
+		0,			/* Bookman-Light */
+		0,			/* Bookman-LightItalic */
+		0,			/* Bookman-Demi */
+		0,			/* Bookman-DemiItalic */
+		0,			/* Courier */
+		0,			/* Courier-Oblique */
+		0,			/* Courier-Bold */
+		0,			/* Courier-BoldItalic */
+		0,			/* Helvetica */
+		0,			/* Helvetica-Oblique */
+		0,			/* Helvetica-Bold */
+		0,			/* Helvetica-BoldOblique */
+		0,			/* Helvetica-Narrow */
+		0,			/* Helvetica-Narrow-Oblique */
+		0,			/* Helvetica-Narrow-Bold */
+		0,			/* Helvetica-Narrow-BoldOblique */
+		0,			/* NewCenturySchlbk-Roman */
+		0,			/* NewCenturySchlbk-Italic */
+		0,			/* NewCenturySchlbk-Bold */
+		0,			/* NewCenturySchlbk-BoldItalic */
+		0,			/* Palatino-Roman */
+		0,			/* Palatino-Italic */
+		0,			/* Palatino-Bold */
+		0,			/* Palatino-BoldItalic */
+		2,			/* Symbol */
+		0,			/* ZapfChancery-MediumItalic */
+		2			/* ZapfDingbats */
 };
 
 static char *figfontnames = {
@@ -195,12 +196,14 @@
 void unpsfont(F_text *t)
 {
 	if (!psfont_text(t))
-	    return;
+		return;
 	if (PSmapwarnt->font+1)
-	  fprintf(stderr, "PS fonts not supported; substituting %s for %s\n",
-		figfontnamesPSfontmapt->font+1+1, PSfontnamest->font+1);
+		fprintf(stderr,
+			"PS fonts not supported; substituting %s for %s\n",
+			figfontnamesPSfontmapt->font+1+1,
+			PSfontnamest->font+1);
 	if (t->font == -1) /* leave default to be default, but no-ps */
-	  t->font = 0;
+		t->font = 0;
 	else
-	  t->font = PSfontmapt->font+1;
+		t->font = PSfontmapt->font+1;
 }

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/psfonts.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/psfonts.h Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/psprolog.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/psprolog.h Changed

@@ -579,51 +579,318 @@
 makepattern\n\
 /P22 exch def\n"
 
+#define		XFIG_CMAP1	"\
+%%BeginResource: CMap (Xfig-UTF8-H)\n\
+%%Title: (Xfig-UTF8-H Adobe 0)\n\
+%%Version: 1.0\n\
+% The PostScript Language Reference, 3rd ed., Section 5.11.4 - CMap Example,\n\
+% pp 385-387 and the example for the composefont operator on p 388 was useful.\n\
+/CIDInit /ProcSet findresource begin\n\
+12 dict begin\n\
+begincmap\n\
+/CIDSystemInfo  null  def\n\
+% Xfig Adobe Glyph List\n\
+/CMapName /Xfig-AGL-UTF8-H def\n\
+/CMapVersion 1.0 def\n\
+/CMapType 1 def\n\
+/WMode 0 def\n\
+% See Adobe Technical Note #5099,\n\
+% Building CMap Files for CID-Keyed Fonts (1998), 5099.CMapFiles.pdf, Sec. 3.4:\n\
+% \"...the theoretical code space range should be used here, not just the code\n\
+%  space range that contains defined characters.\"\n\
+%\n\
+% Define the UTF-8 code space range\n\
+3 begincodespacerange\n\
+     <00>     <7F>\n\
+   <C280>   <DFBF>\n\
+ <E08080> <EFBFBF>\n\
+% <F0808080> <F7BFBFBF>\n\
+endcodespacerange\n\
+0 usefont\n\
+42 beginbfrange\n\
+% Basic Latin, or ASCII\n\
+<20> <7f>  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand\n\
+ /quotesingle /parenleft /parenright /asterisk /plus /comma /hyphen /period\n\
+ /slash /zero /one /two /three /four /five /six /seven /eight /nine /colon\n\
+ /semicolon /less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K\n\
+ /L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash\n\
+ /bracketright /asciicircum /underscore /grave /a /b /c /d /e /f /g /h /i /j /k\n\
+ /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar /braceright\n\
+ /asciitilde /controlDEL \n\
+% Latin-1 Supplement, u+a0--u+bf\n\
+<c2a0> <c2bf>  /nbspace /exclamdown /cent /sterling /currency /yen /brokenbar\n\
+ /section /dieresis /copyright /ordfeminine /guillemotleft /logicalnot\n\
+ /sfthyphen /registered /macron /degree /plusminus /twosuperior /threesuperior\n\
+ /acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine\n\
+ /guillemotright /onequarter /onehalf /threequarters /questiondown \n\
+% Latin-1 Supplement, u+c0--u+ff\n\
+<c380> <c3bf>  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE\n\
+ /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex\n\
+ /Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis\n\
+ /multiply /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn\n\
+ /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring /ae\n\
+ /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex\n\
+ /idieresis /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide\n\
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis \n\
+% Latin Extended-A, u+0100--u+013f\n\
+<c480> <c4bf>  /Amacron /amacron /Abreve /abreve /Aogonek /aogonek /Cacute\n\
+ /cacute /Ccircumflex /ccircumflex /Cdotaccent /cdotaccent /Ccaron /ccaron\n\
+ /Dcaron /dcaron /Dcroat /dcroat /Emacron /emacron /Ebreve /ebreve /Edotaccent\n\
+ /edotaccent /Eogonek /eogonek /Ecaron /ecaron /Gcircumflex /gcircumflex /Gbreve\n\
+ /gbreve /Gdotaccent /gdotaccent /Gcedilla /gcedilla /Hcircumflex /hcircumflex\n\
+ /Hbar /hbar /Itilde /itilde /Imacron /imacron /Ibreve /ibreve /Iogonek /iogonek\n\
+ /Idotaccent /dotlessi /IJ /ij /Jcircumflex /jcircumflex /Kcedilla /kcedilla\n\
+ /kgreenlandic /Lacute /lacute /Lcedilla /lcedilla /Lcaron /lcaron /Ldot \n\
+% Latin Extended-A, u+0140--u+017f\n\
+<c580> <c5bf>  /ldot /Lslash /lslash /Nacute /nacute /Ncedilla /ncedilla\n\
+ /Ncaron /ncaron /napostrophe /Eng /eng /Omacron /omacron /Obreve /obreve\n\
+ /Ohungarumlaut /ohungarumlaut /OE /oe /Racute /racute /Rcedilla /rcedilla\n\
+ /Rcaron /rcaron /Sacute /sacute /Scircumflex /scircumflex /Scedilla /scedilla\n\
+ /Scaron /scaron /Tcedilla /tcedilla /Tcaron /tcaron /Tbar /tbar /Utilde /utilde\n\
+ /Umacron /umacron /Ubreve /ubreve /Uring /uring /Uhungarumlaut /uhungarumlaut\n\
+ /Uogonek /uogonek /Wcircumflex /wcircumflex /Ycircumflex /ycircumflex\n\
+ /Ydieresis /Zacute /zacute /Zdotaccent /zdotaccent /Zcaron /zcaron /longs \n"
 
-#define		SPECIAL_CHAR_1	"\
-/reencdict 12 dict def /ReEncode { reencdict begin\n\
-/newcodesandnames exch def /newfontname exch def /basefontname exch def\n\
-/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def\n\
-basefontdict { exch dup /FID ne { dup /Encoding eq\n\
-{ exch dup length array copy newfont 3 1 roll put }\n\
-{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall\n\
-newfont /FontName newfontname put newcodesandnames aload pop\n\
-128 1 255 { newfont /Encoding get exch /.notdef put } for\n\
-newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat\n\
-newfontname newfont definefont pop end } def\n\
-/isovec \n\
-"
-#define		SPECIAL_CHAR_2	"\
-8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde\n\
-8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis\n\
-8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron\n\
-8#220 /dotlessi 8#230 /oe 8#231 /OE\n\
-8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling\n\
-8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis\n\
-8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot\n\
-8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus\n\
-8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph\n\
-8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine\n\
-8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf\n\
-8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute\n\
-8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring\n\
-"
-#define		SPECIAL_CHAR_3	"\
-8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute\n\
-8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute\n\
-8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve\n\
-8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply\n\
-8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex\n\
-8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave\n\
-8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring\n\
-8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute\n\
-8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute\n\
-8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve\n\
-8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide\n\
-8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex\n\
-8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis\
- def\n\
-"
+#define		XFIG_CMAP2	"\
+% Latin Extended-B (small part), u+1fa--u+1ff\n\
+<c7ba> <c7bf>  /Aringacute /aringacute /AEacute /aeacute /Oslashacute\n\
+ /oslashacute \n\
+<c898> <c89b>  /Scommaaccent /scommaaccent /uni021A /uni021B \n\
+% Spacing Modifier Letters (small part), u+2d8--u2dd\n\
+<cb98> <cb9d>  /breve /dotaccent /ring /ogonek /tilde /hungarumlaut \n\
+% Greek and Coptic, u+384--u+386\n\
+<ce84> <ce86>  /tonos /dieresistonos /Alphatonos \n\
+<ce88> <ce8a>  /Epsilontonos /Etatonos /Iotatonos \n\
+<ce8e> <cea1>  /Upsilontonos /Omegatonos /iotadieresistonos /Alpha /Beta\n\
+  /Gamma /uni0394 /Epsilon /Zeta /Eta /Theta /Iota /Kappa /Lambda /Mu /Nu /Xi\n\
+  /Omicron /Pi /Rho \n\
+<cea3> <cebf>  /Sigma /Tau /Upsilon /Phi /Chi /Psi /uni03A9 /Iotadieresis\n\
+  /Upsilondieresis /alphatonos /epsilontonos /etatonos /iotatonos\n\
+  /upsilondieresistonos /alpha /beta /gamma /delta /epsilon /zeta /eta /theta\n\
+  /iota /kappa /lambda /uni03BC /nu /xi /omicron \n\
+<cf82> <cf8e>  /uni03C2 /sigma /tau /upsilon /phi /chi /psi /omega /iotadieresis\n\
+  /upsilondieresis /omicrontonos /upsilontonos /omegatonos \n\
+% Cyrillic, u+400--u+43f\n\
+<d080> <d0bf>  /uni0400 /afii10023 /afii10051 /afii10052 /afii10053 /afii10054\n\
+  /afii10055 /afii10056 /afii10057 /afii10058 /afii10059 /afii10060 /afii10061\n\
+  /uni040D /afii10062 /afii10145 /afii10017 /afii10018 /afii10019\n\
+  /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 /afii10026 /afii10027\n\
+  /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 /afii10034\n\
+  /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041\n\
+  /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048\n\
+  /afii10049 /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070\n\
+  /afii10072 /afii10073 /afii10074 /afii10075 /afii10076 /afii10077 /afii10078\n\
+  /afii10079 /afii10080 /afii10081 \n\
+% Cyrillic, u+440--u+463\n\
+<d180> <d19f>  /afii10082 /afii10083 /afii10084 /afii10085 /afii10086\n\
+  /afii10087 /afii10088 /afii10089 /afii10090 /afii10091 /afii10092 /afii10093\n\
+  /afii10094 /afii10095 /afii10096 /afii10097 /uni0450 /afii10071 /afii10099\n\
+  /afii10100 /afii10101 /afii10102 /afii10103 /afii10104 /afii10105 /afii10106\n\
+  /afii10107 /afii10108 /afii10109 /uni045D /afii10110 /afii10193 \n\
+<d1b2> <d1b5>  /uni0472 /uni0473 /uni0474 /uni0475 \n\
+<d290> <d293>  /afii10050 /afii10098 /uni0492 /uni0493 \n\
+<d296> <d29d>  /uni0496 /uni0497 /uni0498 /uni0499 /uni049A /uni049B /uni049C\n\
+  /uni049D \n\
+<d2a0> <d2a3>  /uni04A0 /uni04A1 /uni04A2 /uni04A3 \n\
+<d2ae> <d2b3>  /uni04AE /uni04AF /uni04B0 /uni04B1 /uni04B2 /uni04B3 \n\
+<d2b6> <d2bb>  /uni04B6 /uni04B7 /uni04B8 /uni04B9 /uni04BA /uni04BB \n\
+% Latin Extended Additional, u+1e80--u+1e85\n\
+<e1ba80> <e1ba85>  /Wgrave /wgrave /Wacute /wacute /Wdieresis /wdieresis \n\
+<e28093> <e28095>  /endash /emdash /afii00208 \n\
+<e28097> <e2809e>  /underscoredbl /quoteleft /quoteright /quotesinglbase\n\
+ /quotereversed /quotedblleft /quotedblright /quotedblbase \n\
+<e280a0> <e280a2>  /dagger /daggerdbl /bullet \n\
+<e280b9> <e280bc>  /guilsinglleft /guilsinglright /exclamdbl \n\
+<e281b4> <e281b9>  /foursuperior /fivesuperior /sixsuperior /sevensuperior\n\
+ /eightsuperior /ninesuperior \n\
+<e2859b> <e2859e>  /oneeighth /threeeighths /fiveeighths /seveneighths \n\
+<e28690> <e28699>  /arrowleft /arrowup /arrowright /arrowdown /arrowboth\n\
+ /arrowupdn /uni2196 /uni2197 /uni2198 /uni2199 \n\
+<e28790> <e28795>  /arrowdblleft /arrowdblup /arrowdblright /arrowdbldown\n\
+ /arrowdblboth /uni21D5\n\
+<e28885> <e28889>  /emptyset /Delta /gradient /element /notelement \n\
+<e2889d> <e288a0>  /proportional /infinity /orthogonal /angle \n\
+<e288a7> <e288ab>  /uni2227 /uni2228 /intersection /union /integral \n\
+<e28a82> <e28a87>  /propersubset /propersuperset /notsubset /uni2285\n\
+ /reflexsubset /reflexsuperset \n\
+<e28a95> <e28a99>  /uni2295 /uni2296 /circlemultiply /uni2298 /uni2299 \n\
+<e28aa2> <e28aa5>  /uni22A2 /uni22A3 /uni22A4 /perpendicular \n\
+<e29590> <e295b0>  /SF430000 /SF240000 /SF510000 /SF520000 /SF390000 /SF220000\n"
+
+#define		XFIG_CMAP3	"\
+ /SF210000 /SF250000 /SF500000 /SF490000 /SF380000 /SF280000 /SF270000 /SF260000\n\
+ /SF360000 /SF370000 /SF420000 /SF190000 /SF200000 /SF230000 /SF470000 /SF480000\n\
+ /SF410000 /SF450000 /SF460000 /SF400000 /SF540000 /SF530000 /SF440000 /uni256D\n\
+ /uni256E /uni256F /uni2570 \n\
+<e29690> <e29693>  /rtblock /ltshade /shade /dkshade \n\
+<e298b9> <e298bc>  /uni25B9 /smileface /invsmileface /sun \n\
+<eebf80> <eebfac>  /uniEFC0 /uniEFC1 /uniEFC2 /uniEFC3 /uniEFC4 /uniEFC5\n\
+ /uniEFC6 /uniEFC7 /uniEFC8 /uniEFC9 /uniEFCA /uniEFCB /uniEFCC /uniEFCD\n\
+ /uniEFCE /uniEFCF /uniEFD0 /uniEFD1 /uniEFD2 /uniEFD3 /uniEFD4 /uniEFD5\n\
+ /uniEFD6 /uniEFD7 /uniEFD8 /uniEFD9 /uniEFDA /uniEFDB /uniEFDC /uniEFDD\n\
+ /uniEFDE /uniEFDF /uniEFE0 /uniEFE1 /uniEFE2 /uniEFE3 /uniEFE4 /uniEFE5\n\
+ /uniEFE6 /uniEFE7 /uniEFE8 /uniEFE9 /uniEFEA /uniEFEB /uniEFEC \n\
+<eebfba> <eebfbf>  /uniEFFA /uniEFFB /uniEFFC /uniEFFD /uniEFFE /uniEFFF \n\

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/readeps.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/readeps.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/readjpg.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/readjpg.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -106,8 +106,13 @@
 	image.fp	= pic_stream->fp;
 	image.filename	= pic->file;
 
-	/* read image parameters and fill image struct */
-	if (!rewind_stream(pic_stream) || !AnalyzeJPEG())
+	if (!rewind_stream(pic_stream))
+		return 0;
+
+	/* rewind_stream() may have changed the file pointer */
+	image.fp = pic_stream->fp;
+
+	if (!AnalyzeJPEG())
 		return 0;
 
 	*llx = *lly = 0;
@@ -311,14 +316,13 @@
 
 static int
 next_marker(FILE *fp) {	/* look for next JPEG Marker  */
-	int c, nbytes = 0;
+	int c;
 
 	if (feof(fp))
 		return M_ERROR;		    /* dummy marker		  */
 
 	do {
 		do {			    /* skip to FF		  */
-			nbytes++;
 			c = getc(fp);
 		} while (c != 0xFF);
 		do {			    /* skip repeated FFs	  */
@@ -332,7 +336,8 @@
 /* analyze JPEG marker */
 
 static bool
-AnalyzeJPEG() {
+AnalyzeJPEG(void)
+{
 	int b, c, unit;
 	unsigned long i, length = 0;
 #define APP_MAX 255

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/readpics.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/readpics.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 
 #include "messages.h"
 #include "xtmpfile.h"
@@ -88,8 +89,8 @@
  *		free(found);
  */
 static int
-file_on_disk(char *restrict name, char *restrict *found, size_t len,
-		const char *restrict *uncompress)
+file_on_disk(char *restrict name, char **restrict found, size_t len,
+		const char **restrict uncompress)
 {
 	int		i;
 	size_t		name_len;
@@ -145,11 +146,10 @@
 			}
 		}
 
-		/* Not found. Check, whether the file has one of the known
-		   compression suffices, but the uncompressed file
-		   exists on disk. */
-		*suffix = '\0';
 		if (i == filetypes_len && (suffix = strrchr(name, '.'))) {
+			/* Not found. Check, whether the file has one of the
+			   known compression suffices, but the
+			   uncompressed file exists on disk. */
 			for (i = 0; i < filetypes_len; ++i) {
 				if (!strcmp(suffix, filetypesi0)) {
 					*(*found + (suffix - name)) = '\0';
@@ -316,15 +316,15 @@
 	char *const	uncompress_fmt = "%s '%s' >%s";
 	FILE		*f;
 
+	/* return early, if uncompressed content already exists */
+	if (xf_stream->content0 != '\0')
+		return 0;
+
 	if (*xf_stream->uncompress == '\0') {
 		xf_stream->content = xf_stream->name_on_disk;
 		return 0;
 	}
 
-	/* return early, if uncompressed_content was already called */
-	if (*xf_stream->uncompress)
-		return 0;
-
 	/* create a temporary file */
 	strcpy(xf_stream->content, "f2dXXXXXX");
 	f = xtmpfile(&xf_stream->content, sizeof xf_stream->content_buf);

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/readpng.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/readpng.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -37,275 +37,290 @@
 int
 read_png(F_pic *pic, struct xfig_stream *restrict pic_stream, int *llx,int *lly)
 {
-    int    i;
-    int		    bit_depth, color_type, interlace_type;
-    int		    compression_type, filter_type;
-    png_uint_32	    j, w, h;
-    png_structp	    png_ptr;
-    png_infop	    info_ptr;
-    size_t	    row_bytes;
-    png_bytep	   *row_pointers;
-    double          gamma;
-
-    if (!rewind_stream(pic_stream))
-	return 0;
-    *llx = *lly = 0;
-
-    /* read the png file here */
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-		(png_voidp) NULL, NULL, NULL);
-    if (!png_ptr)
-	return 0;
-
-    info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-	png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
-	return 0;
-    }
-
-    /*
-     * According to the png specification,
-     * http://www.w3.org/TR/2003/REC-PNG-20031110, all chunks which are of
-     * interest here must appear before the image data. Hence, a second info
-     * pointer, end_info, is not needed. The latter would be created similarly
-     * to info_ptr above,  end_info = png_create_info_struct(png_ptr),
-     * but _after_ reading the image data, I believe.
-     */
-
-    /* set long jump here */
-    if (setjmp(png_jmpbuf(png_ptr))) {
-	/* if we get here there was a problem reading the file */
-	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-	return 0;
-    }
-
-    /* set up the input code */
-    png_init_io(png_ptr, pic_stream->fp);
-
-    /* now read the file info */
-    png_read_info(png_ptr, info_ptr);
-
-    /* get width, height etc */
-    png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
-	&interlace_type, &compression_type, &filter_type);
-
-    if (png_get_gAMA(png_ptr, info_ptr, &gamma))
-	png_set_gamma(png_ptr, 2.2, gamma);
-    else
-	png_set_gamma(png_ptr, 2.2, 0.45455);
-
-    /* force to 8-bits per pixel if less than 8
-       this works both for palette and rgb images */
-    if (bit_depth < 8)
-	png_set_packing(png_ptr);
-
-    /* reduce 16 bit to 8 bit */
-    if (bit_depth == 16)
+	int		i;
+	int		bit_depth, color_type, interlace_type;
+	int		compression_type, filter_type;
+	png_uint_32	j, w, h;
+	png_structp	png_ptr;
+	png_infop	info_ptr;
+	size_t		row_bytes;
+	png_bytep	*row_pointers;
+	double		gamma;
+
+	if (!rewind_stream(pic_stream))
+		return 0;
+	*llx = *lly = 0;
+
+	/* read the png file here */
+	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+			(png_voidp) NULL, NULL, NULL);
+	if (!png_ptr)
+		return 0;
+
+	info_ptr = png_create_info_struct(png_ptr);
+	if (!info_ptr) {
+		png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
+		return 0;
+	}
+
+	/*
+	 * According to the png specification,
+	 * http://www.w3.org/TR/2003/REC-PNG-20031110, all chunks which are of
+	 * interest here must appear before the image data. Hence, a second info
+	 * pointer, end_info, is not needed. The latter would be created
+	 * similarly to info_ptr above,
+	 *	end_info = png_create_info_struct(png_ptr),
+	 * but _after_ reading the image data, I believe.
+	 */
+
+	/* set long jump here */
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		/* if we get here there was a problem reading the file */
+		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+		return 0;
+	}
+
+	/* set up the input code */
+	png_init_io(png_ptr, pic_stream->fp);
+
+	/* now read the file info */
+	png_read_info(png_ptr, info_ptr);
+
+	/* get width, height etc */
+	png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+			&interlace_type, &compression_type, &filter_type);
+
+	if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+		png_set_gamma(png_ptr, 2.2, gamma);
+	else
+		png_set_gamma(png_ptr, 2.2, 0.45455);
+
+	/* force to 8-bits per pixel if less than 8
+	   this works both for palette and rgb images */
+	if (bit_depth < 8)
+		png_set_packing(png_ptr);
+
+	/* reduce 16 bit to 8 bit */
+	if (bit_depth == 16)
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-	png_set_scale_16(png_ptr);
+		png_set_scale_16(png_ptr);
 #else
 	png_set_strip_16(png_ptr);
 #endif
 
-    /*
-     * Image data is transformed to 8 bit rgb data, or to indexed data with
-     * maximum 256 color map entries. The data always has 1 byte per pixel,
-     * regardless of bit_depth. Alpha channels are removed by compositing
-     * with a background. For the application of transformations, the matrix at
-     * line 1800 of file libpng-manual.txt was most useful. We are interested in
-     * conversions to, as is denoted there, "0" - grayscale, "2" - rgb color.
-     * Palette images are basically not transformed (except transparency color
-     * blending?).
-     */
-
-    /* color png */
-    if (color_type & PNG_COLOR_MASK_COLOR) {
-	/* strip 16-bit RGB values down to 8-bit
-	   pngs with a palette have a maximum bit_depth of 8 */
-	if (bit_depth == 16)
+	/*
+	 * Image data is transformed to 8 bit rgb data, or to indexed data with
+	 * maximum 256 color map entries. The data always has 1 byte per pixel,
+	 * regardless of bit_depth. Alpha channels are removed by compositing
+	 * with a background. For the application of transformations, the matrix
+	 * at line 1800 of file libpng-manual.txt was most useful. We are
+	 * interested in conversions to, as is denoted there, "0" - grayscale,
+	 * "2" - rgb color. Palette images are basically not transformed (except
+	 * transparency color blending?).
+	 */
+
+	/* color png */
+	if (color_type & PNG_COLOR_MASK_COLOR) {
+		/* strip 16-bit RGB values down to 8-bit
+		   pngs with a palette have a maximum bit_depth of 8 */
+		if (bit_depth == 16)
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-		png_set_scale_16(png_ptr);
+			png_set_scale_16(png_ptr);
 #else
 		png_set_strip_16(png_ptr);
 #endif
 
-	/* user wants grayscale, map to gray */
-	if (grayonly) {
-
-	    /* this works for palette as well as rgb image data;
-	       creates 8 bit grayscale data */
-	    png_set_rgb_to_gray(png_ptr, 1, 0.3, 0.59);
-	    /* default is: 0.2126 * r + 0.7152 * g + 0.0722 * b */
-
-	    /* add a grayscale palette */
-	    for (i = 0; i < 256; ++i)
-		pic->cmapREDi = pic->cmapGREENi = pic->cmapBLUEi =
-			(unsigned char)i;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/texfonts.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/texfonts.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,9 +19,18 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "texfonts.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>		/* strpbrk() */
+#include <math.h>		/* floor() */
 
+#include "fig2dev.h"
 #include "object.h"
-#include "texfonts.h"
+#include "psfonts.h"		/* unpsfont() */
+#include "textconvert.h"
+
 
 #ifdef NFSS
 const char	*texfontfamily = {
@@ -50,6 +59,52 @@
 	"\\updefault",		/* sans serif */
 	"\\updefault"		/* typewriter */
 };
+const char	*texfonts = {
+	"",			/* default */
+	"\\rmfamily",		/* roman */
+	"\\bfseries",		/* bold */
+	"\\itshape",		/* italic */
+	"\\sffamily",		/* sans serif */
+	"\\ttfamily",		/* typewriter */
+};
+const char	*texpsfonts = {
+	"{T1}{ptm}{m}{n}",	/* Times-Roman, default */
+	"{T1}{ptm}{m}{n}",	/* Times-Roman */
+	"{T1}{ptm}{m}{it}",	/* Times-Italic */
+	"{T1}{ptm}{b}{n}",	/* Times-Bold */
+	"{T1}{ptm}{b}{it}",	/* Times-BoldItalic */
+	"{T1}{pag}{m}{n}",	/* AvantGarde */
+	"{T1}{pag}{m}{sl}",	/* AvantGarde-BookOblique */
+	"{T1}{pag}{db}{n}",	/* AvantGarde-Demi */
+	"{T1}{pag}{db}{sl}",	/* AvantGarde-DemiOblique */
+	"{T1}{pbk}{l}{n}",	/* Bookman-Light */
+	"{T1}{pbk}{l}{it}",	/* Bookman-LightItalic */
+	"{T1}{pbk}{db}{n}",	/* Bookman-Demi */
+	"{T1}{pbk}{db}{it}",	/* Bookman-DemiItalic */
+	"{T1}{pcr}{m}{n}",	/* Courier */
+	"{T1}{pcr}{m}{sl}",	/* Courier-Oblique */
+	"{T1}{pcr}{b}{n}",	/* Courier-Bold */
+	"{T1}{pcr}{b}{sl}",	/* Courier-BoldItalic */
+	"{T1}{phv}{m}{n}",	/* Helvetica */
+	"{T1}{phv}{m}{sl}",	/* Helvetica-Oblique */
+	"{T1}{phv}{b}{n}",	/* Helvetica-Bold */
+	"{T1}{phv}{b}{sl}",	/* Helvetica-BoldOblique */
+	"{T1}{phv}{mc}{n}",	/* Helvetica-Narrow */
+	"{T1}{phv}{mc}{sl}",	/* Helvetica-Narrow-Oblique */
+	"{T1}{phv}{bc}{n}",	/* Helvetica-Narrow-Bold */
+	"{T1}{phv}{bc}{sl}",	/* Helvetica-Narrow-BoldOblique */
+	"{T1}{pnc}{m}{n}",	/* NewCenturySchlbk-Roman */
+	"{T1}{pnc}{m}{it}",	/* NewCenturySchlbk-Italic */
+	"{T1}{pnc}{b}{n}",	/* NewCenturySchlbk-Bold */
+	"{T1}{pnc}{b}{it}",	/* NewCenturySchlbk-BoldItalic */
+	"{T1}{ppl}{m}{n}",	/* Palatino-Roman */
+	"{T1}{ppl}{m}{it}",	/* Palatino-Italic */
+	"{T1}{ppl}{b}{n}",	/* Palatino-Bold */
+	"{T1}{ppl}{b}{it}",	/* Palatino-BoldItalic */
+	"{U}{psy}{m}{n}",	/* Symbol */
+	"{T1}{pzc}{mb}{it}",	/* ZapfChancery-MediumItalic */
+	"{U}{pzd}{m}{n}"	/* ZapfDingbats */
+};
 #endif
 
 const char	*texfontnames = {
@@ -64,7 +119,6 @@
 /* The selection of font names may be site dependent.
  * Not all fonts are preloaded at all sizes.
  */
-
 char	texfontsizes = {
 	11,			/* default */
 	5, 5, 5, 5,		/* 1-4: small fonts */
@@ -81,3 +135,160 @@
 	34, 34, 34, 41,
 	41, 41
 };
+
+
+/*
+ * Output commands to select font and font size.
+ */
+void
+select_font(F_text *t, bool select_fontsize, bool select_fontname,
+			bool only_texfonts)
+{
+	int texsize, bprec;
+	double baselineskip;
+
+	/* tex-drivers by default use the correct font size, a bit different
+	 * from the size on the screen */
+	if (!select_fontsize) {
+		if (!select_fontname)
+			return;
+	} else {
+		texsize = round(t->size * (rigid_text(t) ? 1.0 : fontmag));
+		baselineskip = (texsize * 1.2);
+		if (baselineskip == floor(baselineskip))
+			bprec = 0;
+		else
+			bprec = 1;
+
+		fprintf(tfp, "\\fontsize{%d}{%.*f}",
+					texsize, bprec, baselineskip);
+
+		if (!select_fontname) {
+			fputs("\\selectfont ", tfp);
+			return;
+		}
+	}
+
+	if (only_texfonts && psfont_text(t)) {
+		unpsfont(t);
+		t->flags -= PSFONT_TEXT;
+	}
+
+	if (psfont_text(t))
+		fprintf(tfp, "\\usefont%s", texpsfontst->font <= MAX_PSFONT ?
+				t->font + 1 : 0);
+	else
+		/* Default psfont is -1, default texfont 0, also accept -1. */
+		fprintf(tfp, "\\normalfont%s ", texfontst->font <= MAX_FONT ?
+				(t->font >= 0 ? t->font : 0) : MAX_FONT - 1);
+}
+
+static void
+put_quoted_string(const char *restrict string)
+{
+	const char	*c;
+	const char	*last = string;
+
+	while (*last && (c = strpbrk(last, " #$%&<>\\^_{|}~"))) {
+		/* print the string up to the special character */
+		fprintf(tfp, "%.*s", (int)(c - last), last);
+		switch (*c) {
+		case '<':
+			fputs("\\textless ", tfp);
+			break;
+		case '>':
+			fputs("\\textgreater ", tfp);
+			break;
+		case '|':
+			fputs("\\textbar ", tfp);
+			break;
+		case '\\':
+			fputs("\\textbackslash ", tfp);
+			break;
+		case '^':
+			/* with \usepackageT1{fontenc}, \^{} inserts
+			   ascii 2, while \textasciicircum inserts the
+			   correct ascii 94 */
+			fputs("\\textasciicircum ", tfp);
+			break;
+		case '~':
+			/* with \usepackageT1{fontenc}, \~{} inserts
+			   ascii 3, \textasciitilde inserts ascii 126 */
+			fputs("\\textasciitilde ", tfp);
+			break;
+		default:	/* cases "space"#$%&_{} */
+			fputc('\\', tfp);
+			fputc(*c, tfp);
+			break;
+		}
+		last = c + 1;
+	}
+	if (*last)
+		fputs(last, tfp);
+}
+
+static void
+put_quoted_characters(const char *restrict str)
+{
+	const char	*c;
+
+	/*
+	 * an excerpt from the ascii table:
+	 *   35 #   36 $   37 %   38 &	 39 '	92 \  94 ^  95 _  96 `
+	 *  123 {  125 }  126 ~
+	 * \#, \% and \& would also work
+	 */
+	for (c = str; *c; ++c) {
+		if (strchr(" #$%&\\^_`{}~", *c) || (unsigned char)(*c) > 127) {
+			fprintf(tfp, "\\char%hhu", *c);

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/dev/texfonts.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/texfonts.h Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,14 +19,19 @@
 #ifndef TEXFONTS_H
 #define TEXFONTS_H
 
-#ifdef HAVE_CONFIG_H
+#if defined HAVE_CONFIG_H && !defined VERSION
 #include "config.h"
 #endif
 
+#include "bool.h"
+#include "object.h"
+
 #ifdef NFSS
 extern const char	*texfontfamily;
 extern const char	*texfontseries;
 extern const char	*texfontshape;
+extern const char	*texfonts;
+extern const char	*texpsfonts;
 #endif
 
 extern const char	*texfontnames;
@@ -52,6 +57,9 @@
 #define TEXFONTSIZE(S)	((S) <= MAXFONTSIZE ? texfontsizes(int)round(S) : (S))
 #define TEXFONTMAG(T)	TEXFONTSIZE(T->size*(rigid_text(T) ? 1.0 : fontmag))
 
-void setfigfont(F_text *text);		/* genepic.c */
+extern void	put_string(char *restrict string, int font, bool tex_text,
+				int need_conversion);
+extern void	select_font(F_text *t, bool select_fontsize,
+				bool select_fontname, bool only_texfonts);
 
 #endif /* TEXFONTS_H */

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/textconvert.c Added

@@ -0,0 +1,281 @@
+/*
+ * Fig2dev: Translate Fig code to various Devices
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
+ *
+ * Any party obtaining a copy of these files is granted, free of charge, a
+ * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ * nonexclusive right and license to deal in this software and documentation
+ * files (the "Software"), including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense and/or sell copies
+ * of the Software, and to permit persons who receive copies from any such
+ * party to do so, with the only requirement being that the above copyright
+ * and this permission notice remain intact.
+ *
+ */
+
+/*
+ * Convert text strings between charsets and / or encodings.
+ * Author: Thomas Loimer
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "textconvert.h"
+
+#include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+#ifdef HAVE_NL_LANGINFO
+#include <langinfo.h>
+#else
+#include <locale.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
+#include "messages.h"
+
+int	only_ascii = 1;
+
+#ifdef HAVE_ICONV
+static iconv_t	cd;
+#endif
+
+static int
+get_local_charset(char *charset, size_t size)
+{
+#ifdef HAVE_NL_LANGINFO
+	char	*c = nl_langinfo(CODESET);
+	size_t	size_c;
+
+	size_c = strlen(c) + 1;
+	if (size_c > size) {
+		put_msg("Cannot deal with charset names longer than %zd bytes.",
+				size);
+		return -1;
+	}
+	memcpy(charset, c, size_c);
+	return 0;
+#else
+	char	*c;
+	if ((c = strchr(setlocale(LC_CTYPE, NULL), '.'))) {
+		size_t	size_c = strlen(c + 1) + 1;
+		if (size_c > size) {
+			put_msg("Cannot deal with charset names longer than %zd"
+					" bytes.", size_c);
+			return -1;
+		}
+		memcpy(charset, c + 1, size_c);
+		return 0;
+	}
+	return -1;
+#endif
+}
+
+
+int
+contains_non_ascii(char *str)
+{
+	const unsigned char	mask = ~0x7f;
+	unsigned char		*c;
+	int			ret = 0;
+	for (c = (unsigned char *)str; *c != '\0'; ++c) {
+		if (*c & mask) {
+			ret = 1;
+			break;
+		}
+	}
+	return ret;
+}
+
+/*
+ * Check, whether a conversion between in- and output_charset is necessary.
+ * Return 0 if not necessary or not possible, 1 otherwise.
+ */
+int
+check_conversion(const char *restrict output_charset,
+		const char *restrict input_charset)
+{
+	char	inbuf32;
+	char	outbuf32;
+	char	*in;
+	char	*out;
+
+	if (only_ascii)
+		return 0;
+
+	if (!input_charset && !output_charset)
+		return 0;
+
+	if ((!input_charset && get_local_charset(inbuf, sizeof inbuf)) ||
+			(!output_charset &&
+				get_local_charset(outbuf, sizeof outbuf)))
+		return 0;
+
+	if (input_charset)
+		in = (char *)input_charset;
+	else
+		in = inbuf;
+	if (output_charset)
+		out = (char *)output_charset;
+	else
+		out = outbuf;
+
+	/* This may not work, e.g.,"utf8" versus "UTF-8",
+	   or latin1 versus ISO-8859-1 would fail. */
+	if (!strcasecmp(in, out))
+		return 0;
+
+#ifdef HAVE_ICONV
+	if ((cd = iconv_open(out, in)) == (iconv_t)-1) {
+		fprintf(stderr, "Unable to convert from %s to %s character "
+				"set.\n", in, out);
+		return 0;
+	}
+	return 1;
+#else
+	fprintf(stderr, "iconv() not available, conversion between character "
+			"sets, from %s to %s, is not possible.\n", in, out);
+	return 0;
+#endif
+}
+
+/*
+ * Convert the character sequence given in the string in to the newly allocated
+ * string *out. Use the conversion specifier previously determined by a call to
+ * check_conversion().
+ * Return 0 on success.
+ * On error, return the number of remaining unconverted input characters.
+ * The caller should free *out after use.
+ */
+int
+convert(char **restrict out, char *restrict in, size_t inlen)
+{
+	int	stat;
+#ifdef HAVE_ICONV
+	size_t	converted;
+	size_t	out_remain;
+	size_t	out_size;
+	size_t	in_remain;
+	char	*inpos;
+	char	*outpos;
+
+	if (inlen == 0)
+		return 0;
+
+	out_size = inlen > 8 ? 2 * inlen : 16;
+	if (!(*out = malloc(out_size))) {
+		put_msg(Err_mem);
+		exit(EXIT_FAILURE);
+	}
+	out_remain = out_size;
+	/* the final '\0' needs to be part of the conversion */
+	in_remain = inlen + 1;
+	inpos = in;
+	outpos = *out;
+	errno = 0;
+	while ((converted = iconv(cd, &inpos, &in_remain, &outpos, &out_remain))
+			&& in_remain != 0 && errno == E2BIG) {
+		/* output size too small */
+		size_t		to_outpos = (size_t)(outpos - *out);
+		size_t		mult = 2;
+		size_t		old_size = out_size;
+		/* compute the expansion factor from in to out */
+		if (inpos - in > 0) {
+			mult = to_outpos / (size_t)(inpos - in) + 1;
+			if (mult < 2)
+				mult = 2;
+		}

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/dev/textconvert.h Added

@@ -0,0 +1,34 @@
+/*
+ * Fig2dev: Translate Fig code to various Devices
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
+ *
+ * Any party obtaining a copy of these files is granted, free of charge, a
+ * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ * nonexclusive right and license to deal in this software and documentation
+ * files (the "Software"), including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense and/or sell copies
+ * of the Software, and to permit persons who receive copies from any such
+ * party to do so, with the only requirement being that the above copyright
+ * and this permission notice remain intact.
+ *
+ */
+
+#ifndef TEXTCONVERT_H
+#define TEXTCONVERT_H
+
+#if defined HAVE_CONFIG_H && !defined VERSION
+#include "config.h"
+#endif
+#include <stddef.h>
+
+extern int	only_ascii;
+
+extern int	contains_non_ascii(char *str);
+extern int	check_conversion(const char *restrict output_encoding,
+				const char *restrict input_encoding);
+extern int	convert(char **restrict out, char *restrict in, size_t inlen);
+extern int	convertutf8tolatin1(char *restrict str);
+#endif

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/fig2dev.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/fig2dev.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -79,13 +79,11 @@
 bool	metric;			/* true if file specifies Metric */
 bool	grayonly = false;	/* convert colors to grayscale (-N option) */
 bool	bgspec = false;		/* flag to say -g was specified */
-#ifdef I18N
-bool support_i18n = false;
-#endif
 char	gif_transparent="\0"; /* GIF transp color hex name (e.g. #ff00dd) */
 char	papersizePAPERSZ_LEN;	/* paper size */
 char	boundingbox64;	/* boundingbox */
 char	lang12;		/* selected output language */
+char	*input_encoding = NULL;
 RGB	background;		/* background (if specified by -g) */
 float	grid_minor_spacing = 0.0; /* grid minor spacing (if any) */
 float	grid_major_spacing = 0.0; /* grid major spacing (if any) */
@@ -143,8 +141,8 @@
 
 /* local */
 struct obj_rec {
-	void (*gendev)();
-	char *obj;
+	void (*gendev)(void *obj);
+	void *obj;
 	int depth;
 };
 static bool	maxdimspec = false; /* if max size of figure (-Z) was given */
@@ -160,11 +158,10 @@
 } depth_optNUMDEPTHS + 1;
 
 static char	Usage =
-#ifdef I18N
-"Usage:\n %1$s -hV\n %1$s -L language -s size -m scale -j input output\n";
-#else
-"Usage:\n %1$s -hV\n %1$s -L language -s size -m scale input output\n";
-#endif
+"Usage:\n %1$s -hV\n"
+" %1$s -L language -h\n"
+" %1$s -L language -D +/-rangelist -K -E encoding -m scale\n"
+"\t-s size input output\n";
 
 static int	 parse_gridspec(char *string, float *numer, float *denom,
 				float *spacing, int *nchrs);
@@ -187,14 +184,6 @@
 	}
 }
 
-/* all option letters must be in this string */
-/* not in this string: HIJQUu and non-alphabetic chars */
-#ifdef I18N
-#define ARGSTRING	"AaB:b:C:cD:d:E:eFf:G:g:hi:jKkL:l:Mm:Nn:OoPp:q:R:rS:s:Tt:VvWwX:x:Y:y:Z:z:?"
-#else
-#define ARGSTRING	"AaB:b:C:cD:d:E:eFf:G:g:hi:KkL:l:Mm:Nn:OoPp:q:R:rS:s:Tt:VvWwX:x:Y:y:Z:z:?"
-#endif
-
 /* Options with `continue;' are not passed to drivers;
  * Therefore, only -L and -G remain to be cared for in drivers.
  * -L is needed in genepic and genmp while in genbitmaps, lang is used.
@@ -227,143 +216,164 @@
 						!strcmp(p, driversi.alias))) {
 				strcpy(lang, driversi.name);
 				dev = driversi.dev;
-				dev->option('L', optarg);
+				dev->option('L', driversi.name);
 				break;
 			}
 		}
 	}
 
 
-	/* sum of all arguments */
-	while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
+	/* all option letters must be in this string */
+	/* not in this string: HIJQUu and non-alphabetic chars*/
+	while ((c = getopt(argc, argv, "AaB:b:C:cD:d:E:eFf:G:g:hi:jKkL:l:Mm:Nn:"
+					"OoPp:q:R:rS:s:Tt:VvWwX:x:Y:y:Z:z:?"))
+			!= EOF) {
 
-	  /* global (all drivers) option handling */
-	    switch (c) {
+		/* global (all drivers) option handling */
+		switch (c) {
 
-	    case 'h':	/* print version message for -h too */
-	    case 'V':
-		printf("fig2dev Version %s\n", PACKAGE_VERSION);
-		if (c == 'h')
-		    help_msg();
-		exit(0);
-		break;
-
-	    case 'D':	                /* depth filtering */
-		depth_option(optarg);
-		/* options with "continue" are not passed to the driver */
-		continue;
-
-	    case 'K':
-		/* adjust bounding box according to selected depth range
-		   given with '-D RANGE' option above */
-		adjust_boundingbox = true;
-		continue;
-
-	    case 'G':			/* Grid */
-		/* if major AND minor are specified */
-		if ((p = strchr(optarg,':'))) {
-		    /* parse minor grid spec first */
-		    if (p != optarg) {
-			if ((nvals=parse_gridspec(optarg, &numer, &denom,
-					&grid_minor_spacing, &nchars)) == 2)
-			    grid_minor_spacing = numer/denom;
-		    }
-		    /* now parse major grid spec */
-		    if ((nvals=parse_gridspec(p+1, &numer, &denom,
-				    &grid_major_spacing, &nchars)) == 2)
-			grid_major_spacing = numer/denom;
-		} else {
-		    /* only minor grid specified */
-		    if ((nvals=parse_gridspec(optarg, &numer, &denom,
-				    &grid_minor_spacing, &nchars)) == 2)
-			grid_minor_spacing = numer/denom;
-		    p = optarg-1;
-		}
-		/* now parse any units after grid spacing */
-		if ((size_t)nchars < strlen(p+1)) {
-		    grid = p+nchars+1;
-		    if ((strcmp(grid,"i") && strcmp(grid,"in") &&
-					strcmp(grid,"inch") &&
-				strcmp(grid,"f") && strcmp(grid,"ft") &&
-					strcmp(grid,"feet") &&
-				strcmp(grid,"c") && strcmp(grid,"cm") &&
-				strcmp(grid,"mm") && strcmp(grid,"m") )) {
-			grid_usage();
-			grid_major_spacing = grid_minor_spacing = 0.0;
+		case 'h':		/* print version message for -h too */
+		case 'V':
+			printf("fig2dev Version %s\n", PACKAGE_VERSION);
+			if (c == 'h')
+				help_msg();
+			exit(0);
 			break;
-		    }
-		    if (!strcmp(grid,"i") || !strcmp(grid,"in") ||
-				!strcmp(grid,"in"))
-			mult =  1.0;
-		    else if (!strcmp(grid,"f") || !strcmp(grid,"ft") ||
-				!strcmp(grid,"feet"))
-			mult = 12.0;
-		    else if (strcmp(grid,"c") == 0 || strcmp(grid,"cm") == 0)
-			mult = 1.0/2.54;
-		    else if (strcmp(grid,"mm") == 0)
-			mult = 1.0/25.4;
-		    else if (strcmp(grid,"m") == 0)
-			mult = 1.0/0.0254;
-		} else {
-		    mult = 1.0;	/* no units, 1:1 */
+
+		case 'D':                /* depth filtering */
+			depth_option(optarg);
+			/* options with "continue" are not passed to
+			   the driver */
+			continue;
+
+		case 'E':
+			if (!strcmp(optarg, "0") || !strcmp(optarg, "utf8") ||
+					!strcmp(optarg, "UTF8") ||
+					!strcmp(optarg, "utf-8"))
+				input_encoding = "UTF-8";
+			else if (!strcmp(optarg, "1"))
+				input_encoding = "ISO-8859-1";
+			else if (!strcmp(optarg, "2"))
+				input_encoding = "ISO-8859-2";
+			else
+				input_encoding = optarg;
+			continue;
+
+		case 'K':
+			/* adjust bounding box according to selected
+			   depth range given with '-D RANGE' option above */
+			adjust_boundingbox = true;
+			continue;
+
+		case 'G':		/* Grid */
+			/* if major AND minor are specified */
+			if ((p = strchr(optarg,':'))) {
+				/* parse minor grid spec first */
+				if (p != optarg) {
+					if ((nvals = parse_gridspec(optarg,
+							&numer, &denom,
+							&grid_minor_spacing,
+							&nchars)) == 2)
+						grid_minor_spacing =numer/denom;
+				}

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/fig2dev.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/fig2dev.h Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2020 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -94,13 +94,11 @@
 extern bool	metric;		/* true if the file contains Metric specifier */
 extern bool	grayonly;	/* convert colors to grayscale (-N option) */
 extern bool	bgspec;		/* flag to say -g was specified */
-#ifdef I18N
-extern bool support_i18n;
-#endif
 extern char	gif_transparent8;/* GIF transp color hex name (e.g. #ff00dd)*/
 extern char	papersizePAPERSZ_LEN;	/* paper size */
 extern char	boundingbox;	/* boundingbox */
 extern char	lang;		/* selected output language */
+extern char	*input_encoding;
 extern const char	*Fig_color_names; /* hex names for Fig colors */
 extern RGB	background;	/* background (if specified by -g) */
 extern float	grid_minor_spacing; /* grid minor spacing (if any) */

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/Makefile.am -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/i18n/Makefile.am Changed

@@ -1,7 +1,10 @@
 ## Run automake on this file to produce Makefile.in
 
 # Fig2dev: Translate Fig code to various Devices
-# Parts Copyright (c) 2015-2016 by Thomas Loimer
+# Copyright (c) 1991 by Micah Beck
+# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+# Parts Copyright (c) 1989-2015 by Brian V. Smith
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -13,14 +16,13 @@
 # and this permission notice remain intact.
 
 # fig2dev/i18n/Makefile.am
-# Author: Thomas Loimer, 2015-2016.
+# Author: Thomas Loimer
 
 
 MAINTAINERCLEANFILES = Makefile.in
 
 # With dist_, these files are installed into $(i18ndir).
-dist_i18n_DATA = cs_CZ.ps japanese.ps korean.ps ru_RU.CP1251.ps ru_RU.KOI8-R.ps\
-	uk_UA.KOI8-U.ps
+dist_i18n_DATA = japanese.ps korean.ps
 
 install-data-hook:
 	cd "$(DESTDIR)$(i18ndir)" && { \
@@ -29,10 +31,7 @@
 			$(LN_S) japanese.ps $$f; done; \
 		for f in ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps; do \
 			if test -f $$f; then rm -f $$f; fi; \
-			$(LN_S) korean.ps $$f; done; \
-		for f in hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; do \
-			if test -f $$f; then rm -f $$f; fi; \
-			$(LN_S) cs_CZ.ps $$f; done; }
+			$(LN_S) korean.ps $$f; done; }
 
 ## The dist_i18n_DATA files must be removed before the i18ndir can be removed.
 ## Therefore, use uninstall-hook, not uninstall-local (*-hook is guarantueed
@@ -40,7 +39,6 @@
 uninstall-hook:
 	cd "$(DESTDIR)$(i18ndir)" && \
 	rm -f ja_JP.eucJP.ps ja_JP.EUC.ps ja_JP.ps ja_JP.ujis.ps ja.ps \
-	  ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps hr_HR.ps hu_HU.ps \
-	  pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps && \
+	  ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps && \
 	cd ..
 	rmdir "$(DESTDIR)$(i18ndir)"	# this dir should now be empty

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/i18n/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/i18n/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,10 @@
 @SET_MAKE@
 
 # Fig2dev: Translate Fig code to various Devices
-# Parts Copyright (c) 2015-2016 by Thomas Loimer
+# Copyright (c) 1991 by Micah Beck
+# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+# Parts Copyright (c) 1989-2015 by Brian V. Smith
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -27,7 +30,7 @@
 # and this permission notice remain intact.
 
 # fig2dev/i18n/Makefile.am
-# Author: Thomas Loimer, 2015-2016.
+# Author: Thomas Loimer
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
@@ -178,6 +181,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -185,6 +190,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -266,9 +272,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 # With dist_, these files are installed into $(i18ndir).
-dist_i18n_DATA = cs_CZ.ps japanese.ps korean.ps ru_RU.CP1251.ps ru_RU.KOI8-R.ps\
-	uk_UA.KOI8-U.ps
-
+dist_i18n_DATA = japanese.ps korean.ps
 all: all-am
 
 .SUFFIXES:
@@ -328,7 +332,6 @@
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -492,16 +495,12 @@
 			$(LN_S) japanese.ps $$f; done; \
 		for f in ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps; do \
 			if test -f $$f; then rm -f $$f; fi; \
-			$(LN_S) korean.ps $$f; done; \
-		for f in hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; do \
-			if test -f $$f; then rm -f $$f; fi; \
-			$(LN_S) cs_CZ.ps $$f; done; }
+			$(LN_S) korean.ps $$f; done; }
 
 uninstall-hook:
 	cd "$(DESTDIR)$(i18ndir)" && \
 	rm -f ja_JP.eucJP.ps ja_JP.EUC.ps ja_JP.ps ja_JP.ujis.ps ja.ps \
-	  ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps hr_HR.ps hu_HU.ps \
-	  pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps && \
+	  ko_KR.eucKR.ps ko_KR.EUC.ps ko_KR.ps ko.ps && \
 	cd ..
 	rmdir "$(DESTDIR)$(i18ndir)"	# this dir should now be empty

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/object.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/object.h Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/read.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/read.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2021 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,9 +19,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "read.h"
 
 #include <ctype.h>
 #include <limits.h>
+#include <math.h>	/* sqrt() */
 #include <stddef.h>	/* ptrdiff_t */
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,12 +34,11 @@
 #include <sys/stat.h>
 
 #include "fig2dev.h"	/* includes bool.h and object.h */
-//#include "object.h"
 #include "alloc.h"
 #include "free.h"
 #include "messages.h"
-#include "read.h"
 #include "trans_spline.h"
+#include "dev/textconvert.h"	/* only_ascii */
 
 #ifndef HAVE_GETLINE
 #include "lib/getline.h"
@@ -68,7 +69,7 @@
 					size_t *line_len, int *line_no);
 static F_comment	*attach_comments(void);
 static F_arrow		*make_arrow(int type, int style, double thickness,
-					double wid, double ht);
+					double wid, double ht, int line_no);
 static void		count_lines_correctly(FILE *fp, int *line_no);
 static void		init_pats_used(void);
 static ssize_t		get_line(FILE *fp, char **restrict line,
@@ -79,7 +80,6 @@
 
 static char	Err_incomp = "Incomplete %s object at line %d.";
 static char	Err_invalid = "Invalid %s object at line %d.";
-static char	Err_arrow = "Invalid %s arrow at line %d.";
 
 #define		FILL_CONVERT(f)	((v2_flag || (f) < WHITE_FILL) \
 					? (v30_flag? f: (f-1)) : 20 - ((f)-1)*5)
@@ -166,14 +166,15 @@
 	F_arc		*a, *la = NULL;
 	F_compound	*c, *lc = NULL;
 	bool		objects = false;
+	int		i;
 	int		object, coord_sys;
 	int		line_no;
 	int		gif_colnum = 0;
 	char		*line;
-	char		buf16;
+	char		buf17;
 	size_t		line_len = 256;
 
-	/* Get the 15 chars of the first line.
+	/* Get the first chars of the first line.
 	   Use fgets(), because get_line() would store the line as a comment */
 	if (fgets(buf, sizeof buf, fp) == NULL) {
 		put_msg("Could not read input file.");
@@ -187,10 +188,9 @@
 	/* seek to the end of the first line
 	   (the only place, where '\0's are tolerated) */
 	} else if (bufstrlen(buf) - 1 != '\n') {
-		int	c;
 		do
-			c = fgetc(fp);
-		while (c != '\n' && c != EOF);
+			i = fgetc(fp);
+		while (i != '\n' && i != EOF);
 	}
 
 	if (strncmp(buf, "#FIG ", 5)) {
@@ -209,7 +209,8 @@
 	   and transparent color in Fig file */
 	v32_flag = (!strncmp(buf, "#FIG 3.2", 8));
 	if (strncmp(&buf5, PACKAGE_VERSION, 3) > 0) {
-		put_msg("Fig file format (%s) newer than this version of fig2dev (%s), exiting",
+		put_msg("Fig file format (%s) newer than this version of "
+				"fig2dev (%s), exiting",
 				&buf5, PACKAGE_VERSION);
 		exit(EXIT_FAILURE);
 	}
@@ -221,6 +222,32 @@
 		exit(EXIT_FAILURE);
 	}
 
+	if ((i = fgetc(fp)) == '#') {
+		if (fgets(buf, sizeof buf, fp) == NULL) {
+			put_msg("Could not read input file.");
+			return -1;
+		}
+		/* if the input_encoding is set as an option, override
+		   the encoding given in the file */
+		if (!input_encoding && !strcmp(buf, "encoding: UTF-8\n")) {
+			input_encoding = "UTF-8";
+		} else if (bufstrlen(buf) - 1 != '\n') {
+			/* seek forward to the end of the line;
+			   comments here are not mentioned by the
+			   specification, thus ignore this comment */
+			while ((i = fgetc(fp)) != '\n' && i != EOF)
+				;
+		}
+	} else {
+		if (i == EOF) {
+			put_msg("Could not read input file.");
+			return -1;
+		}
+		if (i != ungetc(i, fp))
+			put_msg("Unable to push back the first character of the"
+					" second line.");
+	}
+
 	if ((line = malloc(line_len)) == NULL) {
 		put_msg(Err_mem);
 		return -1;
@@ -228,140 +255,159 @@
 
 	line_no = 1;
 	if (v30_flag) {
-	    /* read the orientation spec (landscape/portrait) */
-	    if (get_line(fp, &line, &line_len, &line_no) < 0) {
-		put_msg("File is truncated at landscape/portrait specification.");
-		free(line);
-		return -1;
-	    }
-	    /* but set only if the user didn't specify the orientation
-	       on the command line */
-	    if (!orientspec)
-		landscape = !strncasecmp(line, "land", 4);
-
-	    /* now read the metric/inches spec OR centering spec */
-	    if (get_line(fp, &line, &line_len, &line_no) < 0) {
-		put_msg("File is truncated at metric/inches or centering specification.");
-		free(line);
-		return -1;
-	    }
-	    /* read justification spec */
-	    if ((strncasecmp(line, "center", 6) == 0) ||
-		(strncasecmp(line, "flush", 5) == 0)) {
-		/* but set only if user didn't specify it */
-		if (!centerspec)
-		    center = strncasecmp(line, "flush", 5);
-		/* now read metric/inches spec */
+		/* read the orientation spec (landscape/portrait) */
 		if (get_line(fp, &line, &line_len, &line_no) < 0) {
-		    put_msg("File is truncated at metric/inches specification.");
-		    free(line);
-		    return -1;
+			put_msg("File is truncated at "
+					"landscape/portrait specification.");
+			free(line);
+			return -1;
 		}
-	    }
-	    /* read metric/inches spec */
-	    /* if metric, scale magnification to correct for xfig display error */
-	    if (strncasecmp(line, "metric", 6) == 0) {
-		metric = 1;
-	    } else {
-		metric = 0;
-	    }
+		/* but set only if the user didn't specify the orientation
+		   on the command line */
+		if (!orientspec)
+			landscape = !strncasecmp(line, "land", 4);
 
-	    /* new stuff in 3.2 */
-	    if (v32_flag) {
-		/* read the paper size */
+		/* now read the metric/inches spec OR centering spec */
 		if (get_line(fp, &line, &line_len, &line_no) < 0) {
-		    put_msg("File is truncated at paper size specification.");
-		    free(line);
-		    return -1;
-		}
-		if (!paperspec) {
-		    char *p;
-		    /* truncate at first blank, if any */
-		    if ((p = strchr(line, ' ')))
-			*p = '\0';
-		    if (strlen(line) + 1 > sizeof papersize) {
-			put_msg("Invalid paper size specification at line %d: %s",
-					line_no, line);
+			put_msg("File is truncated at metric/inches "
+					"or centering specification.");
 			free(line);
 			return -1;
-		    }
-		    strcpy(papersize, line);

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/read.h -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/read.h Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/read1_3.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/read1_3.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/Makefile.am -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/Makefile.am Changed

@@ -4,7 +4,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -25,7 +25,10 @@
 TESTSUITE_AT = testsuite.at bitmaps.at input.at output.at read.at
 EXTRA_DIST = testsuite package.m4 $(TESTSUITE_AT) atlocal.in data/arrows.eps \
 	data/arrows.fig data/boxwimg.fig data/cross.pdf data/fillswclip.fig  \
-	data/line.eps data/line.fig data/patterns.fig data/text_w_ascii0.fig
+	data/line.eps data/line.fig data/line.gif.gz data/line.jpg.gz        \
+	data/line.pcx.gz data/line.pdf.gz data/line.png.gz data/line.ppm.gz  \
+	data/line.tif.gz data/line.xbm.gz data/line.xpm.gz data/patterns.fig \
+	data/text_w_ascii0.fig
 
 # ??
 DISTCLEANFILES = atconfig
@@ -44,10 +47,7 @@
 check_PROGRAMS = test1 test2
 
 # keep the definitions below in sync with those in ../dev/Makefile.am
-if ENABLE_I18N
 test1_CPPFLAGS = -DI18N_DATADIR="\"$(i18ndir)\""
-endif
-
 test2_CPPFLAGS = -I$(top_srcdir)/fig2dev -I$(top_srcdir)/fig2dev/dev
 test2_LDADD = $(top_builddir)/fig2dev/dev/libdrivers.a \
 	$(top_builddir)/fig2dev/messages.$(OBJEXT)

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@
 # Copyright (c) 1991 by Micah Beck
 # Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 # Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2020 by Thomas Loimer
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -178,8 +178,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/atlocal.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -197,6 +195,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -204,6 +204,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -289,7 +290,10 @@
 TESTSUITE_AT = testsuite.at bitmaps.at input.at output.at read.at
 EXTRA_DIST = testsuite package.m4 $(TESTSUITE_AT) atlocal.in data/arrows.eps \
 	data/arrows.fig data/boxwimg.fig data/cross.pdf data/fillswclip.fig  \
-	data/line.eps data/line.fig data/patterns.fig data/text_w_ascii0.fig
+	data/line.eps data/line.fig data/line.gif.gz data/line.jpg.gz        \
+	data/line.pcx.gz data/line.pdf.gz data/line.png.gz data/line.ppm.gz  \
+	data/line.tif.gz data/line.xbm.gz data/line.xpm.gz data/patterns.fig \
+	data/text_w_ascii0.fig
 
 
 # ??
@@ -297,7 +301,7 @@
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE) $(srcdir)/package.m4
 
 # keep the definitions below in sync with those in ../dev/Makefile.am
-@ENABLE_I18N_TRUE@test1_CPPFLAGS = -DI18N_DATADIR="\"$(i18ndir)\""
+test1_CPPFLAGS = -DI18N_DATADIR="\"$(i18ndir)\""
 test2_CPPFLAGS = -I$(top_srcdir)/fig2dev -I$(top_srcdir)/fig2dev/dev
 test2_LDADD = $(top_builddir)/fig2dev/dev/libdrivers.a \
 	$(top_builddir)/fig2dev/messages.$(OBJEXT)
@@ -463,7 +467,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/bitmaps.at -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/bitmaps.at Changed

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.gif.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.jpg.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.pcx.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.pdf.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.png.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.ppm.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.tif.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.xbm.gz Added

_service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/data/line.xpm.gz Added

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/input.at -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/input.at Changed

@@ -2,7 +2,7 @@
 dnl Copyright (c) 1991 by Micah Beck
 dnl Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 dnl Parts Copyright (c) 1989-2015 by Brian V. Smith
-dnl Parts Copyright (c) 2015-2021 by Thomas Loimer
+dnl Parts Copyright (c) 2015-2023 by Thomas Loimer
 dnl
 dnl Any party obtaining a copy of these files is granted, free of charge, a
 dnl full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -36,26 +36,26 @@
 ,0)
 AT_CLEANUP
 
-AT_SETUP(Use "-" for stdout)
+AT_SETUP(use "-" for stdout)
 AT_KEYWORDS(diversions)
 AT_CHECK(fig2dev -Leps $srcdir/data/line.fig - >out.eps
 ,0)
 AT_CLEANUP
 
-AT_SETUP(Use "- -" for stdin and stdout)
+AT_SETUP(use "- -" for stdin and stdout)
 AT_KEYWORDS(diversions)
 AT_CHECK(fig2dev -Leps - - <$srcdir/data/line.fig >out.eps
 ,0)
 AT_CLEANUP
 
-AT_SETUP(Guess jpeg output format from output filename)
+AT_SETUP(guess jpeg output format from output filename)
 AT_KEYWORDS(read.c)
 AT_SKIP_IF(NO_GS)
 AT_CHECK(fig2dev $srcdir/data/line.fig line.jpg
 ,0)
 AT_CLEANUP
 
-AT_SETUP(Guess tiff output format from output filename)
+AT_SETUP(guess tiff output format from output filename)
 AT_KEYWORDS(read.c)
 AT_SKIP_IF(NO_GS || \
 	( ! pnmtotiff -version && ! convert -version &&  ! gm version))
@@ -63,6 +63,12 @@
 ,0)
 AT_CLEANUP
 
+AT_SETUP(pass driver name to driver, ticket #139)
+AT_KEYWORDS(fig2dev.c epic)
+AT_CHECK(fig2dev $srcdir/data/line.fig line.eepic
+,0)
+AT_CLEANUP
+
 AT_BANNER(Parse color specifications (test lookup_X_color() in colors.c))
 
 AT_SETUP(accept correct hexadecimal rgb-values)
@@ -95,7 +101,7 @@
 AT_CLEANUP
 
 AT_BANNER(Read installed files.)
-AT_SETUP($i18ndir/cs_CZ.ps must exist)
+AT_SETUP($i18ndir/japanese.ps must exist)
 AT_KEYWORDS(installpath)
 AT_SKIP_IF(test "x$INSTALLCHECK" = xno)
 AT_CHECK("$abs_builddir"/test1, 0)
@@ -160,6 +166,74 @@
 ,0,ignore)
 AT_CLEANUP
 
+AT_SETUP(read compressed image files)
+AT_KEYWORDS(readpics gz)
+AT_SKIP_IF(NO_GZIP)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.pdf
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.gif
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.jpg
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.pcx
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.png
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.ppm
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.tif
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.xbm
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CHECK(fig2dev -L eps <<EOF
+FIG_FILE_TOP
+2 5 0 1 0 -1 50 -1 -1 0.0 0 0 -1 0 0 5
+0 $srcdir/data/line.xpm
+0 0 510 0 510 210 0 210 0 0
+EOF
+,0,ignore)
+AT_CLEANUP
+
 AT_SETUP(absolute path in fig file, pipe ok)
 AT_KEYWORDS(readpics fullpath imgpipe)
 # if the path contains '%', the sed-command below fails

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/output.at -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/output.at Changed

@@ -2,7 +2,7 @@
 dnl Copyright (c) 1991 by Micah Beck
 dnl Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 dnl Parts Copyright (c) 1989-2015 by Brian V. Smith
-dnl Parts Copyright (c) 2015-2021 by Thomas Loimer
+dnl Parts Copyright (c) 2015-2023 by Thomas Loimer
 dnl
 dnl Any party obtaining a copy of these files is granted, free of charge, a
 dnl full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -14,13 +14,14 @@
 dnl and this permission notice remain intact.
 
 dnl output.at
-dnl Author: Thomas Loimer, 2016-2021
+dnl Author: Thomas Loimer, 2016-2023
 
 dnl Check various features related to the output languages of fig2dev.
 
 
 AT_BANNER(Test epic/eepic output language.)
 
+dnl AT_SETUP(---- last character here -----------------v
 AT_SETUP(Write complete output file in page mode (-P))
 AT_KEYWORDS(epic)
 AT_CHECK(fig2dev -Lepic -P $srcdir/data/line.fig line.tex)
@@ -121,7 +122,7 @@
 AT_KEYWORDS(eps creationdate SOURCE_DATE_EPOCH)
 AT_CHECK(SOURCE_DATE_EPOCH=7here fig2dev -L eps $srcdir/data/line.fig
 , 0, ignore-nolog,
-Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: here
+Environment variable SOURCE_DATE_EPOCH: Trailing garbage: here
 )
 AT_CLEANUP
 
@@ -203,6 +204,63 @@
 EOF, 0, ignore)
 AT_CLEANUP
 
+AT_SETUP(arcs ending at multiples of pi/4, #145, #148)
+AT_KEYWORDS(pict2e arc read.c)
+# ticket #145
+AT_CHECK(fig2dev -L pict2e <<EOF
+FIG_FILE_TOP
+5 1 2 4 7 2 0 -1 0 0 0 0 1 1 7956 3420 6029 3765 5 84 3270 6254 2685
+	1 1 2 120 240
+	1 1 2 120 240
+EOF, 0, ignore)
+# ticket #148a
+AT_CHECK(fig2dev -L pict2e <<EOF
+FIG_FILE_TOP
+5 1 2 4 7 2 0 -1 0 0 0 0 1 1 7956 3420 6029 3765 5984 3270 9254 2685
+	1 1 2 120 240
+	1 1 2 120 240
+EOF, 0, ignore)
+# ticket #148b
+AT_CHECK(fig2dev -L pict2e <<EOF
+FIG_FILE_TOP
+5 1 2 4 7 2 0 -1 0 0 0 0 1 1 79E6 12003420 79196029 3765 5984 3270 6254 51752685
+	1 1 2 120 240
+	1 1 2 120 240
+EOF, 0, ignore)
+AT_CLEANUP
+
+AT_SETUP(arrows without any points, ticket #146)
+AT_KEYWORDS(pict2e arrows)
+AT_CHECK(fig2dev -L pict2e <<EOF
+FIG_FILE_TOP
+5 1 2 4 7 2 0 -1 0.0 0 0 1 0 7956 3420 6029 3765 5984 3270 6254 2085
+	1 1 2. 120. 240.
+EOF, 0, ignore)
+AT_CLEANUP
+
+AT_SETUP(arrows on two-point line with 0 thickness, #147)
+# The fig-file really contains an open spline that is converted to a line.
+# The problem are the zero width arrows.
+AT_KEYWORDS(pict2e arrows)
+AT_CHECK(fig2dev -L pict2e <<EOF
+#FIG 3.2
+Landscape
+Center
+Inches
+A4
+100.
+Single
+-2
+12. 2
+3 0 4 2 4 7 2 0 -1 0 0 1 1 3
+	1 1 2 0 20
+	1 1 2. 0 20
+5 1 0 2 4 7 2 0 -1
+EOF, 0, ignore, Zero-width arrow at line 11 ignored.
+Zero-width arrow at line 12 ignored.
+)
+AT_CLEANUP
+
 
 AT_BANNER(Test svg output language.)
 AT_SETUP(compare patterns with template)
@@ -266,7 +324,7 @@
 AT_KEYWORDS(svg arrow)
 AT_CHECK(fig2dev -L svg <<EOF
 FIG_FILE_TOP
-5 1 0 1 7 7 44 -1 6 0.000 0 1 1 1 50 -1 -1500 200 -1 7 50 -1  900 750 975
+5 1 0 1 7 7 44 -1 6 0.0 0 1 1 1 50 -1 -1500 200 -1 7 500 200
 	0 0 1.00 45.00 90.00
 	5 0 1.003 1426 1068 1426
 EOF, 0, ignore)

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/package.m4 -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/package.m4 Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/read.at -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/read.at Changed

@@ -2,7 +2,7 @@
 dnl Copyright (c) 1991 by Micah Beck
 dnl Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
 dnl Parts Copyright (c) 1989-2015 by Brian V. Smith
-dnl Parts Copyright (c) 2015-2021 by Thomas Loimer
+dnl Parts Copyright (c) 2015-2023 by Thomas Loimer
 dnl
 dnl Any party obtaining a copy of these files is granted, free of charge, a
 dnl full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -99,6 +99,30 @@
 )
 AT_CLEANUP
 
+AT_SETUP(convert box with two points to a polyline, #142)
+AT_KEYWORDS(read.c gbx)
+AT_CHECK(fig2dev -L gbx <<EOF
+FIG_FILE_TOP
+2 2 0 1 -1 -1 50 -1 -1 0.0 1 0 -1 0 0 2
+	 0 0 0 600
+EOF
+,0,ignore,An open rectangle at line 11 - close it.
+A rectangle with 3 points at line 11 - convert to a polyline.
+)
+AT_CLEANUP
+
+AT_SETUP(convert box with three points to polygon, #152)
+AT_KEYWORDS(read.c gbx)
+AT_CHECK(fig2dev -L gbx <<EOF
+FIG_FILE_TOP
+2 2 0 1 -1 -1 50 -1 -1 0.0 1 0 -1 0 0 3
+	 0 0 0 600 600 0
+EOF
+,0,ignore,An open rectangle at line 11 - close it.
+A rectangle with 3 corners at line 11 - convert to a polygon.
+)
+AT_CLEANUP
+
 AT_SETUP(fail on a malformed arc-box)
 AT_KEYWORDS(read.c malformed arc-box)
 AT_CHECK(fig2dev -L pict2e <<EOF
@@ -167,7 +191,7 @@
 	10000000000000 0 1 60 120
 0 0 600 0
 EOF
-, 1, ignore, Invalid forward arrow at line 11.
+, 0, ignore, Invalid arrow at line 11.
 )
 AT_CLEANUP

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/test1.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/test1.c Changed

@@ -3,7 +3,7 @@
  * Copyright (c) 1991 by Micah Beck
  * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
  * Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 2015-2023 by Thomas Loimer
  *
  * Any party obtaining a copy of these files is granted, free of charge, a
  * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -23,9 +23,6 @@
  * Installation test.
  * Check, whether installation in strange paths, for instance
  * containing a backslash after configure --prefix='/tmp/strange\dir', works.
- * The STRINGIZE(S) is not used any longer, strange paths are not possible.
- * This is of more relevance for installation in, e.g.,
- * C:\Program Files (x86)\fig2dev\i18n.
  * The code below really mocks the code in genps.c and colors.c and
  * therefore must be kept in sync with the code there.
  * Integration tests would be to fragile: I18N_DATADIR depends on the locale
@@ -37,36 +34,19 @@
 #endif
 
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define STRINGIZE(S) _STRINGIZE(S)
-#define _STRINGIZE(S) #S
 
 int
 main(void)
 {
-	const char mode = "rb";
-	int err = 0;
-	char bufBUFSIZ;
-	char *filepath = buf;
-//	char i18ndir = STRINGIZE(I18N_DATADIR);
-	char i18ndir = I18N_DATADIR;
-	size_t	n;
+	const char	mode = "rb";
+	const char	filepath = I18N_DATADIR "/japanese.ps";
+	int		err = 0;
 
 #ifdef I18N_DATADIR
-	n = strlen(i18ndir);
-	if (n + 10 > BUFSIZ) {
-		printf("File path too long, %zd > %d.\n", n + 10, BUFSIZ);
-		return -2;
-	}
-	memcpy(filepath, i18ndir, n);
-	memcpy(filepath + n, "/cs_CZ.ps", (size_t)10);
 	if (fopen(filepath, mode) == NULL) {
 		printf("Cannot open file: %s\n", filepath);
 		err += 1;
 	}
 #endif
-
 	return err;
 }

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/tests/testsuite -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/tests/testsuite Changed

@@ -628,105 +628,112 @@
 # Description of all the test groups.
 at_help_all="1;input.at:25;do not overwrite .fig file;fig2dev.c;
 2;input.at:33;Use \"-\" for stdin;diversions;
-3;input.at:39;Use \"-\" for stdout;diversions;
-4;input.at:45;Use \"- -\" for stdin and stdout;diversions;
-5;input.at:51;Guess jpeg output format from output filename;read.c;
-6;input.at:58;Guess tiff output format from output filename;read.c;
-7;input.at:68;accept correct hexadecimal rgb-values;colors hex;
-8;input.at:80;fail on malformed hexadecimal rgb-values;colors hex;
-9;input.at:91;use built-in color database, blanks in names;colors names;
-10;input.at:98;\$i18ndir/cs_CZ.ps must exist;installpath;
-11;input.at:118;name in fig file img.gz, file img.gz, pipe ok;readpics gz imgpipe;
-12;input.at:128;name in fig file img.Z, file img.Z, no pipe;readpics z imgfile;
-13;input.at:137;name in fig file img, file img.gz, pipe ok;readpics gz imgpipe;
-14;input.at:146;name in fig file img, file img.z, no pipe;readpics z imgfile;
-15;input.at:154;name in fig file img, file img.Z, pipe ok;readpics z imgpipe;
-16;input.at:163;absolute path in fig file, pipe ok;readpics fullpath imgpipe;
-17;input.at:172;long image name, non-existing file, ticket #125;readpics;
-18;input.at:183;non-existing file with suffix (.Z), ticket #126;readpics;
-19;read.at:22;co-incident points;read.c coincident;
-20;read.at:35;open rectangle;read.c open;
-21;read.at:46;open arc box;read.c open;
-22;read.at:57;open polygon;read.c open;
-23;read.at:68;convert box to polygon;read.c polygon;
-24;read.at:79;convert malformed, open box to a polygon;read.c open polygon;
-25;read.at:91;convert box with one point to polyline;read.c tk;
-26;read.at:102;fail on a malformed arc-box;read.c malformed arc-box;
-27;read.at:113;fail on a distorted arc-box;read.c distorted arc-box;
-28;read.at:124;fail on a distorted arc-box;read.c distorted arc-box;
-29;read.at:135;remove arrow tips from single point;read.c polyline;
-30;read.at:149;remove arrow tips on polygon with single point;read.c polygon svg;
-31;read.at:162;reject huge arrow-type, ticket #57;arrow.c arrow;
-32;read.at:174;convert short polygon to polyline, ticket #56;read.c polygon;
-33;read.at:185;reject negative font type;read.c font;
-34;read.at:195;allow negative circle or ellipse radii;read.c ellipse;
-35;read.at:204;reject huge arc radius, ticket #133;read.c arc;
-36;read.at:216;survive debian bugs #881143, #881144;font pic tikz;
-37;read.at:245;reject out-of-range pattern, debian bug #881396;read.c;
-38;read.at:255;survive debian bug #890016;read1_3.c;
-39;read.at:279;ignore too many comment lines, ticket #25;read.c;
-40;read.at:299;correctly free invalid line object, ticket #26;read1_3.c;
-41;read.at:310;correctly free invalid spline, ticket #27;read.c;
-42;read.at:322;allow last line without newline, ticket #28;read.c;
-43;read.at:330;correctly free invalid line object;read.c;
-44;read.at:342;correctly free invalid line with picture;read.c;
-45;read.at:354;ignore splines with one point, ticket #29;read.c;
-46;read.at:365;ignore splines with one point in format 1.3;read1_3.c;
-47;read.at:376;ignore splines with one point in format 2, #129;read.c;
-48;read.at:388;accept closed splines with three points;read.c;
-49;read.at:399;set invalid color number to default, ticket #30;read.c;
-50;read.at:411;set ppi when reading fig files format 1.3;read1_3.c;
-51;read.at:421;process circle arrow at mag > 42, ticket #52;bound.c;
-52;read.at:444;allow text ending with multiple ^A, ticket #55;read.c;
-53;read.at:454;reject too long papersize specification;read.c;
-54;read.at:468;allow tex font -1, tickets #71, #75, #81;pict2e tikz;
-55;read.at:481;reject ASCII NUL ('\\0') in input, ticket #80;read.c svg;
-56;read.at:488;reject out of range text angle, ticket #76;read.c pstricks;
-57;read.at:498;reject out-of-range pattern fills, ticket #63;read.c cgm;
-58;read.at:509;allow files end without eol, tickets #83, #84;read.c;
-59;read.at:520;do not reach beyond buffer, ticket #85;read.c;
-60;read.at:527;reject negative font size, ticket #86;read.c;
-61;read.at:534;reject huge spline controls values, #65, #127;read.c;
-62;read.at:555;prepend fig file path to picture file name;read.c picfilename;
-63;output.at:24;Write complete output file in page mode (-P);epic;
-64;output.at:31;allow polygons with four points;gbx;
-65;output.at:43;compare arrow tips with template;eps arrows;
-66;output.at:69;do not clip 0-width objects having arrows, #53;eps clip0;
-67;output.at:113;honor SOURCE_DATE_EPOCH environment variable;eps creationdate source_date_epoch;
-68;output.at:120;fail on text in SOURCE_DATE_EPOCH;eps creationdate source_date_epoch;
-69;output.at:170;ignore -G option;pict2e options;
-70;output.at:180;accept large coordinates;pict2e;
-71;output.at:197;accept arc arrows with zero height, ticket #74;pict2e;
-72;output.at:208;compare patterns with template;svg pattern creationdate;
-73;output.at:246;compare fills with arrows to template;svg arrows pattern fill creationdate;
-74;output.at:254;truncated sub/superscript, tickets #113, #117;read.c svg;
-75;output.at:265;omit arrows without points, ticket #115;svg arrow;
-76;output.at:278;conditionally allocate \\XFigu;tikz newdimen;
-77;output.at:292;pattern with stroke color equal to fill color;tikz pattern;
-78;output.at:304;accept large coordinates;tikz;
-79;output.at:324;Respect -F option for bitmap outputs;bitmaps;
-80;output.at:335;allow default color in ge, cgm output, #72, #73;cgm ge;
-81;output.at:343;tk output: allow arbitrarily long text, #134;tk;
-82;output.at:353;ptk output: allow arbitrarily long text, #134;ptk;
-83;bitmaps.at:25;gif;bitmaps gif;
-84;bitmaps.at:34;jpeg;bitmaps jpeg jpg;
-85;bitmaps.at:42;pcx;bitmaps pcx;
-86;bitmaps.at:50;png;bitmaps png;
-87;bitmaps.at:58;png with smoothing;bitmaps png smoothing;
-88;bitmaps.at:66;ppm;bitmaps ppm;
-89;bitmaps.at:74;tiff;bitmaps tiff tif;
-90;bitmaps.at:83;xbm;bitmaps xbm;
-91;bitmaps.at:92;xbm with smoothing;bitmaps xbm smoothing;
-92;bitmaps.at:101;xpm;bitmaps xpm;
-93;bitmaps.at:114;eps with acscii preview;bitmaps tmpfile eps-ascii;
-94;bitmaps.at:122;eps with tiff preview;bitmaps tmpfile eps-tiff;
-95;bitmaps.at:129;eps with tiff preview, use \"-\" for stdin;diversions;
-96;bitmaps.at:136;create ppm, use \"-\" for stdin;diversions;
-97;bitmaps.at:145;epsi;embed epsi;
-98;bitmaps.at:157;postscript, created by fig2dev;embed ps;
-99;bitmaps.at:204;postscript, created by latex;embed ps;
-100;bitmaps.at:252;find /MediaBox in pdf file;pdf;
-101;bitmaps.at:257;pdf;pdf;
+3;input.at:39;use \"-\" for stdout;diversions;
+4;input.at:45;use \"- -\" for stdin and stdout;diversions;
+5;input.at:51;guess jpeg output format from output filename;read.c;
+6;input.at:58;guess tiff output format from output filename;read.c;
+7;input.at:66;pass driver name to driver, ticket #139;fig2dev.c epic;
+8;input.at:74;accept correct hexadecimal rgb-values;colors hex;
+9;input.at:86;fail on malformed hexadecimal rgb-values;colors hex;
+10;input.at:97;use built-in color database, blanks in names;colors names;
+11;input.at:104;\$i18ndir/japanese.ps must exist;installpath;
+12;input.at:124;name in fig file img.gz, file img.gz, pipe ok;readpics gz imgpipe;
+13;input.at:134;name in fig file img.Z, file img.Z, no pipe;readpics z imgfile;
+14;input.at:143;name in fig file img, file img.gz, pipe ok;readpics gz imgpipe;
+15;input.at:152;name in fig file img, file img.z, no pipe;readpics z imgfile;
+16;input.at:160;name in fig file img, file img.Z, pipe ok;readpics z imgpipe;
+17;input.at:169;read compressed image files;readpics gz;
+18;input.at:237;absolute path in fig file, pipe ok;readpics fullpath imgpipe;
+19;input.at:246;long image name, non-existing file, ticket #125;readpics;
+20;input.at:257;non-existing file with suffix (.Z), ticket #126;readpics;
+21;read.at:22;co-incident points;read.c coincident;
+22;read.at:35;open rectangle;read.c open;
+23;read.at:46;open arc box;read.c open;
+24;read.at:57;open polygon;read.c open;
+25;read.at:68;convert box to polygon;read.c polygon;
+26;read.at:79;convert malformed, open box to a polygon;read.c open polygon;
+27;read.at:91;convert box with one point to polyline;read.c tk;
+28;read.at:102;convert box with two points to a polyline, #142;read.c gbx;
+29;read.at:114;convert box with three points to polygon, #152;read.c gbx;
+30;read.at:126;fail on a malformed arc-box;read.c malformed arc-box;
+31;read.at:137;fail on a distorted arc-box;read.c distorted arc-box;
+32;read.at:148;fail on a distorted arc-box;read.c distorted arc-box;
+33;read.at:159;remove arrow tips from single point;read.c polyline;
+34;read.at:173;remove arrow tips on polygon with single point;read.c polygon svg;
+35;read.at:186;reject huge arrow-type, ticket #57;arrow.c arrow;
+36;read.at:198;convert short polygon to polyline, ticket #56;read.c polygon;
+37;read.at:209;reject negative font type;read.c font;
+38;read.at:219;allow negative circle or ellipse radii;read.c ellipse;
+39;read.at:228;reject huge arc radius, ticket #133;read.c arc;
+40;read.at:240;survive debian bugs #881143, #881144;font pic tikz;
+41;read.at:269;reject out-of-range pattern, debian bug #881396;read.c;
+42;read.at:279;survive debian bug #890016;read1_3.c;
+43;read.at:303;ignore too many comment lines, ticket #25;read.c;
+44;read.at:323;correctly free invalid line object, ticket #26;read1_3.c;
+45;read.at:334;correctly free invalid spline, ticket #27;read.c;
+46;read.at:346;allow last line without newline, ticket #28;read.c;
+47;read.at:354;correctly free invalid line object;read.c;
+48;read.at:366;correctly free invalid line with picture;read.c;
+49;read.at:378;ignore splines with one point, ticket #29;read.c;
+50;read.at:389;ignore splines with one point in format 1.3;read1_3.c;
+51;read.at:400;ignore splines with one point in format 2, #129;read.c;
+52;read.at:412;accept closed splines with three points;read.c;
+53;read.at:423;set invalid color number to default, ticket #30;read.c;
+54;read.at:435;set ppi when reading fig files format 1.3;read1_3.c;
+55;read.at:445;process circle arrow at mag > 42, ticket #52;bound.c;
+56;read.at:468;allow text ending with multiple ^A, ticket #55;read.c;
+57;read.at:478;reject too long papersize specification;read.c;
+58;read.at:492;allow tex font -1, tickets #71, #75, #81;pict2e tikz;
+59;read.at:505;reject ASCII NUL ('\\0') in input, ticket #80;read.c svg;
+60;read.at:512;reject out of range text angle, ticket #76;read.c pstricks;
+61;read.at:522;reject out-of-range pattern fills, ticket #63;read.c cgm;
+62;read.at:533;allow files end without eol, tickets #83, #84;read.c;
+63;read.at:544;do not reach beyond buffer, ticket #85;read.c;
+64;read.at:551;reject negative font size, ticket #86;read.c;
+65;read.at:558;reject huge spline controls values, #65, #127;read.c;
+66;read.at:579;prepend fig file path to picture file name;read.c picfilename;
+67;output.at:25;Write complete output file in page mode (-P);epic;
+68;output.at:32;allow polygons with four points;gbx;
+69;output.at:44;compare arrow tips with template;eps arrows;
+70;output.at:70;do not clip 0-width objects having arrows, #53;eps clip0;
+71;output.at:114;honor SOURCE_DATE_EPOCH environment variable;eps creationdate source_date_epoch;
+72;output.at:121;fail on text in SOURCE_DATE_EPOCH;eps creationdate source_date_epoch;
+73;output.at:171;ignore -G option;pict2e options;
+74;output.at:181;accept large coordinates;pict2e;
+75;output.at:198;accept arc arrows with zero height, ticket #74;pict2e;
+76;output.at:207;arcs ending at multiples of pi/4, #145, #148;pict2e arc read.c;
+77;output.at:232;arrows without any points, ticket #146;pict2e arrows;
+78;output.at:241;arrows on two-point line with 0 thickness, #147;pict2e arrows;
+79;output.at:266;compare patterns with template;svg pattern creationdate;
+80;output.at:304;compare fills with arrows to template;svg arrows pattern fill creationdate;
+81;output.at:312;truncated sub/superscript, tickets #113, #117;read.c svg;
+82;output.at:323;omit arrows without points, ticket #115;svg arrow;
+83;output.at:336;conditionally allocate \\XFigu;tikz newdimen;
+84;output.at:350;pattern with stroke color equal to fill color;tikz pattern;
+85;output.at:362;accept large coordinates;tikz;
+86;output.at:382;Respect -F option for bitmap outputs;bitmaps;
+87;output.at:393;allow default color in ge, cgm output, #72, #73;cgm ge;
+88;output.at:401;tk output: allow arbitrarily long text, #134;tk;
+89;output.at:411;ptk output: allow arbitrarily long text, #134;ptk;
+90;bitmaps.at:25;gif;bitmaps gif;
+91;bitmaps.at:34;jpeg;bitmaps jpeg jpg;
+92;bitmaps.at:42;pcx;bitmaps pcx;
+93;bitmaps.at:50;png;bitmaps png;
+94;bitmaps.at:58;png with smoothing;bitmaps png smoothing;
+95;bitmaps.at:66;ppm;bitmaps ppm;
+96;bitmaps.at:74;tiff;bitmaps tiff tif;
+97;bitmaps.at:83;xbm;bitmaps xbm;
+98;bitmaps.at:92;xbm with smoothing;bitmaps xbm smoothing;
+99;bitmaps.at:101;xpm;bitmaps xpm;

_service:tar_scm:fig2dev-3.2.8b.tar.xz/fig2dev/trans_spline.c -> _service:tar_scm:fig2dev-3.2.9.tar.xz/fig2dev/trans_spline.c Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/man/Makefile.am -> _service:tar_scm:fig2dev-3.2.9.tar.xz/man/Makefile.am Changed

@@ -1,7 +1,10 @@
 ## Run automake on this file to produce Makefile.in
 
 # Fig2dev: Translate Fig code to various Devices
-# Parts Copyright (c) 2015, 2016 by Thomas Loimer
+# Copyright (c) 1991 by Micah Beck
+# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+# Parts Copyright (c) 1989-2015 by Brian V. Smith
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -13,7 +16,7 @@
 # and this permission notice remain intact.
 
 # man/Makefile.am
-# Author: Thomas Loimer, 2015, 2016.
+# Author: Thomas Loimer
 
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -25,13 +28,13 @@
 # created by "make dist", because automake thinks man-pages are generated
 # from other sources.
 dist_man1_MANS = fig2ps2tex.1 pic2tpic.1
-# fig2dev.1 _is_ created from fig2dev.1.in, i18n.man and nfss.man.
+# fig2dev.1 _is_ created from fig2dev.1.in and nfss.man.
 # fig2dev.1.in is mentioned in configure.ac, so no need
 # to mention it here in EXTRA_DIST
 # But mention transfig.1, otherwise it is not distributed, if configure
 # runs without --enable-transfig.
 man1_MANS = fig2dev.1
-EXTRA_DIST = i18n.man nfss.man transfig.1
+EXTRA_DIST = nfss.man transfig.1
 
 # fig2dev.1 depends on PACKAGE_VERSION - pick up new version, if it changes
 fig2dev.1.in: $(CONFIG_HEADER)

_service:tar_scm:fig2dev-3.2.8b.tar.xz/man/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/man/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,10 @@
 @SET_MAKE@
 
 # Fig2dev: Translate Fig code to various Devices
-# Parts Copyright (c) 2015, 2016 by Thomas Loimer
+# Copyright (c) 1991 by Micah Beck
+# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+# Parts Copyright (c) 1989-2015 by Brian V. Smith
+# Parts Copyright (c) 2015-2023 by Thomas Loimer
 #
 # Any party obtaining a copy of these files is granted, free of charge, a
 # full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -27,7 +30,7 @@
 # and this permission notice remain intact.
 
 # man/Makefile.am
-# Author: Thomas Loimer, 2015, 2016.
+# Author: Thomas Loimer
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -180,6 +183,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -187,6 +192,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -274,13 +280,13 @@
 # created by "make dist", because automake thinks man-pages are generated
 # from other sources.
 dist_man1_MANS = fig2ps2tex.1 pic2tpic.1
-# fig2dev.1 _is_ created from fig2dev.1.in, i18n.man and nfss.man.
+# fig2dev.1 _is_ created from fig2dev.1.in and nfss.man.
 # fig2dev.1.in is mentioned in configure.ac, so no need
 # to mention it here in EXTRA_DIST
 # But mention transfig.1, otherwise it is not distributed, if configure
 # runs without --enable-transfig.
 man1_MANS = fig2dev.1 $(am__append_1)
-EXTRA_DIST = i18n.man nfss.man transfig.1
+EXTRA_DIST = nfss.man transfig.1
 all: all-am
 
 .SUFFIXES:
@@ -362,7 +368,6 @@
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:fig2dev-3.2.8b.tar.xz/man/fig2dev.1.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/man/fig2dev.1.in Changed

@@ -114,6 +114,14 @@
 bounding box is adjusted to include only those objects in the selected depths.
 
 .TP
+.B "\-E encoding"
+Specify the character encoding of the input file.
+Must be one of the strings listed by `iconv --list`, e.g., ISO-8859-1 or UTF-8.
+Defaults to the encoding of the current locale.
+It may be necessary to set this option if the input file was produced on
+a different computer, or in a different language environment.
+
+.TP
 .B "\-G minor:major:unit"
 Draws a grid on the page.
 Specify thin, or thin and thick line spacing in one of several units.
@@ -128,8 +136,6 @@
 .B Only allowed for PostScript, EPS, PDF, pstricks, tikz and
 .B bitmap (GIF, JPEG, etc) drivers.
 
-@i18nman@
-
 .TP
 .B "\-m mag"
 Set the magnification at which the figure is rendered to
@@ -245,29 +251,9 @@
 The output to DXF is experimental.
 
 .TP
-.B \-a
-Select @ALTERNATE_PAPERSIZE@ paper size instead of the
-default @DEFAULT_PAPERSIZE@.
-
-.TP
-.B "\-d xll,yll,xur,yur"
-Restrict plotting to a rectangular area of the plotter paper which has
-a lower left hand corner at
-.I (xll,yll)
-and a upper right hand corner at
-.I (xur,yur).
-All four numbers are in inches and follow \fB\-d\fR in a comma-separated list -
-.I xll,yll,xur,yur
-- with no spaces between them.
-
-.TP
 .B \-P
 Rotate the figure to portrait mode. The default is landscape mode.
 
-.TP
-.B \-v
-Plot the figure upside-down in portrait mode or backwards in landscape mode.
-
 
 .SH EMF OPTIONS
 EMF is Enhanced Metafile, developed by Microsoft and is a
@@ -299,6 +285,9 @@
 Conrad Kwok has also written the EEPIC driver of fig2dev.
 .LP
 EEPIC-EMU is an EEPIC emulation package which does not use tpic specials.
+.LP
+When including EPIC/EEPIC output in a LaTeX file, use
+"\fB\\usepackage{epic,eepic}\fR" in the preamble.
 
 .TP
 .B \-d factor
@@ -310,11 +299,6 @@
 This is because EPIC arrowheads are normally about double the size of
 TeX arrowheads.
 
-.TP
-.B \-E num
-Set encoding for text translation (0 = none, 1 = ISO-8859-1, 2 = ISO-8859-2;
-default 1).
-
 @nfssman@
 
 .TP
@@ -504,6 +488,12 @@
 
 
 .SH LATEX OPTIONS
+LaTeX cannot accurately represent all the graphics objects which can
+be described by Fig.
+For example, the possible slopes which lines may have are limited.
+Some objects, such as spline curves, cannot be drawn at all.
+Fig2latex chooses the closest possible line slope, and prints error
+messages when objects cannot be drawn accurately.
 
 .TP
 .B \-b borderwidth
@@ -515,11 +505,6 @@
 .B \-d dmag
 Set a separate magnification for the length of line dashes to \fIdmag\fR.
 
-.TP
-.B \-E num
-Set encoding for latex text translation
-(0 = no translation, 1 = ISO-8859-1, 2 = ISO-8859-2; default 1).
-
 @nfssman@
 
 .TP
@@ -545,15 +530,6 @@
 .B \-v
 Verbose mode. Include comments in the otput file.
 
-.LP
-LaTeX cannot accurately represent all the graphics objects which can
-be described by Fig.
-For example, the possible slopes which lines may have are limited.
-Some objects, such as spline curves, cannot be drawn at all.
-Fig2latex chooses the closest possible line slope, and prints error
-messages when objects cannot be drawn accurately.
-
-
 .SH MAP (HTML image map) OPTIONS
 Xfig version 3.2.3 and later saves and allows the user to edit comments
 for each Fig object.
@@ -741,18 +717,6 @@
 "\\allinethickness" (if it is defined).
 
 .TP
-.B \-E num
-Set encoding for text translation (0 = no translation, 1 = ISO-8859-1, 2 =
-ISO-8859-2; default 1).
-For instance, to use utf8-encoded text, first \fIcreate\fR a text object, then
-\fIedit\fR
-the text using the edit-button in xfig. Convert the fig-file to pict2e with
-the option \fB\-E\ 0\fR and include "\fB\\usepackageutf8{inputenc}\fR"
-in the LaTeX file
-In xfig, the text typed in may not be displayed correctly, but the document
-produced from the LaTeX file will show the same text as was typed in.
-
-.TP
 .B \-F
 Do not set the font family, series or shape.
 By default, \fIfig2dev\fR sets the font family, series, shape, font size and
@@ -790,8 +754,8 @@
 .B \-O
 Do not quote characters special to TeX/LaTeX.
 Useful to get, e.g., an italic \fIx\fR, not $x$,
-because it was forgotten to set the text-flag "special-text" in xfig.
-This option effectively sets the "special-text" flag for all text.
+if it was forgotten to set the text flag "TeX" in xfig.
+This option effectively sets the "TeX" flag for all text.
 
 .TP
 .B \-P
@@ -843,15 +807,6 @@
 As a result, it is best to use PiCTeX to generate small pictures.
 
 .TP
-.B \-a
-Anonymous mode. Do not write the user name into the output file.
-
-.TP
-.B \-E num
-Set encoding for latex text translation
-(0 = no translation, 1 = ISO-8859-1, 2 = ISO-8859-2; default 1).
-
-.TP
 .B \-f font
 Set the default font used for text objects to \fIfont\fR,
 where \fIfont\fR is one of
@@ -1002,10 +957,6 @@
 Not for PDF.
 
 .TP
-.B \-a
-Anonymous mode. Do not write the user's login name into the output file.
-
-.TP
 .B \-b borderwidth
 Make blank border around figure of width
 .I borderwidth
@@ -1050,6 +1001,22 @@
 for the background.
 
 .TP
+.B \-j
+Enable composite fonts for text objects containing japanese or korean texts.
+With this option on and if your environment variable LC_CTYPE is set to one of
+ja_JP.eucJP, ja_JP.EUC, ja_JP, ja_JP.ujis, ja, japanese, ko_KR.eucKR, ko_KR.EUC,
+ko_KR, ko, or korean, fig2dev will insert a postscript preamble taken from
+the fig2dev/i18n directory into the output file.
+Japanese characters written with the Times-Roman font will then be taken from
+the fonts Ryumin-Light-EUC-H or HeiseiMin-W3-EUC-H, japanese characters written
+with Times-Bold will be taken from GothicBBB-Medium-EUC-H.
+For the korean locales, korean characters appearing in text objects for which
+Times-Roman is selected will be taken from Munhwa-Regular-KSC-EUC-H or
+HLaTeX-Myoungjo-Regular-KSC-EUC-H. Korean characters in Times-Bold text will be
+taken from MunhwaGothic-Bold-KSC-EUC-H or HLaTeX-Gothic-Regular-KSC-EUC-H.
+Ghostscript must be able to find these fonts.
+
+.TP
 .B \-l dummy_arg
 Generate figure in landscape mode.  The dummy argument is ignored,
 but must appear on the command line for reasons of compatibility.
@@ -1196,11 +1163,6 @@
 (see above).

_service:tar_scm:fig2dev-3.2.8b.tar.xz/missing -> _service:tar_scm:fig2dev-3.2.9.tar.xz/missing Changed

_service:tar_scm:fig2dev-3.2.8b.tar.xz/transfig/Makefile.in -> _service:tar_scm:fig2dev-3.2.9.tar.xz/transfig/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -173,8 +173,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -191,6 +189,8 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PAPERSIZE = @DEFAULT_PAPERSIZE@
 DEFS = @DEFS@
@@ -198,6 +198,7 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -452,7 +453,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:fig2dev-3.2.8b.tar.xz/version.m4 -> _service:tar_scm:fig2dev-3.2.9.tar.xz/version.m4 Changed

Changes of Revision 3