From 242821c06c44429369cbf1f542bf07be5d51e955 Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Sun, 3 Sep 2006 11:43:41 +0000
Subject: Doc: Various fixes (non-unique idents, dangling refs).

* doc/modules/skribilo/documentation/api.scm (doc-markup): Added an
  `ident' argument, use it.

* doc/user/package.skb (Articles): Differentiate the identifiers for the
  various `abstract' markups.

* doc/user/Makefile.am (skribilo): Look for it in `$(top_builddir)'
  rather than `$(top_srcdir)'.

* doc/user/markup.skb (Standard Markups): Added an identifier.

* doc/user/src/links1.skb: When referring to `Standard Markups' by
  identifier, use its current identifier (`std-markups').

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-56
---
 doc/modules/skribilo/documentation/api.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'doc/modules')

diff --git a/doc/modules/skribilo/documentation/api.scm b/doc/modules/skribilo/documentation/api.scm
index d27d074..84108c9 100644
--- a/doc/modules/skribilo/documentation/api.scm
+++ b/doc/modules/skribilo/documentation/api.scm
@@ -347,9 +347,10 @@
 ;*    doc-markup ...                                                   */
 ;*---------------------------------------------------------------------*/
 (define-markup (doc-markup id args
-			   #!rest 
+			   #!rest
 			   opts
-			   #!key 
+			   #!key
+			   (ident #f)
 			   (writer-id #f)
 			   (common-args '((:ident "The node identifier.")
 					  (:class "The node class.")))
@@ -557,7 +558,8 @@
 	  (if (and (pair? drest) (not (define-markup-rest d)))
 	      (skribe-error 'doc-markup "No rest argument for" id)
 	      options)
-	  (list (mark :class "public-definition" (symbol->string id))
+	  (list (mark :class "public-definition"
+		      (or ident (symbol->string id)))
 		(map (lambda (i) (mark (symbol->string i))) others)
 		(map (lambda (i)
 			(let ((is (symbol->string i)))
-- 
cgit v1.2.3