generator-latex-template 0.5.0 → 0.6.0

package/README.md

@@ -108,9 +108,9 @@ In the long run, the contents of the `paper.tex` (and similar) files in reposito
   - Run `npx yo <path-to-git-repository>`
     - Windows: `npx yo c:\git-repositories\latextemplates\generator-latex-template`
   - Parameters can be set using command line
-    - Linux: `npx yo /tmp/repo --documentclass=lncs --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment --howtotext=true --examples=true`
-    - Windows: `npx yo c:\git-repositories\latextemplates\generator-latex-template --documentclass=scientific-thesis --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment  --howtotext=true --examples=true`
-    - Windows automatic generation of a LNCS template (with pdflatex and bibtex): `npx yo c:\git-repositories\latextemplates\generator-latex-template --documentclass=lncs --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment --howtotext=true --examples=true`
+    - Linux: `npx yo /tmp/repo --documentclass=lncs --overleaf=false --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment --howtotext=true --examples=true`
+    - Windows: `npx yo c:\git-repositories\latextemplates\generator-latex-template --documentclass=scientific-thesis --overleaf=false --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment  --howtotext=true --examples=true`
+    - Windows automatic generation of a LNCS template (with pdflatex and bibtex): `npx yo c:\git-repositories\latextemplates\generator-latex-template --documentclass=lncs --overleaf=false --texlive=2021 --latexcompiler=pdflatex --bibtextool=bibtex --docker=false --language=en --font=default --listings=listings --cleveref=true --enquotes=csquotes --tweak_outerquote=babel --todo=pdfcomment --howtotext=true --examples=true`
   - Run `latexmk` to build the PDF
 - Update npm dependencies
   - `npx npm-update-all`. See [FreeCodeCamp](https://www.freecodecamp.org/news/10-npm-tricks-that-will-make-you-a-pro-a945982afb25/) for more details.
@@ -171,6 +171,8 @@ ejslint.cmd c:\git-repositories\latextemplates\generator-latex-template\generato
 The code is licensed [0BSD](https://choosealicense.com/licenses/0bsd/#), the snippets (both LaTeX and text) 0BSD, too.
 See [benbalter/talks#15](https://github.com/benbalter/talks/issues/15#issuecomment-599704662), for a reasoning, why [CC0](https://creativecommons.org/share-your-work/public-domain/cc0/) cannot be used.
 
+`generators/app/templates/splncs04nat.bst` is taken from [tpavlic/splncs04nat](https://github.com/tpavlic/splncs04nat) and is MIT-licensed.
+
 [hyperref]: https://ctan.org/pkg/hyperref
 [listings]: https://ctan.org/pkg/listings
 [minted]: https://ctan.org/pkg/minted

package/generators/app/index.js

@@ -146,17 +146,40 @@ module.exports = class extends Generator {
         ],
         default: "a4paper"
       },
+      {
+        type: 'list',
+        name: 'overleaf',
+        message: 'Overleaf compatibility?',
+        choices: [
+          {
+            name: "yes",
+            value: true
+          },
+          {
+            name: "no",
+            value: false
+          }
+        ],
+        default: true
+      },
       {
         type: 'list',
         name: 'texlive',
-        message: 'Which TeXLive compatiblity?',
+        when: function(response) {
+          return (!response.overleaf || (response.overleaf == "false"));
+        },
+        message: 'Which TeXLive compatibility?',
         choices: [
           {
             name: "TeXLive 2021",
             value: 2021
+          },
+          {
+            name: "TeXLive 2022",
+            value: 2022
           }
         ],
-        default: 2021
+        default: 2022
       },
       {
         type: 'list',
@@ -165,7 +188,7 @@ module.exports = class extends Generator {
         choices: ["pdflatex", "lualatex"],
         default: "pdflatex",
         when: function(response) {
-          return !((response.documentclass === 'ieee') && (response.texlive == 2021));
+          return !(response.documentclass === 'ieee');
         }
       },
       {
@@ -394,6 +417,11 @@ module.exports = class extends Generator {
       // To access props later use this.props.someAnswer;
       this.props = props;
 
+      if (this.props.overleaf) {
+        // we do not prompt for texlive version in case of overleaf
+        this.props.texlive = 2021;
+      }
+
       // somehow texlive is not routed through
       // special handling
       if (this.params.options.texlive) {
@@ -428,6 +456,7 @@ module.exports = class extends Generator {
       this.props.cleveref = (this.props.cleveref === true) || (this.props.cleveref === 'true')
       this.props.examples = (this.props.examples === true) || (this.props.examples === 'true')
       this.props.howtotext = (this.props.howtotext === true) || (this.props.howtotext === 'true')
+      this.props.overleaf = (this.props.overleaf === true) || (this.props.overleaf === 'true')
 
       if (this.props.examples) {
         this.props.useExampleEnvironment = true;
@@ -513,7 +542,7 @@ module.exports = class extends Generator {
     );
     global.fs.copyTpl(
       global.templatePath('latexmkrc'),
-      global.destinationPath('latexmkrc'),
+      global.destinationPath(global.props.overleaf ? '_latexmkrc' : 'latexmkrc'),
       global.props
     );
     global.fs.copyTpl(
@@ -533,8 +562,8 @@ module.exports = class extends Generator {
     );
     if (global.props.documentclass === 'lncs') {
       global.fs.copy(
-        global.templatePath('splncsnat.bst'),
-        global.destinationPath('splncsnat.bst')
+        global.templatePath('splncs04nat.bst'),
+        global.destinationPath('splncs04nat.bst')
       );
     }
     if (global.props.language === 'de') {
@@ -604,6 +633,13 @@ module.exports = class extends Generator {
         );
         break;
     }
+    if (global.props.docker) {
+      global.fs.copyTpl(
+        global.templatePath('.github/workflows/check.yml'),
+        global.destinationPath('.github/workflows/check.yml'),
+        global.props
+      );
+    }
   }
 
   install() {

package/generators/app/templates/.github/workflows/check.yml

@@ -0,0 +1,43 @@
+on:
+  push:
+  workflow_dispatch:
+concurrency:
+  group: check
+  cancel-in-progress: true
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          driver-opts: network=host
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx
+      - name: Build Docker image
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: localhost:5000/name/app:latest
+      - name: Set up Git repository
+        uses: actions/checkout@v3
+      - run: |
+          mkdir /tmp/out
+          mkdir /tmp/res
+      - run: docker run -v $(pwd):/work/src -v /tmp/out:/work/out localhost:5000/name/app:latest work "latexmk -pdf -pdflatex='<% if ((latexcompiler == "pdflatex") || githubpublish) { %>pdflatex<% } else { %>lualatex<% } %> --interaction=nonstopmode' <%= filenames.main %>"
+      - run: mv /tmp/out/*.pdf /tmp/res
+      - uses: actions/upload-artifact@v2
+        with:
+          name: test-result
+          path: |
+            /tmp/res/*.pdf

package/generators/app/templates/Dockerfile.reitzig

@@ -3,16 +3,18 @@ FROM reitzig/texlive-<% switch (latexcompiler) {
   case "lualatex": %>base-luatex<% break;
   default: %>base<% break;
 } -%>:<% switch (texlive) {
-  case 2021: %>2021.5<% break;
+  case 2022: %>2022.2<% break;
+  case 2021: %>2021.10<% break;
 } -%>
 
 RUN apk update && apk add --no-cache bash perl python3 py3-pip
 RUN pip3 install pygments
 
 # Emulate "Install dependencies" of "entrypoint work ..."
-<% if (texlive < 2021) { -%>
+<% if (texlive < 2022) { -%>
+RUN tlmgr update --self --repository http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/<%= texlive %>/tlnet-final
 COPY Texlivefile /work/src
-RUN xargs tlmgr install --repository ftp://ftp.math.utah.edu/pub/tex/historic/systems/texlive/<%= texlive %>/tlnet-final < "/work/src/Texlivefile" && \
+RUN xargs tlmgr install --repository http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/<%= texlive %>/tlnet-final < "/work/src/Texlivefile" && \
 <% } else { -%>
 RUN tlmgr update --self --repository https://mirror.mwt.me/ctan/systems/texlive/tlnet
 COPY Texlivefile /work/src

package/generators/app/templates/main.en.tex

@@ -205,8 +205,8 @@
 
 % Add manual adapted hyphenation of English words
 % See https://ctan.org/pkg/hyphenex and https://tex.stackexchange.com/a/22892/9075 for details
-% Could not work on MiKTeX
-\input{ushyphex}
+% Does not work on MiKTeX, therefore disabled - issue reported at https://github.com/MiKTeX/miktex-packaging/issues/271
+% \input{ushyphex}
 
 % correct bad hyphenation here
 \hyphenation{op-tical net-works semi-conduc-tor}
@@ -373,11 +373,10 @@
 \lipsum[1]
 <% } -%>
 <% switch (documentclass) { case "lncs": -%>
+
+\keywords{First keyword \and Second keyword \and Third keyword}
 \end{abstract}
 
-\begin{keywords}
-  keyword1, keyword2
-\end{keywords}
 <% break; case "acmart": -%>
 \end{abstract}
 
@@ -683,8 +682,10 @@ An interpretation can only be followed after all results have been described. Th
 \lipsum[1-3]\todo{Refine me}
 
 The remainder of the paper starts with a presentation of related work (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:relatedwork}).
-<% if (examples) { %>It is followed by a presentation of hints on \LaTeX{} (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:latexhints}).<% } -%>
-<% if (!examples && (documentclass == 'ieee')) { %>Afterwards, we present some Lorem Ipsum (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:loremipsum}).<% } -%>
+<% if (examples) { %>It is followed by a presentation of hints on \LaTeX{} (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:latexhints}).<% }
+-%>
+<% if (!examples && (documentclass == 'ieee')) { %>Afterwards, we present some Lorem Ipsum (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:loremipsum}).<% }
+-%>
 Finally, a conclusion is drawn and outlook on future work is made (<% if (cleveref) { %>\cref<% } else if (documentclass == 'lncs') { %>Sect.~\ref<% } else { %>Section~\ref<% } %>{sec:outlook}).
 
 <%= heading1 %>{Related Work}
@@ -696,11 +697,7 @@ The whole idea of TOSCA is explained by <% if (available.citet) { %>\citet<% } e
 
 <% if (examples) { -%>
 <%= heading1 %>{LaTeX Hints}
-<% if (documentclass == 'lncs') { -%>
 \label{sec:latexhints}
-<% } else { -%>
-\label{chap:latexhints}
-<% } -%>
 
 <% if (useExampleEnvironment) { -%>
 % Required for proper example rendering in the compiled PDF
@@ -839,9 +836,9 @@ See \url{https://help.jabref.org/en/CleanupEntries} for an overview of the clean
 
 \renewcommand{\bibsection}{\section*{References}} % requried for natbib to have "References" printed and as section*, not chapter*
 % Use natbib compatbile splncsnat style.
-% It does provide all features of splncs03, but is developed in a clean way.
-% Source: http://phaseportrait.blogspot.de/2011/02/natbib-compatible-bibtex-style-bst-file.html
-\bibliographystyle{splncsnat}
+% It does provide all features of splncs04.bst, but is developed in a clean way.
+% Source: https://github.com/tpavlic/splncs04nat
+\bibliographystyle{splncs04nat}
 \begingroup
   \microtypecontext{expansion=sloppy}
   \small % ensure correct font size for the bibliography
@@ -882,7 +879,6 @@ See \url{https://help.jabref.org/en/CleanupEntries} for an overview of the clean
 All links were last followed on October 5, 2020.
 
 <% switch (documentclass) { case "lncs": -%>
-
 %%% ===============================================================================
 %\appendix
 %\addcontentsline{toc}{chapter}{APPENDICES}
@@ -895,7 +891,6 @@ All links were last followed on October 5, 2020.
 %<%= heading1 %>{My first appendix}\label{sec:appendix1}
 %%% ===============================================================================
 <% break; case "scientific-thesis": -%>
-
 %%% ===============================================================================
 \appendix
 \addcontentsline{toc}{chapter}{Appendices}

package/generators/app/templates/{splncsnat.bst → splncs04nat.bst}

@@ -1,49 +1,14 @@
-%% natbib-compatible BibTeX bibliography style `splncsnat'
 %%
-%% BibTeX bibliography style for use with numbered references in
-%% Springer Verlag's "Lecture Notes in Computer Science" series.
-%% (See Springer's documentation for llncs.cls for
-%% more details of the suggested reference format.)
-%%
-%% Use
-%%
-%% \documentclass{llncs}
-%% \usepackage[numbers]{natbib}
-%% \bibliographystyle{splncsnat}
-%%
-%% and cite references with (e.g.)
-%%
-%% \cite{smith77}       % to get a "[1]" in the text
-%% \citep{smith77}      % to get a "[1]" in the text
-%% \citet{smith77}      % to get a "Smith [1]" in the text
-%% \citeauthor{smith77} % to get a "Smith" in the text
-%%
-%% The changes below are inspired by similar changes made to
-%% splncs03.bst by Maurizio "Titto" Patrignani of
-%% Dipartimento di Informatica e Automazione Universita' Roma Tre.
-%% Unfortunately, splncs03.bst was not compatible with natbib (because it
-%% was not built with author-year capability).
-%%
-%% ================================================================================================
-%% MANUAL CHANGES
-%% (with respect to splncsnat-unpatched.bst produced from
-%%  splncsnat-unpatched.dbj):
-%% [ search for ++++ to find the changes ]
-%% - Emptied \urlprefix by default
-%% - Added a new.sentence command to separate with a dot booktitle and series in the inproceedings
-%% - Commented all new.block commands before notes (to separate them with a comma)
-%% ================================================================================================
-%%
-%% This is derived from `splncsnat-unpatched.bst',
+%% This is file `splncs04nat.bst',
 %% generated with the docstrip utility.
 %%
-%% The original source files for splncsnat-unpatched.bst were:
+%% The original source files were:
 %%
-%% merlin.mbs  (with options: `ay,nat,vonx,nm-rvvc,ed-rev,yr-par,aymth,note-yr,jttl-rm,volp-com,numser,ser-vol,jnm-x,btit-rm,bt-rm,edparxc,au-col,in-col,fin-bare,pp,ed,abr,mth-bare,xedn,jabr,and-com,and-com-ed,xand,url,url-nt,em-x,nfss,')
+%% merlin.mbs  (with options: `ay,nat,vonx,nm-rvvc,ed-rev,nmfted,yr-par,aymth,jttl-rm,vol-bf,volp-com,num-xser,numser,ser-vol,jnm-x,btit-rm,bt-rm,isbn,issn,doi,edparxc,blk-tit,au-col,in-col,fin-bare,pp,ed,abr,mth-bare,xedn,jabr,and-com,and-com-ed,xand,url,url-blk,em-x,nfss,')
 %% ----------------------------------------
-%% *** natbib-compatible .bst file for Springer LNCS ***
+%% *** natbib-compatible splncs04 ***
 %% 
-%% Copyright 1994-2007 Patrick W Daly
+%% Copyright 1994-2011 Patrick W Daly
  % ===============================================================
  % IMPORTANT NOTICE:
  % This bibliographic style (bst) file has been generated from one or
@@ -55,7 +20,7 @@
  % version 1 of the License, or any later version.
  % ===============================================================
  % Name and version information of the main mbs file:
- % \ProvidesFile{merlin.mbs}[2007/04/24 4.20 (PWD, AO, DPC)]
+ % \ProvidesFile{merlin.mbs}[2011/11/18 4.33 (PWD, AO, DPC)]
  %   For use with BibTeX version 0.99a or later
  %-------------------------------------------------------------------
  % This bibliography style file is intended for texts in ENGLISH
@@ -80,7 +45,7 @@
  %   \citep*{key} ==>>               (Jones, Baker, and Smith, 1990)
  %   \citep[chap. 2]{key} ==>>       (Jones et al., 1990, chap. 2)
  %   \citep[e.g.][]{key} ==>>        (e.g. Jones et al., 1990)
- %   \citep[e.g.][p. 32]{key} ==>>   (e.g. Jones et al., p. 32)
+ %   \citep[e.g.][p. 32]{key} ==>>   (e.g. Jones et al., 1990, p. 32)
  %   \citeauthor{key} ==>>           Jones et al.
  %   \citeauthor*{key} ==>>          Jones, Baker, and Smith
  %   \citeyear{key} ==>>             1990
@@ -91,11 +56,14 @@ ENTRY
     author
     booktitle
     chapter
+    doi
     edition
     editor
     eid
     howpublished
     institution
+    isbn
+    issn
     journal
     key
     month
@@ -192,7 +160,7 @@ FUNCTION {add.colon}
 
 FUNCTION {date.block}
 {
-  new.block
+  skip$
 }
 
 FUNCTION {not}
@@ -211,17 +179,24 @@ FUNCTION {or}
   if$
 }
 STRINGS {z}
+
 FUNCTION {remove.dots}
 { 'z :=
-  ""
-  { z empty$ not }
-  { z #1 #1 substring$
-    z #2 global.max$ substring$ 'z :=
-    duplicate$ "." = 'pop$
-      { * }
-    if$
-  }
-  while$
+   ""
+   { z empty$ not }
+   { z #1 #2 substring$
+     duplicate$ "\." =
+       { z #3 global.max$ substring$ 'z :=  * }
+       { pop$
+         z #1 #1 substring$
+         z #2 global.max$ substring$ 'z :=
+         duplicate$ "." = 'pop$
+           { * }
+         if$
+       }
+     if$
+   }
+   while$
 }
 FUNCTION {new.block.checkb}
 { empty$
@@ -239,6 +214,12 @@ FUNCTION {field.or.null}
 }
 FUNCTION {emphasize}
 { skip$ }
+FUNCTION {bolden}
+{ duplicate$ empty$
+    { pop$ "" }
+    { "\textbf{" swap$ * "}" * }
+  if$
+}
 FUNCTION {tie.or.space.prefix}
 { duplicate$ text.length$ #3 <
     { "~" }
@@ -407,6 +388,15 @@ FUNCTION {bibinfo.warn}
     }
   if$
 }
+FUNCTION {format.url}
+{
+  url
+  duplicate$ empty$
+    { pop$ "" }
+    { "\urlprefix\url{" swap$ * "}" * }
+  if$
+}
+
 INTEGERS { nameptr namesleft numnames }
 
 
@@ -480,12 +470,34 @@ FUNCTION {format.editors}
     }
   if$
 }
+FUNCTION {format.isbn}
+{ isbn "isbn" bibinfo.check
+  duplicate$ empty$ 'skip$
+    {
+      "ISBN " swap$ *
+    }
+  if$
+}
+
+FUNCTION {format.issn}
+{ issn "issn" bibinfo.check
+  duplicate$ empty$ 'skip$
+    {
+      "ISSN " swap$ *
+    }
+  if$
+}
+
+FUNCTION {format.doi}
+{ doi empty$
+    { "" }
+    {
+      "\doi{" doi * "}" *
+    }
+  if$
+}
 FUNCTION {format.note}
 {
-  url empty$
-    'skip$
-    { "\urlprefix\url{" url * "}" * output }
-  if$
  note empty$
     { "" }
     { note #1 #1 substring$
@@ -700,14 +712,14 @@ FUNCTION {format.number.series}
 { volume empty$
     { number empty$
         { series field.or.null }
-        { output.state mid.sentence =
-            { bbl.number }
-            { bbl.number capitalize }
-          if$
-          number tie.or.space.prefix "number" bibinfo.check * *
-          series empty$
-            { "there's a number but no series in " cite$ * warning$ }
-            { bbl.in space.word *
+        { series empty$
+            { number "number" bibinfo.check }
+            { output.state mid.sentence =
+                { bbl.number }
+                { bbl.number capitalize }
+              if$
+              number tie.or.space.prefix "number" bibinfo.check * *
+              bbl.in space.word *
               series "series" bibinfo.check *
             }
           if$
@@ -801,6 +813,7 @@ FUNCTION {format.vol.num.pages}
       "volume" bibinfo.check
     }
   if$
+  bolden
   number "number" bibinfo.check duplicate$ empty$ 'skip$
     {
       swap$ duplicate$ empty$
@@ -930,9 +943,8 @@ FUNCTION {article}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.title "title" output.check
-  new.block
+  new.sentence
   crossref missing$
     {
       journal
@@ -946,7 +958,9 @@ FUNCTION {article}
       format.pages output
     }
   if$
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.issn output
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -965,23 +979,23 @@ FUNCTION {book}
       if$
     }
   if$
-  new.block
   format.btitle "title" output.check
   crossref missing$
     { format.bvolume output
-      new.block
-      new.sentence
+  new.sentence
       format.number.series output
       format.publisher.address output
     }
     {
-      new.block
+  new.sentence
       format.book.crossref output.nonnull
     }
   if$
   format.edition output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.isbn output
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -990,13 +1004,14 @@ FUNCTION {booklet}
   format.authors output
   author format.key output
   add.colon
-  new.block
   format.title "title" output.check
-  new.block
+  new.sentence
   howpublished "howpublished" bibinfo.check output
   address "address" bibinfo.check output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.isbn output
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1016,26 +1031,29 @@ FUNCTION {inbook}
       if$
     }
   if$
-  new.block
   format.btitle "title" output.check
   crossref missing$
     {
       format.bvolume output
       format.chapter.pages "chapter and pages" output.check
-      new.block
-      new.sentence
+  new.sentence
       format.number.series output
       format.publisher.address output
     }
     {
       format.chapter.pages "chapter and pages" output.check
-      new.block
+  new.sentence
       format.book.crossref output.nonnull
     }
   if$
   format.edition output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  crossref missing$
+    { format.isbn output }
+    'skip$
+  if$
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1045,24 +1063,24 @@ FUNCTION {incollection}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.title "title" output.check
-  new.block
+  new.sentence
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
       format.bvolume output
       format.chapter.pages output
-      new.sentence
       format.number.series output
       format.publisher.address output
       format.edition output
       format.date "year" output.check
+      format.isbn output
     }
     { format.incoll.inproc.crossref output.nonnull
       format.chapter.pages output
     }
   if$
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1071,15 +1089,12 @@ FUNCTION {inproceedings}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.title "title" output.check
-  new.block
+  new.sentence
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
-      new.sentence % ++++ ADDED (to get period b/w booktitle and series)
       format.bvolume output
       format.pages output
-      new.sentence
       format.number.series output
       publisher empty$
         { format.organization.address output }
@@ -1088,12 +1103,15 @@ FUNCTION {inproceedings}
         }
       if$
       format.date "year" output.check
+      format.isbn output
+      format.issn output
     }
     { format.incoll.inproc.crossref output.nonnull
       format.pages output
     }
   if$
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1103,14 +1121,14 @@ FUNCTION {manual}
   format.authors output
   author format.key output
   add.colon
-  new.block
   format.btitle "title" output.check
-  organization address new.block.checkb
+  new.sentence
   organization "organization" bibinfo.check output
   address "address" bibinfo.check output
   format.edition output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1120,15 +1138,15 @@ FUNCTION {mastersthesis}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.btitle
   "title" output.check
-  new.block
+  new.sentence
   bbl.mthesis format.thesis.type output.nonnull
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1138,12 +1156,12 @@ FUNCTION {misc}
   format.authors output
   author format.key output
   add.colon
-  new.block
   format.title output
-  new.block
+  new.sentence
   howpublished "howpublished" bibinfo.check output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1152,15 +1170,15 @@ FUNCTION {phdthesis}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.btitle
   "title" output.check
-  new.block
+  new.sentence
   bbl.phdthesis format.thesis.type output.nonnull
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1170,10 +1188,8 @@ FUNCTION {proceedings}
   format.editors output
   editor format.key output
   add.colon
-  new.block
   format.btitle "title" output.check
   format.bvolume output
-  new.sentence
   format.number.series output
   publisher empty$
     { format.organization.address output }
@@ -1182,7 +1198,10 @@ FUNCTION {proceedings}
     }
   if$
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.isbn output
+  format.issn output
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1192,15 +1211,15 @@ FUNCTION {techreport}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.title
   "title" output.check
-  new.block
+  new.sentence
   format.tr.number output.nonnull
   institution "institution" bibinfo.warn output
   address "address" bibinfo.check output
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note output
   fin.entry
 }
@@ -1210,10 +1229,10 @@ FUNCTION {unpublished}
   format.authors "author" output.check
   author format.key output
   add.colon
-  new.block
   format.title "title" output.check
   format.date "year" output.check
-  % new.block       ++++ REMOVED (to get comma before note)
+  format.doi output
+  format.url output
   format.note "note" output.check
   fin.entry
 }
@@ -1315,7 +1334,7 @@ FUNCTION {calc.label}
   *
   year duplicate$ empty$
      { pop$ "????" }
-     'skip$
+     { purify$ #-1 #4 substring$ }
   if$
   *
   'label :=
@@ -1329,15 +1348,16 @@ FUNCTION {sort.format.names}
   numnames 'namesleft :=
     { namesleft #0 > }
     { s nameptr
-      "{ll{ }}{  ff{ }}{  jj{ }}"
+      "{ll{ }}{  f{ }}{  jj{ }}"
       format.name$ 't :=
       nameptr #1 >
         {
           "   "  *
           namesleft #1 = t "others" = and
-            { "zzzzz" * }
-            { t sortify * }
+            { "zzzzz" 't := }
+            'skip$
           if$
+          t sortify *
         }
         { t sortify * }
       if$
@@ -1428,17 +1448,30 @@ FUNCTION {presort}
 ITERATE {presort}
 SORT
 STRINGS { last.label next.extra }
-INTEGERS { last.extra.num number.label }
+INTEGERS { last.extra.num last.extra.num.extended last.extra.num.blank number.label }
 FUNCTION {initialize.extra.label.stuff}
 { #0 int.to.chr$ 'last.label :=
   "" 'next.extra :=
   #0 'last.extra.num :=
+  "a" chr.to.int$ #1 - 'last.extra.num.blank :=
+  last.extra.num.blank 'last.extra.num.extended :=
   #0 'number.label :=
 }
 FUNCTION {forward.pass}
 { last.label label =
     { last.extra.num #1 + 'last.extra.num :=
-      last.extra.num int.to.chr$ 'extra.label :=
+      last.extra.num "z" chr.to.int$ >
+       { "a" chr.to.int$ 'last.extra.num :=
+         last.extra.num.extended #1 + 'last.extra.num.extended :=
+       }
+       'skip$
+      if$
+      last.extra.num.extended last.extra.num.blank >
+        { last.extra.num.extended int.to.chr$
+          last.extra.num int.to.chr$
+          * 'extra.label := }
+        { last.extra.num int.to.chr$ 'extra.label := }
+      if$
     }
     { "a" chr.to.int$ 'last.extra.num :=
       "" 'extra.label :=
@@ -1491,8 +1524,13 @@ FUNCTION {begin.bib}
   write$ newline$
   "\providecommand{\url}[1]{\texttt{#1}}"
   write$ newline$
-%  "\providecommand{\urlprefix}{URL }"      ++++ EMPTIED by default
-  "\providecommand{\urlprefix}{}"
+  "\providecommand{\urlprefix}{URL }"
+  write$ newline$
+  "\expandafter\ifx\csname urlstyle\endcsname\relax"
+  write$ newline$
+  "  \providecommand{\doi}[1]{doi:\discretionary{}{}{}#1}\else"
+  write$ newline$
+  "  \providecommand{\doi}{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url}\fi"
   write$ newline$
 }
 EXECUTE {begin.bib}
@@ -1505,4 +1543,4 @@ FUNCTION {end.bib}
 EXECUTE {end.bib}
 %% End of customized bst file
 %%
-%% End of file `splncsnat.bst'.
+%% End of file `splncs04nat.bst'.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-latex-template",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Generates a latex template to be used as start for writing scientific works (papers, articles, theses)",
   "homepage": "https://github.com/latextemplates/generator-latex-template",
   "author": {