From 9e0b0b9845e5100ceb20fe50885ca0af77e2896c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Feb 2024 22:03:10 +0000 Subject: gitinfo-lua (23feb24) git-svn-id: svn://tug.org/texlive/trunk@70096 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/lualatex/gitinfo-lua/README.md | 1 + .../doc/lualatex/gitinfo-lua/git-scenario.sh | 18 ++++++------------ .../doc/lualatex/gitinfo-lua/gitinfo-lua.pdf | Bin 115167 -> 115812 bytes .../doc/lualatex/gitinfo-lua/gitinfo-lua.tex | 8 +++++--- .../scripts/gitinfo-lua/gitinfo-lua-cmd.lua | 2 +- .../texmf-dist/scripts/gitinfo-lua/gitinfo-lua.lua | 8 +++++--- .../tex/lualatex/gitinfo-lua/gitinfo-lua.sty | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/lualatex/gitinfo-lua/README.md b/Master/texmf-dist/doc/lualatex/gitinfo-lua/README.md index 1abafbdc062..463e764fa1c 100644 --- a/Master/texmf-dist/doc/lualatex/gitinfo-lua/README.md +++ b/Master/texmf-dist/doc/lualatex/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/Master/texmf-dist/doc/lualatex/gitinfo-lua/git-scenario.sh b/Master/texmf-dist/doc/lualatex/gitinfo-lua/git-scenario.sh index a3cfd179e9a..423c2a7d0c0 100644 --- a/Master/texmf-dist/doc/lualatex/gitinfo-lua/git-scenario.sh +++ b/Master/texmf-dist/doc/lualatex/gitinfo-lua/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/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.pdf b/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.pdf index da85914b1b3..02edd681a71 100644 Binary files a/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.pdf and b/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.tex b/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.tex index 438f235b005..ef7781dd01f 100644 --- a/Master/texmf-dist/doc/lualatex/gitinfo-lua/gitinfo-lua.tex +++ b/Master/texmf-dist/doc/lualatex/gitinfo-lua/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/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua-cmd.lua b/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua-cmd.lua index 7e27bc05bae..5aa0dc56e55 100644 --- a/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua-cmd.lua +++ b/Master/texmf-dist/scripts/gitinfo-lua/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/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua.lua b/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua.lua index a1c2a6988b1..0f3a1315d3e 100644 --- a/Master/texmf-dist/scripts/gitinfo-lua/gitinfo-lua.lua +++ b/Master/texmf-dist/scripts/gitinfo-lua/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/Master/texmf-dist/tex/lualatex/gitinfo-lua/gitinfo-lua.sty b/Master/texmf-dist/tex/lualatex/gitinfo-lua/gitinfo-lua.sty index 33fe5066c90..3f850a1146e 100644 --- a/Master/texmf-dist/tex/lualatex/gitinfo-lua/gitinfo-lua.sty +++ b/Master/texmf-dist/tex/lualatex/gitinfo-lua/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} -- cgit v1.2.3