Merge pull request #48 from nmtake/fix-table

Fix broken table

python/filter.py

@@ -120,6 +120,7 @@ def filter(key, value, fmt, meta):
         return RawInline('latex', value)
     elif key == 'Code':  # Code Attr String
         value[1] = value[1].replace('\uFFFD', '?')
+        value[1] = value[1].replace('+CHARPIPE+', '|')
         # \lstinline 内では LaTeX コマンドが使えないので \texttt を使う
         if RE_SCRIPT.search(value[1]):
             s = escape_tex(value[1])

python/fix_table.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+import re
+import sys
+
+
+for line in sys.stdin:
+    line = line.rstrip()
+    if re.search(r'[^-|]', line):
+        print(re.sub(r'<code>(.*?)</code>',
+              lambda m: '`%s`' % m.group(1).replace(r'\|', '+CHARPIPE+'),
+              line))
+    else:
+        ncols = len(re.findall(r'-+\|', line))
+        # http://pandoc.org/MANUAL.html#extension-pipe_tables
+        if ncols == 4:  # Table B-1
+            print('|-|---|---|--|')
+        elif ncols == 2:
+            print('|-|---|')
+        else:
+            print(line)

setup.sh

@@ -29,19 +29,26 @@ if [[ ! -d "./target" ]]; then
   mkdir target
 fi
 
-for f in ./book/second-edition/src/*.md
-do
-  cp $f ./target/
-  echo $f
+for f in book/second-edition/src/*.md; do
+  cp "$f" target/
+  echo "$f"
+done
 
+python3 python/fix_table.py < target/appendix-02-operators.md > target/tmp.md
+mv target/tmp.md target/appendix-02-operators.md
+
+for f in target/*.md; do
   BASE=$(basename $f .md)
   if [[ $BASE =~ appendix-(06|07)- ]]; then
     FILTERS="--filter ./python/fix_headers.py --filter ./python/filter.py"
   else
     FILTERS="--filter ./python/filter.py"
   fi
+  if [[ $BASE =~ appendix-02- ]]; then
+    COLUMNS="--columns=10"
+  fi
   FILENAME="$BASE" pandoc -o "./target/$BASE.tex" -f markdown_github+footnotes+header_attributes-hard_line_breaks \
-      --pdf-engine=lualatex --top-level-division=chapter --listings $FILTERS $f
+      --pdf-engine=lualatex --top-level-division=chapter $COLUMNS --listings $FILTERS $f
 done
 
 python3 ./python/body.py < ./target/SUMMARY.md > body.tex