ngz pushed a commit to branch tex-team-next
in repository guix.
commit 41f3d8eb60beec7fe0bc70beef91e9ceead59d64
Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
AuthorDate: Sat May 13 12:09:15 2023 +0200
gnu: texlive-latex-upquote -> texlive-upquote.
* gnu/packages/tex.scm (texlive-upquote): New variable.
(texlive-latex-upquote): Deprecate variable.
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/maths.scm (hypre):
* gnu/packages/python-xyz.scm (python-nbconvert):
* gnu/packages/sphinx.scm (python-sphinx):
* gnu/packages/statistics.scm (r-with-tests): Use new name.
---
gnu/packages/cran.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/sphinx.scm | 2 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/tex.scm | 30 ++++++++++++++++--------------
6 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0a295dbbe7..53f48bfc6d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -35514,7 +35514,7 @@ package online.")
texlive-graphics
texlive-latex-threeparttable
texlive-titlesec
- texlive-latex-upquote
+ texlive-upquote
texlive-listings
texlive-polyglossia
texlive-titling
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 1314b2e8f7..91fe52e17f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5790,7 +5790,7 @@ set.")
texlive-stackengine
texlive-latex-tabulary
texlive-tocloft
- texlive-latex-upquote
+ texlive-upquote
texlive-latex-varwidth
texlive-titlesec
texlive-ulem
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5673d2e906..20880939a7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14793,7 +14793,7 @@ time.")
texlive-ms
texlive-latex-parskip
texlive-trimspaces
- texlive-latex-upquote
+ texlive-upquote
texlive-stringenc
texlive-tcolorbox
texlive-titling
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index cab660a6c4..d8380be4f2 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -128,7 +128,7 @@
texlive-latex-tabulary
texlive-titlesec
texlive-tools ;multicol, longtable
- texlive-latex-upquote
+ texlive-upquote
texlive-latex-varwidth
texlive-oberdiek ;hypcap
texlive-wrapfig
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 2f471420c2..811253a538 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -390,7 +390,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
texlive-hyperref
texlive-oberdiek
texlive-tools
- texlive-latex-upquote
+ texlive-upquote
texlive-url
texlive-latex-xkeyval))
tzdata-for-tests
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a77e5c7716..45d960fdd5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6421,26 +6421,26 @@ might say:
@end example\n")
(license license:lppl)))
-(define-public texlive-latex-upquote
+(define-public texlive-upquote
(package
- (name "texlive-latex-upquote")
+ (name "texlive-upquote")
(version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (texlive-ref "latex" "upquote"))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "0d1050i973wnxigy0xpky5l7vn4ff7ldhkjpdqsw5s653gagwixp"))))
+ (source (texlive-origin
+ name version
+ (list "doc/latex/upquote/"
+ "source/latex/upquote/"
+ "tex/latex/upquote/")
+ (base32
+ "1manbljqx2859wq9by6bpcx4rnxvc596a05d21cw464484f8a8z2")))
+ (outputs '("out" "doc"))
(build-system texlive-build-system)
- (arguments '(#:tex-directory "latex/upquote"))
(home-page "https://www.ctan.org/pkg/upquote";)
- (synopsis "Show \"realistic\" quotes in verbatim")
+ (synopsis "Show realistic quotes in verbatim")
(description
"Typewriter-style fonts are best for program listings, but Computer
-Modern Typewriter prints @code{`} and @code{'} as bent opening and closing
-single quotes. Other fonts, and most programming languages, print @code{`} as
-a grave accent and @code{'} upright; @code{'} is used both to open and to
+Modern Typewriter prints @samp{`} and @samp{'} as bent opening and closing
+single quotes. Other fonts, and most programming languages, print @samp{`} as
+a grave accent and @samp{'} upright; @samp{'} is used both to open and to
close quoted strings. The package switches the typewriter font to Computer
Modern Typewriter in OT1 encoding, and modifies the behaviour of
@code{verbatim}, @code{verbatim*}, @code{\\verb}, and @code{\\verb*} to print
@@ -6449,6 +6449,8 @@ use, so long as the package is loaded after the other
fonts were. The package
does not affect @code{\\tt}, @code{\\texttt}, etc.")
(license license:lppl1.2+)))
+(define-deprecated-package texlive-latex-upquote texlive-upquote)
+
(define-public texlive-latex-anysize
(package
(name "texlive-latex-anysize")
