From fa8f76eb12235a9223c2f7f9514201426a470a32 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 29 Jul 2016 22:00:57 -0300 Subject: [PATCH] sch2fig/sch2pdf, Makefile: also process the first page --- sch2fig/Makefile | 2 +- sch2fig/sch2pdf | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sch2fig/Makefile b/sch2fig/Makefile index 89e8fb5..d1411e2 100644 --- a/sch2fig/Makefile +++ b/sch2fig/Makefile @@ -57,7 +57,7 @@ neo900: $(NAME) >out.fig neo900.pdf: $(NAME) sch2pdf neo900-template.fig - ./sch2pdf -n 2 -o $@ -t neo900-template.fig \ + ./sch2pdf -o $@ -t neo900-template.fig \ $(NEO900_HW)/neo900.lib $(KICAD_LIBS)/powered.lib \ $(NEO900_HW)/neo900.sch diff --git a/sch2fig/sch2pdf b/sch2fig/sch2pdf index 9e1dae9..fa72a2f 100755 --- a/sch2fig/sch2pdf +++ b/sch2fig/sch2pdf @@ -56,9 +56,12 @@ while [ "$2" ]; do shift done -first=true +./sch2fig "-DTITLE=`basename \"$1\" .sch" -DNUMBER=$num $template $libs "$1" | + fig2dev -L pdf >"$out" + sheet=false while read line; do + num=`expr $num + 1` if ! $sheet; then [ "${line#\$Sheet}" != "$line" ] && sheet=true continue @@ -80,13 +83,7 @@ while read line; do ./sch2fig "-DTITLE=$name" -DNUMBER=$num $template \ $libs `dirname "$1"`/$file | fig2dev -L pdf >_tmp.pdf - if $first; then - mv _tmp.pdf "$out" - first=false - else - pdfunite "$out" _tmp.pdf _tmp2.pdf - mv _tmp2.pdf "$out" - fi - num=`expr $num + 1` + pdfunite "$out" _tmp.pdf _tmp2.pdf + mv _tmp2.pdf "$out" done <"$1" exit