diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | src/guile/skribilo/package/base.scm | 16 |
2 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 6757312..c805653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,26 @@ # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 # +2006-09-04 09:15:58 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-74 + + Summary: + `base' package: Removed more sources of duplicate identifiers. + Revision: + skribilo--devel--1.2--patch-74 + + * src/guile/skribilo/package/base.scm (~): Use `gensym' to produce unique + identifiers. + (ref)[unref]: Likewise. + [handle-ref]: Likewise. + [do-title-ref]: Likewise. + [mark-ref]: Likewise. + [make-bib-ref]: Likewise. + [line-ref]: Likewise. + + modified files: + ChangeLog src/guile/skribilo/package/base.scm + + 2006-09-03 15:08:10 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-73 Summary: diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index 8ba9024..bbb2a62 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -294,7 +294,7 @@ (define-markup (~ #!rest opts #!key (class #f)) (new markup (markup '~) - (ident (gensym "~")) + (ident (symbol->string (gensym "~"))) (class class) (required-options '()) (options (the-options opts :class)) @@ -1030,7 +1030,7 @@ (skribe-warning/ast 1 ast 'ref msg text) (new markup (markup 'unref) - (ident (symbol->string 'unref)) + (ident (symbol->string (gensym "unref"))) (class class) (required-options '(:text)) (options `((kind ,kind) ,@(the-options opts :ident :class))) @@ -1039,7 +1039,7 @@ (skribe-warning 1 'ref msg text) (new markup (markup 'unref) - (ident (symbol->string 'unref)) + (ident (symbol->string (gensym "unref"))) (class class) (required-options '(:text)) (options `((kind ,kind) ,@(the-options opts :ident :class))) @@ -1057,7 +1057,7 @@ (define (handle-ref text) (new markup (markup 'ref) - (ident (symbol->string 'ref)) + (ident (symbol->string (gensym "handle-ref"))) (class class) (required-options '(:text)) (options `((kind handle) ,@(the-options opts :ident :class))) @@ -1077,7 +1077,7 @@ (if s (new markup (markup 'ref) - (ident (symbol->string 'title-ref)) + (ident (symbol->string (gensym "title-ref"))) (class class) (required-options '(:text)) (options `((kind ,kind) @@ -1113,7 +1113,7 @@ (if s (new markup (markup 'ref) - (ident (symbol->string 'ref)) + (ident (symbol->string (gensym "mark-ref"))) (class class) (required-options '(:text)) (options `((kind mark) @@ -1143,7 +1143,7 @@ (if (pair? text) (new markup (markup 'bib-ref+) - (ident (symbol->string 'bib-ref+)) + (ident (symbol->string (gensym "bib-ref+"))) (class class) (options (the-options opts :ident :class)) (body (map make-bib-ref text))) @@ -1162,7 +1162,7 @@ (if (pair? l) (new markup (markup 'line-ref) - (ident (symbol->string 'line-ref)) + (ident (symbol->string (gensym "line-ref"))) (class class) (options `((:text ,(markup-ident (car l))) ,@(the-options opts :ident :class))) |