diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index a7bd77b6..b0bc779a 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -37,7 +37,7 @@
#
# Description:
# Simple Makefile to create html documentation from templates. Requires
-# some special tools (awk, python, xsltproc) but really only needs to
+# some special tools (awk, python, xsltproc) but really only needs to
# be used to update the documentation after changing Exiv2 tags in the
# source code.
#
@@ -166,7 +166,7 @@ all: tags
tags: $(TABLES) Iptc $(SCHEMA)
@./gen.py *.html.in
-$(TABLES): $(TAGLIST)
+$(TABLES):
@echo Generating $@ table...
@$(TAGLIST) $@ | sed -e"s/\</g" -e"s/>/\>/g" | awk -f tags.awk > $@.xml
@xsltproc tags.xsl $@.xml > $@.tmp
@@ -174,7 +174,7 @@ $(TABLES): $(TAGLIST)
@touch $@
@rm -f $@.tmp
-Iptc: $(TAGLIST)
+Iptc:
@echo Generating $@ table...
@$(TAGLIST) $@ | sed -e"s/\</g" -e"s/>/\>/g" -e"s/�/\±/g" \
| awk -f iptc.awk > $@.xml
@@ -183,7 +183,7 @@ Iptc: $(TAGLIST)
@touch $@
@rm -f $@.tmp
-$(SCHEMA): $(TAGLIST)
+$(SCHEMA):
@echo Generating $@ table...
@echo $@ | sed "s/xmp_//" | xargs $(TAGLIST) | sed -e"s/\</g" -e"s/>/\>/g" | awk -f xmp.awk > $@.xml
@xsltproc xmp.xsl $@.xml > $@.tmp
@@ -191,7 +191,7 @@ $(SCHEMA): $(TAGLIST)
@touch $@
@rm -f $@.tmp
-$(TAGLIST):
+$(TAGLIST):
$(error File $(TAGLIST) does not exist. Did you build the library and programs in the src/ directory?)
mostlyclean:
diff --git a/website/Makefile b/website/Makefile
index bfbc792c..451e6ea9 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -105,6 +105,7 @@ all: html doc
publish really-publish
html: news
+ @bin/download.sh
@bin/gen.py master/*.in
@echo "Moving files to html/ ..."
-@mv -f master/*.html master/*.php html/
@@ -167,8 +168,9 @@ update-conversion:
@./bin/conversion.sh
update-changelog:
- @cp -f ../doc/ChangeLog var/__ChangeLog__
- @bin/buglinks.sh var/__ChangeLog__
+ echo changelog should be updated using team/contrib/redmine/progress.py
+ # @cp -f ../doc/ChangeLog var/__ChangeLog__
+ # @bin/buglinks.sh var/__ChangeLog__
update-makernotes:
@cp -f ../doc/templates/__makernotes__ var/__makernotes__
diff --git a/website/bin/download.sh b/website/bin/download.sh
index e8fa1797..ce639533 100755
--- a/website/bin/download.sh
+++ b/website/bin/download.sh
@@ -13,9 +13,9 @@ rm -rf $basedir/var/$buttons
for P in trunk macosx linux cygwin mingw msvc; do
p=exiv2-$version-$P.tar.gz
size=$(ls -la html/builds/$p | cut -d' ' -f 5)
- date=$(stat -c "%w" html/builds/$p | cut -d' ' -f 1)
+ date=$(stat -c "%y" html/builds/$p | cut -d' ' -f 1)
md5=$(md5sum html/builds/$p | cut -d' ' -f 1)
-
+
echo "
\
Exiv2 v$version $P | \
${p} | \
@@ -23,13 +23,13 @@ for P in trunk macosx linux cygwin mingw msvc; do
$date | \
$md5 | \
" >> $basedir/var/$table
-
+
platform=$P
- config="64 bit shared libraries"
- if [ "$platform" == macosx ]; then platform="MacOSX" ; fi
- if [ "$platform" == cygwin ]; then platform="Cygwin" ; fi
- if [ "$platform" == mingw ]; then platform="MinGW" ; config="32 bit shared libraries" ; fi
- if [ "$platform" == msvc ]; then platform="Visual Studio"; config="32 & 64 bit DLLs for MSVC 2005/8/10/12/13/15"; fi
+ config="64 bit shared libraries"
+ if [ "$platform" == macosx ]; then platform="MacOSX" ; fi
+ if [ "$platform" == cygwin ]; then platform="Cygwin" ; fi
+ if [ "$platform" == mingw ]; then platform="MinGW" ; config="32 bit shared libraries" ; fi
+ if [ "$platform" == msvc ]; then platform="Visual Studio"; config="32 & 64 bit DLLs for MSVC 2005/8/10/12/13/15"; fi
if [ "$platform" == linux ]; then platform="Linux" ; fi
if [ "$platform" != trunk ]; then
echo "$platform | $config | \
diff --git a/website/html/exiv2-manpage.pdf b/website/html/exiv2-manpage.pdf
index 8156257a..dd80ebe0 100644
--- a/website/html/exiv2-manpage.pdf
+++ b/website/html/exiv2-manpage.pdf
@@ -1763,7 +1763,7 @@ endobj
endobj
27 0 obj
<<
-/Length 6840
+/Length 6404
>>
stream
BT
@@ -2153,31 +2153,7 @@ T*
/TT2 1 Tf
0.5562 0 TD
(les in insert action.)Tj
-/TT4 1 Tf
-10.95 0 0 10.95 72 136.8 Tm
-(COMMANDS)Tj
-/TT2 1 Tf
-10 0 0 10 108 124.8 Tm
-(Commands for the modify action can be read from a command )Tj
-/TT8 1 Tf
-26.0747 0 TD
-()Tj
-/TT2 1 Tf
-0.5562 0 TD
-(le, e.g.,)Tj
--25.8809 -2.4 TD
--0.015 Tc
-[(ex)-15(i)10(v)-15(2)]TJ
-/TT1 1 Tf
-2.4317 0 TD
-0 Tc
-<00ef>Tj
-/TT2 1 Tf
-0.564 0 TD
-[(m)-250(cmd.txt image.jpg)]TJ
--3.7456 -2.4 TD
-[(or gi)25(v)15(e)0(n)-250(o)0(n)-250(the command line, as in)]TJ
-17.203 -5.28 TD
+2.7955 -12.96 TD
[(Oct 19, 2016)-20303(6)]TJ
ET
endstream
@@ -2201,7 +2177,7 @@ endobj
endobj
30 0 obj
<<
-/Length 6484
+/Length 6478
>>
stream
BT
@@ -2214,7 +2190,31 @@ BT
(EXIV2\(1\) )Tj
42.7462 0 TD
(EXIV2\(1\))Tj
--38.3962 -3.6 TD
+/TT4 1 Tf
+10.95 0 0 10.95 72 708 Tm
+(COMMANDS)Tj
+/TT2 1 Tf
+10 0 0 10 108 696 Tm
+(Commands for the modify action can be read from a command )Tj
+/TT8 1 Tf
+26.0747 0 TD
+()Tj
+/TT2 1 Tf
+0.5562 0 TD
+(le, e.g.,)Tj
+-25.8809 -2.4 TD
+-0.015 Tc
+[(ex)-15(i)10(v)-15(2)]TJ
+/TT1 1 Tf
+2.4317 0 TD
+0 Tc
+<00ef>Tj
+/TT2 1 Tf
+0.564 0 TD
+[(m)-250(cmd.txt image.jpg)]TJ
+-3.7456 -2.4 TD
+[(or gi)25(v)15(e)0(n)-250(o)0(n)-250(the command line, as in)]TJ
+0.75 -2.4 TD
-0.015 Tc
[(ex)-15(i)10(v)-15(2)]TJ
/TT1 1 Tf
@@ -2292,11 +2292,11 @@ BT
[(M"set Exif.Image.Artist Mr)55(.)-250(S)]TJ
ET
BT
-10 0 0 10 608.0883 648 Tm
+10 0 0 10 608.0883 564 Tm
(m)Tj
ET
BT
-10 0 0 10 108 624 Tm
+10 0 0 10 108 540 Tm
0.0432 Tw
(When writing Exif, IPTC and XMP metadata,)Tj
/TT4 1 Tf
@@ -2603,31 +2603,7 @@ T*
[(v)25(alue is:)]TJ
-11.2008 -2.4 TD
(HH:MM:SS \(hours, minutes, seconds\))Tj
--1 -2.4 TD
-[(and may optionally be follo)25(wed by:)]TJ
-/TT1 1 Tf
-0.75 -2.4 TD
-<00ef>Tj
-/TT2 1 Tf
-0.564 0 TD
-(HH:MM or +HH:MM \(hours, minutes ahead/behind UTC\))Tj
--1.314 -2.4 TD
-(The format of)Tj
-/TT4 1 Tf
-5.8032 0 TD
-(Rational)Tj
-/TT2 1 Tf
-3.917 0 TD
-(\(and)Tj
-/TT4 1 Tf
-2.0269 0 TD
-(SRational)Tj
-/TT2 1 Tf
-4.2231 0 TD
-[(\))-250(i)0(s)-250(one of:)]TJ
--15.2202 -2.4 TD
-[(inte)15(ger | inte)15(ger/inte)15(ger | Fnumber | number)]TJ
-12.853 -3.84 TD
+12.603 -5.04 TD
[(Oct 19, 2016)-20303(7)]TJ
ET
endstream
@@ -2651,7 +2627,7 @@ endobj
endobj
33 0 obj
<<
-/Length 5616
+/Length 3913
>>
stream
BT
@@ -2665,8 +2641,32 @@ BT
42.7462 0 TD
(EXIV2\(1\))Tj
-35.5462 -3.6 TD
+[(and may optionally be follo)25(wed by:)]TJ
+/TT1 1 Tf
+0.75 -2.4 TD
+<00ef>Tj
+/TT2 1 Tf
+0.564 0 TD
+(HH:MM or +HH:MM \(hours, minutes ahead/behind UTC\))Tj
+-1.314 -2.4 TD
+(The format of)Tj
+/TT4 1 Tf
+5.8032 0 TD
+(Rational)Tj
+/TT2 1 Tf
+3.917 0 TD
+(\(and)Tj
+/TT4 1 Tf
+2.0269 0 TD
+(SRational)Tj
+/TT2 1 Tf
+4.2231 0 TD
+[(\))-250(i)0(s)-250(one of:)]TJ
+-15.2202 -2.4 TD
+[(inte)15(ger | inte)15(ger/inte)15(ger | Fnumber | number)]TJ
+-0.75 -2.4 TD
(Rational Examples:)Tj
-0 -2.4 TD
+T*
[($)-250(e)15(xi)25(v2 "-Mset Exif.Photo.MaxApertureV)111(alue 557429/62500" X.jpg)]TJ
0 -1.2 TD
[($)-250(e)15(xi)25(v2 "-Mset Exif.Photo.MaxApertureV)111(alue F5.6" X.jpg)]TJ
@@ -2828,11 +2828,48 @@ T*
-21.6699 -1.2 TD
0 Tw
[(mands as described abo)15(v)15(e)0(.)]TJ
+17.203 -18.72 TD
+[(Oct 19, 2016)-20303(8)]TJ
+ET
+endstream
+endobj
+34 0 obj
+<<
+/ProcSet [/PDF /Text ]
+/Font <<
+/TT1 4 0 R
+/TT2 5 0 R
+/TT4 7 0 R
+/TT6 8 0 R
+/TT7 9 0 R
+/TT8 10 0 R
+/TT9 11 0 R
+>>
+/ExtGState <<
+/GS1 12 0 R
+>>
+>>
+endobj
+36 0 obj
+<<
+/Length 6017
+>>
+stream
+BT
+/TT2 1 Tf
+10 0 0 10 72 744 Tm
+0 g
+/GS1 gs
+0 Tc
+0 Tw
+(EXIV2\(1\) )Tj
+42.7462 0 TD
+(EXIV2\(1\))Tj
/TT4 1 Tf
-10.95 0 0 10.95 72 290.4 Tm
+10.95 0 0 10.95 72 708 Tm
(EXAMPLES)Tj
/TT2 1 Tf
-10 0 0 10 108 278.4 Tm
+10 0 0 10 108 696 Tm
[(e)15(x)0(i)25(v)0(2)-250(*.jpg)]TJ
3.6 -1.2 TD
(Prints a summary of the Exif information for all JPEG )Tj
@@ -2962,44 +2999,7 @@ T*
(pre-)Tj
-37.9855 -1.2 TD
[(vie)25(w2.jpg.)]TJ
-13.603 -5.76 TD
-[(Oct 19, 2016)-20303(8)]TJ
-ET
-endstream
-endobj
-34 0 obj
-<<
-/ProcSet [/PDF /Text ]
-/Font <<
-/TT1 4 0 R
-/TT2 5 0 R
-/TT4 7 0 R
-/TT6 8 0 R
-/TT7 9 0 R
-/TT8 10 0 R
-/TT9 11 0 R
->>
-/ExtGState <<
-/GS1 12 0 R
->>
->>
-endobj
-36 0 obj
-<<
-/Length 3887
->>
-stream
-BT
-/TT2 1 Tf
-10 0 0 10 72 744 Tm
-0 g
-/GS1 gs
-0 Tc
-0 Tw
-(EXIV2\(1\) )Tj
-42.7462 0 TD
-(EXIV2\(1\))Tj
--39.1462 -3.6 TD
+-3.6 -1.68 TD
-0.015 Tc
[(ex)-15(i)10(v)-15(2)]TJ
/TT1 1 Tf
@@ -3148,10 +3148,10 @@ T*
0 Tw
[(the tar)18(get image.)]TJ
/TT4 1 Tf
-10.95 0 0 10.95 72 444 Tm
+10.95 0 0 10.95 72 218.4 Tm
(SEE ALSO)Tj
/TT6 1 Tf
-10 0 0 10 108.31 432 Tm
+10 0 0 10 108.31 206.4 Tm
[(http://www)74(.e)20(xiv2.or)37(g/sample)15(.html#modify)]TJ
/TT2 1 Tf
3.569 -1.2 TD
@@ -3183,16 +3183,16 @@ T*
1.9155 0 TD
[(v)25(alues.)]TJ
/TT4 1 Tf
-10.95 0 0 10.95 72 374.4 Tm
+10.95 0 0 10.95 72 148.8 Tm
[(A)50(UTHORS)]TJ
-10 0 0 10 108 362.4 Tm
+10 0 0 10 108 136.8 Tm
[(exi)10(v2)]TJ
/TT2 1 Tf
2.4617 0 TD
[(w)10(a)0(s)-250(written by Andreas Huggel and others.)-500(The Exi)25(v2 project web site is http://e)15(xi)25(v2.or)18(g)]TJ
-2.4617 -1.68 TD
[(This manual page w)10(as originally created for the Debian project by KELEMEN Peter .)]TJ
-17.203 -32.16 TD
+17.203 -9.6 TD
[(Oct 19, 2016)-20303(9)]TJ
ET
endstream
@@ -3234,7 +3234,7 @@ endobj
/Descent -250
/Flags 262150
/FontBBox [-168 -218 1000 935]
-/FontName /JKJDOK+Times-Bold
+/FontName /DIMOGG+Times-Bold
/ItalicAngle 0
/StemV 133
/XHeight 461
@@ -3245,132 +3245,107 @@ endobj
39 0 obj
<<
/Filter /FlateDecode
-/Length 28501
+/Length 28498
/Length1 215908
>>
stream
-HWpT}$$<DeI%dK؍AB<\BB@j.Gb#Rm)Nqb3TZE:X#5R)~& 8t?{ @_~iHnxɢvj&cK
-oZ\0kMЕA)g4[*C5ל=}Jh;j&wSoZfs)n\UMG~OS#*j:)Jxh7ꫛ?X[OU߰hوԬ9j1KN!g~Q5 Rn\jPǟT
6G٣[ C9Q !s8Qn_MnVYZ<| ؊B Qe6D$ތZ]A>J%ۏq&J~~a
;qDdޑI&yi*& oF.T1s؈l?dwdѬlgd4ꓴG
-2e{܌Ɗ`i-N$$OJ͞o/w bz+~eҠlqN HNY)ֳ%Uz,Y ͲM)uhoX#%gdIKҦ%f۴O)DBwqpكG2$[(-%RNzA(Ҫ)ji5WDerhF"iApi=څW9}DmtMFfd[vR
-"ytTN)lJQmjN֪қQXكJѸ
C4cxS܆XGg .SQEdVFLS.cHc% ŬDqN3.VT.sJZdPv^=!)9#*u'V*ere=irPiZ@;3zRRJ.~hKl5{`O#0w-CZ֓!?Is3 NڏQN8Uԛ[ATश5ɏ&Tfq6~yoS(x#]_-҄*=RI笛^o
-)Õ3ڨy&]1o[X7^eNb otޤ7q%H{|:QȻ.O*5p?a.kXZsV$59h]-$y50tH`&=h`Vf Oo>_ߴ35Gr2*kH
1N;"z2*2*\7j =k>\4c"&}F4?M]K hF{|ybAÒ
-#d-CA`~ z:-L.y8!+fе9h54
-fzϒ)\fu]ns]gԏ̪̭pv{XJoZ;Lh)9ExY9Kp*J%e*%"ڻ6CְRB3 ޚ`%(;u׳k]vtϵde\dL˨tuU=qt'"r2"6OYzNiς2;?Z$夝uyDoP_I;R):.vk;w"4yA>Mü
Eș7UqȈqZP䱝<~+Hd<:q47N<jpN>_ !2=\ZV !$_/Gxj'OƵ &'1
yw&!Mĭ[L쿖>6&o]翘K"6j%M}^&