pangrid 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e04bea2f4ebdb7947ec122f28a4a8feaa9cb4e7c4a27206abb6ef0fe7e6f254c
-  data.tar.gz: d5f32ec895146fe2141c5f68dcf775477b7a381577239e8225d8d8a155fe0c10
+  metadata.gz: bae2448ff977c9e56ef72dbab05adaaafe6ce7014b98efa76dc58b31405a2d5f
+  data.tar.gz: bed5ea209d24fa963dc2c77815e77dc8c519d041c0936b45a9b49adf257d50a3
 SHA512:
-  metadata.gz: d8057bad79f07c4d761f136a8258171b5b7a3711d5d72d589282d7219153fbf6bbb28c29315ab0ee99eba74ef465d334dbef71fd7657e8881dfe42ad944076ac
-  data.tar.gz: e8bf9a1582e69ab4279505d19f957dbe3668cb471cd2644660fbaff073a08f3b608de57db830f637c6a97ada3f255e79bcbc59bab45f0e8d9e9ff345cc0636f8
+  metadata.gz: 67db80faa5ab209c14991387b3fe7eebd837fc0fc0cdb5adb9cf9d27e1261a56a07f82dc0e5274587ac9b1b088f42fc518ed7649ca6c61ad224add01c13dfcce
+  data.tar.gz: f7a5f9c50dbd853e24609385e9f06eac8dc7ebe4ea04a654885d6768e9f53bc3e59c1c0392808c707b830a0e4b4e721acc39d9ac9d465c87b03df4024c72b958

data/README

@@ -5,18 +5,37 @@ Examples:
 # Run from the command line
 $ pangrid -f across-lite-binary -t text -i sample.puz -o sample.txt
 
-# Start the webserver
-$ pangrid -w
+# Add clues from a text file, e.g. to a grid from qxw, which has no clues
+$ pangrid -f qxw -t across-lite-binary -i grid.qxw -c clues.txt -o puzzle.puz
 
 # List available plugins
 $ pangrid -l
 
 
 Options:
-  -f, --from=<s>    Format to convert from
-  -t, --to=<s>      Format to convert to
-  -i, --in=<s>      Input file
-  -o, --out=<s>     Output file
-  -l, --list        List available format plugins
-  -w, --web         Launch webserver
-  -h, --help        Show this message
+    -f, --from=FORMAT                Format to convert from
+    -t, --to=FORMAT                  Format to convert to
+    -i, --in=FILE                    Input file
+    -o, --out=FILE                   Output file
+    -c, --clues=FILE                 Add clues from a text file (see below)
+    -l, --list                       List available format plugins
+    -v, --version                    Print version and exit
+    -h, --help                       Show this message
+
+
+Clues file format (-c):
+
+  Across
+
+  7 Wonderful view of canal, including outer banks (8)
+  9 Bleed badly after hack's first cut with saw (6)
+
+  Down
+
+  1 Power to limit a settlement (8)
+
+Every clue starts with its number, which is used to match it to the grid, so
+the clues can be in any order. Numbers may be decorated ("7.", "**7.**",
+"7)"). Blank lines are ignored. The clue numbers must match the grid exactly;
+missing or extra clues are reported as an error. The clues replace any that
+were already in the input file.

data/lib/pangrid/clues.rb

