[groff] 01/02: [pdfroff] Deduce "--no-toc-relocation" from input stream (revisited).

[Keith Marshall]

keithmarshall pushed a commit to branch master
in repository groff.

commit e65af0ad9d9e2d8c412d1c760779688ae90720a6
Author: Keith Marshall <address@hidden>
Date:   Tue Oct 14 12:58:27 2014 +0100

    [pdfroff] Deduce "--no-toc-relocation" from input stream (revisited).
    
    * pdfroff.sh (WRKFILE): Correct malformed sed expression.
    
    * spdf.tmac (TC): Prefer value of pdfroff's PHASE register to defined
    state of pdf:href.map, when choosing to emit control record to...
    (toc_relocation): ...enable this.
---
 contrib/pdfmark/ChangeLog  |   10 ++++++++++
 contrib/pdfmark/pdfroff.sh |    2 +-
 contrib/pdfmark/spdf.tmac  |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index 02719c5..f49120f 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,13 @@
+2014-10-14  Keith Marshall  <address@hidden>
+
+       Deduce "--no-toc-relocation" from input stream (revisited).
+
+       * pdfroff.sh (WRKFILE): Correct malformed sed expression.
+
+       * spdf.tmac (TC): Prefer value of pdfroff's PHASE register to defined
+       state of pdf:href.map, when choosing to emit control record to...
+       (toc_relocation): ...enable this.
+
 2014-10-13  Keith Marshall  <address@hidden>
 
        Deduce "--no-toc-relocation" from input stream.
diff --git a/contrib/pdfmark/pdfroff.sh b/contrib/pdfmark/pdfroff.sh
index 1a0b7cb..9e19327 100644
--- a/contrib/pdfmark/pdfroff.sh
+++ b/contrib/pdfmark/pdfroff.sh
@@ -591,7 +591,7 @@
 # Evaluate any processing options which may have been specified
 # as a result of parsing the document source ...
 #
-  eval `$SED -n '/^ *pdfroff-option:set */s//p' $WRKFILE`
+  eval `$SED -n '/^ *pdfroff-option:set */s///p' $WRKFILE`
 #
 # ... (which is currently supported to enable "toc-relocation",
 # only when the document actually relies on it, and if it is not
diff --git a/contrib/pdfmark/spdf.tmac b/contrib/pdfmark/spdf.tmac
index d32bb74..26e9a1a 100644
--- a/contrib/pdfmark/spdf.tmac
+++ b/contrib/pdfmark/spdf.tmac
@@ -198,7 +198,7 @@ The content for this section is not yet available.
 .P1
 .OP \n[PDF-TOC-ONLY]
 address@hidden 1 i
-.if !dpdf:href.map .tm pdfroff-option:set toc_relocation=enabled
+.if !\\n[PHASE] .tm pdfroff-option:set toc_relocation=enabled
 .if \\n[OPMODE] address@hidden
 .PX \\$1
 ..