be5369a0cb
* fpc is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
-- fig2dev/read.c
|
|
+++fig2dev/read.c
|
|
@@ -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-2019 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,
|
|
@@ -1328,7 +1328,7 @@
|
|
If we do not find the CONTROL-A on this line then this must
|
|
be a multi-line text object and we will have to read more. */
|
|
|
|
- n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%[\1]",
|
|
+ n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%1[\1]",
|
|
&t->type, &t->font, &t->size, &t->pen,
|
|
&t->color, &t->depth, &t->angle,
|
|
&t->flags, &t->height, &t->length,
|
|
--- a/fig2dev/tests/read.at
|
|
+++ b/fig2dev/tests/read.at
|
|
@@ -359,6 +359,17 @@
|
|
], 0, ignore)
|
|
AT_CLEANUP
|
|
|
|
+AT_SETUP([allow text ending with multiple ^A, ticket #55])
|
|
+AT_KEYWORDS([read.c])
|
|
+AT_CHECK([fig2dev -L box <<EOF
|
|
+#FIG 2
|
|
+1200 2
|
|
+4 2 0 0 1 0 0 390 306 110 376 639 5 Text
|
|
+EOF
|
|
+], 1, ignore, [Invalid text object at line 2.
|
|
+])
|
|
+AT_CLEANUP
|
|
+
|
|
AT_BANNER([Dynamically allocate picture file name.])
|
|
|
|
AT_SETUP([prepend fig file path to picture file name])
|
|
|
|
|