@@ -0,0 +1,80 @@
+# A plain text list of clues, to be added to a crossword read from another
+# file (e.g. a grid from qxw, which has no clues of its own).
+#
+#   Across
+#
+#   7 Wonderful view of canal, including outer banks (8)
+#   9 Bleed badly after hack's first cut with saw (6)
+#
+#   Down
+#
+#   1 Power to limit a settlement (8)
+#
+# Section headers are "Across" and "Down" (case insensitive, optionally
+# decorated, e.g. "**Across**" or "Across:"). Blank lines are ignored. Each
+# clue starts with its number, which is used to match it to the grid, so the
+# clues don't have to be in order.
+
+module Pangrid
+
+class ClueList
+  include PluginUtils
+
+  attr_reader :across, :down
+
+  HEADER = /\A[^\w]*(across|down)[^\w]*\z/i
+  # The leading clue number, allowing for markup like "**12.**"
+  NUMBER = /\A[^\w\s,]*(\d+)\b/
+
+  def initialize
+    @across, @down = {}, {}
+  end
+
+  # String -> ClueList
+  def self.read(data)
+    new.tap {|c| c.read(data)}
+  end
+
+  def read(data)
+    section = nil
+    data.each_line.with_index(1) do |line, lineno|
+      line = line.strip
+      next if line.empty?
+      if (m = line.match(HEADER))
+        section = m[1].downcase == "across" ? across : down
+        next
+      end
+      check("Line #{lineno}: clue before an Across or Down header") { section }
+      n = line[NUMBER, 1]
+      check("Line #{lineno}: clue does not start with a number: #{line}") { n }
+      n = n.to_i
+      check("Line #{lineno}: duplicate clue #{n}") { !section.key?(n) }
+      section[n] = strip_clue_numbers([line], [n]).first
+    end
+    check("No clues found") { !across.empty? || !down.empty? }
+    self
+  end
+
+  # Set the crossword's clues, matching clue numbers against the grid.
+  def apply(xw)
+    a, d = xw.number
+    errors = mismatches("across", a, across) + mismatches("down", d, down)
+    check("Clues do not match the grid: " + errors.join("; ")) { errors.empty? }
+    xw.across_clues = a.map {|n| across[n]}
+    xw.down_clues = d.map {|n| down[n]}
+    xw
+  end
+
+  private
+
+  def mismatches(dir, grid, clues)
+    missing = grid - clues.keys
+    extra = clues.keys - grid
+    errors = []
+    errors << "no #{dir} clue for #{missing.join(', ')}" unless missing.empty?
+    errors << "#{dir} clue #{extra.join(', ')} not in grid" unless extra.empty?
+    errors
+  end
+end
+
+end # module Pangrid

data/lib/pangrid/plugin.rb

@@ -43,9 +43,12 @@ class Plugin
     REGISTRY[name] = subclass
   end
 
+  # Plugins register themselves via `inherited` when their file is first
+  # required, so the registry must not be cleared here: `require` will not
+  # re-run an already loaded file.
   def self.load_all
-    REGISTRY.clear
     FAILED.clear
+    MISSING_DEPS.clear
     plugins = Dir.glob(File.dirname(__FILE__) + "/plugins/*.rb")
     plugins.each do |f|
       load_plugin f
@@ -57,7 +60,9 @@ class Plugin
       require filename
     rescue PluginDependencyError => e
       MISSING_DEPS[e.name] = e.gems
-    rescue StandardError => e
+    rescue StandardError, LoadError => e
+      # LoadError is not a StandardError; catch it so that one plugin with a
+      # missing dependency cannot take down every other plugin.
       FAILED << "#{File.basename(filename)}: #{e}"
     end
   end

data/lib/pangrid/plugins/acrosslite.rb

@@ -7,13 +7,36 @@
 #   AcrossLiteBinary : read, write
 #   AcrossLiteText : read, write
 
-require 'ostruct'
-
 module Pangrid
 
 GRID_CHARS = {:black => '.', :null => '?'}
 FILL_CHARS = {:black => '.', :null => '-'}
 
