From 994560f76edc0ba77542b37a69a0f7e2de8733a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 6 Mar 2020 21:30:42 +0000 Subject: icite (6mar20) git-svn-id: svn://tug.org/texlive/trunk@54130 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/icite/Makefile | 37 ++-- Master/texmf-dist/source/latex/icite/icite.dtx | 260 +++++-------------------- Master/texmf-dist/source/latex/icite/icite.ins | 13 +- 3 files changed, 80 insertions(+), 230 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/icite/Makefile b/Master/texmf-dist/source/latex/icite/Makefile index 35bf3e4a63d..01c10eb740c 100644 --- a/Master/texmf-dist/source/latex/icite/Makefile +++ b/Master/texmf-dist/source/latex/icite/Makefile @@ -4,6 +4,7 @@ PWD = $(shell pwd) VERS = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//') LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) UTREE = $(shell kpsewhich --var-value TEXMFHOME) +CMP = lualatex-dev exts := md bib ins dtx html texsamples := $(basename $(wildcard $(PWD)/samples/*.tex)) @@ -14,44 +15,48 @@ findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)") # $(if $(wildcard $(PWD)/TMP/$(notdir $1).bcf),biber $(PWD)/TMP/$(notdir $1),) define dosamples - lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null - lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null + $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null + $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null if [ -f $(PWD)/TMP/$(notdir $1)-primary.idx ]; \ then texindy -M $(PWD)/TMP/$(notdir $1).xdy $(PWD)/TMP/$(notdir $1)-primary.idx >/dev/null; fi if [ -f $(PWD)/TMP/$(notdir $1).bcf ]; then biber $(PWD)/TMP/$(notdir $1) >/dev/null; fi - lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null - lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null + $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null + $(CMP) --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null endef -all: $(NAME).pdf +sty: clean + $(CMP) $(NAME).ins + +all: clean sty $(NAME).pdf # test -e README.md || exit 0 -$(NAME).pdf: $(NAME).dtx + +$(NAME).pdf: clean sty $(NAME).dtx @ echo "Make documentation..." - lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null + $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null biber $(NAME) >/dev/null - lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null + $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi if [ -f loccit.idx ]; then texindy -M icite.xdy loccit.idx >/dev/null; fi if [ -f primary.idx ]; then texindy -M icite.xdy primary.idx >/dev/null; fi - lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null - lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null + $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null + $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null @ echo "Make sample files..." if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi cp $(PWD)/samples/*.bib $(PWD)/TMP $(foreach file,$(texsamples), $(call dosamples, $(file))) mv TMP/*.pdf samples/ -samples: +samples: clean sty if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi cp $(PWD)/samples/*.bib $(PWD)/TMP $(foreach file,$(texsamples), $(call dosamples, $(file))) mv TMP/*.pdf samples/ lualatex: - lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null + $(CMP) --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null -clean: lualatex +clean: rm -f $(NAME).bib $(PWD)/TMP/*.bib rm -rf .backup find -iname "*~" -or -iname "*.pdf" | xargs rm -rf @@ -70,9 +75,10 @@ inst: uninst all cp $(NAME).dtx $(UTREE)/source/latex/$(NAME) cp $(NAME).sty $(UTREE)/tex/latex/$(NAME) cp $(NAME).pdf $(UTREE)/doc/latex/$(NAME) + cp -r samples/ $(UTREE)/doc/latex/$(NAME) local: uninst - lualatex $(NAME).ins + $(CMP) $(NAME).ins mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME) cp $(NAME).sty $(UTREE)/tex/latex/$(NAME) @@ -84,6 +90,7 @@ install: all sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME) sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME) sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME) + cp -r samples/ $(LOCAL)/doc/latex/$(NAME) uninstall: rm -rf $(LOCAL)/{tex,source,doc}/latex/$(NAME) @@ -95,7 +102,7 @@ zip: all package: distclean all mkdir $(NAME)/ - cp Makefile README.md $(NAME).{dtx,ins,pdf} $(NAME)/ + cp Makefile README.md $(NAME).{ins,dtx,pdf} $(NAME)/ cp -r samples/ $(NAME)/ mkdir -p tex/latex/$(NAME)/ cp $(NAME).sty tex/latex/$(NAME)/ diff --git a/Master/texmf-dist/source/latex/icite/icite.dtx b/Master/texmf-dist/source/latex/icite/icite.dtx index 1e61a15d9c6..62c3eacbe07 100644 --- a/Master/texmf-dist/source/latex/icite/icite.dtx +++ b/Master/texmf-dist/source/latex/icite/icite.dtx @@ -1,184 +1,23 @@ % \iffalse meta-comment -% vim: textwidth=75 -%<*internal> -\iffalse -% -%<*readme> ---- -author: -- Robert Alessi -title: 'The icite package – README file' ---- - -Overview -======== - -`icite` is designed to produce from BibTeX or BibLaTeX bibliographical -databases the different indices of authors and works cited which are -called _indices locorum citatorum_. It relies on a specific -`\icite` command and can operate with either BibTeX or BibLaTeX. - -License and disclamer -===================== - -icite – Indices locorum citatorum - -Copyright ⓒ 2019 Robert Alessi - -Please send error reports and suggestions for improvements to Robert -Alessi: - -- email: - -- website: - -- comments, feature requests, bug reports: - - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation, either version 3 of the License, or (at your -option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . - -This release of icite consists of the following source files: - -- `icite.dtx` - -- `icite.ins` - -- `Makefile` - -License applicable to the documentation ---------------------------------------- - -Copyright ⓒ 2019 Robert Alessi - -The documentation file `icite.pdf` that is generated from the -`icite.dtx` source file is licensed under the Creative Commons -Attribution-ShareAlike 4.0 International License. To view a copy of this -license, visit or send -a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. - -Installation -============ - -1. Run `'latex icite.ins'` to produce the `icite.sty` - file; - -2. To finish the installation you have to move the `icite.sty` file into - a directory where LaTeX can find them. See the FAQ on `texfaq.org` - at for more on this. - - -Development, Git Repository -=========================== - -Browse the code ---------------- - -You can browse icite repository on the web: - - -From this page, you can download all the releases of `icite`. For -instructions on how to install `icite`, please see above. - -Comments, Feature requests, Bug Reports ---------------------------------------- - - - -Download the repository ------------------------ - -`icite` development is facilitated by git, a distributed version -control system. You will need to install git (most GNU/Linux -distributions package it in their repositories). - -Use this command to download the repository - - git clone http://git.robertalessi.net/icite - -A new directory named icite will have been created, containing -`icite`. - -Git hosting ------------ - -Make an account on and navigate (while logged in) -to . Click *Fork* and you will -have in your account your own repository of `icite` where you will -be able to make whatever changes you like to. - -% -%<*internal> -\fi -\def\nameofplainTeX{plain} -\ifx\fmtname\nameofplainTeX\else - \expandafter\begingroup -\fi -% -%<*install> -\input docstrip.tex -\keepsilent -\askforoverwritefalse -\preamble - -Copyright (C) 2019 by Robert Alessi - -Please send error reports and suggestions for improvements to Robert -Alessi - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see -. - -This work consists of the file icite.dtx, icite.ins and a Makefile. -Running "make" generates the derived files README.md, icite.pdf and icite.sty. -Running "make inst" installs the files in the user's TeX tree. -Running "make install" installs the files in the local TeX tree. - -\endpreamble - -\usedir{tex/latex/icite} -\generate{ - \file{\jobname.sty}{\from{\jobname.dtx}{package}} -} -% -%\endbatchfile -%<*internal> -\usedir{source/latex/icite} -\generate{ - \file{\jobname.ins}{\from{\jobname.dtx}{install}} -} -\nopreamble\nopostamble -\usedir{doc/latex/icite} -\generate{ - \file{README.md}{\from{\jobname.dtx}{readme}} -} -\ifx\fmtname\nameofplainTeX - \expandafter\endbatchfile -\else - \expandafter\endgroup -\fi -% +% icite -- Indices locorum citatorum +% Copyright (C) 2019--2020 Robert Alesssi +% +% Please send error reports and suggestions for improvements to Robert +% Alessi +% +% This program is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +% General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with this program. If not, see +% . % \fi % % \iffalse @@ -188,7 +27,7 @@ Running "make install" installs the files in the local TeX tree. %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{icite} %<*package> - [2019/03/17 v1.2 Make Indices locorum citatorum] + [2020/03/05 v1.3a Make Indices locorum citatorum] % %<*driver> \documentclass{ltxdoc} @@ -258,7 +97,7 @@ Running "make install" installs the files in the local TeX tree. } @Book{IAUMuller, - sortname = {Ibn abi Usaybia}, + sortname = {{ibn abi usaybia}}, editor = {Müller, August}, author = {\prname{ibn 'abI 'u.saybi`aT}}, shorteditor = {Müller}, @@ -289,7 +128,7 @@ Running "make install" installs the files in the local TeX tree. title = {\arb[trans]{\uc{k}itAb al-^sukUk `al_A \uc{^g}AlInUs}}, indextitle = {\arb[trans]{\uc{^s}ukUk}}, - sortname = {Razi}, + sortname = {razi}, date = 1993, shorthand = {\prname{al-rAziyy}, \arb[trans]{\uc{^s}ukUk}}, editor = {Mehdi Mohaghegh}, @@ -310,7 +149,7 @@ Running "make install" installs the files in the local TeX tree. @MVBook{al-Nadim, author = {\prname{ibn al-nadIm}}, title = {\arb[trans]{\uc{f}ihrist}}, - sortname = {Ibn al-Nadim}, + sortname = {{ibn al-nadim}}, date = {1871/1872}, shorthand = {\arb[trans]{\uc{f}ihrist}}, editor = {Flügel, Gustav}, @@ -320,7 +159,7 @@ Running "make install" installs the files in the local TeX tree. } @Book{al-Qifti, - sortname = {Ibn al-Qifti}, + sortname = {{ibn al-qifti}}, entrysubtype = {classical}, shorthand = {\prname{al-qif.tiyy}, \arb[trans]{\uc{t}a'rI_h}}, location = {Leipzig}, @@ -340,25 +179,25 @@ Running "make install" installs the files in the local TeX tree. version = {1.0a} } \end{filecontents*} +\usepackage{fontspec} \usepackage[english]{babel} \usepackage[letterpaper,margin=25mm,left=50mm,nohead]{geometry} -\usepackage{fontspec} -\setmainfont{Old Standard}[RawFeature={+ss05;+ss06}] -\usepackage{newunicodechar} -\newunicodechar{ǧ}{ǧ} % Old Standard does not include ǧ/Ǧ -\newunicodechar{Ǧ}{Ǧ} % +\babelfont{rm}{Old Standard} +\babelfont{sf}{NewComputerModern Sans} +\babelfont{tt}{NewComputerModern Mono} \usepackage{arabluatex} \SetTranslitConvention{loc} \usepackage{xurl} \usepackage{uri} \usepackage{hyperxmp} \usepackage{varioref} +\usepackage{latexcolors} \usepackage[numbered]{hypdoc} -\hypersetup{unicode=true, colorlinks, allcolors=blue, +\hypersetup{unicode=true, colorlinks, allcolors=cinnamon, linktocpage=true, pdfauthor={Robert Alessi}, pdftitle={The icite package}, pdfcontactemail={alessi@robertalessi.net}, pdfcontacturl={http://www.robertalessi.net/icite}, - pdfcopyright={Copyright (C) 2019 Robert Alessi + pdfcopyright={Copyright (C) 2019--2020 Robert Alessi . This document is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit @@ -408,7 +247,7 @@ Running "make install" installs the files in the local TeX tree. \newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}} \usepackage{tikz} \usepackage[breakable, skins, xparse, minted]{tcolorbox} -\tcbset{colback=white, boxrule=.15mm, colframe=red!50!white, +\tcbset{colback=white, boxrule=.15mm, colframe=cinnamon, breakable} \newtcblisting{example}{minted options={linenos, numbersep=0mm}} \newtcblisting{code}{minted options={linenos, numbersep=0mm}, listing @@ -451,7 +290,7 @@ Running "make install" installs the files in the local TeX tree. % % \fi % -% \CheckSum{352} +% \CheckSum{360} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -526,7 +365,7 @@ Running "make install" installs the files in the local TeX tree. % \label{sec:license-software} % % \package{icite} --- \emph{Indices locorum citatorum}\\ -% Copyright \textcopyright\ 2019 Robert Alessi +% Copyright \textcopyright\ 2019--2020 Robert Alessi % % Please send error reports and suggestions for improvements to Robert % Alessi: @@ -563,7 +402,7 @@ Running "make install" installs the files in the local TeX tree. % % \subsection*{License applicable to this document} % \label{sec:documentation-license} -% Copyright \textcopyright\ 2019 Robert Alessi +% Copyright \textcopyright\ 2019--2020 Robert Alessi % % \ccbysa\marginpar{\texttt{CC BY-SA 4.0}} % This document is licensed under the Creative Commons @@ -609,7 +448,7 @@ Running "make install" installs the files in the local TeX tree. % % \fi % -% \package{icite} may be loaded with two optional \enquote*{named +% \package{icite} may be loaded with three optional \enquote*{named % arguments} either of which is set using the syntax % \meta{key}$=$\meta{value}. The description of the optional arguments % follows:--- @@ -626,7 +465,7 @@ Running "make install" installs the files in the local TeX tree. % \tcboxverb{Default: not set}\\ % \meta{index\_name} is the name of the index in which all passages % cited with the \cs{icite} command are to be found by default. As -% this option is not initally set, \cs{icite} naturally inserts cited +% this option is not initially set, \cs{icite} naturally inserts cited % passages in the default general index, unless |defaultindex| is set % to the value |none|, in which case indexing is disabled. It must be % noted that this named argument does not need a value as it defaults @@ -717,8 +556,9 @@ Running "make install" installs the files in the local TeX tree. % is satisfactory in most cases. % \item[indexauthor] This field is not set by Bib\LaTeX. However, it % may be used as a fallback field for multiple or complex names. -% \item[sortname] This standard Bib\LaTeX\ which is never printed may -% be used to modify the sorting order of the index entries. +% \item[sortname] This standard Bib\LaTeX\ field which is never +% printed may be used to modify the sorting order of the index +% entries. % \end{description} % % \paragraph{Example} @@ -733,7 +573,7 @@ Running "make install" installs the files in the local TeX tree. % But in the end, the |sortname| field is also needed because the % diacritics must be discarded so that the name be sorted % properly:\\[1ex]% -% |sortname = {|Hunayn ibn Ishaq|}| +% |sortname = {{|Hunayn ibn Ishaq|}}| % % \subsection{Titles} % To process titles, \package{icite} uses the following entry fields: @@ -1111,7 +951,7 @@ Running "make install" installs the files in the local TeX tree. \begin{code} % preamble: \usepackage[xindy]{imakeidx} - \makeindex[name=loccit, options=-M icite.sty] + \makeindex[name=loccit, options=-M icite.xdy] % document: \printindex[loccit] \end{code} @@ -1320,6 +1160,7 @@ Running "make install" installs the files in the local TeX tree. \index{\@sortedauthor!\@sortedtitle}% \fi\fi% }{% + \bgroup% \DTLforeach*{icite@indices}{% \icite@subtype=subtype,\icite@index=index}{% \ifx\@subtype\icite@subtype% @@ -1332,7 +1173,8 @@ Running "make install" installs the files in the local TeX tree. \else% \index{\@sortedauthor!\@sortedtitle}% \fi\fi% - \fi}} + \fi}% + \egroup}% \ifno@bibengine \ifx\@shorthand\empty% \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% @@ -1352,6 +1194,7 @@ Running "make install" installs the files in the local TeX tree. \index{\@sortedauthor!\@sortedtitle!#1}% \fi\fi% }{% + \bgroup% \DTLforeach*{icite@indices}{% \icite@subtype=subtype,\icite@index=index}{% \ifx\@subtype\icite@subtype% @@ -1364,13 +1207,14 @@ Running "make install" installs the files in the local TeX tree. \else% \index{\@sortedauthor!\@sortedtitle!#1}% \fi\fi% - \fi}}% + \fi}% + \egroup}% \ifno@bibengine \ifx\@shorthand\empty% \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% \ic@titpgdelim{#1}% \else% - \@shorthand, {#1}% + \@shorthand\ic@titpgdelim{#1}% \fi% \else% \fi% @@ -1384,6 +1228,7 @@ Running "make install" installs the files in the local TeX tree. \index{\@sortedauthor!\@sortedtitle!#2}% \fi\fi% }{% + \bgroup% \DTLforeach*{icite@indices}{% \icite@subtype=subtype,\icite@index=index}{% \ifx\@subtype\icite@subtype% @@ -1396,13 +1241,14 @@ Running "make install" installs the files in the local TeX tree. \else% \index{\@sortedauthor!\@sortedtitle!#2}% \fi\fi% - \fi}}% + \fi}% + \egroup}% \ifno@bibengine \ifx\@shorthand\empty% #1 \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% \ic@titpgdelim{#2}% \else% - #1 \@shorthand, {#2}% + #1 \@shorthand\ic@titpgdelim{#2}% \fi \else% \fi% diff --git a/Master/texmf-dist/source/latex/icite/icite.ins b/Master/texmf-dist/source/latex/icite/icite.ins index 176b1fd700c..d29cefb4003 100644 --- a/Master/texmf-dist/source/latex/icite/icite.ins +++ b/Master/texmf-dist/source/latex/icite/icite.ins @@ -1,12 +1,7 @@ %% -%% This is file `icite.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% icite.dtx (with options: `install') +%% icite -- Indices locorum citatorum %% -%% Copyright (C) 2019 by Robert Alessi +%% Copyright (C) 2019--2020 by Robert Alessi %% %% Please send error reports and suggestions for improvements to Robert %% Alessi @@ -35,7 +30,9 @@ \askforoverwritefalse \preamble -Copyright (C) 2019 by Robert Alessi +icite -- Indices locorum citatorum + +Copyright (C) 2019--2020 by Robert Alessi Please send error reports and suggestions for improvements to Robert Alessi -- cgit v1.2.3