summaryrefslogtreecommitdiff
path: root/macros/luatex/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-02-24 03:01:46 +0000
committerNorbert Preining <norbert@preining.info>2024-02-24 03:01:46 +0000
commitf325bd88d1d4db13f51277bc59c8ff8814e937bc (patch)
treee39af6619c91d812dd93cb57d25149da5a84d801 /macros/luatex/latex
parente7a321bba289c40f39563c19bbeac355f7c0eeeb (diff)
CTAN sync 202402240301
Diffstat (limited to 'macros/luatex/latex')
-rw-r--r--macros/luatex/latex/gitinfo-lua/README.md1
-rwxr-xr-xmacros/luatex/latex/gitinfo-lua/doc/git-scenario.sh18
-rw-r--r--macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.pdfbin115167 -> 115812 bytes
-rw-r--r--macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.tex8
-rw-r--r--macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua-cmd.lua2
-rw-r--r--macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua.lua8
-rw-r--r--macros/luatex/latex/gitinfo-lua/tex/gitinfo-lua.sty2
7 files changed, 19 insertions, 20 deletions
diff --git a/macros/luatex/latex/gitinfo-lua/README.md b/macros/luatex/latex/gitinfo-lua/README.md
index 1abafbdc06..463e764fa1 100644
--- a/macros/luatex/latex/gitinfo-lua/README.md
+++ b/macros/luatex/latex/gitinfo-lua/README.md
@@ -1,5 +1,6 @@
# Gitinfo Lua
![CTAN Version](https://img.shields.io/ctan/v/gitinfo-lua)
+[![build](https://github.com/Xerdi/gitinfo-lua/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/Xerdi/gitinfo-lua/actions/workflows/build.yml)
A LaTeX package which provides macros integrated with LuaTeX and the commandline tool `git`.
diff --git a/macros/luatex/latex/gitinfo-lua/doc/git-scenario.sh b/macros/luatex/latex/gitinfo-lua/doc/git-scenario.sh
index a3cfd179e9..423c2a7d0c 100755
--- a/macros/luatex/latex/gitinfo-lua/doc/git-scenario.sh
+++ b/macros/luatex/latex/gitinfo-lua/doc/git-scenario.sh
@@ -2,8 +2,6 @@
set -e
-PROJECT_DIR="${1:-../../git-test-project}"
-
set_author() {
git config user.name $1
git config user.email $2
@@ -23,15 +21,6 @@ charlie() {
set_author 'Charlie' 'charlie@example.com'
}
-if [[ -d "${PROJECT_DIR}" ]]; then
- rm -rf "${PROJECT_DIR}"
-fi
-
-mkdir "${PROJECT_DIR}"
-cd "${PROJECT_DIR}"
-
-git init
-
alice
echo "# My project" > README.md
@@ -53,7 +42,12 @@ bob
curl https://raw.githubusercontent.com/github/gitignore/main/TeX.gitignore > .gitignore
git add .gitignore
-git commit -m "Add gitignore" --date="2017-08-06 12:03"
+git commit -m "Add gitignore
+
+Get the TeX.gitignore from the gitignore repository and
+use it for this project.
+
+From github" --date="2017-08-06 12:03"
charlie
diff --git a/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.pdf b/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.pdf
index da85914b1b..02edd681a7 100644
--- a/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.pdf
+++ b/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.pdf
Binary files differ
diff --git a/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.tex b/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.tex
index 438f235b00..ef7781dd01 100644
--- a/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.tex
+++ b/macros/luatex/latex/gitinfo-lua/doc/gitinfo-lua.tex
@@ -17,7 +17,7 @@
% gitinfo-cmd.lua and gitinfo-lua.lua
\documentclass{ltxdoc}
\usepackage[english]{babel}
-\usepackage[titlepage,authors]{../tex/gitinfo-lua}
+\usepackage[titlepage,authors]{gitinfo-lua}
\usepackage{listings}
\lstset{
@@ -314,11 +314,13 @@ latexmk -pvc -lualatex -shell-escape main
\end{description}
\end{lstlisting}
\noindent
- \newcommand\commitline[1]{\item #1}
+ \newcommand\commitline[2]{\item #1
+
+ #2}
\newcommand\formatversion[3]{%
\item[#1] \gittag[(taggerdate)(taggerdate:short)(authordate:short)]{printdate}{#1}
\begin{itemize}
- \forgitcommit[s]{commitline}{#3}
+ \forgitcommit[s,b]{commitline}{#3}
\end{itemize}%
}%
\setlength{\fboxsep}{16pt}%
diff --git a/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua-cmd.lua b/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua-cmd.lua
index 7e27bc05ba..5aa0dc56e5 100644
--- a/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua-cmd.lua
+++ b/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua-cmd.lua
@@ -41,7 +41,7 @@ function api:exec(command, do_caching, target_dir)
local cmd = self.executable .. ' ' .. command
local cwd = target_dir or self.cwd
if cwd then
- cmd = 'cd ' .. cwd .. ';' .. cmd
+ cmd = 'cd ' .. cwd .. ' && ' .. cmd
end
if do_caching then
local found, result = cache:seek(cmd)
diff --git a/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua.lua b/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua.lua
index a1c2a6988b..0f3a1315d3 100644
--- a/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua.lua
+++ b/macros/luatex/latex/gitinfo-lua/scripts/gitinfo-lua.lua
@@ -23,8 +23,8 @@ end
local module = {
name = 'gitinfo-lua',
info = {
- version = '1.0.1', --TAGVERSION
- date = '2024/02/12', --TAGDATE
+ version = '1.0.2', --TAGVERSION
+ date = '2024/02/23', --TAGDATE
comment = "Git info Lua — Git integration with LaTeX",
author = "Erik Nijenhuis",
license = "free"
@@ -45,7 +45,8 @@ local api = {
['{'] = '\\{',
['}'] = '\\}',
['~'] = '\\textasciitilde ',
- ['%^'] = '\\textasciicircum '
+ ['%^'] = '\\textasciicircum ',
+ ['\n'] = ' '
}
}
local mt = {
@@ -73,6 +74,7 @@ end
function api:escape_str(value)
local buf = string.gsub(value, '\\', '\\textbackslash ')
+ buf = string.gsub(buf, "\n%s*\n+", "\\par ")
for search, replace in pairs(self.escape_chars) do
buf = string.gsub(buf, search, replace)
end
diff --git a/macros/luatex/latex/gitinfo-lua/tex/gitinfo-lua.sty b/macros/luatex/latex/gitinfo-lua/tex/gitinfo-lua.sty
index 33fe5066c9..3f850a1146 100644
--- a/macros/luatex/latex/gitinfo-lua/tex/gitinfo-lua.sty
+++ b/macros/luatex/latex/gitinfo-lua/tex/gitinfo-lua.sty
@@ -16,7 +16,7 @@
% This work consists of the files gitinfo-lua.sty gitinfo-lua.pdf
% gitinfo-cmd.lua and gitinfo-lua.lua
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitinfo-lua}[2024/02/12 1.0.1 Xerdi's Git Package]
+\ProvidesPackage{gitinfo-lua}[2024/02/23 1.0.2 Xerdi's Git Package]
\RequirePackage{luacode}