+# The binary format stores text as ISO-8859-1; we use UTF-8 internally.
+module Latin1
+  # String -> ISO-8859-1 bytes (binary strings are passed through)
+  def self.bytes(s)
+    return s.b if [Encoding::BINARY, Encoding::ISO_8859_1].include?(s.encoding)
+    s.encode(Encoding::ISO_8859_1, undef: :replace, invalid: :replace,
+             replace: '?').b
+  end
+
+  # ISO-8859-1 bytes -> UTF-8 String
+  def self.decode(s)
+    s.dup.force_encoding(Encoding::ISO_8859_1).encode(Encoding::UTF_8)
+  end
+end
+
+# Binary format extension sections. `data` holds the raw bytes; the other
+# fields are populated by the section-specific readers.
+Extension = Struct.new(:section, :len, :checksum, :data,
+                       :elapsed, :stopped,  # LTIM
+                       :grid,               # GRBS, GEXT
+                       :rebus,              # RTBL
+                       keyword_init: true)
+
+Checksums = Struct.new(:global, :cib, :masked_low, :masked_high, :scrambled)
+
 # CRC checksum for binary format
 class Checksum
   attr_accessor :sum
@@ -36,7 +59,7 @@ class Checksum
   end
 
   def add_string(s)
-    s.bytes.map {|b| add_char b}
+    Latin1.bytes(s).bytes.map {|b| add_char b}
   end
 
   def add_string_0(s)
@@ -85,12 +108,12 @@ class AcrossLiteBinary < Plugin
 
   def initialize
     @xw = XWord.new
-    @cs = OpenStruct.new
+    @cs = Checksums.new
     @xw.extensions = []
   end
 
   def read(data)
-    s = data.force_encoding("ISO-8859-1")
+    s = data.b
 
     i = s.index(FILE_MAGIC)
     check("Could not recognise AcrossLite binary file") { i }
@@ -103,20 +126,29 @@ class AcrossLiteBinary < Plugin
       xw.version, _, cs.scrambled, _,
       xw.width, xw.height, xw.n_clues, xw.puzzle_type, xw.scrambled_state =
       header.unpack(HEADER_FORMAT)
+    check("Could not recognise AcrossLite binary file") { xw.width }
+    check("Scrambled (locked) puzzles are not supported") {
+      xw.scrambled_state == 0
+    }
 
     # solution and fill = blocks of w*h bytes each
     size = xw.width * xw.height
-    xw.solution = unpack_solution xw, s[h_end, size]
-    xw.fill = s[h_end + size, size]
+    check("AcrossLite binary file is truncated") { s.length >= h_end + 2 * size }
+    xw.solution = unpack_solution xw, Latin1.decode(s[h_end, size])
+    xw.fill = Latin1.decode(s[h_end + size, size])
     s = s[h_end + 2 * size .. -1]
 
     # title, author, copyright, clues * n, notes = zero-terminated strings
     xw.title, xw.author, xw.copyright, *xw.clues, xw.notes, s =
       s.split("\0", xw.n_clues + 5)
+    check("Could not read clues from AcrossLite binary file") { s }
+    xw.title, xw.author, xw.copyright, xw.notes =
+      [xw.title, xw.author, xw.copyright, xw.notes].map {|x| Latin1.decode(x)}
+    xw.clues = xw.clues.map {|x| Latin1.decode(x)}
 
     # extensions: 8-byte header + len bytes data + \0
     while (s.length > 8) do
-      e = OpenStruct.new
+      e = Extension.new
       e.section, e.len, e.checksum = s.unpack(EXT_HEADER_FORMAT)
       check("Unrecognised extension #{e.section}") { EXTENSIONS.include? e.section }
       size = 8 + e.len + 1
@@ -137,7 +169,9 @@ class AcrossLiteBinary < Plugin
   end
 
   def write(xw)
-    @xw = xw
+    # work on a copy so that the fields filled in below don't leak back into
+    # the caller's puzzle
+    @xw = xw = xw.dup
 
     # fill in some fields that might not be present (checksums needs this)
     pack_clues
@@ -148,7 +182,10 @@ class AcrossLiteBinary < Plugin
     xw.scrambled_state ||= 0
     xw.version = "1.3"
     xw.notes ||= ""
-    xw.extensions ||= []
+    # rebus extensions are regenerated from the grid below
+    xw.extensions = (xw.extensions || []).reject {|e|
+      %w(GRBS RTBL).include? e.section
+    }
     xw.title ||= ""
     xw.author ||= ""
     xw.copyright ||= ""
