Fix handling of hyperlinks with missing characters

Author: brechtm

CHANGES.rst

@@ -71,6 +71,7 @@ Changed:
 
 Fixed:
 
+* Handling of hyperlinks with missing characters
 * Glyphs missing from a font (rendered by the fallback font) resulted in
   duplicated words when line wrapping
 * OpenType: handle optional subtables (e.g. Liberation Sans Narrow now loads)

src/rinoh/paragraph.py

@@ -439,6 +439,14 @@ def handle_missing_glyphs(span, container):
     if isinstance(span, InlineFlowable):
         yield span
         return
+
+    def annotate(styled_text):
+        if isinstance(span, AnnotatedSpan):
+            return AnnotatedSpan(styled_text, anchor=span.anchor_annotation,
+                                 link=span.link_annotation)
+        else:
+            return styled_text
+
     get_glyph, _ = create_lig_kern(span, container)
     string = []
     has_missing_glyphs = False
@@ -450,18 +458,21 @@ def handle_missing_glyphs(span, container):
         except MissingGlyphException:
             has_missing_glyphs = True
             if string:
-                yield SingleStyledText(''.join(string), parent=span)
+                text = SingleStyledText(''.join(string), parent=span)
+                yield annotate(text)
                 string.clear()
-            if span.parent.style == FALLBACK_STYLE:
-                yield SingleStyledText('?', parent=span)
+            if span.parent.style is FALLBACK_STYLE:
+                text = SingleStyledText('?', parent=span)
+                yield annotate(text)
             else:
                 fallback_span = SingleStyledText(char, style=FALLBACK_STYLE, parent=span)
-                yield from handle_missing_glyphs(fallback_span, container)
+                yield from handle_missing_glyphs(annotate(fallback_span), container)
     if not has_missing_glyphs:
         yield span
         return
     if string:
-        yield SingleStyledText(''.join(string), parent=span)
+        text = SingleStyledText(''.join(string), parent=span)
+        yield annotate(text)
 
 
 class LinePart(object):

tests_regression/rst/missing_glyphs.pdf

@@ -359,6 +359,40 @@
         and
         ∇
         .
+    <paragraph>
+        Missing glyph in a linked reference: 
+        <reference refuri="http://www.python.org">
+            ∇
+        , 
+        <reference refuri="http://www.python.org">
+            ∇
+             after
+        , 
+        <reference refuri="http://www.python.org">
+            after 
+            ∇
+        .
+    <footnote auto="1" ids="f1" names="f1">
+        <label>
+            1
+        <paragraph>
+            Footnote one!
+    <footnote auto="1" ids="f2" names="f2">
+        <label>
+            2
+        <paragraph>
+            Footnote two!
+    <substitution_definition names="solo">
+        ∇
+    <target ids="solo" names="solo" refuri="http://www.python.org">
+    <substitution_definition names="after">
+        ∇
+         after
+    <target ids="after" names="after" refuri="http://www.python.org">
+    <substitution_definition names="before">
+        after 
+        ∇
+    <target ids="before" names="before" refuri="http://www.python.org">
     <substitution_definition names=">">
         ‣
     <paragraph>

tests_regression/rst/missing_glyphs.pxml

@@ -10,6 +10,19 @@ Missing glyphs: |cylcty| and |nabla|.
 
 Without surrounding whitespace:\ |cylcty|\ and\ |nabla|.
 
+Missing glyph in a linked reference: |solo|_, |after|_, |before|_.
+
+.. [#f1] Footnote one!
+.. [#f2] Footnote two!
+
+.. |solo| replace:: |nabla|
+.. _solo: http://www.python.org
+
+.. |after| replace:: |nabla| after
+.. _after: http://www.python.org
+
+.. |before| replace:: after |nabla|
+.. _before: http://www.python.org
 
 .. |>| unicode:: 0x2023
 

tests_regression/rst/missing_glyphs.rst

@@ -26,7 +26,26 @@
               SingleStyledText('and')
               SingleStyledText('∇')
               SingleStyledText('.')
-      Paragraph('Test for word wrapping of a line...')   missing_glyphs.rst:17   <paragraph>
+      Paragraph('Missing glyph in a linked refere...')   missing_glyphs.rst:13   <paragraph>
+           > (0,0,0,0,2) body [Sphinx] > default
+          MixedStyledText('Missing glyph in a linked refere...')
+            MixedStyledText('Missing glyph in a linked refere...')
+              SingleStyledText('Missing glyph in a linked refere...')
+              MixedStyledText('∇', style='external link')   <reference>
+                   > (0,0,1,0,1) external hyperlink [Sphinx] > DEFAULT
+                SingleStyledText('∇')
+              SingleStyledText(', ')
+              MixedStyledText('∇ after', style='external link')   <reference>
+                   > (0,0,1,0,1) external hyperlink [Sphinx] > DEFAULT
+                SingleStyledText('∇')
+                SingleStyledText(' after')
+              SingleStyledText(', ')
+              MixedStyledText('after ∇', style='external link')   <reference>
+                   > (0,0,1,0,1) external hyperlink [Sphinx] > DEFAULT
+                SingleStyledText('after ')
+                SingleStyledText('∇')
+              SingleStyledText('.')
+      Paragraph('Test for word wrapping of a line...')   missing_glyphs.rst:29   <paragraph>
            > (0,0,0,0,2) body [Sphinx] > default
           MixedStyledText('Test for word wrapping of a line...')
             MixedStyledText('Test for word wrapping of a line...')
@@ -38,7 +57,7 @@
               SingleStyledText('Test for word wrapping of a line...')
               SingleStyledText('‣')
               SingleStyledText(' Item')
-      Paragraph('And Menu ‣ Item, Utility Functio...')   missing_glyphs.rst:19   <paragraph>
+      Paragraph('And Menu ‣ Item, Utility Functio...')   missing_glyphs.rst:31   <paragraph>
            > (0,0,0,0,2) body [Sphinx] > default
           MixedStyledText('And Menu ‣ Item, Utility Functio...')
             MixedStyledText('And Menu ‣ Item, Utility Functio...')