Kleinere Fehler beim Inkludieren behoben

This commit is contained in:
André Hilbig 2016-06-24 17:02:17 +02:00
parent 42609466df
commit 1b7c975dc7
3 changed files with 15 additions and 13 deletions

17
build
View File

@ -8,15 +8,16 @@ cp -v post-commit gitfile-info/
cp -v post-merge gitfile-info/
sed "s/Version: [0-9].[0-9]*/Version: $1/1" README > /tmp/output.readme
sed "s/Last Change: [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/Last Change: `date +%Y-%m-%d`/1" /tmp/output.readme > output.readme
mv -v output.readme bewerbung/README
mv -v output.readme gitfile-info/README
echo "=+-Kopieren und Anpassen abgeschlossen---------------------------+=" >> build.log
cd gitfile-info
echo "=+-Packe DTX-----------------------------------------------------+=" >> build.log
./makedtx.pl -src "(.*)\.sty=>\1.sty" -doc ../dokumentation.tex \
-src "gfi-run=>gfi-run" --src "post-commit=>post-commit" --src "post-merge=>post-merge" \
-macrocode "gfi-run=>gfi-run" --macrocode "post-commit=>post-commit" --macrocode "post-merge=>post-merge" \
-setambles "gfi-run=>gfi-run" --setambles "post-commit=>post-commit" --setambles "post-merge=>post-merge" \
-comment "gfi-run=>gfi-run" --comment "post-commit=>post-commit" --comment "post-merge=>post-merge" \
../makedtx.pl -src "(.*)\.sty=>\1.sty" -doc ../dokumentation.tex \
-src "gfi-run=>gfi-run" -src "post-commit=>post-commit" -src "post-merge=>post-merge" \
-macrocode "gfi-run" -macrocode "post-commit" -macrocode "post-merge" \
-setambles "gfi-run=>\\nopreamble\\nopostamble" -setambles "post-commit=>\\nopreamble\\nopostamble" \
-setambles "post-merge=>\\nopreamble\\nopostamble" \
-comment "gfi-run" -comment "post-commit" -comment "post-merge" \
-date "`date +%Y-%m-%d:%H:%M:%S` -- Version $1" \
-author "André Hilbig, mail@andrehilbig.de" -codetitle "Implementation" gitfile-info
pdflatex gitfile-info.dtx
@ -27,6 +28,4 @@ rm gitfile-info.dtx
mv output.dtx gitfile-info.dtx
latexmk -pdf gitfile-info.dtx
cd ..
zip -r gitfile-info_latest.zip gitfile-info/gitfile-info.dtx gitfile-info/gitfile-info.ins\
gitfile-info/gfi-run gitfile-info/post-commit gitfile-info/post-merge
zip -r gitfile-info_latest.zip gitfile-info/gitfile-info.dtx gitfile-info/gitfile-info.ins

View File

@ -204,11 +204,12 @@ pdftitle = {\LaTeX-package for reading git commit info for specific files}
Installation werden die Dateien \verb|gitfile-info.ins| und \verb|gitfile-info.dtx| benötigt.
\begin{itemize}
\item Erzeugung der Paket- und Klassendateien
\item Erzeugung der Paketdateien und Dokumentation
\begin{lstlisting}[gobble=12,numbers=none,language=bash,%
linewidth=0.7\textwidth,resetmargins=false]
latex gitfile-info.dtx
latex gitfile-info.ins
latexmk -pdf gitfile-info.dtx
\end{lstlisting}
\item Die erzeugte Paketdatei (*.sty) muss in einem für \TeX\ lesbarem Verzeichnis platziert
werden. Für eine lokale Installation bietet sich dafür

View File

@ -65,10 +65,12 @@
}
\ProvideDocumentCommand{\gfiInfo}{O{none} O{none} O{none} O{gfiInfoBox}}{%
\begin{#4}
\vspace{1mm}
\textbf{Version:} \ifthenelse{\equal{#1}{none}}{\gfiGetCommit}{\gfiGetCommitAbr}\newline
\textbf{Stand:} \ifthenelse{\equal{#2}{none}}{\gfiGetDate}{#2}\newline
\textbf{Zuletzt bearbeitet von:}
\ifthenelse{\equal{#3}{none}}{\href{mailto:\gfiGetAuthorMail}{\gfiGetAuthorName}}{#3}
\vspace{1mm}
\end{#4}
}
@ -97,10 +99,10 @@
\providecommand{\gfiInput}[1]{%
\gfiInitInc{#1}
\input{#1}
\gfiInitInc{\currfilebase}
\gfiInitInc{\currfiledir\currfilebase}
}
\providecommand{\gfiInclude}[1]{%
\gfiInitInc{#1}
\include{#1}
\gfiInitInc{\currfilebase}
\gfiInitInc{\currfiledir\currfilebase}
}