@@ -157,15 +194,13 @@ class AcrossLiteBinary < Plugin
     xw.encode_rebus!
     if not xw.rebus.empty?
       # GRBS
-      e = OpenStruct.new
-      e.section = "GRBS"
+      e = Extension.new(section: "GRBS")
       e.grid = xw.to_array({:black => 0, :null => 0}) {|s|
         s.rebus? ? s.solution.symbol.to_i : 0
       }.flatten
       xw.extensions << e
       # RTBL
-      e = OpenStruct.new
-      e.section = "RTBL"
+      e = Extension.new(section: "RTBL")
       e.rebus = {}
       xw.rebus.each do |long, (k, short)|
         e.rebus[k] = [long, short]
@@ -182,10 +217,10 @@ class AcrossLiteBinary < Plugin
     header = h.pack(HEADER_FORMAT)
 
     strings = [xw.title, xw.author, xw.copyright] + xw.clues + [xw.notes]
-    strings = strings.map {|x| x + "\0"}.join
+    strings = strings.map {|x| Latin1.bytes(x) + "\0".b}.join
 
     [header, pack_solution(xw), xw.fill, strings, write_extensions].map {|x|
-      x.force_encoding("ISO-8859-1")
+      Latin1.bytes(x)
     }.join
   end
 
@@ -233,7 +268,6 @@ class AcrossLiteBinary < Plugin
     # record these for file inspection, though they're unlikely to be useful
     if (ltim = get_extension("LTIM"))
       xw.time_elapsed = ltim.elapsed
-      xw.paused
     end
 
     # we need both grbs and rtbl
@@ -266,7 +300,7 @@ class AcrossLiteBinary < Plugin
     check("Could not read extension RTBL") { m }
     e.rebus = {}
     e.data.scan(rx).each {|_, k, v|
-      e.rebus[k.to_i] = [v, '-']
+      e.rebus[k.to_i] = [Latin1.decode(v), '-']
     }
   end
 
@@ -346,7 +380,7 @@ class AcrossLiteBinary < Plugin
   end
 
   def checksums
-    c = OpenStruct.new
+    c = Checksums.new
     c.masked_low, c.masked_high = magic_checksums
     c.cib = header_checksum
     c.global = global_checksum

data/lib/pangrid/plugins/csv.rb

@@ -38,27 +38,32 @@ class CSV < Plugin
     check("No header row found. Header needs a 'Width: ' cell in the first column.") { !s.empty? }
     xw = XWord.new
     h = s.shift.map {|c| c.split(/:\s*/)}
-    header = OpenStruct.new
+    header = {}
     h.each do |k, v|
       header[k.downcase.strip] = v
     end
 
-    header.clues = header.clues.to_i
-    xw.width = header.width.to_i
-    xw.height = header.height.to_i
+    clue_column = header["clues"].to_i
+    black, empty = header["black"], header["empty"]
+    xw.width = header["width"].to_i
+    xw.height = header["height"].to_i
+    offset = header["offset"].to_i
+    check("Width and Height must be positive") { xw.width > 0 && xw.height > 0 }
     xw.solution = []
-    xw.height.times do
+    xw.height.times do |y|
       row = s.shift
-      check("Row does not have #{xw.width} cells: \n" +
-            row.join(',')) { row.length == xw.width }
-      xw.solution << row.map do |c|
+      check("Expected #{xw.height} grid rows, found #{y}") { row }
+      cells = row[offset, xw.width] || []
+      check("Row does not have #{xw.width} cells starting at column " +
+            "#{offset}: \n" + row.join(',')) { cells.length == xw.width }
+      xw.solution << cells.map do |c|
         cell = Cell.new
-        if c == header.black
+        if c == black
           cell.solution = :black
-        elsif c == header.empty or c == nil
+        elsif c == empty or c == nil
           cell.solution = :null
         else
-          cell.solution = c.gsub /[^[:alpha:]]/, ''
+          cell.solution = c.gsub(/[^[:alpha:]]/, '')
         end
         cell
       end
