Changeset 30117

Timestamp:

2015-08-21T17:18:42+12:00 (8 years ago)

Author:

jmt12

Message:

Altered to fix bug where imgcaption tag closed before image actually output. Looks like this was intentional at some stage, but means problems in the Wiki, so I'll repair

Location:

documentation/trunk/php

Files:

• gs-manual-export.php (modified) (2 diffs)
• gs-manual-import.php (modified) (2 diffs)

documentation/trunk/php/gs-manual-export.php

@@ -945 +945 @@
     }
     // - images start with an image caption 'element'
-    elseif (preg_match('/<imgcaption\s+figure_([a-z0-9_\-]+)\|(.+)>\s*<\/imgcaption>/', $line, $matches))
+    elseif (preg_match('/<imgcaption\s+figure_([a-z0-9_\-]+)\|(.+)>([^<]*?)<\/imgcaption>/', $line, $matches))
     {
       $figure_id = $matches[1];
       $figure_title = $matches[2];
+      $image_content = $matches[3];
       // - watch for the special withLineNumber flag
       $class_attribute = '';
@@ -986 +987 @@
       }
       fwrite($xml_out, '</Title>' . "\n");
-      $in_figure = true;
+      // Try and find the image itself
+      if (preg_match('/\{\{.+?[^:?]+\?\d+x\d+(&direct)?\}\}/', $image_content))
+      {
+        processImage($xml_out, $line);
+        fwrite($xml_out, '</Figure>' . "\n");
+      }
+      // Didn't find an image? Weird, but mark the imgcaption as open, and
+      // we'll chomp up the next image found as the content.
+      else
+      {
+          $in_figure = true;
+      }
       // - record the id to prevent repeating
       $seen_ids[$figure_id] = true;

documentation/trunk/php/gs-manual-import.php

@@ -291 +291 @@
        $txt .= '%!-- withLineNumber --%';
      }
-     $txt .= '></imgcaption>' . "\n";
+     $txt .= '>';
      if ($in_chapter)
      {
@@ -305 +305 @@
      if ($in_chapter)
      {
-       fwrite($chapter_txt_out, "\n\n");
-     }
-     else
-     {
-       $frontmatter_text .= "\n\n";
+       fwrite($chapter_txt_out, "</imgcaption>\n\n");
+     }
+     else
+     {
+       $frontmatter_text .= "</imgcaption>\n\n";
      }
      // - no longer required