diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex | 40 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/ducksay/ducksay.sty | 36 |
2 files changed, 51 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex b/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex index b42307e7305..3c07a4dcd00 100644 --- a/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex +++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.animals.tex @@ -362,7 +362,7 @@ { s s s}%=<< -\AddAnimal[tail-symbol=s,tail-count=3]{snake} +\AddAnimal[tail-symbol=s,tail-count=3]{snake}% >>= { s s /^\/^\ s _|__| O | @@ -373,8 +373,8 @@ / / _---_ | | / / / __ "-_ ," | | "--" / "-_ "--" ," - "-_____-" "-___-"} -\AddAnimal{cat} + "-_____-" "-___-"}% =<< +\AddAnimal{cat}% >>= + \ \ _ ___ .--. \`.|\..----...-'` `-._.-' .-' @@ -382,14 +382,14 @@ )/' _/ \ `-_, / `-'" `"\_ ,_.-;_.-\_ ', _.-'_./ {_.' ; / - {_.-``-' {_/+ -\AddAnimal{sleepy-cat} + {_.-``-' {_/+% =<< +\AddAnimal{sleepy-cat}% >>= { \ \ |\ _,,,---,,_ _._ /,`.-'`' -. )'._,'.-,) |,4- ) )-,_. ,\ ( `-.-' - '---''(_/--' `-'\_)} -\AddAnimal{schroedinger-dead} + '---''(_/--' `-'\_)}% =<< +\AddAnimal{schroedinger-dead}% >>= { \ \ _.--"""--._ | | @@ -400,8 +400,8 @@ __|___________|__ _ o . . . ~ . o o - . ~ .} -\AddAnimal{schroedinger-alive} + . ~ .}% =<< +\AddAnimal{schroedinger-alive}% >>= { \ \ ,_ _ |\\__,'/ @@ -412,8 +412,8 @@ | _ \ | \ \ , / | || |-_\__ / - ((_/`(____,-'} -\AddAnimal{sheep} + ((_/`(____,-'}% =<< +\AddAnimal{sheep}% >>= { \ _,_,_,_,_, \ .:( ,) ), (__, (, ), @@ -421,20 +421,28 @@ (___(, (, ,) (, ,) ,) `-_,---_,-' - || ||} -\AddAnimal[tail-symbol=s]{platypus} + || ||}% =<< +\AddAnimal[tail-symbol=s]{platypus}% >>= | s _.-^~~^^`~-,,,~~''```~-''``~'``~, s ______,' -o :. _ . ; ,'`, `. ( -\.._,.;;'._,( } _`_-_,, `, `, - ``~~~~~~' ((/'(((____/~~'(,(,___> `~'| -\AddAnimal[tail-symbol=s]{small-horse} + ``~~~~~~' ((/'(((____/~~'(,(,___> `~'|% =<< +\AddAnimal[tail-symbol=s]{small-horse}% >>= { s _,_ s /._ \\ /_/ |_\\ _ __ / \\ \\ \ _ __ _ /|| | | | | || - | | | |} + | | | |}% =<< +\AddAnimal[tail-symbol=s]{turtle} +{ s + s __ + /_'\ .,-;-;-,. + \ (/_/_|_\_\_\_ + /\=<_><_><_><_>-' + /_/'-\_\====\_\' + "" "" ""} %% %% %% End of file `ducksay.animals.tex'. diff --git a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty index b55dcd8f5a1..9d6c4637135 100644 --- a/Master/texmf-dist/tex/latex/ducksay/ducksay.sty +++ b/Master/texmf-dist/tex/latex/ducksay/ducksay.sty @@ -33,10 +33,10 @@ %% ducksay.animals.tex. %% \NeedsTeXFormat{LaTeX2e} -\RequirePackage{xparse,l3keys2e} +\@ifundefined{NewDocumentCommand}{\RequirePackage{xparse}}{} -\def\ducksay@version{2.6} -\def\ducksay@date{2022-10-08} +\def\ducksay@version{2.7} +\def\ducksay@date{2024-03-29} \ProvidesExplPackage {ducksay} {\ducksay@date} @@ -123,7 +123,12 @@ } ,version .initial:n = 2 } -\ProcessKeysOptions { ducksay } +\cs_if_exist:NTF \ProcessKeyOptions + { \ProcessKeyOptions [ ducksay ] } + { + \RequirePackage { l3keys2e } + \ProcessKeysOptions { ducksay } + } \keys_define:nn { ducksay } { version .code:n = \msg_error:nnn { ducksay } { load-time-only } { version } @@ -141,14 +146,27 @@ \cs_generate_variant:Nn \keys_set:nn { nx } \cs_set_eq:NN \__ducksay_everyeof:w \tex_everyeof:D \cs_set_eq:NN \__ducksay_scantokens:w \tex_scantokens:D -\cs_new_protected:Npx \ducksay_replace_verb_newline:Nn #1 #2 +\IfFormatAtLeastTF{2024-06-01} + { + \cs_new_protected:Npn \ducksay_replace_verb_newline:Nn #1 #2 + { \tl_replace_all:Nnn #1 \obeyedline {#2} } + } { - \tl_replace_all:Nnn #1 { \char_generate:nn { 13 } { 12 } } { #2 } + \cs_new_protected:Npx \ducksay_replace_verb_newline:Nn #1 #2 + { \tl_replace_all:Nnn #1 { \char_generate:nn { 13 } { 12 } } {#2} } } -\cs_new_protected:Npx \ducksay_replace_verb_newline_newline:Nn #1 #2 +\IfFormatAtLeastTF{2024-06-01} { - \tl_replace_all:Nnn #1 - { \char_generate:nn { 13 } { 12 } \char_generate:nn { 13 } { 12 } } { #2 } + \cs_new_protected:Npn \ducksay_replace_verb_newline_newline:Nn #1 #2 + { \tl_replace_all:Nnn #1 { \obeyedline \obeyedline } {#2} } + } + { + \cs_new_protected:Npx \ducksay_replace_verb_newline_newline:Nn #1 #2 + { + \tl_replace_all:Nnn #1 + { \char_generate:nn { 13 } { 12 } \char_generate:nn { 13 } { 12 } } + {#2} + } } \cs_new_protected:Npn \ducksay_process_verb_newline:nnn #1 #2 #3 { |