@@ -66,8 +71,8 @@ class CSV < Plugin
 
     xw.clues = []
     s.each do |row|
-      if row[header.clues]
-        xw.clues << row[header.clues]
+      if row[clue_column]
+        xw.clues << row[clue_column]
       end
     end
     unpack_clues(xw)

data/lib/pangrid/plugins/excel.rb

@@ -36,7 +36,7 @@ class ExcelXSLX < Plugin
     rows = xw.to_array(:black => " ", :null => " ") {|c|
       format_number(c.number) + " " +
       # We can insert the entire word for rebuses
-      c.solution
+      (c.rebus? ? c.solution.solution : c.solution)
     }
 
     styles = xw.to_array(:black => :black, :null => :white) {

data/lib/pangrid/plugins/exolve.rb

@@ -52,16 +52,28 @@ module ExolveReader
     xw = XWord.new
     s = sections(lines)
     s.each do |_, field, data|
-      if %w(title setter copyright prelude).include? field
+      if %w(title copyright).include? field
         xw[field] = data
+      elsif field == "prelude"
+        xw.preamble = data
+      elsif field == "setter"
+        xw.author = data
       elsif %w(height width).include? field
         xw[field] = data.to_i
-      elsif %(across down).include? field
-        xw["#{field}_clues"] = data
+      elsif %w(across down).include? field
+        xw["#{field}_clues"] = strip_clue_numbers(data)
       elsif field == "grid"
         xw.solution = parse_grid(data)
       end
     end
+    check("exolve-grid missing") { xw.solution && !xw.solution.empty? }
+    xw.height ||= xw.solution.length
+    xw.width ||= xw.solution[0].length
+    check("Grid does not match exolve-width/exolve-height " +
+          "(#{xw.width}x#{xw.height})") {
+      xw.solution.length == xw.height &&
+        xw.solution.all? {|row| row.length == xw.width}
+    }
     xw
   end
 

data/lib/pangrid/plugins/json.rb

@@ -25,7 +25,7 @@ class Json < Plugin
         s = case cell.solution
             when :black; '#'
             when :null; ''
-            when Rebus; cell.solution.inspect
+            when Rebus; cell.solution.solution
             else; cell.solution
             end
 
@@ -45,15 +45,30 @@ class Json < Plugin
   end
 
   def read(data)
-    json = ::JSON.parse(data)
+    begin
+      json = ::JSON.parse(data)
+    rescue ::JSON::ParserError => e
+      raise PuzzleFormatError, "Invalid JSON: #{e.message}"
+    end
+    check("Expected a JSON object") { json.is_a?(Hash) }
     xw = XWord.new
 
     xw.height = json['rows']
     xw.width = json['cols']
+    check("rows and cols must be positive integers") {
+      [xw.height, xw.width].all? {|i| i.is_a?(Integer) && i > 0}
+    }
+    check("cells must be a list") { json['cells'].is_a?(Array) }
     xw.solution = Array.new(xw.height) { Array.new(xw.width) }
     json['cells'].each do |c|
       cell = Cell.new
       s = c['contents']
+      x, y = c['x'], c['y']
+      check("Cell #{c.inspect} is outside the grid") {
+        x.is_a?(Integer) && y.is_a?(Integer) &&
+          (0...xw.width).cover?(x) && (0...xw.height).cover?(y)
+      }
+      check("Cell #{c.inspect} needs string contents") { s.is_a?(String) }
       cell.solution =
         case s
         when ""; :null
@@ -65,9 +80,10 @@ class Json < Plugin
             Rebus.new s
           end
         end
-      x, y = c['x'], c['y']
       xw.solution[y][x] = cell
     end
+    missing = xw.solution.flatten.count(nil)
+    check("#{missing} cells are missing from the grid") { missing == 0 }
     xw.across_clues = json['across']
     xw.down_clues = json['down']
     xw

data/lib/pangrid/plugins/png.rb

@@ -1,7 +1,7 @@
-require 'chunky_png'
-
 module Pangrid
-  
+
+  require_for_plugin 'png-thumbnail', ['chunky_png']
+
   class PNGThumbnail < Plugin
     attr_reader :scale, :border
 
@@ -21,11 +21,11 @@ module Pangrid
         c = cell.black? ? black : white
         png.rect(
           x * scale, y * scale, (x + 1) * scale, (y + 1) * scale,
-          stroke_color = grey, fill_color = c)
+          grey, c)  # stroke, fill
       end
       if border
         stroke = ChunkyPNG::Color::rgb(*border)
