summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-28 03:00:39 +0000
committerNorbert Preining <norbert@preining.info>2023-11-28 03:00:39 +0000
commit7b33592d2a3093111382c6dc05e50425c79eb37b (patch)
tree160e1779884fd13d09ea89414e175b13ca1b2a3e /macros/latex/contrib
parentc053caa3ee50538ec23a08c0d35a0ca205b9923d (diff)
CTAN sync 202311280300
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/kantlipsum/README.md6
-rw-r--r--macros/latex/contrib/kantlipsum/kantlipsum.dtx9
-rw-r--r--macros/latex/contrib/kantlipsum/kantlipsum.pdfbin677247 -> 677444 bytes
-rw-r--r--macros/latex/contrib/lni/CHANGELOG.md109
-rw-r--r--macros/latex/contrib/lni/CONTRIBUTING.md34
-rw-r--r--macros/latex/contrib/lni/README.md37
-rw-r--r--macros/latex/contrib/lni/lni-author-template.tex37
-rw-r--r--macros/latex/contrib/lni/lni-paper-example-de.bib14
-rw-r--r--macros/latex/contrib/lni/lni-paper-example-de.tex69
-rw-r--r--macros/latex/contrib/lni/lni.dtx666
-rw-r--r--macros/latex/contrib/lni/lni.ins8
-rw-r--r--macros/latex/contrib/lni/lni.pdfbin360866 -> 377740 bytes
-rw-r--r--macros/latex/contrib/unbtex/README.md16
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example.pdfbin592016 -> 587482 bytes
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example.tex24
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/apendice-a.tex3
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex6
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/capitulo1.tex2
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex228
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex37
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl1
-rw-r--r--macros/latex/contrib/unbtex/unbtex-example/codigos/blockdiagram.tex1
-rw-r--r--macros/latex/contrib/unbtex/unbtex.cls112
-rw-r--r--macros/latex/contrib/vectorlogos/README.md14
-rw-r--r--macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.pdfbin452149 -> 430507 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.tex98
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python-icon.pdfbin2388 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python-notm.pdfbin3661 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powh.pdfbin5705 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powv.pdfbin5592 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python-vertical.pdfbin3673 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogo-python.pdfbin5770 -> 0 bytes
-rw-r--r--macros/latex/contrib/vectorlogos/tex/vectorlogos.sty35
33 files changed, 856 insertions, 710 deletions
diff --git a/macros/latex/contrib/kantlipsum/README.md b/macros/latex/contrib/kantlipsum/README.md
index 3061cf96d1..b6415ccb28 100644
--- a/macros/latex/contrib/kantlipsum/README.md
+++ b/macros/latex/contrib/kantlipsum/README.md
@@ -2,9 +2,11 @@ The kantlipsum package spits out sentences in Kantian style provided
by the "Kant generator for Python" by Mark Pilgrim, described in the
book "Dive into Python".
-This is version 0.8b of the package
+This is version 0.8c of the package
-Version 0.8b is a maintenance release.
+Changes from earlier version:
+
+Version 0.8c is a maintenance release.
Copyright 2011-2023 Enrico Gregorio
diff --git a/macros/latex/contrib/kantlipsum/kantlipsum.dtx b/macros/latex/contrib/kantlipsum/kantlipsum.dtx
index 9d3faf6bee..dcee3f051c 100644
--- a/macros/latex/contrib/kantlipsum/kantlipsum.dtx
+++ b/macros/latex/contrib/kantlipsum/kantlipsum.dtx
@@ -7,11 +7,11 @@ The kantlipsum package spits out sentences in Kantian style provided
by the "Kant generator for Python" by Mark Pilgrim, described in the
book "Dive into Python".
-This is version 0.8b of the package
+This is version 0.8c of the package
Changes from earlier version:
-Version 0.8b is a maintenance release.
+Version 0.8c is a maintenance release.
Copyright 2011-2023 Enrico Gregorio
@@ -135,6 +135,7 @@ This work consists of the file kantlipsum.dtx
%\changes{v0.8}{2017/07/23}{Print only a few sentences of a paragraph}
%\changes{v0.8a}{2017/07/24}{Respect options and *-version}
%\changes{v0.8b}{2023/11/21}{Maintenance release}
+%\changes{v0.8c}{2023/11/27}{Maintenance release}
%
% \begin{documentation}
%
@@ -269,8 +270,8 @@ This work consists of the file kantlipsum.dtx
% \begin{macrocode}
\ProvidesExplPackage
{kantlipsum}
- {2023/11/21}
- {0.8b}
+ {2023/11/27}
+ {0.8c}
{Generate text in Kantian style}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/kantlipsum/kantlipsum.pdf b/macros/latex/contrib/kantlipsum/kantlipsum.pdf
index d58f559606..8c78d6996e 100644
--- a/macros/latex/contrib/kantlipsum/kantlipsum.pdf
+++ b/macros/latex/contrib/kantlipsum/kantlipsum.pdf
Binary files differ
diff --git a/macros/latex/contrib/lni/CHANGELOG.md b/macros/latex/contrib/lni/CHANGELOG.md
index 0620ff73a0..9eb9a35d23 100644
--- a/macros/latex/contrib/lni/CHANGELOG.md
+++ b/macros/latex/contrib/lni/CHANGELOG.md
@@ -1,94 +1,142 @@
# Changelog
All notable changes to this project will be documented in this file.
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](https://keepachangelog.com/).
-## [Unreleased]
+## [1.8] - 2023-11-26
-## [1.7.0] - 2021-03-02
+### Added
+
+- Added option `anonymous` for anonymizing an article ([#100](https://github.com/gi-ev/LNI/pull/100))
+- Added `\pdfoutput=1` to fix compatibility with [arXiv](https://arxiv.org/) ([#81](https://github.com/gi-ev/LNI/issues/81))
+- Added more links to `biblatex-lni` to documentation ([#90](https://github.com/gi-ev/LNI/issues/90))
+- Added `\yearofpublication` to documentation ([#89](https://github.com/gi-ev/LNI/pull/89))
+- New macro `\affil` for an easier way to enter afiliations (see the documentation and lni-paper-example-de.tex for more details)
+
+### Changed
+
+- Improved spacing in and around lists to better match the Word template ([#102](https://github.com/gi-ev/LNI/pull/102))
+- Synced title spacing with Word template ([#104](https://github.com/gi-ev/LNI/pull/104))
+- (chore) `build.sh` assumes `*.md` are formatted using LF line endings, removed `dos2unix` dependency.
+- Improvement for documentation ([#89](https://github.com/gi-ev/LNI/issues/89), [#90](https://github.com/gi-ev/LNI/issues/90), [#93](https://github.com/gi-ev/LNI/issues/93), [#95](https://github.com/gi-ev/LNI/issues/95), [#96](https://github.com/gi-ev/LNI/issues/96))
+- Changed delimiter between keywords to comma (,)
+- Load `amsmath` explictly
+- `author` now holds four arguments to integrate email and ORCID id.
+
+### Fixed
+
+- hyperref option `linktoc` fixed to `all` instead of `both`
+- Fixed output in bst files ([#97](https://github.com/gi-ev/LNI/issues/97))
+- Hyperlinked bibliographic entries work again ([#107](https://github.com/gi-ev/LNI/issues/107))
+- `\footnote` is not used for pdf bookmarks ([#87](https://github.com/gi-ev/LNI/issues/87))
+- Footnotes are always set at the bottom of the page ([#122](https://github.com/gi-ev/LNI/issues/122))
+- Handling of `fleqn` option for `amsmath`
+
+### Removed
+
+- Removed support for `ccicons`
+- Removed option `nohyperref` ([#131](https://github.com/gi-ev/LNI/issues/131))
+
+## [1.7] - 2021-03-02
### Changed
-- Change loading of latest ngerman hyphenation patterns (#47)
-- Change `\year` to `\yearofpublication` to avoid problems (#85)
+- Change loading of latest ngerman hyphenation patterns ([#47](https://github.com/gi-ev/LNI/issues/47))
+- Change `\year` to `\yearofpublication` to avoid problems ([#85](https://github.com/gi-ev/LNI/issues/85))
### Fixed
-- Fix setting of pdf metadata (#87)
-
-## [1.6.0] - 2019-10-14
+
+- Fix setting of pdf metadata ([#87](https://github.com/gi-ev/LNI/issues/87))
+
+## [1.6] - 2019-10-14
### Added
+
- Optional argument for `\booktitle` to support a short book title for running headers
- New macro `\booksubtitle`
- Add support for `selnolig` (LuaTeX-only)
### Changed
+
- `\email` now generates a `mailto:` hyperlink
- Example file: `align` instead of `eqnarray`
- Add `driver=none` option to `geometry` for better crop results (independent from engine)
### Fixed
+
- Global options are passed to `article` class ([#78](https://github.com/gi-ev/LNI/issues/78))
- Finally fix BiBTeX issue thanks to @ytzemih ([#6](https://github.com/gi-ev/LNI/issues/6))
- `hyperref` is loaded without options to make it more compatible with other packages like `authorarchive`
+- `hypcap` is only loaded if `hyperref` has been loaded before.
-## [1.5.0] - 2019-04-04
+
+## [1.5] - 2019-04-04
### Added
+
- Load package `textcomp` by default and add option `upquote` to `listings` package ([#69](https://github.com/gi-ev/LNI/issues/69))
- New option `norunningheads` to remove all running headers from the document
([#77](https://github.com/gi-ev/LNI/issues/77))
### Changed
+
- `\refname` changed to `Bibliography` for English texts
### Fixed
+
- German paper example: Correct language `Java` at example listing
- Packages `hyperef`, `cleveref` and `hypcap` are always at the end of the preamble ([#71](https://github.com/gi-ev/LNI/issues/71))
- Option `bookmarks` of `hyperref` now set at load-time. Had no effect before.
- Layout for English texts (subtitle)
- URL for GI in example file
-## [1.4.0] - 2018-01-15
+## [1.4] - 2018-01-15
### Added
+
- New option `oldfonts` to use the class file on older systems by loading the `mathptmx` font package ([#56](https://github.com/gi-ev/LNI/issues/56))
- New macros added (taken from `emisa.dtx`) ([#57](https://github.com/gi-ev/LNI/issues/57))
- Hint to word limit for abstract ([#60](https://github.com/gi-ev/LNI/issues/60))
-- Added full example for an article in German ([#63](https://github.com/gi-ev/LNI/issues/63))
+- Full example for an article in German ([#63](https://github.com/gi-ev/LNI/issues/63))
### Changed
+
- Package `caption` is loaded in order to make the class more robust ([#59](https://github.com/gi-ev/LNI/issues/59))
### Fixed
+
- Basewidth for `lstlistings` ([#62](https://github.com/gi-ev/LNI/issues/62))
- Adapting captions of `lstlistings`
- License statement of paper: CC-BY-SA instead of CC-BY-NC ([#67](https://github.com/gi-ev/LNI/issues/67))
+- Font size for `\large`
+- Font size bug regarding the running header and the captions
-## [1.3.0] - 2017-05-15
+## [1.3] - 2017-05-15
### Added
-- New option `nofonts` to use the class file on older systems ([#53](https://github.com/gi-ev/LNI/issues/52))
+
+- New option `nofonts` to use the class file on older systems ([#53](https://github.com/gi-ev/LNI/issues/53))
### Changed
-- Use more stable syntax for font loading with `fontspec` ([#54](https://github.com/gi-ev/LNI/issues/54))
+- Use more stable syntax for font loading with `fontspec` ([#54](https://github.com/gi-ev/LNI/issues/54))
-## [1.2.0] - 2017-05-05
+## [1.2] - 2017-05-05
### Added
+
- Quick start section for README.md ([#48](https://github.com/gi-ev/LNI/issues/48))
- New macro `\lnidoi` to add DOI to pages (DOI provided by editor)
- General (partial) support for `XeTeX` and `LuaTeX` using the `iftex` package ([#51](https://github.com/gi-ev/LNI/issues/51))
### Changed
-- Option `straightquotes` is set manually for package `newtxtt` to gain compatibility with versions prior to v1.05 ([#49](https://github.com/gi-ev/LNI/issues/49))
+- Option `straightquotes` is set manually for package `newtxtt` to gain compatibility with versions prior to v1.05 ([#49](https://github.com/gi-ev/LNI/issues/49))
-## [1.1.0] - 2017-04-19
+## [1.1] - 2017-04-19
### Added
+
- New macro `\subtitle` ([#44](https://github.com/gi-ev/LNI/issues/44))
- New keyword delimiter `\and` ([#43](https://github.com/gi-ev/LNI/issues/43))
- New files CHANGELOG.md and CONTRIBUTING.md
@@ -96,22 +144,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Check for latest German hyphenation patterns ([#47](https://github.com/gi-ev/LNI/issues/47))
### Changed
+
- CTAN script to include new files
- Documentation
### Fixed
-- Definition of `\Crefname` to always get "Abb." instead of "ABB." etc. ([#45](https://github.com/gi-ev/LNI/pull/45))
+- Definition of `\Crefname` to always gets "Abb." instead of "ABB." etc. ([#45](https://github.com/gi-ev/LNI/pull/45))
+
+## [1.0] - 2017-04-07
-## [1.0.0] - 2017-04-07
First release of the revised files
-[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.7...HEAD
-[1.7.0]: https://github.com/gi-ev/LNI/releases/tag/v1.7
-[1.6.0]: https://github.com/gi-ev/LNI/releases/tag/v1.6
-[1.5.0]: https://github.com/gi-ev/LNI/releases/tag/v1.5
-[1.4.0]: https://github.com/gi-ev/LNI/releases/tag/v1.4
-[1.3.0]: https://github.com/gi-ev/LNI/releases/tag/v1.3
-[1.2.0]: https://github.com/gi-ev/LNI/releases/tag/v1.2
-[1.1.0]: https://github.com/gi-ev/LNI/releases/tag/v1.1
-[1.0.0]: https://github.com/gi-ev/LNI/releases/tag/v1.0
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.8...HEAD
+[1.8]: https://github.com/gi-ev/LNI/releases/tag/v1.8
+[1.7]: https://github.com/gi-ev/LNI/releases/tag/v1.7.0
+[1.6]: https://github.com/gi-ev/LNI/releases/tag/v1.6.0
+[1.5]: https://github.com/gi-ev/LNI/releases/tag/v1.5
+[1.4]: https://github.com/gi-ev/LNI/releases/tag/v1.4
+[1.3]: https://github.com/gi-ev/LNI/releases/tag/v1.3
+[1.2]: https://github.com/gi-ev/LNI/releases/tag/v1.2
+[1.1]: https://github.com/gi-ev/LNI/releases/tag/v1.1
+[1.0]: https://github.com/gi-ev/LNI/releases/tag/v1.0
diff --git a/macros/latex/contrib/lni/CONTRIBUTING.md b/macros/latex/contrib/lni/CONTRIBUTING.md
index ff718c5bd6..0b8e296053 100644
--- a/macros/latex/contrib/lni/CONTRIBUTING.md
+++ b/macros/latex/contrib/lni/CONTRIBUTING.md
@@ -6,6 +6,30 @@ We love code contributions.
You can easily work on the code if you have a GitHub account ([get one](https://github.com/join)).
For that, please [fork the repository](https://help.github.com/articles/fork-a-repo/), work on the code, and submit a [pull request](https://help.github.com/articles/about-pull-requests/).
+## LaTeX hints
+
+We base on [reitzig's TeXLive Docker Images](https://github.com/reitzig/texlive-docker), which are small.
+They require each new package listed in `Texlivefile`.
+Thus, if you add a new LaTeX package, please also add it into that file.
+
+You can have a full `bash` environment to experiment by using following command (assuming you are on Windows and checked out the repository at `c:\git-repositories\LNI`):
+
+ docker run -it --rm -v c:\git-repositories\LNI:/work/src reitzig/texlive-base:2023.1 work bash
+
+After `cd /work/src`, you are in the directory hosting `lni.dtx` and all other files.
+
+You can check successful generation of `lni.cls` based on `lni.dtx` using following command:
+
+ docker run --rm -v c:\git-repositories\LNI:/work/src reitzig/texlive-base:2023.1 work
+
+⚠ Running that command overwrites `lni.cls` (based on `lni.dtx`), so be careful. ⚠
+
+## CI checks
+
+We have a GitHub workflow running, which checks the complete build using that Docker image.
+
+## Hints on GitHub usage
+
Take a look at GitHub's excellent overview on the [GitHub flow](https://guides.github.com/introduction/flow/index.html).
The [Feature Branch Workflow](https://de.atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) forms the basis of this kind of development.
@@ -20,11 +44,11 @@ In other words:
git checkout -b patch
-3. Make your changes.
-4. Commit your changes.
+4. Make your changes.
+5. Commit your changes.
Thereby, try to write a [good commit message](https://github.com/joelparkerhenderson/git_commit_message).
-5. Push your chaneges (to your repository)
-6. [submit a pull request](https://github.com/gi-ev/lni/compare/)
-7. At this point you're waiting on us.
+6. Push your changes (to your repository)
+7. [submit a pull request](https://github.com/gi-ev/lni/compare/)
+8. At this point you're waiting on us.
We like to at least comment on pull requests as soon as possible.
We may suggest some changes or improvements or alternatives.
diff --git a/macros/latex/contrib/lni/README.md b/macros/latex/contrib/lni/README.md
index f986ef46f5..b8ab8bdfc7 100644
--- a/macros/latex/contrib/lni/README.md
+++ b/macros/latex/contrib/lni/README.md
@@ -1,10 +1,10 @@
-# lni [![Build Status](https://circleci.com/gh/gi-ev/LNI/tree/master.svg?style=shield)](https://circleci.com/gh/gi-ev/LNI/) [![CTAN](https://img.shields.io/badge/CTAN-lni-blue.svg?style=flat-square)](https://ctan.org/pkg/lni)
+# lni
-```
+```yaml
----------------------------------------------------------------------------
-lni -- A class for submissions to the ``Lecture Notes in Informatics''
-(c) 2016-2021 Gesellschaft für Informatik (GI)
-Version: 1.7
+lni -- A class for submissions to the ``Lecture Notes in Informatics''
+(c) 2016-2023 Gesellschaft für Informatik (GI)
+Version: 1.8
Maintainer: Martin Sievers
Email: martin.sievers@schoenerpublizieren.de
License: Released under the LaTeX Project Public License v1.3c or later
@@ -19,19 +19,24 @@ This is the official version of the class “lni” for submissions to the
It is based on previous templates created on behalf of the GI.
Quick start:
-Download [lni-author-template.tex](lni-author-template.tex) and edit it in
+Download [`lni-author-template.tex`](lni-author-template.tex) and edit it in
your favorite LaTeX editor.
-You will have to use [BibTeX](https://www.ctan.org/pkg/bibtex) as bibliography tool.
-In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) and
-[Biber](https://www.ctan.org/pkg/biber), read on in the documentation of this class.
+By default [BibTeX](https://www.ctan.org/pkg/bibtex) is used as bibliography tool.
+In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) together with
+[Biber](https://www.ctan.org/pkg/biber) (strongly recommended), read on in the
+documentation. There is a specialized package
+[biblatex-lni](https://ctan.org/pkg/biblatex-lni), which can easily be included
+to get correctly formed bibliographies. The easiest way is to add `biblatex` as class
+option. See documentation for details.
+
You should use `pdflatex` as `xelatex` and `lualatex` lack some features of the class file.
-Stable versions are always uploaded to CTAN (https://www.ctan.org/pkg/lni).
-In addition you will find the most recent developer version on GitHub at https://github.com/gi-ev/lni.
-The most recent documentation is available at https://github.com/gi-ev/LNI/blob/master/lni.pdf.
-It includes a short description how to use the template and also provides trouble shooting hints.
+Stable versions are always uploaded to CTAN and available at <https://www.ctan.org/pkg/lni>.
+In addition, you will find the most recent developer version on GitHub at https://github.com/gi-ev/lni.
+The most recent documentation is available at <https://gi-ev.github.io/LNI/lni.pdf>.
+It includes a short description how to use the template and also provides troubleshooting hints.
-Please see [CHANGELOG.md](CHANGELOG.md) for a version history
+Please see [`CHANGELOG.md`](CHANGELOG.md) for a version history
- [GI]: https://www.gi.de/
- [Lecture Notes in Informatics]: https://www.gi.de/service/publikationen/lni.html
+[GI]: https://gi.de/
+[Lecture Notes in Informatics]: https://gi.de/service/publikationen/lni
diff --git a/macros/latex/contrib/lni/lni-author-template.tex b/macros/latex/contrib/lni/lni-author-template.tex
index abdbd74ce6..411fea056a 100644
--- a/macros/latex/contrib/lni/lni-author-template.tex
+++ b/macros/latex/contrib/lni/lni-author-template.tex
@@ -2,12 +2,15 @@
% !TeX program = pdflatex
% !BIB program = bibtex
-%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
-%%% Parameter zu laden.
-\documentclass[]{lni}
%%% To write an article in English, please use the option ``english'' in order
%%% to get the correct hyphenation patterns and terms.
%%% \documentclass[english]{class}
+%%% for anonymizing an article you can use the ``anonymous'' option.
+%%%
+%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
+%%% Parameter zu laden.
+%%% Zur Anonymisierung kann die ``anonymous'' Option genutzt werden.
+\documentclass[]{lni}
%%
\begin{document}
%%% Mehrere Autoren werden durch \and voneinander getrennt.
@@ -15,22 +18,19 @@
%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
Worten und noch mehr Buchstaben}
-%%%\subtitle{Untertitel / Subtitle} % if needed
-\author[Vorname1 Nachname1 \and Firstname2 Lastname2]
-{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort,
-Land \email{emailaddress@author1}} \and
-Firstname2 Lastname2\footnote{University, Department, Address, Country
-\email{emailaddress@author2}}}
-\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page
-\editor{Herausgeber et al.} % Names of Editors
-\booktitle{Name-der-Konferenz} % Name of book title
-\yearofpublication{2017}
-%%%\lnidoi{18.18420/provided-by-editor-02} % if known
+%% \subtitle{Untertitel / Subtitle} % if needed
+\author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+\author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
+\author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+\author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
+\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+\affil[2]{University\\Department\\Address\\Country}
\maketitle
\begin{abstract}
-This is a brief overview of the paper, which should be 70 to 150 words long and
-include the most relevant points. This has to be a single paragraph.
+Dies ist eine kurze Übersicht über das Dokument mit einer Länge von
+70 bis 150 Wörtern. Es sollte ein Absatz sein, der die relevantesten
+Aspekte enthält.
\end{abstract}
\begin{keywords}
Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
@@ -38,6 +38,7 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
%%% Beginn des Artikeltexts
\section{Überschrift/Heading}
-%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (for BibTeX usage)
-\bibliography{mybibfile} %\printbibliography if you use biblatex/Biber
+%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (im Falle der Nutzung von BibTeX)
+%% \bibliography{mybibfile}
+%% \printbibliography % im Falle der Nutzung von biblatex
\end{document}
diff --git a/macros/latex/contrib/lni/lni-paper-example-de.bib b/macros/latex/contrib/lni/lni-paper-example-de.bib
index 93899d66e4..4cd4836376 100644
--- a/macros/latex/contrib/lni/lni-paper-example-de.bib
+++ b/macros/latex/contrib/lni/lni-paper-example-de.bib
@@ -1,6 +1,6 @@
@InProceedings{ABC01,
- author = {N. Abraham and U. Bibel and P. Corleone},
+ author = {Abraham, N. and Bibel, U. and Corleone, P.},
title = {Formatting Contributions for Proceedings},
pages = {46-53},
crossref = {Gl01},
@@ -17,7 +17,7 @@
title = {Formatierungsrichtlinien für Tagungsbände},
publisher = {Format-Verlag},
year = {2000},
- author = {K. Abel and U. Bibel},
+ author = {Abel, K. and Bibel, U.},
address = {Bonn},
}
@@ -25,11 +25,11 @@
title = {The Magic Format -- Your Way to Pretty Books},
publisher = {Noah \& Sons},
year = {2010},
- author = {O. Ezgarani},
+ author = {Ezgarani, O.},
}
@Article{Gl06,
- author = {H. I. Glück},
+ author = {Glück, H. I.},
title = {Formatierung leicht gemacht},
journal = {Formatierungsjournal},
volume = {11},
@@ -42,14 +42,14 @@
title = {Essenzen der Informatik},
publisher = {Verlag Formvoll},
year = {2014},
- author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+ author = {Wasser, K. and Feuer, H. and Erde, R. and Licht, H.},
}
@Book{Wa14b,
title = {Ganz neue Essenzen der Informatik im selben Jahr},
publisher = {Format-Verlag},
year = {2014},
- author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+ author = {Wasser, K. and Feuer, H. and Erde, R. and Licht, H.},
}
@Proceedings{Gl01,
@@ -65,7 +65,7 @@
title = {Formatierung 2009},
publisher = {Format-Verlag},
year = {2009},
- editor = {H. I. Glück},
+ editor = {Glück, H. I.},
number = {999},
series = {LNI},
address = {Bonn},
diff --git a/macros/latex/contrib/lni/lni-paper-example-de.tex b/macros/latex/contrib/lni/lni-paper-example-de.tex
index 40f52c0b1f..5169c43fa7 100644
--- a/macros/latex/contrib/lni/lni-paper-example-de.tex
+++ b/macros/latex/contrib/lni/lni-paper-example-de.tex
@@ -1,41 +1,14 @@
% !TeX encoding = UTF-8
% !TeX spellcheck = de_DE
-%% Dies gibt Warnungen aus, sollten veraltete LaTeX-Befehle verwendet werden
-\RequirePackage[l2tabu, orthodox]{nag}
-
-\documentclass[utf8,biblatex]{lni}
-\bibliography{lni-paper-example-de}
+\documentclass[biblatex]{lni}
+\addbibresource{lni-paper-example-de.bib}
%% Schöne Tabellen mittels \toprule, \midrule, \bottomrule
\usepackage{booktabs}
%% Zu Demonstrationszwecken
-\usepackage[math]{blindtext}
-\usepackage{mwe}
-
-%% BibLaTeX-Sonderkonfiguration,
-%% falls man schnell eine existierende Bibliographie wiederverwenden will, aber nicht die .bib-Datei händisch anpassen möchte.
-%% Bitte \iffalse und \fi entfernen, dann ist diese Konfiguration aktiviert.
-
-\iffalse
-\AtEveryBibitem{%
- \ifentrytype{article}{%
- }{%
- \clearfield{doi}%
- \clearfield{issn}%
- \clearfield{url}%
- \clearfield{urldate}%
- }%
- \ifentrytype{inproceedings}{%
- }{%
- \clearfield{doi}%
- \clearfield{issn}%
- \clearfield{url}%
- \clearfield{urldate}%
- }%
-}
-\fi
+\usepackage[]{blindtext}
\begin{document}
%%% Mehrere Autoren werden durch \and voneinander getrennt.
@@ -43,14 +16,12 @@
%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen Worten und noch mehr Buchstaben}
%%%\subtitle{Untertitel / Subtitle} % falls benötigt
-\author[Vorname1 Nachname1 \and Vorname2 Nachname2]
-{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort, Land \email{emailaddress@author1}} \and
- Vorname2 Nachname2\footnote{University, Department, Address, Country \email{emailaddress@author2}}}
-\startpage{11} % Beginn der Seitenzählung für diesen Beitrag
-\editor{Herausgeber et al.} % Namen der Herausgeber
-\booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
-\yearofpublication{2017}
-%%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
+\author[1]{Vorname1 Nachname1}{vorname1.name1@affiliation1.de}{0000-0000-0000-0000}
+\author[2]{Vorname2 Nachname2}{vorname2.name2@affiliation2.de}{0000-0000-0000-0000}
+\author[1]{Vorname3 Nachname3}{vorname3.name3@affiliation1.de}{0000-0000-0000-0000}
+\author[1]{Vorname4 Nachname4}{vorname4.name4@affiliation1.de}{0000-0000-0000-0000}%
+\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+\affil[2]{University\\Department\\Address\\Country}
\maketitle
\begin{abstract}
@@ -61,7 +32,7 @@ Die Formatierung erfolgt automatisch innerhalb des abstract-Bereichs.
\end{abstract}
\begin{keywords}
-LNI Guidelines \and \LaTeX Vorlage
+LNI Guidelines \and \LaTeX\ Vorlage
\end{keywords}
\section{Verwendung}
@@ -69,7 +40,7 @@ Die GI gibt unter \url{http://www.gi-ev.de/LNI} Vorgaben für die Formatierung v
Für \LaTeX-Dokumente werden diese durch die Dokumentenklasse \texttt{lni} realisiert.
Dieses Dokument basiert auf der offiziellen Dokumentation, simplifiziert und setzt grundlegendes LaTeX-Wissen voraus.
-Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Authoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
+Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Autoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
Dieses Template ist wie folgt gegliedert:
\Cref{sec:demos} zeigt Demonstrationen der LNI-Verlage.
@@ -82,6 +53,8 @@ Es ist kein Weierstraß-p ($\wp$) mehr.
Spitze Klammen können direkt eingegeben werden: <test />
+Anonymisierungen können mittels anonymous-Option in der documentclass automatisch vorgenommen werden. Dafür gibt es das \texttt{anon}-Makro, z.\,B. \anon{Geheim für Review} und \anon[nur für Review]{nur für finale Version}.
+
Hier eine kleine Demonstration von \href{https://www.ctan.org/pkg/microtype}{microtype}:
\blindtext
@@ -142,16 +115,22 @@ public class Hello {
Alternativ kann auch die \texttt{lstlisting}-Umgebung verwendet werden.
-\Cref{L1} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist.
+\Cref{java-hello-world} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist. Ein anderes Beispiel ist \cref{python-hello-world}.
-\begin{lstlisting}[caption={Beschreibung}, label=L1, language=Java]
+\begin{lstlisting}[caption={Ein Java-Programm}, label=java-hello-world, language=Java]
public class Hello {
- public static void main (String[] args) {
- System.out.println("Hello World!");
- }
+ public static void main (String[] args) {
+ System.out.println("Hello World!");
+ }
}
\end{lstlisting}
+\begin{lstlisting}[caption={Ein Python-Programm}, label=python-hello-world, language=Python]
+# This program prints Hello, world!
+
+print('Hello, world!')
+\end{lstlisting}
+
\subsection{Formeln und Gleichungen}
Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen
diff --git a/macros/latex/contrib/lni/lni.dtx b/macros/latex/contrib/lni/lni.dtx
index 4ad46abd8d..399b886416 100644
--- a/macros/latex/contrib/lni/lni.dtx
+++ b/macros/latex/contrib/lni/lni.dtx
@@ -16,7 +16,7 @@
\declarepreamble\bibtexengpre
lnig.bst
Lecture Notes in Informatics Style File (english)
-Version 1.0 (2017/04/07)
+Version 1.1 (2022/06/10)
The Style File is based on alpha.bst
@@ -28,7 +28,7 @@ Modified files should be clearly indicated as such and renamed.
\declarepreamble\bibtexgerpre
lnig.bst
Lecture Notes in Informatics Style File (german)
-Version 1.0 (2017/04/07)
+Version 1.1 (2022/06/10)
The Style File is based on alpha.bst
@@ -60,7 +60,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
\postamble
-Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
+Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -134,7 +134,7 @@ This work consists of the file lni.dtx
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{lni}
%<*class>
- [2021/03/02 v1.7 Official class for submissions to the ``Lecture Notes
+ [2023/11/26 v1.8 Official class for submissions to the ``Lecture Notes
in Informatics'']
%</class>
%<*driver>
@@ -156,13 +156,13 @@ This work consists of the file lni.dtx
\usepackage{csquotes}
\usepackage[dvipsnames]{xcolor}
\usepackage{hologo}
-\newcommand*{\MiKTeX}{\hologo{MiKTeX}}
+\usepackage{dtxdescribe}
\usepackage[%
pdftitle={lni: Official LaTeX class for submissions to the ``Lecture Notes in
Informatics'', published by the ``Gesellschaft für Informatik e.\,V.'' (GI)},
- pdfauthor={Martin Sievers},
+ pdfauthor={Martin Sievers and Oliver Kopp},
urlcolor=blue,%
- linktoc=both,%
+ linktoc=all,%
colorlinks=true]{hyperref}
\usepackage[nameinlink,capitalise]{cleveref}
@@ -181,36 +181,6 @@ This work consists of the file lni.dtx
\newcommand{\lni}{\texttt{lni}}
\newcommand{\LNI}{\emph{Lecture Notes in Informatics}}
-\makeatletter
-\newcommand*\DescribeOption{%
-\leavevmode%
-\@bsphack%
-\begingroup%
- \MakePrivateLetters%
- \Describe@Option%
-}%
-\newcommand*\Describe@Option[1]{%
- \endgroup%
-\marginpar{%
- \raggedleft%
- \PrintDescribeEnv{#1}%
-}%
-\SpecialOptionIndex{#1}%
-\@esphack%
-\ignorespaces%
-}%
-\newcommand*\SpecialOptionIndex[1]{%
-\@bsphack%
-\index{%
- #1\actualchar{\protect\ttfamily#1} (option)\encapchar usage%
-}%
-\index{%
- options:\levelchar#1\actualchar{\protect\ttfamily#1}%
- \encapchar usage%
-}%
-\@esphack%
-}%
-\makeatother
\lstset{
basicstyle = \small\ttfamily,
gobble = 2,
@@ -218,7 +188,7 @@ This work consists of the file lni.dtx
language = [LaTeX]{TeX},
moretexcs = {,
addbibresource,authorrunning,%
- email,lnidoi,
+ email,lnidoi,affil,
ExecuteBibliographyOptions,includegraphics,printbibliography,
}
frame = single,
@@ -305,13 +275,17 @@ This work consists of the file lni.dtx
% it more compatible with other packages like \pkg{authorarchive}}
% \changes{v1.6}{2019/10/14}{Fix for BibTeX style}
% \changes{v1.6}{2019/10/14}{Add support for \pkg{selnolig}}
-% \changes{v1.7}{2020/12/03}{Revert redefinition of \cs{year} after
+% \changes{v1.7}{2020/12/03}{Revert redefinition of \cs{year} after
% \cs{maketitle}}
% \changes{v1.7}{2021/03/02}{Fix setting of pdf metadata (#87)}
% \changes{v1.7}{2021/03/02}{Change loading of latest ngerman hyphenation
% patterns (#47)}
-% \changes{v1.7}{2021/03/02}{Change \cs{year} to \cs{yearofpublication} to
+% \changes{v1.7}{2021/03/02}{Change \cs{year} to \cs{yearofpublication} to
% avoid problems (#85)}
+% \changes{v1.8}{2022/06/10}{Improvements for documentation}
+% \changes{v1.8}{2022/06/10}{Fix output error in bst files (#97)}
+% \changes{v1.8}{2022/11/25}{Make class compatable with latest publisher requirements (#121)}
+% \changes{v1.8}{2022/11/25}{Make usage of `hyperref` mandatory (#131)}
%
% \GetFileInfo{\jobname.dtx}
% \DoNotIndex{\newcommand,\newenvironment}
@@ -344,19 +318,18 @@ This work consists of the file lni.dtx
%
% Based on the existing class and bib files I set-up a DTX file and started
% reworking the source code. Editors and authors suggested different additions
-% and changes, which I tried to incoporate without changing the existing
+% and changes, which I tried to incorporate without changing the existing
% mechanisms too much.
%
-% This is the first public release. I would to thank especially
-% \href{https://github.com/koppor/}{Oliver Kopp} and
-% \href{https://www.fernuni-hagen.de/evis/team/stefan.strecker.shtml}{Stefan
-% Strecker} and his team for their suggestions and tests.
+% There is an additional package
+% \href{https://github.com/gi-ev/biblatex-lni}{\pkg{biblatex-lni}} for an easy
+% way of getting a correctly formed bibliography. This package can be
+% incorporated using the option \opt{biblatex}. See \cref{sec:bibliography} for
+% more information.
%
% \section{Installation}
% The \lni{} bundle is currently distributed via
-% \href{https://github.com/gi-ev/LNI}{GitHub}, the
-% \href{https://www.gi.de/service/publikationen/lni/autorenrichtlinien.html}
-% {GI website} and (preferably) \href{https://www.ctan.org/pkg/lni}{CTAN}.
+% \href{https://github.com/gi-ev/LNI}{GitHub} and (preferably) \href{https://www.ctan.org/pkg/lni}{CTAN}.
% The later is the basis for all updates of the two main \TeX{} distributions
% \MiKTeX{} and \TeX{}~Live. Thus the easiest way to get all files needed to
% typeset an article for the \LNI{} is to use the package manager of your
@@ -366,7 +339,7 @@ This work consists of the file lni.dtx
% twice and
% copy all resulting files (cls, tex, pdf and bst) to your local TEXMF tree.
% Don't forget to update your file name database.
-% \newpage
+%
% \section{Usage}
% To use the predefined layout for a (German) submission to the \LNI{} just
% load the class file as usual with \cs{documentclass\{lni\}}.
@@ -394,7 +367,8 @@ This work consists of the file lni.dtx
% the text, but also the choice of a corresponding \BibTeX{} file
% (cf.~\cref{sec:bibliography}).
%
-% \DescribeOption{utf8}\DescribeOption{latin1}\DescribeOption{applemac}Although
+% \DescribeOption{utf8 (deprecated in v1.8)}\DescribeOption{latin1 (deprecated in v1.8)}%
+% \DescribeOption{applemac (deprecated in v1.8)}Although
% nowadays all major plattforms support and widely use UTF-8 encoding for
% text files, there might be some need to change the input encoding the
% \LaTeX{} document uses.
@@ -404,15 +378,17 @@ This work consists of the file lni.dtx
% is strongly recommended. Please note, that currently the bib file is supposed
% to use the same encoding.
%
-% \DescribeOption{biblatex}Nowadays bibliographies cannot only be produced with
+% \DescribeOption{biblatex (deprecated in v1.8; will become default option in next major release)}%
+% Nowadays bibliographies cannot only be produced with
% \BibTeX{}, but with a much more powerful approach consisting of the package
% \pkg{biblatex} and the tool \texttt{biber}.
%
-% There is even a specialized package \pkg{biblatex-lni} which is automatically
-% used when setting the class option \opt{biblatex}. For more information see
-% as well \cref{sec:bibliography}.
+% There is even a specialized package
+% \href{https://github.com/gi-ev/biblatex-lni}{\pkg{biblatex-lni}} which is
+% automatically used when setting the class option \opt{biblatex}. For more
+% information see as well \cref{sec:bibliography}.
%
-% \DescribeOption{crop\space(new in v1.1)}%
+% \DescribeOption{crop (new in v1.1)}%
% Option \opt{crop} gives you some crop marks (using the package \pkg{crop}) to
% better illustrate the final
% result of your article.
@@ -423,11 +399,11 @@ This work consists of the file lni.dtx
% used with all floating objects. The package is loaded as default. In case it
% causes issues, one can disable it using with the \opt{nocleveref} option.
%
-% \DescribeOption{nohyperref}\pkg{hyperref} is used for colored hyperlinks
+% \DescribeOption{nohyperref (deprecated in v1.8)}\pkg{hyperref} is used for colored hyperlinks
% within the articles. If you consider problems or just do not want that
% feature, you can disable it by using the option \opt{nohyperref}.
%
-% \DescribeOption{nofonts\space(new in v1.3, deprecated in v1.4)}On old systems
+% \DescribeOption{nofonts (deprecated in v1.4)}On old systems
% you might not have installed the New TX fonts. If for whatever reason the
% \opt{oldfonts} option
% does not work for you, you can activate option \opt{nofonts}. This allows to
@@ -435,30 +411,41 @@ This work consists of the file lni.dtx
% Usually there should be no need to do so. Please note, that your output will
% differ from the publishers'.
%
-% \DescribeOption{oldfonts\space(new in v1.4)}On older systems you might not
+% \DescribeOption{oldfonts (deprecated in v1.8)}On older systems you might not
% have installed the New TX fonts. Therefore option \opt{oldfonts} allows to
% to load the package \pkg{mathptmx} instead of the New TX fonts. The output
% will be in accordance to (or at least near) the publisher's requirements.
%
-% \DescribeOption{norunningheads\space(new in v1.5)}To easily remove all running
-% headers from your document, you can use the option \opt{norunningheads}.
+% \DescribeOption{norunningheads (deprecated in v1.8)}By default there are no more
+% running headers from your document.
+%
+% \DescribeOption{runningheads (new in v1.8)}Editors can turn on the running headers
+% using option \opt{runningheads}.
+%
+% \DescribeOption{anonymous (new in v1.8)}To easily anonymize a paper for
+% blind review, use this option. Then all author information will be replaced
+% with a placeholder. Additionally, there is a new macro \cs{anon\marg{hide in review}}
+% which will be replaced with ``ANONIMIZED'' if the option is set.
+% Also, \cs{anon\marg[for review]{for final version}} can be used that outputs ``for review''
+% if the option is set, and ``for final version'' otherwise.
+%
% \newpage
% \section{Setting up a document}
% You can use the file \file{lni-author-template.tex} as a starting point
% for setting up a document for submission. The \lni{} class uses the standard
-% ways to build an article.
+% ways to build an article. A larger German example can be found in \file{lni-paper-example-de.tex}
%
-% \subsection{Special meta data}\label{sec:metadata}
+% \subsection{Special meta comments}\label{sec:metadata}
% There is not just one \enquote{\TeX} and one \enquote{bibliography tool}, but
% many different ways to transform a .tex file into a PDF.
% Some \TeX{} editors like \texttt{TeXstudio}, \texttt{TeXmaker} and
-% \texttt{TeXshop} support a special set of meta data to tell the editor, how
-% to deal with a concrete document.
+% \texttt{TeXshop} support a special set of meta comments to give some
+% information, how to deal with a concrete document.
%
% A typical example looks like:
% \begin{examplecode}
% % !TeX program = pdflatex
-% % !BIB program = bibtex8
+% % !BIB program = biber
% % !TeX encoding = UTF-8
% % !TeX spellcheck = en_US
% \documentclass[english]{lni}
@@ -468,7 +455,7 @@ This work consists of the file lni.dtx
% \DescribeMacro{\startpage}\DescribeMacro{\editor}%
% \DescribeMacro{\booktitle\space(changed in v1.6)}%
% \DescribeMacro{\booksubtitle\space(new in v1.6)}%
-% \DescribeMacro{\yearofpublication}In addition to the macros stated in
+% \DescribeMacro{\yearofpublication\space(new in v1.7)}In addition to the macros stated in
% \cref{sec:titlepage} for authors, there are special editor macros to
% influence the layout of the article:
% \begin{itemize}
@@ -478,7 +465,7 @@ This work consists of the file lni.dtx
% \item\cs{booktitle} holds the name of a conference (optional argument for
% a short title used in the running headers)
% \item\cs{booksubtitle} holds an optional subtitle of a conference
-% \item\cs{year} can be used to set the year
+% \item\cs{yearofpublication} can be used to set the year of publication
% \end{itemize}
%
% \subsection{Title page}\label{sec:titlepage}
@@ -493,20 +480,25 @@ This work consists of the file lni.dtx
%
% You can also add a subtitle by \cs{subtitle\marg{subtitle}}.
%
-% \DescribeMacro{\author}\DescribeMacro{\email}\DescribeMacro{\footnote}%
-% \DescribeMacro{\and}%
+% \DescribeMacro{\author}\DescribeMacro{\email}\DescribeMacro{\footnote\space(deprecated in v1.8)}%
+% \DescribeMacro{\and\space(deprecated in v1.8)}\DescribeMacro{\affil}%
% The authors of an article are
-% given using the standard \cs{author} macro. Multiple authors are separated
-% by \cs{and}; affiliations have to be added with
-% \cs{footnote\marg{affiliations}} where you can use
-% \cs{email\marg{email address}} for the email address of an author:
+% given using an extended \cs{author} macro, which holds not only the name, but also
+% email adress and ORCID iD. Moreover the affiliation marker (number) is given as an optional
+% argument. Affiliations are added with
+% \cs{affil\oarg{number}\marg{information}} where you can use
+% \texttt{\textbackslash\textbackslash} to split the address.
% \begin{examplecode}[label={lst:author}]
-% \author[Author 1 \and Author 2]{%
-% Author 1\footnote{Affiliations including \email{email@author1}} \and%
-% Author 2\footnote{Affiliations including \email{email@author2}}}
+% \author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+% \author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
+% \author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+% \author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
+% \affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+% \affil[2]{University\\Department\\Address\\Country}
% \end{examplecode}
-% In case the authors are too long for the page header, see
-% \cref{sec:pageheader} of how to shorten the authors for the page header.
+%
+% Leave the third and/or fourth argument empty if there is no email address and/or ORCID iD.
+% Finally \cs{maketitle} will output the formatted title page.
%
% \DescribeMacro{\lnidoi\space(new in v1.2)}%
% LNI provides a DOI for each paper. In case, the DOI is known, it can be
@@ -529,30 +521,10 @@ This work consists of the file lni.dtx
% \end{abstract}
% \begin{keywords}
% Give some keywords to categorize your article. You can use \and between two
-% keywords to get the correct delimiter (semicolon plus space) automatically.
+% keywords to get the correct delimiter (comma plus space) automatically.
% \end{keywords}
% \end{examplecode}
%
-% \subsection{Page header}\label{sec:pageheader}
-% The template automatically sets the page headers according to the
-% requirements of \LNI. From page~2 onwards, the title and the authors are
-% printed. These information has to stay in one line. In case the title is too
-% long, use the optional argument for \cs{title}:
-% \begin{examplecode}
-% \title[Short title]{Title}
-% \end{examplecode}
-%
-% \DescribeMacro{\authorrunning}%
-% In case there are many authors on a paper, they might not fit into the paper.
-% For that purpose, additionally use \cs{authorrunning}:
-% \begin{examplecode}
-% \author[Firstname1 Lastname1 \and Firstname2 Lastname2%
-% \and Firstname3 Lastname3]{Firstname1 Lastname1\footnote{...}%
-% \and Firstname2 Lastname2\footnote{...}%
-% \and Firstname3 Lastname3\footnote{...}}%
-% \authorrunning{Lastname1 et al.}
-% \end{examplecode}
-%
% \subsection{Main text}
% \subsubsection{Headings}
% \DescribeMacro{\section}\DescribeMacro{\subsection}%
@@ -619,8 +591,8 @@ This work consists of the file lni.dtx
% specific programming language.
%
% \subsubsection{Math}
-% If you need mathematics, you can load packages \pkg{amsmath} and
-% \pkg{mathtools} for
+% For writing mathematics the package \pkg{amsmath} is already loaded by default.
+% In addtion you can load e.g. \pkg{mathtools} for
% additional features. The \lni{} class offers by default the command
% \cs{powerset} to render the powerset symbol correctly as $\powerset$ and not
% as Weierstrass p ($\wp$).
@@ -665,9 +637,11 @@ This work consists of the file lni.dtx
% article you have to add \cs{bibliography\marg{Bib file}} at an appropriate
% position within your text. The correct bst file is loaded automatically.
%
-% With option
-% \opt{biblatex} (cf.~\cref{sec:options}) you can easily switch to the modern
-% \pkg{biblatex} package. However, you have to add information on the bib
+% With document option
+% \opt{biblatex} (cf.~\cref{sec:options}) you can easily switch to the
+% \pkg{biblatex} style \enquote{lni} provided by
+% \href{https://github.com/gi-ev/biblatex-lni}{\pkg{biblatex-lni}}.
+% However, you have to add information on the bib
% file(s) in your preamble using \cs{addbibresource\marg{Bib file(s)}} and call
% \cs{printbibliography} where you want the bibliography to appear.
%
@@ -745,6 +719,10 @@ This work consists of the file lni.dtx
% \begin{macrocode}
%<*class>
% \end{macrocode}
+% We have to make sure, that pdf is always written (arXiv's requirements)
+% \begin{macrocode}
+\RequirePackage{iftex}\ifluatex\else\pdfoutput=1\fi%
+% \end{macrocode}
% \begin{macrocode}
\def\@clearglobaloption#1{%
\def\@tempa{#1}%
@@ -760,15 +738,22 @@ This work consists of the file lni.dtx
\let\@classoptionslist\@empty
\fi}
%
-\DeclareOption{latin1}{\PassOptionsToPackage{latin1}{inputenc}}
-\DeclareOption{utf8}{\PassOptionsToPackage{utf8}{inputenc}}
-\DeclareOption{ansinew}{\PassOptionsToPackage{ansinew}{inputenc}}
+\DeclareOption{latin1}{%
+ \PassOptionsToPackage{latin1}{inputenc}
+ \ClassNoteNoLine{lni}{The option `latin1` will be removed from the class with the next major release}}
+\DeclareOption{utf8}{%
+ \PassOptionsToPackage{utf8}{inputenc}
+ \ClassNoteNoLine{lni}{The option `utf8` will be removed from the class with the next major release as it is the only valid value}}
+\DeclareOption{ansinew}{%
+ \PassOptionsToPackage{ansinew}{inputenc}
+ \ClassNoteNoLine{lni}{The option `ansinew` will be removed from the class with the next major release}}
\newif\iflnienglish
\lnienglishfalse
\DeclareOption{english}{\lnienglishtrue\@clearglobaloption{english}}
\newif\ifusehyperref
\usehyperreftrue
-\DeclareOption{nohyperref}{\usehyperreffalse}
+\DeclareOption{nohyperref}{%
+ \ClassWarningNoLine{lni}{The option `nohyperref` has been deactivated and will be removed from the class with the next major release}}
\newif\ifusecleveref
\useclevereftrue
\DeclareOption{nocleveref}{\useclevereffalse}
@@ -780,20 +765,39 @@ This work consists of the file lni.dtx
\DeclareOption{crop}{\croptrue}
\newif\ifnofonts
\nofontsfalse
-\DeclareOption{nofonts}{\nofontstrue\autofontsfalse}
+\DeclareOption{nofonts}{%
+ \nofontstrue\autofontsfalse
+ \ClassNoteNoLine{lni}{The option `nofonts` will be removed from the class with the next major release}}
\newif\ifoldfonts
\oldfontsfalse
-\DeclareOption{oldfonts}{\oldfontstrue\autofontsfalse}
+\DeclareOption{oldfonts}{%
+ \oldfontstrue\autofontsfalse
+ \ClassNoteNoLine{lni}{The option `oldfonts` will be removed from the class with the next major release}}
\newif\ifautofonts
\autofontstrue
\newif\ifnorunningheads
-\DeclareOption{norunningheads}{\norunningheadstrue}
-\ExecuteOptions{utf8}
+\DeclareOption{norunningheads}{%
+ \norunningheadstrue
+ \ClassNoteNoLine{lni}{The option `norunningheads` will be removed from the class with the next major release}}
+\newif\ifrunningheads
+\DeclareOption{runningheads}{\norunningheadsfalse}
+\newif\ifanonymous
+\anonymousfalse
+\DeclareOption{anonymous}{\anonymoustrue}
+\newcommand{\anon}[2][\iflnienglish ANONYMIZED\else ANONYMISIERT\fi]{%
+ \ifanonymous%
+ {\color{orange}#1}%
+ \else%
+ #2%
+ \fi}
+\ExecuteOptions{utf8,norunningheads}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
-%
-\RequirePackage{iftex}
-\LoadClass[10pt,twoside,a4paper,fleqn]{article}
+% \end{macrocode}
+% \changes{v1.8}{2023/11/06}{Fix option handling for \opt{fleqn}}
+% \begin{macrocode}
+\PassOptionsToPackage{fleqn}{amsmath}
+\LoadClass[10pt,twoside,a4paper]{article}
\ifPDFTeX
\RequirePackage{cmap}
\RequirePackage{inputenc}
@@ -918,9 +922,8 @@ This work consists of the file lni.dtx
}{}
\DeclareMathSymbol{\powerset}{\mathord}{MnSyC}{180}
% \end{macrocode}
+% \changes{v1.8}{2023/11/06}{Remove support for ccicons}
% \begin{macrocode}
-% Support for CC icons
-\RequirePackage{ccicons}
% Support for \cs{ifdefempty}
\RequirePackage{etoolbox}
% \end{macrocode}
@@ -1004,6 +1007,7 @@ This work consists of the file lni.dtx
\ifusebiblatex
\RequirePackage[%
backend=biber,% UTF-8 support
+ date=year,
style=LNI, % The GI style - see https://www.ctan.org/pkg/biblatex-lni
natbib=true % Required for \Citet
]{biblatex}[2016-09-15]% at least version 3.6 of biblatex is required.
@@ -1022,16 +1026,28 @@ This work consists of the file lni.dtx
\printtext[bibhyperref]{\printnames{labelname}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
+% \end{macrocode}
% \end{macro}
% \begin{macrocode}
\fi%
% \end{macrocode}
+% \changes{v1.8}{2023/11/06}{Load \pkg{amsmath} explicitly by default (was implicitly done before)}
% \begin{macrocode}
+\RequirePackage{amsmath}
+\RequirePackage{etoolbox}
\RequirePackage{graphicx}
\RequirePackage{eso-pic}
\RequirePackage{grffile}
\RequirePackage{fancyhdr}
\RequirePackage{listings}
+\RequirePackage{enumitem}
+\RequirePackage[hang]{footmisc}
+\setlength{\footnotemargin}{1em}
+\def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+
+% \end{macrocode}
+% \begin{macrocode}
+%\def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
% \end{macrocode}
% We fix the basewidth for lstlistings:
% The default setting of listings with ``fixed columns'' has a space 0.6em
@@ -1079,7 +1095,8 @@ This work consists of the file lni.dtx
% \begin{macro}{\title}
% \begin{macrocode}
\renewcommand{\title}{\@dblarg\@@title}
-\def\@@title[#1]#2{\gdef\@shorttitle{#1}\gdef\@title{#2}}
+\def\@@title[#1]#2{%
+ \gdef\@shorttitle{#1}\gdef\@title{#2}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\subtitle}
@@ -1089,23 +1106,100 @@ This work consists of the file lni.dtx
% \end{macro}
% \begin{macro}{\author}
% \begin{macrocode}
-\renewcommand{\author}{\@dblarg\@@author}
-\newcommand{\@@author}[2][]{%
- \DeclareRobustCommand{\@shortauthor}{%
- {%
- %\let\footnote\@gobble%
- \def\and{\texorpdfstring{\unskip,\ }{}}%
- #1%
- }%
- }%
- \DeclareRobustCommand{\@author}{#2}%
+\RequirePackage{authblk}
+\newcommand{\@authlisthead}{}
+\newtoks\@temptokenb
+\newtoks\@temptokenc
+\renewcommand\Authsep{, }
+\renewcommand\Authands{\iflanguage{ngerman}{ und }{, and }}
+\renewcommand\Authand{\iflanguage{ngerman}{ und }{ and }}
+\renewcommand{\AB@authnote}[1]{$^{\mbox{\footnotesize #1}}$}
+\renewcommand\author[4][]{%
+ \ifnewaffil\addtocounter{affil}{1}%
+ \edef\AB@thenote{\arabic{affil}}%
+ \fi%
+ \if\relax#1\relax\def\AB@note{\AB@thenote}\else\def\AB@note{#1}%
+ \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
+ \setcounter{Maxaffil}{0}\fi
+ \ifnum\value{authors}=0\def\@firstauthor{#2}\fi
+ \ifnum\value{authors}>1\relax
+ \@namedef{@sep\number\c@authors}{\Authsep}\fi
+ \addtocounter{authors}{1}%
+ \begingroup
+ \let\protect\@unexpandable@protect \let\and\AB@pand
+ \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
+ \@temptokena=\expandafter{\AB@authors}%
+ \@temptokenb=\expandafter{\AB@authors}%
+ {\def\\{\protect\\[\@affilsep]\protect\Affilfont
+ \protect\AB@resetsep}%
+ \xdef\AB@author{\AB@blk@and#2}%
+ \ifnewaffil\gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
+ \xdef\AB@authors{\the\@temptokena\AB@blk@and}%
+ \else
+ \xdef\AB@authors{\the\@temptokena\AB@as\AB@au@str}%
+ \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
+ \gdef\AB@as{\Authsep}%
+ \fi
+ \gdef\AB@au@str{#2}}%
+ \@temptokena=\expandafter{\AB@authlist}%
+ \@temptokenb=\expandafter{\@authlisthead}%
+ \let\\=\authorcr
+ \xdef\AB@authlist{\the\@temptokena
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2\if\relax#4\relax\else\,\orcidlink{#4}\fi\AB@authnote{\AB@note}}%
+ \xdef\@authlisthead{\the\@temptokenb
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2}%
+ \endgroup
+ \ifnum\value{authors}>2\relax
+ \@namedef{@sep\number\c@authors}{\Authands}\fi
+ \ifcsempty{@emailsandorcids\AB@note}%
+ {\csgappto{@emailsandorcids\AB@note}{%
+ \if\relax#3\relax\else\email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}%
+ }%
+ {\csgappto{@emailsandorcids\AB@note}{%
+ \if\relax#3\relax\else;\ \email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}}%
+
+ \newaffilfalse
+}
+
+\renewcommand\@author{%
+ \ifx\AB@affillist\AB@empty\AB@author\else
+ \ifnum\value{affil}>\value{Maxaffil}\def\rlap##1{##1}%
+ \AB@authlist\AB@affillist
+ \else\AB@authors%
+ \fi%
+ \fi%
+}
+
+\renewcommand\affil[2][]{%
+ \newaffiltrue\let\AB@blk@and\AB@pand
+ \if\relax#1\relax\def\AB@note{\AB@thenote}\else\def\AB@note{#1}%
+ \setcounter{Maxaffil}{0}\fi%
+ \begingroup
+ \let\protect\@unexpandable@protect
+ \def\thanks{\protect\thanks}\def\footnotetext{\protect\footnotetext}%
+ \@temptokena=\expandafter{\AB@authors}%
+ {\def\\{\protect\\\protect\Affilfont}\xdef\AB@temp{#2}}%
+ \xdef\AB@authors{\the\@temptokena\AB@las\AB@au@str
+ \protect\\[\affilsep]\protect\Affilfont\AB@temp}%
+ \gdef\AB@las{}\gdef\AB@au@str{}%
+ {\def\\{, \ignorespaces}\xdef\AB@temp{#2}}%
+ \@temptokena=\expandafter{\AB@affillist}%
+ \xdef\AB@affillist{\the\@temptokena \AB@affilsep
+ \footnotetext[\AB@note]{%
+ \raggedright\AB@temp\ifcsempty{@emailsandorcids\AB@note}{}{, \csuse{@emailsandorcids\AB@note}}}%
}
+ \endgroup
+ \let\AB@affilsep\AB@affilsepx
+ \setcounter{footnote}{#1}
+}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\authorrunning}
% \begin{macrocode}
\newcommand{\authorrunning}[1]{%
- \fancyhead[LE]{\hspace{0.05cm}\oldsmall\thepage\hspace{5pt}#1}}
+ \fancyhead[LE]{\hspace{0.05cm}\oldsmall\thepage\hspace{5pt}\ifanonymous\iflnienglish Anonymized for review\else Anonymisiert für Review\fi\else#1\fi}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\email}
@@ -1113,26 +1207,25 @@ This work consists of the file lni.dtx
\newcommand*{\email}[1]{\href{mailto:#1}{\urlstyle{same}\protect\nolinkurl{#1}}}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\orcid}
+% \begin{macrocode}
+\newcommand*{\orcid}[1]{%
+ \unskip~\orcidlink{#1}\,\href{https://orcid.org/#1}{https://orcid.org/#1}}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\lnidoi}
% \begin{macrocode}
\newcommand{\@lnidoi}{}
-\newcommand{\lnidoi}[1]{\gdef\@lnidoi{#1}}
+\newcommand{\lnidoi}{%
+ \begingroup\catcode`\_12 \lnidoi@i}
+\newcommand{\lnidoi@i}[1]{%
+ \gdef\@lnidoi{#1}\endgroup}
% \end{macrocode}
% \end{macro}
-% Title: Kopie aus article.cls mit anderem \thispagestyle
% \begin{macrocode}
\renewcommand\maketitle{\par%
\begingroup
\renewcommand\thefootnote{\@arabic\c@footnote}%
- \def\@makefnmark% keine Einrückung der Fußnoten eingestellt
- {\@textsuperscript{\normalfont\@thefnmark}}%
- \long\def\@makefntext##1{%
- \@setpar{\@@par
- \@tempdima = \hsize
- \advance\@tempdima -1em
- \parshape \@ne 0.15cm \@tempdima}%
- \par\parindent 0.3cm \noindent
- \hb@xt@\z@{\hss\@textsuperscript{\normalfont\@thefnmark}\,}##1}
\if@twocolumn
\ifnum \col@number=\@ne
\@maketitle
@@ -1151,14 +1244,12 @@ This work consists of the file lni.dtx
\fi%
\@thanks
\endgroup
- \ifusehyperref
- \HyXeTeX@CheckUnicode
- \HyPsd@PrerenderUnicode{\@shortauthor}%
- \pdfstringdef\@pdfauthor{\@shortauthor}%
- \HyXeTeX@CheckUnicode
- \HyPsd@PrerenderUnicode{\@title}%
- \pdfstringdef\@pdftitle{\@title}%
- \fi%
+ \HyXeTeX@CheckUnicode
+ \HyPsd@PrerenderUnicode{\@authlisthead}%
+ \ifanonymous\else\pdfstringdef\@pdfauthor{\@authlisthead}\fi%
+ \HyXeTeX@CheckUnicode
+ \HyPsd@PrerenderUnicode{\@title}%
+ \pdfstringdef\@pdftitle{\@title}%
\global\let\thanks\relax
\global\let\maketitle\relax
\global\let\@maketitle\relax
@@ -1166,6 +1257,7 @@ This work consists of the file lni.dtx
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\title\relax
\global\let\author\relax
\global\let\date\relax
@@ -1177,41 +1269,42 @@ This work consists of the file lni.dtx
\newpage
\null
\begin{center}%
- \vskip -24pt% Abstand vor dem Titel
+ \vskip -27pt% Abstand vor dem Titel
\raggedright% Linksbündig
\let\footnote\thanks
{\Large\bfseries\@title\par}%
- \ifx\@subtitle\empty\else
- \ifx\@subtitle\undefined\else
- \vskip 16pt
+ \ifx\@subtitle\empty\vskip 9pt\else % Abstand nach dem Titel
+ \ifx\@subtitle\undefined\vskip 9pt\else
+ \vskip 9pt
{\normalsize\bfseries\@subtitle}%
+ \vskip 15pt% Abstand nach dem Titel
\fi%
\fi%
- \vskip 19pt% Abstand nach dem Titel
{\normalsize%
\lineskip .5em%
+ \ifanonymous
+ \iflnienglish
+ Anonymized for review\footnote{placeholder for contact information}
+ \else
+ Anonymisiert für Review\footnote{Platzhalter für Kontaktinformationen}
+ \fi%
+ \else
\@author
+ \fi%
\par}%
- \vskip 28pt% Abstand vor dem Abstract
+ \vskip 21pt% Abstand vor dem Abstract
\end{center}%
-% output CC license and DOI (if it exists)
+% output DOI (if it exists)
\AddToShipoutPictureBG*{\AtPageLowerLeft{%
\put(\LenToUnit{\the\doihoffset},\LenToUnit{\the\doivoffset}){%
- \ifusehyperref
- \href{https://creativecommons.org/licenses/by-sa/4.0/}{\ccbysa}
+ \ifanonymous
\else
- \ccbysa
- \fi
- \ifdefempty{\@lnidoi}{}{
- \footnotesize
- \ifusehyperref
- \href{https://doi.org/\@lnidoi}{doi:\@lnidoi}
- \else
- doi:\@lnidoi
- \fi%
- }
- }
- }}
+ \ifdefempty{\@lnidoi}%
+ {}%
+ {\footnotesize\href{https://doi.org/\@lnidoi}{doi:\@lnidoi}}
+ \fi%
+ }%
+ }}%
\par
}%
% \end{macrocode}
@@ -1223,13 +1316,14 @@ This work consists of the file lni.dtx
}{\endquotation}
% \end{macrocode}
% \end{environment}
+% \changes{v1.8}{2023/11/06}{Change delimiter to comma}
% \begin{environment}{keywords}
% \begin{macrocode}
\newif\ifkeywords
\newenvironment{keywords}%
{\global\keywordstrue\small%
- \def\and{\unskip;\space}%
- \noindent\ignorespaces{\bfseries Keywords:\ }}%
+ \def\and{\unskip,\space}%
+ \vskip -2pt\noindent\ignorespaces{\bfseries Keywords:\ }}%
{\global\keywordsfalse}
\let\@RIGsection\section
\pretocmd\@startsection{%
@@ -1289,60 +1383,38 @@ This work consists of the file lni.dtx
\RequirePackage{verbatim}
\def\verbatim@processline{\hskip0.5cm\the\verbatim@line\par}
% \end{macrocode}
+% \begin{macrocode}
+\robustify{\footnote}
+% \end{macrocode}
% Set rule width und correct size
% \begin{macrocode}
\renewcommand\footnoterule{%
- \kern-3\p@
+ \vfill\kern-3\p@
\hrule\@width 5cm
\kern2.6\p@}
-\newdimen\fnindent
-\fnindent0.18cm
-\long\def\@makefntext#1{%
- \parindent \fnindent%
- \leftskip \fnindent% Einrückung vor der footnotemark
- \noindent
- \llap{\hb@xt@0.10cm{\hss\@makefnmark\ }}\ignorespaces#1}
+ %\newdimen\fnindent
+ %\fnindent0.18cm
+ %\long\def\@makefntext#1{%
+ %\parindent \fnindent%
+ %\leftskip \fnindent% Einrückung vor der footnotemark
+ %\noindent
+ %\llap{\hb@xt@0.10cm{\hss\@makefnmark\ }}\ignorespaces#1}
% \end{macrocode}
% \begin{macrocode}
\setlength{\parindent}{0pt}
\setlength{\parskip}{8pt}
% \end{macrocode}
-% Set symbols for itemize
-% \begin{macrocode}
-\renewcommand{\labelitemi}{$\bullet$}
-\renewcommand*\itemize{%
- \ifnum \@itemdepth >\thr@@\@toodeep\else
- \setlength{\labelsep}{0.70cm}%
- \advance\@itemdepth\@ne
- \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list
- \csname\@itemitem\endcsname
- {\def\makelabel##1{\hss\llap{##1}}%
- \setlength{\itemsep}{8pt}%
- \setlength{\parsep}{-2pt}}%
- \fi}
+% Set symbols and spacings for itemize
+% \begin{macrocode}
+\setlist{topsep=0pt,itemsep=7pt,parsep=-2pt}
+\setlist[itemize]{labelsep=0.70cm}%Abstand zur Aufzählungsnummer
+\setlist[itemize,1]{label=$\bullet$}
+\setlist[itemize,2]{topsep=9pt}
% \end{macrocode}
% and numbered lists
% \begin{macrocode}
- \renewcommand{\labelenumii}{\alph{enumii})}
- \renewcommand*\enumerate{%
- \ifnum \@enumdepth >\thr@@
- \@toodeep
- \else
- \setlength{\labelsep}{0.70cm}%Abstand zur Aufzählungsnummer
- \advance\@enumdepth \@ne
- \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \fi
- \@ifnextchar[{\@enumlabel@{\@enumerate@}[}{\@enumerate@}}
- \def\@enumerate@{%
- \expandafter\list\csname label\@enumctr\endcsname{%
- \usecounter{\@enumctr}%
- \def\makelabel##1{\hss\llap{##1}}
- \setlength{\labelsep}{0.6cm} %Einrückung des Aufzählungszeichens
- \setlength{\itemsep}{8pt}%
- \setlength{\parsep}{-2pt}}
- }%
+\setlist[enumerate]{labelsep=0.60cm}%Einrückung des Aufzählungszeichens
+\setlist[enumerate,2]{label=\alph*),topsep=9pt}
% \end{macrocode}
% \begin{macro}{\andname}
% \begin{macrocode}
@@ -1397,12 +1469,12 @@ This work consists of the file lni.dtx
\fancypagestyle{plain}{%
\fancyhead{} % Löscht alle Kopfzeileneinstellungen
\fancyhead[RO]{%
- \small\@editor~(Hrsg.):\
+ \small\@editor~(Hrsg.):\
\ifdefempty{\@bookshorttitle}%
{}%
{\@bookshorttitle,\hspace{1sp}}%
\null\linebreak%
- Lecture Notes in Informatics (LNI), Gesellschaft für Informatik,
+ Lecture Notes in Informatics (LNI), Gesellschaft für Informatik,
Bonn~\@yearofpublication%
\hspace{5pt}\thepage\hspace{0.05cm}%
}%
@@ -1412,7 +1484,7 @@ This work consists of the file lni.dtx
{}%
{\@bookshorttitle,\hspace{1sp}}%
\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes
- in Informatics (LNI), Gesellschaft für Informatik,
+ in Informatics (LNI), Gesellschaft für Informatik,
Bonn~\@yearofpublication%
}%
\fancyfoot{}% Löscht alle Fußzeileneinstellungen
@@ -1424,7 +1496,7 @@ This work consists of the file lni.dtx
\pagestyle{fancy}
\fancyhead{}% Löscht alle Kopfzeileneinstellungen
\fancyhead[RO]{\small\@shorttitle\hspace{5pt}\thepage\hspace{0.05cm}}
- \fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}\@shortauthor}
+ \fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}\ifanonymous\iflnienglish Anonymized for review\else Anonymisiert für Review\fi\else\@authlisthead\fi}
\fancyfoot{}% Löscht alle Fußzeileneinstellungen
\renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
\fi%
@@ -1440,23 +1512,24 @@ This work consists of the file lni.dtx
\RequirePackage{xspace}
% \end{macrocode}
% \begin{macrocode}
-\ifusehyperref
- \AtEndPreamble{%
- \RequirePackage[bookmarks=false]{hyperref}
- \hypersetup{%
+\AddToHook{env/document/begin}[lni/loadhyperref]{%
+ \RequirePackage[bookmarks=false]{hyperref}
+ \hypersetup{%
pdfdisplaydoctitle,%
colorlinks=true,%
allcolors=black,%
pdfstartview=Fit,%
- }%
-%%% \pdfstringdefDisableCommands{%
-%%% \def\unskip{}%
-%%% \renewcommand{\footnote}[1]{}%
-%%% }%
}%
-\else
- \providecommand{\texorpdfstring}[2]{#2}%
-\fi%
+ \pdfstringdefDisableCommands{%
+ \def\footnote#1{}%
+ }
+ \RequirePackage{orcidlink}%
+% \end{macrocode}
+% enables correct jumping to figures when referencing
+% \begin{macrocode}
+ \RequirePackage[all]{hypcap}%
+}%
+\DeclareHookRule{env/document/begin}{lni/loadhyperref}{before}{biblatex}
% \end{macrocode}
% \begin{macrocode}
\ifusecleveref%
@@ -1477,14 +1550,6 @@ This work consists of the file lni.dtx
}%
\fi%
% \end{macrocode}
-% enables correct jumping to figures when referencing
-% \begin{macrocode}
-\AtEndPreamble{%
- \@ifpackageloaded{hyperref}
- {\RequirePackage[all]{hypcap}}%
- {}%
-}%
-% \end{macrocode}
% \begin{macrocode}
\def\and{\texorpdfstring{\unskip\hspace{-0.42em},\hspace{.6em}}{, }}%
% \end{macrocode}
@@ -2404,7 +2469,7 @@ FUNCTION {misc}
{ output.bibitem
author empty$
{ "" }
- { format.authors output.nonnull }
+ { format.authors write$ }
if$
%title howpublished new.block.checkb
format.title output
@@ -2960,12 +3025,18 @@ EXECUTE {end.bib}
%</eng|ger>
%</bibtex>
%<*template>
-%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
-%%% Parameter zu laden.
-\documentclass[]{lni}
+% % !TeX program = pdflatex
+% % !BIB program = biber
+% % !TeX spellcheck = de-DE
%%% To write an article in English, please use the option ``english'' in order
%%% to get the correct hyphenation patterns and terms.
%%% \documentclass[english]{class}
+%%% for anonymizing an article you can use the ``anonymous'' option.
+%%%
+%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
+%%% Parameter zu laden.
+%%% Zur Anonymisierung kann die ``anonymous'' Option genutzt werden.
+\documentclass[]{lni}
%%
\begin{document}
%%% Mehrere Autoren werden durch \and voneinander getrennt.
@@ -2973,23 +3044,19 @@ EXECUTE {end.bib}
%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
Worten und noch mehr Buchstaben}
-%%%\subtitle{Untertitel / Subtitle} % if needed
-\author[Vorname1 Nachname1 \and Firstname2 Lastname2]
-{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort,
-Land \email{emailaddress@author1}} \and
-Firstname2 Lastname2\footnote{University, Department, Address, Country
-\email{emailaddress@author2}}}
-\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page
-%numbering at this number
-\editor{Herausgeber et al.} % Names of Editors
-\booktitle{Name-der-Konferenz} % Name of book title
-\yearofpublication{2017}
-%%%\lnidoi{18.18420/provided-by-editor-02} % if known
+%% \subtitle{Untertitel / Subtitle} % if needed
+\author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+\author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
+\author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+\author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
+\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+\affil[2]{University\\Department\\Address\\Country}
\maketitle
\begin{abstract}
-This is a brief overview of the paper, which should be 70 to 150 words long and
-include the most relevant points. This has to be a single paragraph.
+Dies ist eine kurze Übersicht über das Dokument mit einer Länge von
+70 bis 150 Wörtern. Es sollte ein Absatz sein, der die relevantesten
+Aspekte enthält.
\end{abstract}
\begin{keywords}
Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
@@ -2997,15 +3064,16 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
%%% Beginn des Artikeltexts
\section{Überschrift/Heading}
-%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (for BibTeX usage)
-\bibliography{mybibfile} %\printbibliography if you use biblatex/Biber
+%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (im Falle der Nutzung von BibTeX)
+%% \bibliography{mybibfile}
+%% \printbibliography % im Falle der Nutzung von biblatex
\end{document}
%</template>
%<*exampledebib>
% Encoding: UTF-8
@InProceedings{ABC01,
- author = {N. Abraham and U. Bibel and P. Corleone},
+ author = {Abraham, N. and Bibel, U. and Corleone, P.},
title = {Formatting Contributions for Proceedings},
pages = {46-53},
crossref = {Gl01},
@@ -3022,7 +3090,7 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
title = {Formatierungsrichtlinien für Tagungsbände},
publisher = {Format-Verlag},
year = {2000},
- author = {K. Abel and U. Bibel},
+ author = {Abel, K. and Bibel, U.},
address = {Bonn},
}
@@ -3030,11 +3098,11 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
title = {The Magic Format -- Your Way to Pretty Books},
publisher = {Noah \& Sons},
year = {2010},
- author = {O. Ezgarani},
+ author = {Ezgarani, O.},
}
@Article{Gl06,
- author = {H. I. Glück},
+ author = {Glück, H. I.},
title = {Formatierung leicht gemacht},
journal = {Formatierungsjournal},
volume = {11},
@@ -3047,14 +3115,14 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
title = {Essenzen der Informatik},
publisher = {Verlag Formvoll},
year = {2014},
- author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+ author = {Wasser, K. and Feuer, H. and Erde, R. and Licht, H.},
}
@Book{Wa14b,
title = {Ganz neue Essenzen der Informatik im selben Jahr},
publisher = {Format-Verlag},
year = {2014},
- author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+ author = {Wasser, K. and Feuer, H. and Erde, R. and Licht, H.},
}
@Proceedings{Gl01,
@@ -3070,7 +3138,7 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
title = {Formatierung 2009},
publisher = {Format-Verlag},
year = {2009},
- editor = {H. I. Glück},
+ editor = {Glück, H. I.},
number = {999},
series = {LNI},
address = {Bonn},
@@ -3095,41 +3163,17 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
@Comment{jabref-meta: databaseType:biblatex;}
%</exampledebib>
%<*exampledetex>
-%% Dies gibt Warnungen aus, sollten veraltete LaTeX-Befehle verwendet werden
-\RequirePackage[l2tabu, orthodox]{nag}
-
-\documentclass[utf8,biblatex]{lni}
-\bibliography{lni-paper-example-de}
+% % !TeX program = pdflatex
+% % !BIB program = biber
+% % !TeX spellcheck = de-DE
+\documentclass[biblatex]{lni}
+\addbibresource{lni-paper-example-de.bib}
%% Schöne Tabellen mittels \toprule, \midrule, \bottomrule
\usepackage{booktabs}
%% Zu Demonstrationszwecken
-\usepackage[math]{blindtext}
-\usepackage{mwe}
-
-%% BibLaTeX-Sonderkonfiguration,
-%% falls man schnell eine existierende Bibliographie wiederverwenden will, aber nicht die .bib-Datei händisch anpassen möchte.
-%% Bitte \iffalse und \fi entfernen, dann ist diese Konfiguration aktiviert.
-
-\iffalse
-\AtEveryBibitem{%
- \ifentrytype{article}{%
- }{%
- \clearfield{doi}%
- \clearfield{issn}%
- \clearfield{url}%
- \clearfield{urldate}%
- }%
- \ifentrytype{inproceedings}{%
- }{%
- \clearfield{doi}%
- \clearfield{issn}%
- \clearfield{url}%
- \clearfield{urldate}%
- }%
-}
-\fi
+\usepackage[]{blindtext}
\begin{document}
%%% Mehrere Autoren werden durch \and voneinander getrennt.
@@ -3137,14 +3181,12 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen Worten und noch mehr Buchstaben}
%%%\subtitle{Untertitel / Subtitle} % falls benötigt
-\author[Vorname1 Nachname1 \and Vorname2 Nachname2]
-{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort, Land \email{emailaddress@author1}} \and
- Vorname2 Nachname2\footnote{University, Department, Address, Country \email{emailaddress@author2}}}
-\startpage{11} % Beginn der Seitenzählung für diesen Beitrag
-\editor{Herausgeber et al.} % Namen der Herausgeber
-\booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
-\yearofpublication{2017}
-%%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
+\author[1]{Vorname1 Nachname1}{vorname1.name1@affiliation1.de}{0000-0000-0000-0000}
+\author[2]{Vorname2 Nachname2}{vorname2.name2@affiliation2.de}{0000-0000-0000-0000}
+\author[1]{Vorname3 Nachname3}{vorname3.name3@affiliation1.de}{0000-0000-0000-0000}
+\author[1]{Vorname4 Nachname4}{vorname4.name4@affiliation1.de}{0000-0000-0000-0000}%
+\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+\affil[2]{University\\Department\\Address\\Country}
\maketitle
\begin{abstract}
@@ -3155,7 +3197,7 @@ Die Formatierung erfolgt automatisch innerhalb des abstract-Bereichs.
\end{abstract}
\begin{keywords}
-LNI Guidelines \and \LaTeX Vorlage
+LNI Guidelines \and \LaTeX\ Vorlage
\end{keywords}
\section{Verwendung}
@@ -3163,7 +3205,7 @@ Die GI gibt unter \url{http://www.gi-ev.de/LNI} Vorgaben für die Formatierung v
Für \LaTeX-Dokumente werden diese durch die Dokumentenklasse \texttt{lni} realisiert.
Dieses Dokument basiert auf der offiziellen Dokumentation, simplifiziert und setzt grundlegendes LaTeX-Wissen voraus.
-Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Authoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
+Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Autoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
Dieses Template ist wie folgt gegliedert:
\Cref{sec:demos} zeigt Demonstrationen der LNI-Verlage.
@@ -3176,6 +3218,8 @@ Es ist kein Weierstraß-p ($\wp$) mehr.
Spitze Klammen können direkt eingegeben werden: <test />
+Anonymisierungen können mittels anonymous-Option in der documentclass automatisch vorgenommen werden. Dafür gibt es das \texttt{anon}-Makro, z.\,B. \anon{Geheim für Review} und \anon[nur für Review]{nur für finale Version}.
+
Hier eine kleine Demonstration von \href{https://www.ctan.org/pkg/microtype}{microtype}:
\blindtext
@@ -3236,16 +3280,22 @@ public class Hello {
Alternativ kann auch die \texttt{lstlisting}-Umgebung verwendet werden.
-\Cref{L1} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist.
+\Cref{java-hello-world} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist. Ein anderes Beispiel ist \cref{python-hello-world}.
-\begin{lstlisting}[caption={Beschreibung}, label=L1, language=Java]
+\begin{lstlisting}[caption={Ein Java-Programm}, label=java-hello-world, language=Java]
public class Hello {
- public static void main (String[] args) {
- System.out.println("Hello World!");
- }
+ public static void main (String[] args) {
+ System.out.println("Hello World!");
+ }
}
\end{lstlisting}
+\begin{lstlisting}[caption={Ein Python-Programm}, label=python-hello-world, language=Python]
+# This program prints Hello, world!
+
+print('Hello, world!')
+\end{lstlisting}
+
\subsection{Formeln und Gleichungen}
Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen
diff --git a/macros/latex/contrib/lni/lni.ins b/macros/latex/contrib/lni/lni.ins
index 5536ab57b9..6f7d41e148 100644
--- a/macros/latex/contrib/lni/lni.ins
+++ b/macros/latex/contrib/lni/lni.ins
@@ -13,7 +13,7 @@
\declarepreamble\bibtexengpre
lnig.bst
Lecture Notes in Informatics Style File (english)
-Version 1.0 (2017/04/07)
+Version 1.1 (2022/06/10)
The Style File is based on alpha.bst
@@ -25,7 +25,7 @@ Modified files should be clearly indicated as such and renamed.
\declarepreamble\bibtexgerpre
lnig.bst
Lecture Notes in Informatics Style File (german)
-Version 1.0 (2017/04/07)
+Version 1.1 (2022/06/10)
The Style File is based on alpha.bst
@@ -57,7 +57,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
\postamble
-Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
+Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -97,7 +97,7 @@ This work consists of the file lni.dtx
}
\endbatchfile
%%
-%% Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/macros/latex/contrib/lni/lni.pdf b/macros/latex/contrib/lni/lni.pdf
index e4aa3474b2..4fa2e79a5f 100644
--- a/macros/latex/contrib/lni/lni.pdf
+++ b/macros/latex/contrib/lni/lni.pdf
Binary files differ
diff --git a/macros/latex/contrib/unbtex/README.md b/macros/latex/contrib/unbtex/README.md
index 94f844f944..ab1ed67dfd 100644
--- a/macros/latex/contrib/unbtex/README.md
+++ b/macros/latex/contrib/unbtex/README.md
@@ -1,6 +1,6 @@
# UnBTeX: A class for bachelor, master, and doctoral thesis at the
University of Brasilia (UnB), Brazil.
-Version 1.4 2023/11/15
+Version 1.4.1 2023/11/27
Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br>
@@ -14,8 +14,8 @@ templates are all written in Portuguese, the language of the target
audience.
This package consists of the following source file: unbtex.cls.
-Template files: unbtex-example.pdf, unbtex-example.tex and files within
-unbtex-example directory.
+Template files: unbtex-example.pdf, unbtex-example.tex, unbtextcite-pt,
+unbtexcite-en, and files within unbtex-example directory.
To compile the unbtex-example.tex file you should call pdflatex, bibtex,
pdflatex.
@@ -68,11 +68,19 @@ Here is a history of changes:
package to improve math subscript spacing
. Sans serif font scale has been adjusted (helvet package)
. Typewriter font and scale have been changed (inconsolata package)
- . Font size and line spread of verbatim environment have beem modified
+ . Font size and line spread of verbatim environment have been modified
. Cross-references names for listing, algorithm, and theorem
environments have been corrected
. Indentation and line spacing of references list have been adjusted
. Figure and table numbering by chapter have been corrected
+ 1.4.1 (2023-11-27):
+ . Figure captions have been moved to the top to comply with the ABNT
+ standard
+ . Spacing between figures/tables and captions/legends has been
+ adjusted
+ . Spacing between figures/tables and text has been adjusted
+ . Spacing between text and title of sections has been compacted
+ . Spacing in list environments has been adjusted
## Overleaf
diff --git a/macros/latex/contrib/unbtex/unbtex-example.pdf b/macros/latex/contrib/unbtex/unbtex-example.pdf
index 153199da18..abfc7dd73a 100644
--- a/macros/latex/contrib/unbtex/unbtex-example.pdf
+++ b/macros/latex/contrib/unbtex/unbtex-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/unbtex/unbtex-example.tex b/macros/latex/contrib/unbtex/unbtex-example.tex
index f62347759b..1df03f03e0 100644
--- a/macros/latex/contrib/unbtex/unbtex-example.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example.tex
@@ -1,7 +1,7 @@
%%
%% UnBTeX: A class for bachelor, master, and doctoral thesis at the
%% University of Brasilia (UnB), Brazil
-%% Version 1.4 2023/11/15
+%% Version 1.4.1 2023/11/27
%% Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br>
%%
%% This class file may be distributed and/or modified under the conditions
@@ -35,9 +35,9 @@
% Pacotes básicos (Adicione abaixo pacotes úteis para o seu trabalho)
% ---
+% Lista na bibliografia o número das páginas que cada referência é citada
+\RequirePackage[english,brazilian,hyperpageref]{backref}
% Bibliografia nas normas da ABNT, formato autor-data
-% O formato autor-data facilita a leitura, sobretudo de trabalhos com muitas páginas
-\RequirePackage[english,brazilian,hyperpageref]{backref} % Paginas com as citações na lista de referências
\RequirePackage[alf,abnt-etal-list=0,abnt-etal-cite=3,abnt-emphasize=bf,bibjustif]{abntex2cite}
\addtociteoptionlist{abnt-url-package=url}
\def\UrlLeft{}
@@ -125,7 +125,7 @@
% Local e data
\local{Brasília}
-\dia{15}
+\dia{27}
\mes{novembro}
\ano{2023}
@@ -147,9 +147,9 @@
% Membros da banca
\membrodabancai{Prof. Dr. Lourenço Nassib Chehab, UnB/FT/ENE} % Membro 1 - Geralmente é o orientador
\membrodabancaifuncao{Orientador} % Em português mesmo que o trabalho seja em inglês.
-\membrodabancaii{Prof. Dr. Wilson Gonçalves de Almeida, UnB/FT/ENE} % Membro 2
+\membrodabancaii{Prof. Dr. Sérgio Barroso de Assis Fonseca, UnB/FT/ENE} % Membro 2
\membrodabancaiifuncao{Examinador interno}
-\membrodabancaiii{Prof. Dr. João Guedes de Campos Barros, UnB/FT/ENE} % Membro 3
+\membrodabancaiii{Prof. Dr. Wilson Gonçalves de Almeida, UnB/FT/ENE} % Membro 3
\membrodabancaiiifuncao{Examinador interno}
\membrodabancaiv{} % deixar vazio se não tiver o quarto membro
\membrodabancaivfuncao{Examinador externo}
@@ -175,13 +175,17 @@
\renewcommand{\coorientadorname}{Coorientador} % O gênero pode ser alterado para Coorientadora
\renewcommand{\anexoname}{Anexo}
\renewcommand{\apendicename}{Apêndice}
+\renewcommand{\listfigurename}{Lista de figuras}
}{
\thmnameen
\renewcommand{\bibname}{References}
-\renewcommand{\orientadorname}{Orientador} % O gênero pode ser alterado para Orientadora. Não alterar para Supervisor/Advisor, mesmo que o trabalho seja em inglês.
-\renewcommand{\coorientadorname}{Coorientador} % O gênero pode ser alterado para Coorientadora. Não alterar para Co-Supervisor/Co-Advisor, mesmo que o trabalho seja em inglês.
+\renewcommand{\orientadorname}{Orientador} % Não alterar para Supervisor/Advisor, mesmo que o trabalho seja em inglês
+\renewcommand{\coorientadorname}{Coorientador} % Não alterar para Co-Supervisor/Co-Advisor, mesmo que o trabalho seja em inglês
+\renewcommand{\agradecimentosname}{Agradecimentos} % Comente esta linha caso queira escrever os agradecimentos em inglês
\renewcommand{\anexoname}{Annex}
\renewcommand{\apendicename}{Appendix}
+\renewcommand{\listfigurename}{List of figures}
+\renewcommand{\listtablename}{List of tables}
}
% Configurações do pacote backref
@@ -313,7 +317,7 @@ Agradecimentos do segundo autor.
\newcommand{\imprimirresumo}{
\newpage
\setlength{\absparsep}{18pt} % ajusta o espaçamento dos parágrafos do resumo
-\begin{resumo}[Resumo]
+\begin{resumo}[Resumo]\vspace{\baselineskip}
% ---
Segundo a \citeonline[seções 3.1-3.2]{NBR6028:2003}, o resumo deve ressaltar o objetivo, o método, os resultados e as conclusões do documento. A ordem e a extensão destes itens dependem do tipo de resumo (informativo ou indicativo) e do tratamento que cada item recebe no documento original. As palavras-chave devem figurar logo abaixo do resumo, antecedidas da expressão Palavras-chave: separadas entre si por ponto e finalizadas também por ponto.
% ---
@@ -327,7 +331,7 @@ Segundo a \citeonline[seções 3.1-3.2]{NBR6028:2003}, o resumo deve ressaltar o
\newcommand{\imprimirabstract}{
\newpage
\setlength{\absparsep}{18pt} % ajusta o espaçamento dos parágrafos do resumo
-\begin{resumo}[Abstract]
+\begin{resumo}[Abstract]\vspace{\baselineskip}
\begin{otherlanguage*}{english}
% ---
This is the english abstract.
diff --git a/macros/latex/contrib/unbtex/unbtex-example/apendice-a.tex b/macros/latex/contrib/unbtex/unbtex-example/apendice-a.tex
index e70fab3bb4..fa08776445 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/apendice-a.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/apendice-a.tex
@@ -8,7 +8,6 @@ Este modelo usa Bib\TeX\ para configurar as referências. Os arquivo referencias
\end{verbatim}
Por exemplo , a entrada
-%\verbatimfont{\small}
\begin{verbatim}
@article{greenwade93,
author = "George D. Greenwade",
@@ -20,7 +19,6 @@ Por exemplo , a entrada
pages = "342--351"
}
\end{verbatim}
-%\verbatimfont{\normalfont}
pode ser citada no texto com
\begin{verbatim}
\cite{greenwade93}
@@ -37,6 +35,7 @@ Esse código gera uma citação assim:
\begin{citacao}{Carl Sagan}
Alegações extraordinárias exigem evidências extraordinárias.
\end{citacao}
+
O comando \verb|\cite{...}| pode ser usado como indicação do autor:
\begin{verbatim}
\begin{citacao}{\cite{greenwade93}}
diff --git a/macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex b/macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex
index 812fe936f5..1c86f09671 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex
@@ -3,10 +3,10 @@
% ----------------------------------------------------------
\section{Projeto do Controlador com Realimentação de Estados}
-\lstinputlisting[language=Matlab,caption={Código de Matlab},label={cod_matlab}]{unbtex-example/codigos/controle.m}
+\lstinputlisting[language=Matlab,caption={Código de Matlab},label={cod:matlab}]{unbtex-example/codigos/controle.m}
\section{Exemplo de teste em Malha Fechada com Rampa}
-\lstinputlisting[language=Python,caption={Código de Python},label={cod_python}]{unbtex-example/codigos/controleSmithPredictor.py}
+\lstinputlisting[language=Python,caption={Código de Python},label={cod:python}]{unbtex-example/codigos/controleSmithPredictor.py}
\section{Redução modal}
-\lstinputlisting[language=Julia,caption={Código de Julia},label={cod_julia}]{unbtex-example/codigos/ModalReduction.jl} \ No newline at end of file
+\lstinputlisting[language=Julia,caption={Código de Julia},label={cod:julia}]{unbtex-example/codigos/ModalReduction.jl} \ No newline at end of file
diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo1.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo1.tex
index 151822d3e0..e5a5d1dcfe 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/capitulo1.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo1.tex
@@ -1,6 +1,6 @@
% ----------------------------------------------------------
\chapter{Introdução}
-\label{cap_intr}
+\label{cap:intr}
% ----------------------------------------------------------
Este documento exemplifica a elaboração de trabalho acadêmico (trabalho de conclusão de curso, dissertação e tese) a partir da classe UnB\TeX, uma customização da classe \textsf{abntex2} para a Universidade de Brasília (UnB).
diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex
index a787644a95..7616e974ab 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex
@@ -1,6 +1,6 @@
% ----------------------------------------------------------
\chapter{Comandos do \LaTeX, do \abnTeX\ e do UnB\TeX}
-\label{cap_exemplos}
+\label{cap:exemplos}
% ----------------------------------------------------------
Este capítulo ilustra o uso de comandos do \LaTeX, do \abnTeX\ e do UnB\TeX.
@@ -12,17 +12,15 @@ Este capítulo ilustra o uso de comandos do \LaTeX, do \abnTeX\ e do UnB\TeX.
A codificação de todos os arquivos do \abnTeX\ é \texttt{UTF8}. É necessário que você utilize a mesma codificação nos documentos que escrever, inclusive nos arquivos de base bibliográficas \texttt{bib}.
% ---
-\section{Citações diretas}\label{sec-citacao}
+\section{Citações diretas}\label{sec:citacao}
% ---
Utilize o ambiente \texttt{citacao} para incluir citações diretas com mais de três linhas:
-
\begin{citacao}
As citações diretas, no texto, com mais de três linhas, devem ser destacadas com recuo de 4 cm da margem esquerda, com letra menor que a do texto utilizado e sem as aspas. No caso de documentos datilografados, deve-se observar apenas o recuo \cite[seção 5.3]{NBR10520:2002}.
\end{citacao}
Use o ambiente assim:
-
\begin{verbatim}
\begin{citacao}
As citações diretas, no texto, com mais de três linhas [...] deve-se observar
@@ -30,8 +28,7 @@ apenas o recuo \cite[seção 5.3]{NBR10520:2002}.
\end{citacao}
\end{verbatim}
-O ambiente \texttt{citacao} pode receber como parâmetro opcional um nome de idioma previamente carregado nas opções da classe (\cref{sec-hifenizacao}). Nesse caso, o texto da citação é automaticamente escrito em itálico e a hifenização é ajustada para o idioma selecionado na opção do ambiente. Por exemplo:
-
+O ambiente \texttt{citacao} pode receber como parâmetro opcional um nome de idioma previamente carregado nas opções da classe (\cref{sec:hifenizacao}). Nesse caso, o texto da citação é automaticamente escrito em itálico e a hifenização é ajustada para o idioma selecionado na opção do ambiente. Por exemplo:
\begin{verbatim}
\begin{citacao}[english]
Text in English language in italic with correct hyphenation.
@@ -39,7 +36,6 @@ Text in English language in italic with correct hyphenation.
\end{verbatim}
Tem como resultado:
-
\begin{citacao}[english]
Text in English language in italic with correct hyphenation.
\end{citacao}
@@ -54,12 +50,12 @@ As notas de rodapé são detalhadas pela NBR 14724:2011 na seção 5.2.1\footnot
% ---
\section{Expressões matemáticas}
-\label{sec-mat}
+\label{sec:mat}
% ---
Use o ambiente \texttt{equation} para escrever expressões matemáticas numeradas:
\begin{equation}
- \forall x \in X, \quad \exists \: y \leq \epsilon
+ \forall x \in X, \quad \exists \: y \leq \epsilon.
\end{equation}
Escreva expressões matemáticas entre \$ e \$, como em $ \lim_{x \to \infty} \exp(-x) = 0 $, para que fiquem na mesma linha.
@@ -138,13 +134,13 @@ u_{li}(t) &= - \textrm{sign}(s_{li}(t))\eta. \label{eq:u_xbi}
\section{Tabelas}
% ---
-A \cref{tab-nivinv} é um exemplo de tabela construída em
+A \cref{tab:nivinv} é um exemplo de tabela construída em
\LaTeX.
\begin{table}[htb]
\footnotesize
-\caption[Níveis de investigação]{Níveis de investigação.}
-\label{tab-nivinv}
+\caption[Níveis de investigação]{Níveis de investigação}
+\label{tab:nivinv}
{\renewcommand{\arraystretch}{1.2} % espaçamento entre as linhas da tabela
\begin{tabular}{p{2.6cm}|p{6.0cm}|p{2.25cm}|p{3.40cm}} %\hline
\textbf{Nível de Investigação} & \textbf{Insumos} & \textbf{Sistemas de Investigação} & \textbf{Produtos} \\ \hline
@@ -152,15 +148,15 @@ A \cref{tab-nivinv} é um exemplo de tabela construída em
Nível do objeto & Paradigmas do metanível e evidências do nível inferior & Ciência & Teorias e modelos \\ \hline
Nível inferior & Modelos e métodos do nível do objeto e problemas do nível inferior & Prática & Solução de problemas \\ %\hline
\end{tabular}}
-\legend{Fonte: \citeonline{van86}}
+\fonte{\citeonline{van86}}
\end{table}
-Já a \cref{tabela-ibge} apresenta uma tabela criada conforme o padrão do \citeonline{ibge1993} requerido pelas normas da ABNT para documentos técnicos e acadêmicos.
+Já a \cref{tab:ibge} apresenta uma tabela criada conforme o padrão do \citeonline{ibge1993} requerido pelas normas da ABNT para documentos técnicos e acadêmicos.
\begin{table}[htb]
\IBGEtab{%
\caption{Um Exemplo de tabela alinhada que pode ser longa ou curta, conforme padrão IBGE}%
- \label{tabela-ibge}
+ \label{tab:ibge}
}{%
\begin{tabular}{ccc}
\toprule
@@ -171,17 +167,18 @@ Já a \cref{tabela-ibge} apresenta uma tabela criada conforme o padrão do \cite
\end{tabular}%
}{%
\fonte{Produzido pelos autores.}%
- \nota{Esta é uma nota, que diz que os dados são baseados na regressão linear.}%
+ \nota{Esta é uma nota, que diz que os dados são baseados na regressão linear.}%
\nota[Anotações]{Uma anotação adicional, que pode ser seguida de várias outras.}%
}
\end{table}
-Na \cref{tab:lvlii} são mostrados os componentes curriculares do novo fluxograma da engenharia mecatrônica.
+Na \cref{tab:lvlii} são mostrados os componentes curriculares obrigatórios do 2º nível da nova estrutura curricular do curso de engenharia mecatrônica da UnB.
\begin{table}[htb]
\small
\begin{center}%
-\caption{Componentes curriculares do segundo nível} \label{tab:lvlii}
+\caption{Componentes curriculares do segundo nível}
+\label{tab:lvlii}
{\renewcommand{\arraystretch}{1.2} % espaçamento entre as linhas da tabela
\begin{tabular}{|m{1.5cm}|m{4.3cm}|m{.7cm}|m{.7cm}|m{.7cm}|m{.7cm}|m{.7cm}|m{2.1cm}|}
\hline%
@@ -218,106 +215,108 @@ Existem pacotes que permitem criar figuras e gráficos no próprio código \LaTe
\item \textsf{PSTricks}: \url{https://tug.org/PSTricks/main.cgi?file=examples}
\end{itemize}
-Figuras também podem ser incorporadas de arquivos externos, como é o caso das \cref{fig_blockdiagram,fig_grafico}. Se a figura que for incluída se tratar de um diagrama, um gráfico ou uma ilustração que você mesmo produza, priorize o uso de imagens vetoriais no formato \texttt{pdf}. Com isso, o tamanho do arquivo final do trabalho será menor, e as imagens terão uma apresentação melhor, principalmente quando impressas, uma vez que imagens vetoriais são perfeitamente escaláveis para qualquer dimensão.
+Figuras também podem ser incorporadas de arquivos externos, como é o caso das \cref{fig:blockdiagram,fig:grafico}. Se a figura que for incluída se tratar de um diagrama, um gráfico ou uma ilustração que você mesmo produza, priorize o uso de imagens vetoriais no formato \texttt{pdf}. Com isso, o tamanho do arquivo final do trabalho será menor, e as imagens terão uma apresentação melhor, principalmente quando impressas, uma vez que imagens vetoriais são perfeitamente escaláveis para qualquer dimensão.
-\begin{figure}[htb]
+\begin{figure}[tb]
\centering
- \includegraphics[scale=1]{blockdiagram.pdf}
\caption{Sistema de controle em malha fechada}
- \label{fig_blockdiagram}
+ \label{fig:blockdiagram}
+ \includegraphics[scale=1]{blockdiagram.pdf}
\end{figure}
-\begin{figure}[htb]
- \begin{center}
- \includegraphics[scale=1]{bodediagram.pdf}
+\begin{figure}[tb]
+ \centering
\caption{Resposta em frequência de malha aberta}
- \label{fig_grafico}
- \legend{Fonte: Produzido pelos autores}
- \end{center}
+ \label{fig:grafico}
+ \includegraphics[scale=1]{bodediagram.pdf}
\end{figure}
Para manter a coerência no uso de software livre (já que você está usando \LaTeX\ e \abnTeX), teste a ferramenta \textsf{InkScape} (\url{http://inkscape.org/}). Ela é uma excelente opção de código-livre para produzir ilustrações vetoriais, similar ao CorelDraw ou ao Adobe Illustrator.
De todo modo, caso não seja possível utilizar arquivos de imagens como \texttt{pdf}, utilize qualquer outro formato, como \texttt{jpeg}, \texttt{gif}, \texttt{bmp}, etc. Nesse caso, você pode tentar aprimorar as imagens incorporadas com o software livre \textsf{Gimp} (\url{http://www.gimp.org/}). Ele é uma alternativa livre ao Adobe Photoshop.
+De acordo com as normas da ABNT, numeração e título das figuras e tabelas devem aparecer na parte superior. Na parte inferior deve ser informada a fonte.
+
% ---
\subsection{Figuras em \emph{minipages}}
% ---
-\emph{Minipages} são usadas para inserir textos ou outros elementos em quadros com tamanhos e posições controladas. Veja os exemplos das \cref{fig_minipage_imagem1,fig_minipage_grafico2}.
+\emph{Minipages} são usadas para inserir textos ou outros elementos em quadros com tamanhos e posições controladas. Veja os exemplos das \cref{fig:minipage_circuito,fig:minipage_grafico}.
\begin{figure}[htb]
- \label{teste}
+ \label{fig:teste}
\centering
- \begin{minipage}{0.46\textwidth}
+ \begin{minipage}[t]{0.46\textwidth}
\centering
- \includegraphics[scale=1]{circuito.pdf}
- \caption{Imagem 1 da minipage} \label{fig_minipage_imagem1}
- \legend{Fonte: Produzido pelos autores}
+ \caption{Imagem da minipage}
+ \label{fig:minipage_circuito}
+ \includegraphics[scale=1]{circuito.pdf}
\end{minipage}
\hfill
- \begin{minipage}{0.52\textwidth}
+ \begin{minipage}[t]{0.52\textwidth}
\centering
+ \caption{Gráfico da minipage}
+ \label{fig:minipage_grafico}
\includegraphics[scale=1.2]{diodocurva.pdf}
- \caption{Gráfico 2 da minipage} \label{fig_minipage_grafico2}
- \legend{Fonte: Produzido pelos autores}
\end{minipage}
\end{figure}
\subsection{Subfiguras}
-O pacote \textsf{subfig} foi utilizado para inserir as \cref{fig_subfigura_imagem1,fig_subfigura_grafico2}. Subfiguras também podem ser inseridas no texto com o pacote \textsf{subcaption}.
+O pacote \textsf{subfig} foi utilizado para inserir as \cref{fig:subfigura_circuito,fig:subfigura_grafico}. Subfiguras também podem ser inseridas no texto com o pacote \textsf{subcaption}.
% utiliza o pacote subfig
\begin{figure}[htb]
- \centering
- \subfloat[Primeira subfigura]{\label{fig_subfigura_imagem1} \centering
+ \centering
+ \caption{Figura com subfiguras}
+ \label{fig:subfiguras}
+ \subfloat[Primeira subfigura]{\label{fig:subfigura_circuito} \centering
\includegraphics[scale=1]{circuito.pdf}}
- \subfloat[Segunda subfigura]{\label{fig_subfigura_grafico2} \hspace{0.4em}
+ \subfloat[Segunda subfigura]{\label{fig:subfigura_grafico} \hspace{0.4em}
\centering \includegraphics[scale=1.2]{diodocurva.pdf}}
- \caption{Figura com subfiguras} \label{fig:tau}
\end{figure}
% utiliza o pacote subcaption
%\begin{figure}[htb]
% \centering
-% \begin{subfigure}[t]{0.46\textwidth}
-% \includegraphics[scale=1]{circuito.pdf}
-% \caption{Primeira subfigura}
-% \label{fig_subfigura_imagem1}
+% \caption{Figura com subfiguras}
+% \label{fig:subfiguras}
+% \begin{subfigure}[t]{0.47\textwidth}
+% \caption{Primeira subfigura}
+% \label{fig:subfigura_circuito}
+% \includegraphics[scale=1]{circuito.pdf}
% \end{subfigure}%
% \hfill
% \begin{subfigure}[t]{0.52\textwidth}
-% \includegraphics[scale=1.2]{diodocurva.pdf}
-% \caption{Segunda subfigura}
-% \label{fig_subfigura_grafico2}
+% \caption{Segunda subfigura}
+% \label{fig:subfigura_grafico}
+% \includegraphics[scale=1.2]{diodocurva.pdf}
% \end{subfigure}
-% \caption{Figura com subfiguras}
-% \label{fig:tau}
%\end{figure}
% ---
-\subsection{Substituir texto de figura \texttt{eps} por texto e equações com as mesmas fontes usadas no documento}
+\subsection{Obtenção de figuras com texto e equações que usam as mesmas fontes do documento}
% ---
-Caso queira utilizar a mesma fonte do texto para escrever dentro de figuras, como é o caso da \cref{fig_psfrag1} (arquivo \texttt{blockdiagram.pdf}), produza uma figura como a da \cref{fig_psfrag2} e a salve no formato \texttt{eps} (arquivo \texttt{blockdiagram.eps}). Softwares como InkScape, CorelDraw ou Adobe Ilustrator podem ser utilizados para este fim.
+Caso queira utilizar a mesma fonte do texto para escrever dentro de figuras, como é o caso da \cref{fig:psfrag1} (arquivo \texttt{blockdiagram.pdf}), produza uma figura como a da \cref{fig:psfrag2} e a salve no formato \texttt{eps} (arquivo \texttt{blockdiagram.eps}). Softwares como InkScape, CorelDraw ou Adobe Ilustrator podem ser utilizados para este fim.
\begin{figure}[htb]
- \centering
- \subfloat[Arquivo \texttt{blockdiagram.pdf}]{\label{fig_psfrag1} \centering
+ \centering
+ \caption{Uso do pacote \textsf{psfrag}}
+ \subfloat[Arquivo \texttt{blockdiagram.pdf}]{\label{fig:psfrag1} \centering
\includegraphics[scale=1]{blockdiagram.pdf}} \\
- \subfloat[Arquivo \texttt{blockdiagram.eps}]{\label{fig_psfrag2}
+ \subfloat[Arquivo \texttt{blockdiagram.eps}]{\label{fig:psfrag2}
\centering \includegraphics[scale=1]{blockdiagramfrag.eps}}
- \caption{Uso do pacote \textsf{psfrag}} \label{fig:psgrag}
+ \label{fig:psgrag}
\end{figure}
-Crie no Overleaf um projeto nomeado \texttt{blockdiagram} e que tenha, dentro de um arquivo nomeado \texttt{blockdiagram.tex}, o conteúdo mostrado no \cref{cod_tex}.
+Crie no Overleaf um projeto nomeado \texttt{blockdiagram} e que tenha, dentro de um arquivo nomeado \texttt{blockdiagram.tex}, o conteúdo mostrado no \cref{cod:tex}.
-\lstinputlisting[numbers=none,float,caption={\texttt{blockdiagram.tex}},label={cod_tex}]{unbtex-example/codigos/blockdiagram.tex}
+\lstinputlisting[numbers=none,float,caption={\texttt{blockdiagram.tex}},label={cod:tex}]{unbtex-example/codigos/blockdiagram.tex}
-No menu do Overleaf, defina \texttt{LaTeX} como compilador e o arquivo \texttt{blockdiagram.tex} como principal. Coloque dentro do projeto o arquivo \texttt{blockdiagram.eps} e compile o projeto. A saída gerada corresponde à \cref{fig_psfrag1} e deverá ser salva como \texttt{blockdiagram.pdf}. Este arquivo poderá ser carregado no projeto do texto do trabalho (TCC, dissertação ou tese) que você estiver escrevendo com o UnB\TeX\ (que usa o \texttt{pdfLaTeX} como compilador).
+No menu do Overleaf, defina \texttt{LaTeX} como compilador e o arquivo \texttt{blockdiagram.tex} como principal. Coloque dentro do projeto o arquivo \texttt{blockdiagram.eps} e compile o projeto. A saída gerada corresponde à \cref{fig:psfrag1} e deverá ser salva como \texttt{blockdiagram.pdf}. Este arquivo poderá ser carregado no projeto do texto do trabalho (TCC, dissertação ou tese) que você estiver escrevendo com o UnB\TeX\ (que usa o \texttt{pdfLaTeX} como compilador).
-Note no \cref{cod_tex} que o pacote \textsf{psfrag} substitui, por meio do comando
+Note no \cref{cod:tex} que o pacote \textsf{psfrag} substitui, por meio do comando
\begin{verbatim}
\psfrag{r}[c][c]{\footnotesize $R(s)$}
\end{verbatim}
@@ -366,17 +365,15 @@ subdividida em alíneas \cite[seção 4.2]{NBR6024:2012}:
\end{alineas}
% ---
-\section{Inclusão de outros arquivos}\label{sec-include}
+\section{Inclusão de outros arquivos}\label{sec:include}
% ---
É uma boa prática dividir o seu documento em diversos arquivos, e não apenas escrever tudo em um único. Esse recurso foi utilizado neste documento. Para incluir diferentes arquivos em um arquivo principal, de modo que cada arquivo incluído fique em uma página diferente, utilize o comando:
-
\begin{verbatim}
\include{documento-a-ser-incluido} % sem a extensão .tex
\end{verbatim}
Para incluir documentos sem quebra de páginas, utilize:
-
\begin{verbatim}
\input{documento-a-ser-incluido} % sem a extensão .tex
\end{verbatim}
@@ -385,84 +382,21 @@ Para incluir documentos sem quebra de páginas, utilize:
\section{Remissões internas}
% ---
-Ao nomear a \cref{tab-nivinv} e a \cref{fig_blockdiagram}, apresentamos um exemplo de remissão interna, que também pode ser feita quando indicamos o \cref{cap_exemplos}, que tem o nome \emph{\nameref{cap_exemplos}}. O número do capítulo indicado é \ref{cap_exemplos}, que se inicia à \cpageref{cap_exemplos}\footnote{O número da página de uma remissão pode ser obtida também assim: \pageref{cap_exemplos}.}. Veja a \cref{sec-divisoes} para outros exemplos de remissões internas entre seções, subseções e subsubseções.
+Ao nomear a \cref{tab:nivinv} e a \cref{fig:blockdiagram}, apresentamos um exemplo de remissão interna, que também pode ser feita quando indicamos o \cref{cap:exemplos}, que tem o nome \emph{\nameref{cap:exemplos}}. O número do capítulo indicado é \ref{cap:exemplos}, que se inicia à \cpageref{cap:exemplos}\footnote{O número da página de uma remissão pode ser obtida também assim: \pageref{cap:exemplos}.}.
O código usado para produzir o texto desta seção é:
-
\begin{verbatim}
-Ao nomear a \cref{tab-nivinv} e a \cref{fig:syscl}, apresentamos um
+Ao nomear a \cref{tab:nivinv} e a \cref{fig:syscl}, apresentamos um
exemplo de remissão interna, que também pode ser feita quando indicamos
-o \cref{cap_exemplos}, que tem o nome \emph{\nameref{cap_exemplos}}.
-O número do capítulo indicado é \ref{cap_exemplos}, que se inicia à
-\cpageref{cap_exemplos}\footnote{O número da página de uma remissão
-pode ser obtida também assim: \pageref{cap_exemplos}.}. Veja a
-\cref{sec-divisoes} para outros exemplos de remissões internas entre
-seções, subseções e subsubseções.
-\end{verbatim}
-
-% ---
-\section{Divisões do documento: seção}\label{sec-divisoes}
-% ---
-
-Esta seção testa o uso de divisões de documentos. Esta é a \cref{sec-divisoes}. Veja a \cref{sec-divisoes-subsection}.
-
-\subsection{Divisões do documento: subseção}\label{sec-divisoes-subsection}
-
-Isto é uma subseção. Veja a \cref{sec-divisoes-subsubsection}, que é uma \texttt{subsubsection} do \LaTeX, mas é impressa chamada de ``subseção'' porque no Português não temos a palavra ``subsubseção''.
-
-\subsubsection{Divisões do documento: subsubseção}
-\label{sec-divisoes-subsubsection}
-
-Isto é uma subsubseção.
-
-\subsubsection{Divisões do documento: subsubseção}
-
-Isto é outra subsubseção.
-
-\subsection{Divisões do documento: subseção}\label{sec-exemplo-subsec}
-
-Isto é uma subseção.
-
-\subsubsection{Divisões do documento: subsubseção}
-
-Isto é mais uma subsubseção da \cref{sec-exemplo-subsec}.
-
-\subsubsubsection{Esta é uma subseção de quinto nível}\label{sec-exemplo-subsubsubsection}
-
-Esta é uma seção de quinto nível. Ela é produzida com o seguinte comando:
-
-\begin{verbatim}
-\subsubsubsection{Esta é uma subseção de quinto
-nível}\label{sec-exemplo-subsubsubsection}
-\end{verbatim}
-
-\subsubsubsection{Esta é outra subseção de quinto nível}\label{sec-exemplo-subsubsubsection-outro}
-
-Esta é outra seção de quinto nível.
-
-\paragraph{Este é um parágrafo numerado}\label{sec-exemplo-paragrafo}
-
-Este é um exemplo de parágrafo nomeado. Ele é produzida com o comando de parágrafo:
-
-\begin{verbatim}
-\paragraph{Este é um parágrafo nomeado}\label{sec-exemplo-paragrafo}
+o \cref{cap:exemplos}, que tem o nome \emph{\nameref{cap:exemplos}}.
+O número do capítulo indicado é \ref{cap:exemplos}, que se inicia à
+\cpageref{cap:exemplos}\footnote{O número da página de uma remissão
+pode ser obtida também assim: \pageref{cap:exemplos}.}.
\end{verbatim}
-A numeração entre parágrafos numeradaos e subsubsubseções são contínuas.
-
-\paragraph{Esta é outro parágrafo numerado}\label{sec-exemplo-paragrafo-outro}
-
-Esta é outro parágrafo nomeado.
-
-% ---
-\section{Este é um exemplo de nome de seção longo. Ele deve estar alinhado à esquerda e a segunda e demais linhas devem iniciar logo abaixo da primeira palavra da primeira linha}
-% ---
-
-Isso atende à norma \citeonline[seções 5.2.2 a 5.2.4]{NBR14724:2011} e \citeonline[seções 3.1 a 3.8]{NBR6024:2012}.
-
% ---
\section{Diferentes idiomas e hifenizações}
-\label{sec-hifenizacao}
+\label{sec:hifenizacao}
% ---
Para usar hifenizações de diferentes idiomas, inclua nas opções do documento o nome dos idiomas que o seu texto contém.
@@ -478,14 +412,13 @@ Exemplo de hifenização em inglês\footnote{Extraído de: \url{http://en.wikibo
\end{otherlanguage*}
O idioma geral do texto por ser alterado como no exemplo seguinte:
-
\begin{verbatim}
\selectlanguage{english}
\end{verbatim}
Isso altera automaticamente a hifenização e todos os nomes constantes de referências do documento para o idioma inglês. Consulte o manual da classe \cite{abntex2classe} para obter orientações adicionais sobre internacionalização de documentos produzidos com \abnTeX.
-A \cref{sec-citacao} descreve o ambiente \texttt{citacao} que pode receber como parâmetro um idioma a ser usado na citação.
+A \cref{sec:citacao} descreve o ambiente \texttt{citacao} que pode receber como parâmetro um idioma a ser usado na citação.
% ---
\section{Consulte o manual da classe \textsf{abntex2}}
@@ -516,17 +449,17 @@ No formato autor-data, considere chamar as referências usando o comando \verb|\
\subsection{Acentuação de referências bibliográficas}
%-
-Normalmente não há problemas em usar caracteres acentuados em arquivos bibliográficos (\texttt{bib}). Porém, como as regras da ABNT fazem uso quase abusivo da conversão para letras maiúsculas, é preciso observar o modo como se escreve os nomes dos autores. Na \cref{tabela-acentos} você encontra alguns exemplos das conversões mais importantes. Preste atenção especial para `ç' e `í' que devem estar envoltos em chaves. A regra geral é sempre usar a acentuação neste modo quando houver conversão para letras maiúsculas.
+Normalmente não há problemas em usar caracteres acentuados em arquivos bibliográficos (\texttt{bib}). Porém, como as regras da ABNT fazem uso quase abusivo da conversão para letras maiúsculas, é preciso observar o modo como se escreve os nomes dos autores. Na \cref{tab:acentos} você encontra alguns exemplos das conversões mais importantes. Preste atenção especial para `ç' e `í' que devem estar envoltos em chaves. A regra geral é sempre usar a acentuação neste modo quando houver conversão para letras maiúsculas.
\begin{table}[htbp]
\begin{center}
-\caption{Tabela de conversão de acentuação.}
-\label{tabela-acentos}
-\begin{tabular}{ll} \hline
-acento & bibtex\\ \hline\hline
-à á ã & \verb|\`a| \verb|\'a| \verb|\~a|\\ \hline
-í & \verb|{\'\i}|\\ \hline
-ç & \verb|{\c c}|\\ \hline
+\caption{Tabela de conversão de acentuação}
+\label{tab:acentos}
+\begin{tabular}{ll} \toprule
+acento & bibtex\\ \midrule\midrule
+à á ã & \verb|\`a| \verb|\'a| \verb|\~a|\\ \midrule
+í & \verb|{\'\i}|\\ \midrule
+ç & \verb|{\c c}|\\ \bottomrule
\end{tabular}
\end{center}
\end{table}
@@ -537,15 +470,13 @@ acento & bibtex\\ \hline\hline
As listas de ilustrações (figuras) e de tabelas utilizadas ao longo do trabalho são geradas automaticamente e incluídas entre o \emph{Abstract} e o Sumário.
-Para definir um elemento que deverá aparecer na lista de abreviatura e siglas, próximo do texto onde a sigla ou abreviatura aparece, utilize o comando \verb|\nomenclature|. Por exemplo, para definir as siglas que aparecem no primeiro parágrafo do \cref{cap_intr}, foram utilizados os seguintes comandos:
-
+Para definir um elemento que deverá aparecer na lista de abreviatura e siglas, próximo do texto onde a sigla ou abreviatura aparece, utilize o comando \verb|\nomenclature|. Por exemplo, para definir as siglas que aparecem no primeiro parágrafo do \cref{cap:intr}, foram utilizados os seguintes comandos:
\begin{verbatim}
\nomenclature[A]{ABNT}{Associação Brasileira de Normas Técnicas}
\nomenclature[A]{UnB}{Universidade de Brasília}
\end{verbatim}
-Para definir um elemento da lista de símbolos, próximo da equação onde o símbolo aparece, utilize também o comando \verb|\nomenclature|. Por exemplo, para definir os símbolos das equações da \cref{sec-mat}, foram utilizados os comandos:
-
+Para definir um elemento da lista de símbolos, próximo da equação onde o símbolo aparece, utilize também o comando \verb|\nomenclature|. Por exemplo, para definir os símbolos das equações da \cref{sec:mat}, foram utilizados os comandos:
\begin{verbatim}
\nomenclature[B]{$p$}{Pressão}
\nomenclature[B]{$v$}{Velocidade}
@@ -563,7 +494,6 @@ Note que a letra \verb|[A]| de \verb|\nomenclature[A]| indica que o item pertenc
A Tabela Cutter-Sanborn é uma codificação elaborada por Charles Ammi Cutter e, posteriormente, expandida por Kate F. Sanborn. Na Tabela Cutter-Sanborn, é possível consultar qual sequência numérica representa a sequência do sobrenome do autor.
Em vários sites da internet\footnote{\url{https://www.tabelacutter.com/}}\footnote{\url{https://cuttersonline.com.br/registrador-gratuito}} há ferramentas online para obtenção do código. Se o nome do primeiro autor do trabalho for, digamos, Carlos Lisboa, a entrada da ferramenta online deverá ser: \textbf{Lisboa, Carlos}. Nenhuma outra informação é necessária para gerar o código que, no caso desse autor, é \textbf{769}. Considere apenas esses três números. Eventuais letras devem ser ignoradas. No arquivo \texttt{tex} principal do relatório, na linha que tem o comando \verb|\numerocutter| troque por
-
\begin{verbatim}
\numerocutter{769}
\end{verbatim}
diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex
index f63332b28b..8dd6184026 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex
@@ -8,9 +8,10 @@ Sugiro que você guarde todas as figuras na pasta ``figuras'' para que seu proje
\begin{figure}[htb]
\begin{center}
+ \caption{Logo \LaTeX} \label{fig:logolatex}
\includegraphics[width=0.5\linewidth]{1280px-LaTeX-logo.png}
- \caption{Logo \LaTeX.} \label{fig:logolatex}
- \legend{Fonte: Wikimedia Commons \cite{wikimedia-latex}.}
+ \captionsetup{aboveskip=0pt,belowskip=2pt}
+ \fonte{Wikimedia Commons \cite{wikimedia-latex}}
\end{center}
\end{figure}
@@ -20,7 +21,7 @@ Além de figuras, é possível inserir caixas de texto de diversos tipos, como e
\begin{exercise}\label{exc:in}
Explique como Isaac Newton usaria cada um dos pacotes seguintes, se vivesse no tempo presente:
- \begin{enumerate}[label=(\Alph*)]
+ \begin{enumerate}[label=(\alph*)]
\item Metapost
\item TikZ
\item PGFPlots
@@ -39,7 +40,8 @@ Além de figuras, é possível inserir caixas de texto de diversos tipos, como e
O \cref{alg:NNMPC} é um pseudo-código para obtenção de um controlador preditivo baseado em modelo e em redes neurais.
-\begin{algorithm} [ht]
+\begin{algorithm}[htb]
+%\linespread{1.0}\selectfont % espaçamento entre as linhas do algoritmo
\caption{Pseudocódigo de MPC baseado em redes neurais para consenso}
\label{alg:NNMPC}
\begin{algorithmic}[1] %\opção para numerar as linhas [1]
@@ -50,24 +52,19 @@ O \cref{alg:NNMPC} é um pseudo-código para obtenção de um controlador predit
\State $dataset \gets [K_0,J]$
\For{$k = 1:k_{max}$} \Comment{Laço de simulação}
\State $(W,Y) \gets train(dataset)$
- \State $\tilde{J} = Y\sigma(Wz)$ $\forall K^{ab}_k\pm \delta_K
- $
+ \State $\tilde{J} = Y\sigma(Wz)$ $\forall K^{ab}_k\pm \delta_K$
\State $K_k^{\ast} = arg \min_{K_k}(\tilde{J})$
\State $u(k) = \left( L(\theta(k)) \otimes K_k^{\ast} \right) x(k)$
\State $\hat{x}(k) = x(k)$; $\hat{\theta}(k) = \theta(k)$
\For{$t = k+1:k+h+1$} \Comment{Laço de predição}
- %\For{$s = 1:S$} \Comment{Markov loop}
- \State $\hat{\theta}(t) = randMarkov(\hat{\theta}(t-1),\Pi)$
- \State $p = \hat{\theta}(t)$
- \State $\hat{u}(t) = \left( L(p) \otimes K_k^{\ast} \right) \hat{x}(t)$
- \State $\hat{x}(t+1) = F_{p}(\hat{x}(t))$
- \State $x_0(t) = mean(\hat{x}(t))$
- \State $\hat{e}(t) = F_{p}(\hat{x}(t)) - \boldsymbol{1_N} f_{p0}(x(t)) $
- \State $\hat{V}_{t} = \hat{e}^T(t)P_{p}\hat{e}(t)$
- \EndFor
- %\State $r(t) = r(t-k)\Pi^{k}$
- %\State $\bar{V}_t = \sum_{s=1}^S r_s(t) V_t^s$
- %\EndFor
+ \State $\hat{\theta}(t) = randMarkov(\hat{\theta}(t-1),\Pi)$
+ \State $p = \hat{\theta}(t)$
+ \State $\hat{u}(t) = \left( L(p) \otimes K_k^{\ast} \right) \hat{x}(t)$
+ \State $\hat{x}(t+1) = F_{p}(\hat{x}(t))$
+ \State $x_0(t) = mean(\hat{x}(t))$
+ \State $\hat{e}(t) = F_{p}(\hat{x}(t)) - \boldsymbol{1_N} f_{p0}(x(t)) $
+ \State $\hat{V}_{t} = \hat{e}^T(t)P_{p}\hat{e}(t)$
+ \EndFor
\State $\hat{J} = \sum_{t = k+1}^{k+h+1} \hat{V}_{t}$
\State $dataset \gets [K^{\ast}_k,\hat{J}]$
\State $x(k+1) = F_{p}(x(k))$
@@ -78,9 +75,9 @@ O \cref{alg:NNMPC} é um pseudo-código para obtenção de um controlador predit
\section{Programa}
-O \cref{cod_exemplo} é um exemplo de programa. Para mais exemplos, confira o \cref{apd:cdg}.
+O \cref{cod:exemplo} é um exemplo de programa. Para mais exemplos, confira o \cref{apd:cdg}.
-\begin{lstlisting}[caption={Exemplo de programa},label={cod_exemplo}]
+\begin{lstlisting}[caption={Exemplo de programa},label={cod:exemplo}]
/**
* MSO: ativa o servo cujo eixo eh descrito
* por drive_axis; informacoes de controle
diff --git a/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl b/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl
index f7108d0fd5..d17d1b305f 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl
+++ b/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl
@@ -4,7 +4,6 @@ export generateABC, getABC_M, getABCD_R
export manuscript_p48, simulation
export generateMATLABSimulationScript
-
#Gera A, B, C to sistema completo
function generateABC(n)
tau = 0.2426 # tau do barbante (1/s) para excursão de 30cm
diff --git a/macros/latex/contrib/unbtex/unbtex-example/codigos/blockdiagram.tex b/macros/latex/contrib/unbtex/unbtex-example/codigos/blockdiagram.tex
index e261f6a480..0af68cc6e0 100644
--- a/macros/latex/contrib/unbtex/unbtex-example/codigos/blockdiagram.tex
+++ b/macros/latex/contrib/unbtex/unbtex-example/codigos/blockdiagram.tex
@@ -19,6 +19,7 @@
\psfrag{c}[c][c]{\small $G_C(s)$}
\psfrag{g}[c][c]{\small $G(s)$}
\includegraphics[scale=1,trim={0pt 0pt 0pt 0pt}]{blockdiagram.eps}
+ % trim pode aumentar ou diminuiur as margens da figura
\end{psfrags}
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/unbtex/unbtex.cls b/macros/latex/contrib/unbtex/unbtex.cls
index 22649ed005..7c88458859 100644
--- a/macros/latex/contrib/unbtex/unbtex.cls
+++ b/macros/latex/contrib/unbtex/unbtex.cls
@@ -1,7 +1,7 @@
%%
%% UnBTeX: A class for bachelor, master, and doctoral thesis at the
%% University of Brasilia (UnB), Brazil
-%% Version 1.4 2023/11/15
+%% Version 1.4.1 2023/11/27
%% Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br>
%%
%% This class file may be distributed and/or modified under the conditions
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{unbtex}[2023/11/15 v1.4 Modelo da Universidade de Brasília baseado em abnTeX2]
+\ProvidesClass{unbtex}[2023/11/27 v1.4.1 Modelo da Universidade de Brasília baseado em abnTeX2]
% ---
% Repassa todos os parâmetros a classe abntex2,
@@ -43,10 +43,9 @@
% Pacotes básicos
% ---
\RequirePackage{graphicx} % Inclusão de gráficos
-%\RequirePackage{subcaption} % Permite fazer subfiguras
-\RequirePackage{subfig} % Permite fazer subfiguras
+%\RequirePackage[skip=8pt]{subcaption} % Permite fazer subfiguras
+\RequirePackage[captionskip=8pt]{subfig} % Permite fazer subfiguras
\RequirePackage{multirow} % Para combinar linhas nas tabelas
-\RequirePackage{icomma} % Configura casas decimais separadas por vírgula
% ---
% ---
@@ -64,13 +63,10 @@
% ---
% Pacotes de fontes
% ---
-\RequirePackage{stickstootext} % Fonte para o texto e equações
- % Utilizada pelo IEEE, Elsevier, AMS, APS, AIP, ACS...
+\RequirePackage{stickstootext} % Fonte principal (Stix2)
\RequirePackage[stickstoo,vvarbb]{newtxmath}
-\RequirePackage[scaled=0.88]{helvet}% Fonte utilizada para os títulos do
- % trabalho (Próxima do padrão da UnB)
- % http://www.marca.unb.br/introducao.php
-\RequirePackage[scaled=1.03]{inconsolata}
+\RequirePackage[scaled=0.88]{helvet} % Fonte sans serif
+\RequirePackage[scaled=1.03]{inconsolata} % Fonte monoespaçada
% ---
% Cores verde e azul UnB
@@ -87,26 +83,31 @@
% Cores das linhas de todas as tabelas:
\arrayrulecolor{verdeunb}
-
-% Define comando \source
-\RequirePackage[font={small}, margin=0cm, justification=centering]{caption}
-\newcommand{\source}[1]{\captionsetup{singlelinecheck=false,justification=justified}\caption*{\footnotesize \noindent Fonte: {#1}}}
% ---
% ---
% Configurações do texto
% ---
-\RequirePackage{indentfirst} % Indenta o primeiro parágrafo de cada seção.
-\RequirePackage[nopatch=item]{microtype} % Para melhorias de justificação
-\setlength{\parindent}{3em} % Tamanho do recuo da primeira linha do parágrafo
+\RequirePackage[compact]{titlesec} % Reduz o espaço entre os títulos de seções e o texto
+\RequirePackage{indentfirst} % Indenta o primeiro parágrafo de cada seção.
+\RequirePackage[nopatch=item]{microtype} % Para melhorias de justificação
+\RequirePackage{icomma} % Configura casas decimais separadas por vírgula
+\setlength{\parindent}{3em} % Tamanho do recuo da primeira linha do parágrafo
+\frenchspacing % Retira espaço extra entre as frases (após o ponto final)
+\setlength{\parskip}{4pt} % Espaço entre parágrafos
+\setlength{\skip\footins}{20pt plus 2pt minus 2pt} % Espaço entre o texto e as notas de rodapé
+\addtolength{\footnotesep}{2pt} % Espaço entre as notas de rodapé
% Ajusta espaço entre texto e figuras/tabelas
-\setlength{\textfloatsep}{18.0pt plus 2.0pt minus 2.0pt}
-\setlength{\floatsep}{12.0pt plus 2.0pt minus 4.0pt}
-\setlength{\intextsep}{12.0pt plus 2.0pt minus 4.0pt}
+\setlength{\textfloatsep}{18.0pt plus 2.0pt minus 2.0pt} % espaçamento entre texto e floats no topo/base da página
+\setlength{\floatsep}{12.0pt plus 2.0pt minus 2.0pt} % espaçamento entre floats
+\setlength{\intextsep}{16pt plus 2pt minus 2pt} % espaçamento entre texto e floats no meio da página
-% Controle do espaçamento entre um parágrafo e outro:
-\setlength{\parskip}{4pt}
+% Ajusta espaçamento nos ambientes itemize, enumerate, description e alineas
+\setlist[itemize]{topsep=0pt,itemsep=0pt,leftmargin=\parindent}
+\setlist[enumerate]{topsep=0pt,itemsep=0pt,leftmargin=\parindent}
+\setlist[description]{topsep=0pt,itemsep=0pt,leftmargin=\parindent}
+\setlist[alineas,1]{label={\alph*)},topsep=0pt,itemsep=0pt,leftmargin=\parindent}%
% Numeração por capítulo das figuras e tabelas
\renewcommand{\thefigure}{\thechapter.\arabic{figure}}\numberwithin{figure}{chapter}
@@ -116,9 +117,6 @@
\pagestyle{myheadings} % cabeçalho com linha e numeração da página
%\setlength{\normalrulethickness}{0pt} % retira a linha do cabeçalho
-% Retira espaço extra entre as frases.
-\frenchspacing
-
% Modifica o tamanho da fonte e espaçamento entre linhas no ambiente verbatim
\usepackage{fvextra}
\renewenvironment{verbatim}{%
@@ -127,12 +125,25 @@
}{%
\end{Verbatim}%
}
+\fvset{listparameters=\setlength{\topsep}{6pt}\setlength{\partopsep}{0pt}}
+
+% Modifica o espaçamento entre o texto e o ambiente citacao
+\renewenvironment*{citacao}[1][default]{%
+ \list{}{\topsep=4pt}%
+ \ABNTEXfontereduzida%
+ \addtolength{\leftskip}{\ABNTEXcitacaorecuo}%
+ \item[]%
+ \begin{SingleSpace}%
+ \ifthenelse{\not\equal{#1}{default}}{\itshape\selectlanguage{#1}}{}%
+ }{%
+ \end{SingleSpace}%
+ \endlist}%
% Personalização do Sumário
\settocdepth{subsection}
\renewcommand{\cftchapterfont}{\normalsize\bfseries\sffamily}
-\setlength{\cftbeforechapterskip}{1.0em}
-\setlength{\cftbeforepartskip}{1.0em}
+\setlength{\cftbeforechapterskip}{8pt}
+\setlength{\cftbeforepartskip}{8pt}
% Corrige falha do abntex2 nos anexos e apêndices
\renewcommand{\PRIVATEapendiceconfig}[2]{%
@@ -150,6 +161,46 @@
% ---
% ---
+% Configurações das legendas
+% ---
+% Legenda das figuras/tabelas na parte superior, tamanho da fonte e espaçamento
+\RequirePackage[figureposition=t,font={small},skip=10pt]{caption}
+
+% Espaçamento vertical do comando \legend
+\renewcommand{\legend}[1]{%
+ \M@gettitle{#1}%
+ \memlegendinfo{#1}%
+ \par
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \ABNTEXfontereduzida
+ \captionsetup{aboveskip=0pt,belowskip=6pt}
+ \captiondelim{\mbox{}}
+ \@makecaption{}{\ABNTEXfontereduzida #1}\par
+ \endgroup}
+
+% Espaçamento vertical do comando \fonte
+% também define o espaçamento do comando \nota
+\renewcommand{\fonte}[2][\fontename]{%
+ \M@gettitle{#2}%
+ \memlegendinfo{#2}%
+ \par
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \ABNTEXfontereduzida
+ \captionsetup{aboveskip=0pt,belowskip=6pt}
+ \captiondelim{\ABNTEXcaptionfontedelim}
+ \@makecaption{\ABNTEXfontereduzida #1}{\ignorespaces\ABNTEXfontereduzida #2}\par
+ \endgroup}
+% ---
+
+% ---
% Pacotes para algoritmos
% ---
\RequirePackage[chapter]{algorithm}
@@ -161,10 +212,6 @@
% ---
% https://ctan.org/pkg/hyperref
\hypersetup{
- %pagebackref=true,
- %pdftitle={\@title},
- %pdfauthor={\@author},
- %pdfpagemode=None,
pdfstartview=FitH,
breaklinks=true,
colorlinks=true,
@@ -208,6 +255,7 @@
rulecolor=\color{black!30},
%title=\lstname,
captionpos=t,
+ belowcaptionskip=10pt,
escapeinside={\%*}{*)},
breaklines=true,%
breakatwhitespace=true,
diff --git a/macros/latex/contrib/vectorlogos/README.md b/macros/latex/contrib/vectorlogos/README.md
index f3b4de93e8..2f18c34c14 100644
--- a/macros/latex/contrib/vectorlogos/README.md
+++ b/macros/latex/contrib/vectorlogos/README.md
@@ -5,6 +5,14 @@ vectorlogos est un package des logos vectoriels de logiciels 'classiques'.
Author...........: Cédric Pierquet
email............: cpierquet@outlook.fr
Licence..........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
-License Python...: PSF license v2 (https://www.python.org/community/logos/)
-License Scratch..: Public Domain (https://commons.wikimedia.org/wiki/File:Scratchlogo.svg) or CC BY-SA 4.0 (https://en.scratch-wiki.info/wiki/File:ScratchCat3.0.svg)
-Others...........: GNU GPL or CC BY-SA 3.0 \ No newline at end of file
+Sources..........: I converted the logos from their original SVG or other forms, as found on the given urls, to PDF
+Scratch..........: Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
+Scratch alt......: Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
+Scratch cat......: CC40 https://fr.scratch-wiki.info/wiki/Fichier:Scratch_Cat_(cat-a).svg
+Texstudio........: FREE https://en.m.wikipedia.org/wiki/File:TeXstudio_Logo.svg
+Emacs............: FREE https://commons.wikimedia.org/wiki/File:EmacsIcon.svg
+Emacs alt........: FREE https://fr.m.wikipedia.org/wiki/Fichier:Emacs-logo.svg
+Geogebra.........: CC30 https://wiki.geogebra.org/en/File:Geogebra-logo-name.svg
+Geogebra icon....: CC30 https://fr.m.wikipedia.org/wiki/Fichier:Geogebra.svg
+Texmaker.........: FREE https://en.wikipedia.org/wiki/File:TeXmaker_Logo.svg
+Texmaker old.....: FREE https://en.wikipedia.org/wiki/File:TeXmaker_New_Logo.svg
diff --git a/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.pdf b/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.pdf
index 5d01fab017..18c3659698 100644
--- a/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.pdf
+++ b/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.tex b/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.tex
index 7b0260f2cc..38b78876ba 100644
--- a/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.tex
+++ b/macros/latex/contrib/vectorlogos/doc/vectorlogos-doc.tex
@@ -27,8 +27,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.0}
-\def\TPdate{25/11/2023}
+\def\TPversion{0.1.1}
+\def\TPdate{27/11/2023}
\usepackage{tcolorbox}
\tcbuselibrary{skins,hooks,listingsutf8}
\usepackage{soul}
@@ -74,11 +74,11 @@
\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
\begin{center}
-\scalebox{4}[4]{\logopython}\hspace{1cm}\scalebox{4}[4]{\logopython[notm]}\hspace{1cm}\scalebox{4}[4]{\logopython[vertical]}
-
-\medskip
-
-\scalebox{4}[4]{\logopython[icon]}\hspace{1cm}\scalebox{4}[4]{\logopython[powh]}\hspace{1cm}\scalebox{4}[4]{\logopython[powv]}
+%\scalebox{4}[4]{\logopython}\hspace{1cm}\scalebox{4}[4]{\logopython[notm]}\hspace{1cm}\scalebox{4}[4]{\logopython[vertical]}
+%
+%\medskip
+%
+%\scalebox{4}[4]{\logopython[icon]}\hspace{1cm}\scalebox{4}[4]{\logopython[powh]}\hspace{1cm}\scalebox{4}[4]{\logopython[powv]}
\medskip
@@ -110,8 +110,9 @@
\emph{%
Logos came with GNU GPL or CC BY-SA (3.0 or 4.0) license.\\
-Some brand icons/logos are trademarks of their respective owners. Please do not use brand icons/logos for any purpose except to represent the company, product, or service to which they refer.\\
-"Python" and the Python Logo are trademarks of the Python Software Foundation (\url{https://www.python.org/psf/trademarks/}).}
+Some brand icons/logos are trademarks of their respective owners. Please do not use brand icons/logos for any purpose except to represent the company, product, or service to which they refer.%\\
+%"Python" and the Python Logo are trademarks of the Python Software Foundation (\url{https://www.python.org/psf/trademarks/}).%
+}
\medskip
@@ -164,12 +165,12 @@ Available logos are :
\medskip
\begin{tblr}{width=\linewidth,colspec={Q[m,l]Q[l,m]X[m,l]},cells={font=\LARGE\ttfamily,bg=teal!5},column{1}={font=\LARGE\bfseries\sffamily}}
- python & vectorlogo-python.pdf & \logopython\ \\
- & vectorlogo-python-icon.pdf & \logopython[icon] \\
- & vectorlogo-python-notm.pdf & \logopython[notm] \\
- & vectorlogo-python-powh.pdf & \logopython[powh] \\
- & vectorlogo-python-powv.pdf & \logopython[powv] \\
- & vectorlogo-python-vertical.pdf & \logopython[vertical] \\
+% python & vectorlogo-python.pdf & \logopython\ \\
+% & vectorlogo-python-icon.pdf & \logopython[icon] \\
+% & vectorlogo-python-notm.pdf & \logopython[notm] \\
+% & vectorlogo-python-powh.pdf & \logopython[powh] \\
+% & vectorlogo-python-powv.pdf & \logopython[powv] \\
+% & vectorlogo-python-vertical.pdf & \logopython[vertical] \\
\hline
emacs & vectorlogo-emacs.pdf & \logoemacs\ \\
& vectorlogo-emacs-alt.pdf & \logoemacs[alt] \\
@@ -203,10 +204,18 @@ In order to insert a vectorial logo, simpy use :
There's no automatic height or raising, it's just an \textit{alias} of a classic \MontreCode{\textbackslash includegraphics} with the given names of the precedent tabular.
+%\begin{tcblisting}{}
+%\simplevectorlogo[height=1.5cm]{scratch}\par
+%\simplevectorlogo[height=4cm]{scratch-cat}\par
+%\simplevectorlogo{python-vertical}\par
+%\simplevectorlogo[scale=0.33]{texstudio}\par
+%\simplevectorlogo{emacs}\par
+%\simplevectorlogo[width=3cm]{geogebra-icon}
+%\end{tcblisting}
+
\begin{tcblisting}{}
\simplevectorlogo[height=1.5cm]{scratch}\par
\simplevectorlogo[height=4cm]{scratch-cat}\par
-\simplevectorlogo{python-vertical}\par
\simplevectorlogo[scale=0.33]{texstudio}\par
\simplevectorlogo{emacs}\par
\simplevectorlogo[width=3cm]{geogebra-icon}
@@ -235,21 +244,21 @@ Available \textsf{names} are :
\begin{multicols}{3}
\begin{itemize}
- \item \texttt{python}
+ %\item \texttt{python}
\item \texttt{emacs}
\item \texttt{geogebra}
\item \texttt{scratch}
- \item \texttt{texmaker} : Spanish
+ \item \texttt{texmaker}
\item \texttt{texstudio}
\end{itemize}
\end{multicols}
Available \textsf{options} are given by the suffix of alt logos.
-\begin{tcblisting}{}
-%classic size and fonte :
-For example, it's a vectorial logo \vectorlogo{python} with inline insertion.
-\end{tcblisting}
+%\begin{tcblisting}{}
+%%classic size and fonte :
+%For example, it's a vectorial logo \vectorlogo{python} with inline insertion.
+%\end{tcblisting}
\begin{tcblisting}{}
%other font and other size
@@ -264,10 +273,10 @@ For example, it's a vectorial logo \vectorlogo{python} with inline insertion.
\subsection{Special commands}
There's an other (shortcut) way to insert logos, with a shortcut-name, like in \textsf{fontawesome5} :
+%\logopython[option]
\begin{quote}
\begin{verbatim}
-\logopython[option]
\logoscratch[option]
\logogeogebra[option]
\logotexstudio[option]
@@ -290,30 +299,59 @@ Available options are given by the suffix of alt logos.
\newcommand\samplevectorlogo[1]{{\LARGE Inline {#1} logo}\par}
\begin{tcblisting}{listing side text}
-\samplevectorlogo{\logopython}
-\samplevectorlogo{\logopython[notm]}
-\samplevectorlogo{\logopython[vertical]}
-\samplevectorlogo{\logopython[icon]}
-\samplevectorlogo{\logopython[powh]}
-\samplevectorlogo{\logopython[powv]}
\samplevectorlogo{\logogeogebra}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logogeogebra[icon]}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logoscratch}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logoscratch[alt]}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logoscratch[cat]}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logotexstudio}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logoemacs}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logoemacs[alt]}
+\end{tcblisting}
+
+\begin{tcblisting}{listing side text}
\samplevectorlogo{\logotexmaker}
-\samplevectorlogo{\logotexmaker[old]}
\end{tcblisting}
+\begin{tcblisting}{listing side text}
+\samplevectorlogo{\logotexmaker[alt]}
+\end{tcblisting}
+
+%\samplevectorlogo{\logopython}
+%\samplevectorlogo{\logopython[notm]}
+%\samplevectorlogo{\logopython[vertical]}
+%\samplevectorlogo{\logopython[icon]}
+%\samplevectorlogo{\logopython[powh]}
+%\samplevectorlogo{\logopython[powv]}
+
\vfill~
\section{History}
\begin{quote}
\begin{verbatim}
+0.1.1 : Update licenses
0.1.0 : Initial version
\end{verbatim}
\end{quote}
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-icon.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-icon.pdf
deleted file mode 100644
index 9cada11482..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-icon.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-notm.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-notm.pdf
deleted file mode 100644
index e597d7c7f1..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-notm.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powh.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powh.pdf
deleted file mode 100644
index 0aed1b551c..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powh.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powv.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powv.pdf
deleted file mode 100644
index f8cfc5494e..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-powv.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-vertical.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-vertical.pdf
deleted file mode 100644
index 458ee50488..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python-vertical.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python.pdf b/macros/latex/contrib/vectorlogos/tex/vectorlogo-python.pdf
deleted file mode 100644
index f2268f7e2b..0000000000
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogo-python.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/vectorlogos/tex/vectorlogos.sty b/macros/latex/contrib/vectorlogos/tex/vectorlogos.sty
index e78247fee2..f7d681f74f 100644
--- a/macros/latex/contrib/vectorlogos/tex/vectorlogos.sty
+++ b/macros/latex/contrib/vectorlogos/tex/vectorlogos.sty
@@ -1,22 +1,23 @@
-% Author : C. Pierquet
-% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
-% licenses svg :
-% python : PSF license v2 https://www.python.org/community/logos/
-% scratch : Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
-% scratch alt : Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
-% scratch cat : CC40 https://fr.scratch-wiki.info/wiki/Fichier:Scratch_Cat_(cat-a).svg
-% texstudio : FREE https://en.m.wikipedia.org/wiki/File:TeXstudio_Logo.svg
-% emacs logo : FREE https://commons.wikimedia.org/wiki/File:EmacsIcon.svg
-% emacs logo alt : FREE https://fr.m.wikipedia.org/wiki/Fichier:Emacs-logo.svg
-% geogebra icon : CC30 https://fr.m.wikipedia.org/wiki/Fichier:Geogebra.svg
-% geogebra logo : CC30 https://fr.m.wikipedia.org/wiki/Fichier:Geogebra.svg
-% texmaker : FREE https://en.wikipedia.org/wiki/File:TeXmaker_Logo.svg
-% texmaker old : FREE https://en.wikipedia.org/wiki/File:TeXmaker_New_Logo.svg
+% Author..........: C. Pierquet
+% licence.........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+% Sources.........: I converted the logos from their original SVG or other forms, as found on the given urls, to PDF
+% Scratch.........: Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
+% Scratch alt.....: Public https://commons.wikimedia.org/wiki/File:Scratchlogo.svg
+% Scratch cat.....: CC40 https://fr.scratch-wiki.info/wiki/Fichier:Scratch_Cat_(cat-a).svg
+% Texstudio.......: FREE https://en.m.wikipedia.org/wiki/File:TeXstudio_Logo.svg
+% Emacs...........: FREE https://commons.wikimedia.org/wiki/File:EmacsIcon.svg
+% Emacs alt.......: FREE https://fr.m.wikipedia.org/wiki/Fichier:Emacs-logo.svg
+% Geogebra........: CC30 https://wiki.geogebra.org/en/File:Geogebra-logo-name.svg
+% Geogebra icon...: CC30 https://fr.m.wikipedia.org/wiki/Fichier:Geogebra.svg
+% Texmaker........: FREE https://en.wikipedia.org/wiki/File:TeXmaker_Logo.svg
+% Texmaker old....: FREE https://en.wikipedia.org/wiki/File:TeXmaker_New_Logo.svg
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{vectorlogos}[2023/11/25 0.1.0 Vectorial logos of 'classic' softwares, for inline use.]
+\ProvidesPackage{vectorlogos}[2023/11/27 0.1.1 Vectorial logos of 'classic' softwares, for inline use.]
%====HISTORY
+% v 0.1.1 Licenses update
% v 0.1.0 Initial Version
%====BASE
@@ -54,7 +55,7 @@
%====GENERIC MACROS
\NewDocumentCommand\vectorlogo{ O{logo} m }{%
- \IfEq{#2}{python}{\logopython[#1]}{}%
+ %\IfEq{#2}{python}{\logopython[#1]}{}%
\IfEq{#2}{scratch}{\logoscratch[#1]}{}%
\IfEq{#2}{geogebra}{\logogeogebra[#1]}{}%
\IfEq{#2}{texstudio}{\logotexstudio[#1]}{}%
@@ -63,7 +64,7 @@
}
%====SPECIFIC MACROS
-\GenMacroLogoVect{\logopython}{python}
+%\GenMacroLogoVect{\logopython}{python}
\GenMacroLogoVect{\logoscratch}{scratch}
\GenMacroLogoVect{\logogeogebra}{geogebra}
\GenMacroLogoVect{\logotexstudio}{texstudio}