isodoc (20feb21)

git-svn-id: svn://tug.org/texlive/trunk@57811 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 42 insertions, 34 deletions

diff --git a/Master/texmf-dist/source/latex/isodoc/Makefile b/Master/texmf-dist/source/latex/isodoc/Makefile
index daaa1941d6e..bbf08f28900 100644
--- a/Master/texmf-dist/source/latex/isodoc/Makefile
+++ b/Master/texmf-dist/source/latex/isodoc/Makefile
@@ -44,16 +44,16 @@ inst: $(NAME).pdf
 	rm -rf $(UTREE)/{tex,source,doc}/latex/$(NAME)/*
 	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
 	cp $(NAME).cls $(UTREE)/tex/latex/$(NAME)
-	cp $(NAME).pdf README $(UTREE)/doc/latex/$(NAME)
+	cp $(NAME).pdf README.md $(UTREE)/doc/latex/$(NAME)
 install: $(NAME).pdf
 	sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
 	sudo rm -rf $(LOCAL)/{tex,source,doc}/latex/$(NAME)/*
 	sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
 	sudo cp $(NAME).cls $(LOCAL)/tex/latex/$(NAME)
-	sudo cp $(NAME).pdf README $(LOCAL)/doc/latex/$(NAME)
+	sudo cp $(NAME).pdf README.md $(LOCAL)/doc/latex/$(NAME)
 zip: $(NAME).pdf
 	ln -sf . $(NAME)
-	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README,$(NAME).{pdf,dtx,ins}}
+	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README.md,$(NAME).{pdf,dtx,ins}}
 	rm $(NAME)
 help:
 	@ echo "make help	Print this help"
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
index 8c05e2e7fb5..777f91404bd 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
@@ -27,7 +27,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{isodoc}%
 %<*class>
-   [2020/07/16 v1.11 isodoc class for letters and invoices]
+   [2021/02/20 v1.12 isodoc class for letters and invoices]
 %</class>
 %<*driver>
 \documentclass{ltxdoc}
@@ -299,6 +299,12 @@
 %  - payment data terminology and footer headers all lower case 
 %    (except for German)
 % }
+% \changes{v1.12}{2021/02/20}{
+%  - For some reason letter body now needs to start with par command, can't find
+%    out which package causes this.
+%  - isodoc.ins syntax did'nt work, probably because of changes in luatex?
+%  - small changes because of move from bitbucket to github
+% }
 % \DoNotIndex{%
 % \,\",\',\@auxout,\AtBeginDocument,\AtEndDocument,\AtEndOfClass,\ClassError,
 % \ClassWarning,\CurrentOption,\DeclareOption,\DescribeMacro,\ForEachX,
@@ -2066,7 +2072,7 @@ accountname;payref;vatno;chamber}
     \end{textblock}
   }
   \subjectpos=\headerpos
-  \textskip=\headerpos\advance\textskip-12
+  \textskip=\headerpos\advance\textskip-14
   \ifx\subject\empty\advance\textskip-10\else\advance\subjectpos10\fi
   \openingpos=\subjectpos
   \ifheader
@@ -2114,7 +2120,7 @@ accountname;payref;vatno;chamber}
   \noindent\isodoc@Tbox{35}{\openingpos}{140}{\opening\@openingcomma}
   \vspace{\textskip mm}
   \thispagestyle{empty}
-  \noindent\ignorespaces#2
+  \par\noindent\ignorespaces#2
   \ifclosing{\vskip\closingskip\vskip-\baselineskip
     \parindent=0pt\parskip=\baselineskip\noindent
     \begin{minipage}[t]{\hsize}
@@ -3292,16 +3298,16 @@ inst: $(NAME).pdf
 	rm -rf $(UTREE)/{tex,source,doc}/latex/$(NAME)/*
 	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
 	cp $(NAME).cls $(UTREE)/tex/latex/$(NAME)
-	cp $(NAME).pdf README $(UTREE)/doc/latex/$(NAME)
+	cp $(NAME).pdf README.md $(UTREE)/doc/latex/$(NAME)
 install: $(NAME).pdf
 	sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
 	sudo rm -rf $(LOCAL)/{tex,source,doc}/latex/$(NAME)/*
 	sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
 	sudo cp $(NAME).cls $(LOCAL)/tex/latex/$(NAME)
-	sudo cp $(NAME).pdf README $(LOCAL)/doc/latex/$(NAME)
+	sudo cp $(NAME).pdf README.md $(LOCAL)/doc/latex/$(NAME)
 zip: $(NAME).pdf
 	ln -sf . $(NAME)
-	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README,$(NAME).{pdf,dtx,ins}}
+	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README.md,$(NAME).{pdf,dtx,ins}}
 	rm $(NAME)
 help:
 	@ echo "make help	Print this help"
@@ -3363,7 +3369,7 @@ if [[ $type == show ]]; then
 else
    which cols >/dev/null || {
       echo "listkeys needs the cols script; you can find that here:"
-      echo "https://bitbucket.org/wybodekker/cols/src/7af1a60161bf2ce45a3842582475de7eb621a1cf/cols?at=default"
+      echo "https://github.com/wybodekker/cols"
       echo "or here:"
       echo "http://www.dekkerdocumenten.nl/unix/cols"
       exit 1
@@ -12718,13 +12724,16 @@ AAAADwAPAOMEAADkZAYAAAA=
 ====
 %</files>
 %<*readme>
-|
--------:|:--------------------------------------
- isodoc:| LaTeX class used for typesetting of letters and invoices
- Author:| Wybo Dekker
- E-mail:| wybo@dekkerdocumenten.nl
-License:| Released under the LaTeX Project Public License v1.3c or later
-    See:| http://www.latex-project.org/lppl.txt
+# isodoc
+|    key | description
+|    ---:|:---
+| isodoc | LaTeX class used for typesetting of letters and invoices
+|version | 1.12
+|   date | 2021-02-20
+| author | Wybo Dekker
+|  email | wybo@dekkerdocumenten.nl
+|license | Released under the LaTeX Project Public License v1.3c or later
+|    see | http://www.latex-project.org/lppl.txt
 
 Short description:
 The isodoc class is used for the preparation of letters and invoices.
@@ -12738,7 +12747,7 @@ These can individually be compiled, which may be useful for users to
 experiment with.
 
 Full documentation:
-https://bitbucket.org/wybodekker/isodoc/downloads/isodoc.pdf
+http://mirrors.ctan.org/macros/latex/contrib/isodoc/isodoc.pdf
 
 Installation:
 1. Copy isodoc.dtx and isodoc.ins in an empty directory
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.ins b/Master/texmf-dist/source/latex/isodoc/isodoc.ins
index f9bcd32f96b..e7f65e50644 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.ins
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.ins
@@ -33,27 +33,26 @@ and version 1.2 or later is part of all distributions of LaTeX version
 
 \endpreamble
 
-\generate{\file{isodoc.cls     }{\from{isodoc.dtx}{class}}
-          \file{README         }{\from{isodoc.dtx}{readme}}
+\generate{\file{isodoc.cls}{\from{isodoc.dtx}{class}}
           \nopreamble\nopostamble
-          \file{accept.tex     }{\from{isodoc.dtx}{accepttex}}
-          \file{accept.sty     }{\from{isodoc.dtx}{acceptsty}}
-          \file{invoice.tex    }{\from{isodoc.dtx}{invoicetex}}
-          \file{invoice.sty    }{\from{isodoc.dtx}{invoicesty}}
-          \file{letter.tex     }{\from{isodoc.dtx}{lettertex}}
-          \file{letter.sty     }{\from{isodoc.dtx}{lettersty}}
-          \file{logoletter.tex }{\from{isodoc.dtx}{logolettertex}}
-          \file{logoletter.sty }{\from{isodoc.dtx}{logolettersty}}
-          \file{ntgletter.tex  }{\from{isodoc.dtx}{ntglettertex}}
-          \file{ntgletter.sty  }{\from{isodoc.dtx}{ntglettersty}}
-          \file{files.zip.uue }{\from{isodoc.dtx}{files}}
-          \file{listkeys.sh    }{\from{isodoc.dtx}{listkeys}}    
+          \file{README.md}{\from{isodoc.dtx}{readme}}
+          \file{accept.tex}{\from{isodoc.dtx}{accepttex}}
+          \file{accept.sty}{\from{isodoc.dtx}{acceptsty}}
+          \file{invoice.tex}{\from{isodoc.dtx}{invoicetex}}
+          \file{invoice.sty}{\from{isodoc.dtx}{invoicesty}}
+          \file{letter.tex}{\from{isodoc.dtx}{lettertex}}
+          \file{letter.sty}{\from{isodoc.dtx}{lettersty}}
+          \file{logoletter.tex}{\from{isodoc.dtx}{logolettertex}}
+          \file{logoletter.sty}{\from{isodoc.dtx}{logolettersty}}
+          \file{ntgletter.tex}{\from{isodoc.dtx}{ntglettertex}}
+          \file{ntgletter.sty}{\from{isodoc.dtx}{ntglettersty}}
+          \file{files.zip.uue}{\from{isodoc.dtx}{files}}
+          \file{listkeys.sh}{\from{isodoc.dtx}{listkeys}}    
           \catcode`\	12
-          \file{Makefile       }{\from{isodoc.dtx}{make}}
+          \file{Makefile}{\from{isodoc.dtx}{make}}
 }
 \directlua{
  os.rename("Makefile.tex","Makefile")
- os.rename("README.tex","README")
 }
 
 \obeyspaces