-        png.rect(0, 0, xw.width * scale, xw.height * scale, stroke_color = stroke)
+        png.rect(0, 0, xw.width * scale, xw.height * scale, stroke)
       end
       png.to_blob  
     end

data/lib/pangrid/plugins/qxw.rb

@@ -8,25 +8,33 @@ class Qxw < Plugin
 
   DESCRIPTION = "QXW grid reader (rectangular grids only)"
 
-  def read(data)
-    xw = XWord.new
-    lines = data.lines.map(&:chomp)
-    gp = lines.find {|x| x =~ /^GP( \d+){6}$/}
-    check("Could not read grid size from .qxw file") { gp }
-    type, w, h, _ = gp.scan(/\d+/).map(&:to_i)
-    check("Only rectangular grids are supported") { type == 0 }
-    xw.width = w
-    xw.height = h
-    xw.solution = []
+  def read_black(xw, lines)
+    # Read black cells
     grid = lines.select {|x| x =~ /^SQ /}
     grid.each do |line|
       parts = line.scan(/\w+/)
       check(QXW_GRID_ERROR) { parts.length == 6 || parts.length == 7 }
-      col, row, b, c = parts[1].to_i, parts[2].to_i, parts[5].to_i, parts[6]
+      _, col, row, _, _, b, _ = parts
+      col, row, b = col.to_i, row.to_i, b.to_i
+      next if b != 1
+      cell = Cell.new
+      cell.solution = :black
+      xw.solution[row] ||= []
+      xw.solution[row][col] = cell
+    end
+  end
+
+  def read_filled(xw, lines)
+    # Read filled cells
+    grid = lines.select {|x| x =~ /^SQCT /}
+    grid.each do |line|
+      parts = line.scan(/\w+/)
+      check(QXW_GRID_ERROR) { parts.length == 4 || parts.length == 5 }
+      _, col, row, d, c = parts
+      col, row, d = col.to_i, row.to_i, d.to_i
+      next if d != 0  # different char per direction, not supported for now
       cell = Cell.new
-      if b == 1
-        cell.solution = :black
-      elsif c == nil
+      if c == nil
         cell.solution = :null
       else
         cell.solution = c
@@ -34,6 +42,20 @@ class Qxw < Plugin
       xw.solution[row] ||= []
       xw.solution[row][col] = cell
     end
+  end
+
+  def read(data)
+    xw = XWord.new
+    lines = data.lines.map(&:chomp)
+    gp = lines.find {|x| x =~ /^GP( \d+){6}$/}
+    check("Could not read grid size from .qxw file") { gp }
+    type, w, h, _ = gp.scan(/\d+/).map(&:to_i)
+    check("Only rectangular grids are supported") { type == 0 }
+    xw.width = w
+    xw.height = h
+    xw.solution = []
+    read_filled(xw, lines)
+    read_black(xw, lines)
     check(QXW_GRID_ERROR) { xw.solution.length == xw.height }
     check(QXW_GRID_ERROR) { xw.solution.all? {|i| i.compact.length == xw.width} }
 

data/lib/pangrid/plugins/reddit.rb

@@ -64,19 +64,10 @@ class RedditBlank < Plugin
     c == "" || c == "*.*" || c =~ /^(\^\d+)?[[:alpha:]]*$/ # allow partially filled grids
   end
 
