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/package/base.scm | |
| 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/package/base.scm')
| -rw-r--r-- | src/guile/skribilo/package/base.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index f5a4829..fa89c81 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -1,7 +1,7 @@ ;;; base.scm -- The base markup package of Skribe/Skribilo. ;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2007, 2008, 2009, 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2008, 2009, 2013, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -539,21 +539,21 @@ ;; 'definition' denote parameter names; they must not ;; be translated. Likewise for the 3 subsequent ;; strings. - (_ "file, start/stop, and definition\ + (G_ "file, start/stop, and definition\ cannot be combined with body") body)) ((and start stop definition) (skribe-error 'source - (_ "start/stop are exclusive with a definition") + (G_ "start/stop are exclusive with a definition") body)) ((and (or start stop definition) (not file)) (skribe-error 'source - (_ "start/stop and definition require a\ + (G_ "start/stop and definition require a\ file specification") file)) ((and definition (not language)) (skribe-error 'source - (_ "definition requires a language specification") + (G_ "definition requires a language specification") definition)) ((and file (not (string? file))) (invalid-argument-error 'source file 'file)) @@ -563,7 +563,7 @@ (invalid-argument-error 'source stop 'stop)) ((and (integer? start) (integer? stop) (> start stop)) (skribe-error 'source - (_ "start line is greater than stop line") + (G_ "start line is greater than stop line") (format #f "~a/~a" start stop))) ((and language (not (language? language))) (invalid-argument-error 'source language 'language)) |