summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès2013-03-18 10:41:08 +0100
committerLudovic Courtès2013-05-19 17:35:07 +0200
commit86f94102f6bb98203462ae53dfcfcc39c18eb5c0 (patch)
treec7afb04caf06420407481424ce81423823410be6
parentfb818a87642aa03f28ed41e80cc720e7630ab2e5 (diff)
downloadskribilo-86f94102f6bb98203462ae53dfcfcc39c18eb5c0.tar.gz
skribilo-86f94102f6bb98203462ae53dfcfcc39c18eb5c0.tar.lz
skribilo-86f94102f6bb98203462ae53dfcfcc39c18eb5c0.zip
`base' package: Insert an unbreakable space after `:text' in `numref'.
* src/guile/skribilo/package/base.scm (numref): Remove explicit call to
  `resolve!'; insert an unbreakable space after TEXT.
* NEWS: Update.
-rw-r--r--NEWS1
-rw-r--r--src/guile/skribilo/package/base.scm19
2 files changed, 10 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 443f6eb..6a58f08 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ and nested <a> tags, which is invalid.
 
 ** acmproc: Fix typos in the LaTeX engine customs
 ** `ref' warnings now always print the location of erroneous `:bib' references
+** `numref' inserts an unbreakable space (was a breakable space) after its `:text'
 
 * New in Skribilo 0.9.2
 
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm
index ea34308..64d6b97 100644
--- a/src/guile/skribilo/package/base.scm
+++ b/src/guile/skribilo/package/base.scm
@@ -1245,16 +1245,15 @@
                    ;; Loop until `number' is resolved.
                    n)
                   (else
-                   (let ((xref
-                          (ref :text
-                               (list (if text text "") " "
-                                     (if (number? number)
-                                         (markup-number-string target
-                                                               separator)
-                                         ""))
-                               :page page
-                               :handle (handle target))))
-                     (resolve! xref e env)))))))))
+                   (ref :text
+                        (list (if text text "")
+                              (if text (~) "")
+                              (if (number? number)
+                                  (markup-number-string target
+                                                        separator)
+                                  ""))
+                        :page page
+                        :handle (handle target)))))))))
 
 ;*---------------------------------------------------------------------*/
 ;*    resolve ...                                                      */