diff options
| author | Ludovic Courtès | 2018-03-30 15:04:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2018-03-30 15:42:50 +0200 |
| commit | 6c7778dd9ec5e6cdc635238619dd18bfecfdf555 (patch) | |
| tree | df09548cc8d6185683d57e20ad0fcfb7479bc001 /src/guile/skribilo/engine | |
| parent | c3d1019b8f2d5af0637ae2f055099e51b9706675 (diff) | |
| download | skribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.tar.gz skribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.tar.lz skribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.zip | |
syntax: Rename '_' to 'G_' to avoid issues on Guile 2.2.
Failing to do that, literal '_' would not match in contexts such as
'match' patterns on Guile 2.2.
* src/guile/skribilo/utils/syntax.scm (_): Rename to...
(G_): ... this.
* po/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* src/guile/skribilo.scm,
src/guile/skribilo/ast.scm,
src/guile/skribilo/biblio.scm,
src/guile/skribilo/biblio/author.scm,
src/guile/skribilo/condition.scm,
src/guile/skribilo/engine.scm,
src/guile/skribilo/engine/info.scm,
src/guile/skribilo/engine/lout.scm,
src/guile/skribilo/index.scm,
src/guile/skribilo/package/base.scm,
src/guile/skribilo/package/lncs.scm,
src/guile/skribilo/reader/rss-2.scm,
src/guile/skribilo/source.scm,
src/guile/skribilo/sui.scm,
src/guile/skribilo/biblio/template.scm,
src/guile/skribilo/verify.scm: Use 'G_' instead of '_'.
Diffstat (limited to 'src/guile/skribilo/engine')
| -rw-r--r-- | src/guile/skribilo/engine/info.scm | 8 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/guile/skribilo/engine/info.scm b/src/guile/skribilo/engine/info.scm index ce448d9..13ba77c 100644 --- a/src/guile/skribilo/engine/info.scm +++ b/src/guile/skribilo/engine/info.scm @@ -1,7 +1,7 @@ ;;; info.scm -- GNU Info engine. ;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2008, 2009, 2012, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2008, 2009, 2012, 2015, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2001, 2002 Manuel Serrano ;;; ;;; @@ -174,10 +174,10 @@ (begin (skribe-warning/ast 1 section (format #f - (_ "Info node title '~A' already used") + (G_ "Info node title '~A' already used") title)) (skribe-warning/ast 1 (cdr same-named) - (_ "previous occurrence was here")) + (G_ "previous occurrence was here")) section+title) (alist-cons title section section+title)))) '() @@ -806,7 +806,7 @@ (string? (markup-option n :file))) :action (lambda (n e) (if (markup-option n :url) - (skribe-warning/ast 1 n (_ "image URLs are not supported")) + (skribe-warning/ast 1 n (G_ "image URLs are not supported")) (let ((f (let ((f (markup-option n :file))) (convert-image f '("png" "gif" "jpg")))) (h (markup-option n :height)) diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index a059af1..a5afcae 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -2,7 +2,7 @@ ;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, -;;; 2012, 2015 Ludovic Courtès <ludo@gnu.org> +;;; 2012, 2015, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -2422,7 +2422,7 @@ '("eps")))))) (cond (url ;; maybe we should run `wget' then? :-) (skribe-warning/ast 1 n - (_ "image URLs are not supported"))) + (G_ "image URLs are not supported"))) ((string? img) (if width |