summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-14 21:38:17 +0000
committerKarl Berry <karl@freefriends.org>2016-07-14 21:38:17 +0000
commit71d433e6039c736a93e0dfeb0e90d058ddc6fc60 (patch)
tree92be248a8eaa4b023fa3f921fd79f1da56e73e03 /Master
parent3502b6b709295037d367cdd7ccd0795f027d095f (diff)
gitfile-info (14jul16)
git-svn-id: svn://tug.org/texlive/trunk@41693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/README4
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/gfi-run.py10
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/gitfile-info.gfi4
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/gitfile-info.pdf (renamed from Master/texmf-dist/doc/support/gitfile-info/doc/gitfile-info.pdf)bin565709 -> 569750 bytes
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/post-commit.py10
-rw-r--r--Master/texmf-dist/doc/support/gitfile-info/post-merge.py10
-rw-r--r--Master/texmf-dist/source/support/gitfile-info/gitfile-info.dtx73
-rw-r--r--Master/texmf-dist/source/support/gitfile-info/gitfile-info.ins4
-rw-r--r--Master/texmf-dist/tex/latex/gitfile-info/gitfile-info.sty2
9 files changed, 80 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/support/gitfile-info/README b/Master/texmf-dist/doc/support/gitfile-info/README
index 550f74cce49..11bc8c4baf2 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/README
+++ b/Master/texmf-dist/doc/support/gitfile-info/README
@@ -10,8 +10,8 @@
and want to show within the document who had edited what. This package gives you the
opportunity to do so.
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+
- Version: 0.2
- Last Change: 2016-06-30
+ Version: 0.3
+ Last Change: 2016-07-14
Current Maintainer: André Hilbig
mail@andrehilbig.de
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+
diff --git a/Master/texmf-dist/doc/support/gitfile-info/gfi-run.py b/Master/texmf-dist/doc/support/gitfile-info/gfi-run.py
index 93806bf53ba..e39bb9459a2 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/gfi-run.py
+++ b/Master/texmf-dist/doc/support/gitfile-info/gfi-run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -9,7 +9,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
diff --git a/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.gfi b/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.gfi
index 10ed60b188e..35d2df60953 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.gfi
+++ b/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.gfi
@@ -1,3 +1,3 @@
-\gfiSetDate{30}{06}{2016}{10}{33}{30. Juni 2016 10:33}
+\gfiSetDate{14}{07}{2016}{14}{14}{14. Juli 2016 14:14}
\gfiSetAuthor{André Hilbig}{mail@andrehilbig.de}
-\gfiSetCommit{1c6107b49f1e8829fdfe3b656867175cb9d5e043}{1c6107}% \end{macrocode}
+\gfiSetCommit{4850e30b19068843d017a4330d38cafd563d4586}{4850e3}% \end{macrocode}
diff --git a/Master/texmf-dist/doc/support/gitfile-info/doc/gitfile-info.pdf b/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.pdf
index 89bee1b125f..b0ccfd5a5ee 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/doc/gitfile-info.pdf
+++ b/Master/texmf-dist/doc/support/gitfile-info/gitfile-info.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/gitfile-info/post-commit.py b/Master/texmf-dist/doc/support/gitfile-info/post-commit.py
index 4f9a7aa2dd6..832b0750d26 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/post-commit.py
+++ b/Master/texmf-dist/doc/support/gitfile-info/post-commit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -8,7 +8,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
diff --git a/Master/texmf-dist/doc/support/gitfile-info/post-merge.py b/Master/texmf-dist/doc/support/gitfile-info/post-merge.py
index 0988c7ed913..eebef400513 100644
--- a/Master/texmf-dist/doc/support/gitfile-info/post-merge.py
+++ b/Master/texmf-dist/doc/support/gitfile-info/post-merge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -8,7 +8,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
diff --git a/Master/texmf-dist/source/support/gitfile-info/gitfile-info.dtx b/Master/texmf-dist/source/support/gitfile-info/gitfile-info.dtx
index 3582f599a11..ba8756deef3 100644
--- a/Master/texmf-dist/source/support/gitfile-info/gitfile-info.dtx
+++ b/Master/texmf-dist/source/support/gitfile-info/gitfile-info.dtx
@@ -1,29 +1,29 @@
%\iffalse
% gitfile-info.dtx generated using makedtx version 0.94b (c) Nicola Talbot
% Command line args:
-% -codetitle "Code"
-% -setambles "gitfile-info.gfi=>\nopreamble\nopostamble"
-% -setambles "gfi-run.py=>\nopreamble\nopostamble"
-% -setambles "post-commit.py=>\nopreamble\nopostamble"
-% -setambles "post-merge.py=>\nopreamble\nopostamble"
-% -date "2016-06-30:10:44:30 -- Version 0.2"
+% -date "2016-07-14:14:15:32 -- Version 0.3"
% -comment "gitfile-info.gfi"
% -comment "gfi-run.py"
% -comment "post-commit.py"
% -comment "post-merge.py"
-% -macrocode "gfi-run.py"
-% -macrocode "post-commit.py"
-% -macrocode "post-merge.py"
-% -macrocode "gitfile-info.gfi"
-% -doc "../dokumentation.tex"
% -src "(.*)\.sty=>\1.sty"
% -src "gfi-run.py=>gfi-run.py"
% -src "post-commit.py=>post-commit.py"
% -src "post-merge.py=>post-merge.py"
% -src "gitfile-info.gfi=>gitfile-info.gfi"
+% -setambles "gitfile-info.gfi=>\nopreamble\nopostamble"
+% -setambles "gfi-run.py=>\nopreamble\nopostamble"
+% -setambles "post-commit.py=>\nopreamble\nopostamble"
+% -setambles "post-merge.py=>\nopreamble\nopostamble"
+% -codetitle "Code"
+% -doc "../dokumentation.tex"
% -author "André Hilbig, mail@andrehilbig.de"
+% -macrocode "gfi-run.py"
+% -macrocode "post-commit.py"
+% -macrocode "post-merge.py"
+% -macrocode "gitfile-info.gfi"
% gitfile-info
-% Created on 2016-06-30:10:44:30 -- Version 0.2/6/30 10:44
+% Created on 2016-07-14:14:15:32 -- Version 0.3/7/14 14:15
%\fi
%\iffalse
%<*package>
@@ -46,7 +46,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2016-06-30:10:44:30 -- Version 0.2 André Hilbig, mail@andrehilbig.de, all rights reserved.
+% Copyright (C) 2016-07-14:14:15:32 -- Version 0.3 André Hilbig, mail@andrehilbig.de, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -282,6 +282,8 @@ pdftitle = {\LaTeX-package for reading git commit info for specific files}
% \begin{description}
% \item[v0.1] Intialisierung und erste Veröffentlichung
% \item[v0.2] Dokumentation auf CTAN inkludiert
+% \item[v0.3] Pfad der Scripte in texlive in der Dokumentation aktualisiert -- Pythonscripte
+% erzwingen Py3 und geben Fehler bei falscher Lokalisierung aus.
% \end{description}
%
% \section{Installation}
@@ -360,7 +362,7 @@ pdftitle = {\LaTeX-package for reading git commit info for specific files}
% \end{lstlisting}
%
% Die Scripte sollten in einer Standard \texttt{texlive}"~Installation unter dem Pfad
-% \verb|…/texmf-dist/doc/latex/gitfile-info/| gefunden werden können. Bei einer manuellen
+% \verb|…/texmf-dist/doc/support/gitfile-info/| gefunden werden können. Bei einer manuellen
% Installation sollten die Scripte mit erstellt worden sein.
%
% \textbf{Hinweis:} Die drei Dateien sollten Nutzern zur Verfügung gestellt werden.
@@ -523,11 +525,16 @@ pdftitle = {\LaTeX-package for reading git commit info for specific files}
% \subsection{Scripte}\label{sec:implementierung-scripte}
% Die Scripte sind auf deutsche Monatsbezeichnungen eingestellt. Sofern hier eine andere
% Lokalisierung gewünscht wird, muss in \textit{allen} Scripten der entsprechende Eintrag in der
-% Präambel geändert werden!
+% Präambel geändert werden! Prinzipiell reicht es aus im ersten Block zu ändern, da bei einer
+% individuellen Anpassungen Fehler nicht auftreten sollten.
%
% \begin{lstlisting}[gobble=8,numbers=none,language=python,%
% linewidth=0.7\textwidth,resetmargins=false]
-% locale.setlocale(locale.LC_ALL, 'de_DE')
+% try:
+% locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+% except:
+% try:
+% locale.setlocale(locale.LC_ALL, 'de_DE')
% \end{lstlisting}
%
%
@@ -804,7 +811,7 @@ pdftitle = {\LaTeX-package for reading git commit info for specific files}
%\fi
%\iffalse
% \begin{macrocode}
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -815,7 +822,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
@@ -893,7 +906,7 @@ else:
%\fi
%\iffalse
% \begin{macrocode}
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -903,7 +916,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
@@ -952,7 +971,7 @@ for fl in commFiles:
%\fi
%\iffalse
% \begin{macrocode}
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# -*- mode:python -*-
import os
@@ -962,7 +981,13 @@ from git import Repo
import locale
# Locales for date set up to de_DE
# Please edit to you needs
-locale.setlocale(locale.LC_ALL, 'de_DE')
+try:
+ locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
+except:
+ try:
+ locale.setlocale(locale.LC_ALL, 'de_DE')
+ except:
+ print ("Fehler: bitte prüfen Sie das Ergebnis von 'locale -d' und fügen es in das Script ein.")
# set up the git repo
# path is the current working directory
@@ -1014,9 +1039,9 @@ for fl in commFiles:
%\iffalse
% \begin{macrocode}
% gitfile-info control file
-\gfiSetDate{30}{06}{2016}{10}{33}{30. Juni 2016 10:33}
+\gfiSetDate{14}{07}{2016}{14}{14}{14. Juli 2016 14:14}
\gfiSetAuthor{André Hilbig}{mail@andrehilbig.de}
-\gfiSetCommit{1c6107b49f1e8829fdfe3b656867175cb9d5e043}{1c6107}% \end{macrocode}
+\gfiSetCommit{4850e30b19068843d017a4330d38cafd563d4586}{4850e3}% \end{macrocode}
%\fi
%\iffalse
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/support/gitfile-info/gitfile-info.ins b/Master/texmf-dist/source/support/gitfile-info/gitfile-info.ins
index 27103857647..279c7dd4283 100644
--- a/Master/texmf-dist/source/support/gitfile-info/gitfile-info.ins
+++ b/Master/texmf-dist/source/support/gitfile-info/gitfile-info.ins
@@ -1,10 +1,10 @@
-% gitfile-info.ins generated using makedtx version 0.94b 2016-06-30:10:44:30 -- Version 0.2/6/30 10:44
+% gitfile-info.ins generated using makedtx version 0.94b 2016-07-14:14:15:32 -- Version 0.3/7/14 14:15
\input docstrip
\preamble
gitfile-info.dtx
- Copyright 2016-06-30:10:44:30 -- Version 0.2 André Hilbig, mail@andrehilbig.de
+ Copyright 2016-07-14:14:15:32 -- Version 0.3 André Hilbig, mail@andrehilbig.de
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/gitfile-info/gitfile-info.sty b/Master/texmf-dist/tex/latex/gitfile-info/gitfile-info.sty
index 1c808ada5af..4a8a6e5173c 100644
--- a/Master/texmf-dist/tex/latex/gitfile-info/gitfile-info.sty
+++ b/Master/texmf-dist/tex/latex/gitfile-info/gitfile-info.sty
@@ -7,7 +7,7 @@
%% gitfile-info.dtx (with options: `gitfile-info.sty,package')
%%
%% gitfile-info.dtx
-%% Copyright 2016-06-30:10:44:30 -- Version 0.2 André Hilbig, mail@andrehilbig.de
+%% Copyright 2016-07-14:14:15:32 -- Version 0.3 André Hilbig, mail@andrehilbig.de
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3