-  # make a best-attempt effort to strip off the clue number
-  def strip_clues(nums, clues)
-    nums.zip(clues).each_with_index.map do |(n, cl), i|
-      b = cl.index(n.to_s)
-      if b
-        e = b + n.to_s.length
-        if cl[0...b] =~ /\W*/ and cl[e + 1] =~ /\W/
-          cl[e+1 .. -1].sub(/^\W*\s/, '').strip
-        else
-          cl.strip
-        end
-      end
-    end
+  # The lines following a clue section header, up to the next header
+  def clue_section(lines, start, other)
+    stop = other > start ? other : lines.length
+    lines[(start + 1) ... stop]
   end
 
   def read(data)
@@ -97,8 +88,7 @@ class RedditBlank < Plugin
     lines = [lines[(ix - 1)]] + lines[(ix + 1) .. -1]
     grid = lines.take_while {|i| is_grid_row(i)}
 
-    clues = lines[grid.length .. -1]
-    clues = lines.reject {|i| i.strip.empty?}
+    clues = lines[grid.length .. -1].map(&:strip).reject(&:empty?)
 
     # strip leading |s
     grid = grid.map {|line| line.sub(/^\|/, '')}
@@ -126,10 +116,12 @@ class RedditBlank < Plugin
     across, down = xw.number
     aix = clues.find_index {|row| row =~ /^\W*across/i}
     dix = clues.find_index {|row| row =~ /^\W*down/i}
-    xw.across_clues = clues[(aix + 1) .. (aix + across.length)]
-    xw.down_clues = clues[(dix + 1) .. (dix + down.length)]
-    xw.across_clues = strip_clues(across, xw.across_clues)
-    xw.down_clues = strip_clues(down, xw.down_clues)
+    check("Could not find across clues") { aix }
+    check("Could not find down clues") { dix }
+    ac = clue_section(clues, aix, dix).take(across.length)
+    dn = clue_section(clues, dix, aix).take(down.length)
+    xw.across_clues = strip_clue_numbers(ac, across)
+    xw.down_clues = strip_clue_numbers(dn, down)
 
     xw
   end

data/lib/pangrid/plugins/text.rb

@@ -21,14 +21,6 @@ class Text < Plugin
     grid + "\n" + ac + "\n\n" + dn + "\n"
   end
 
-  # rename to 'read' when this is complete
-  def read_grid(data)
-    s = data.each_line.map(&:strip)
-    m = s[0].match(/^Grid (\d+) (\d+)$/)
-    check("Grid line missing") { m }
-    xw.height, xw.width = m[1].to_i, m[2].to_i
-  end
-
   def format_clues(numbers, clues, indent)
     numbers.zip(clues).map {|n, c| " "*indent + "#{n.to_s.rjust(2)}. #{c}"}.join("\n")
   end

data/lib/pangrid/utils.rb

@@ -4,6 +4,23 @@ module PluginUtils
   def check(msg = "")
     raise PuzzleFormatError, msg unless yield
   end
+
+  # Strip leading clue numbers from a list of clues, e.g.
+  #   "1. Clue", "1\\. Clue", "**1.** Clue", "1 Clue" -> "Clue"
+  #
+  # If `numbers` is given, clues[i] only has numbers[i] stripped, and clues
+  # that don't start with their expected number are left as they are.
+  # Otherwise any leading number is stripped.
+  #
+  # The number must be a whole word followed by whitespace, so "1984 author"
+  # is not clue 1, and linked clues like "1, 5 Clue" are left alone.
+  def strip_clue_numbers(clues, numbers = nil)
+    clues.each_with_index.map do |clue, i|
+      next clue.strip if numbers && numbers[i].nil?
+      n = numbers ? Regexp.escape(numbers[i].to_s) : '\d+'
+      clue.sub(/\A\s*[^\w\s,]*#{n}\b[^\w\s,]*\s+/, '').strip
+    end
+  end
 end
 
 end # module Pangrid