コミット: 6e270617e182abbcca805698d54c6e135989c5f0 - pagewriter (git)

wiki style document editor

コミットメタ情報

• リビジョン: 6e270617e182abbcca805698d54c6e135989c5f0 (tree)
• 日時: 2014-09-01 01:41:09
• 作者: Hiromichi Matsushima <hylom@Hiro...>
• コミッター: Hiromichi Matsushima

ログメッセージ

export: fix for table markup

変更サマリ

• modified: tools/export/export-single.js
• modified: tools/export/export.js

差分

--- a/tools/export/export-single.js
+++ b/tools/export/export-single.js
@@ -45,6 +45,7 @@ function copyFiles(filelist, from, dest) {
 
 function exportSingle(target, output) {
   fs.readFile(target, 'utf8', function (err, data) {
+    console.log(target);
     if (err) {
       console.log('Cannot read file: ' + target);
       return;
@@ -60,21 +61,25 @@ function exportSingle(target, output) {
     // output honmon, caption
     fs.writeFileSync(path.join(output, 'honmon.txt'),
                      result.bodies.join('\n'));
-    fs.writeFileSync(path.join(output, 'caption.txt'),
-                     result.captions.join('\n'));
+
+    if (result.captions.length != 0) {
+      fs.writeFileSync(path.join(output, 'caption.txt'),
+                       result.captions.join('\n'));
+      // output html
+      var out = fs.createWriteStream(path.join(output, 'figures.html'), {flags: 'w', encoding: 'utf8', mode: 0666});
+      out.write(HTML_HEAD);
+      out.write('\n');
+      out.write(result.htmls.join('\n'));
+      out.write('\n');
+      out.write(HTML_FOOT);
+      out.end();
+    }
 
     // file copy
     var copyFrom = path.join(path.dirname(target), 'figure');
-    copyFiles(result.figures, copyFrom, path.join(output, 'figures'));
-
-    // output html
-    var out = fs.createWriteStream(path.join(output, 'figures.html'), {flags: 'w', encoding: 'utf8', mode: 0666});
-    out.write(HTML_HEAD);
-    out.write('\n');
-    out.write(result.htmls.join('\n'));
-    out.write('\n');
-    out.write(HTML_FOOT);
-    out.end();
+    if (result.figures.length != 0) {
+      copyFiles(result.figures, copyFrom, path.join(output, 'figures'));
+    }
 
   });
 }
@@ -89,6 +94,9 @@ function findFigureFile(caption, imageDir) {
 }
 
 function findImageFile(name, targetDir) {
+  if (fs.existsSync(path.join(targetDir, name))) {
+    return name;
+  }
   var files = fs.readdirSync(targetDir);
   var exts = config.figureFormat;
   for (var i = 0; i < files.length; i++) {
@@ -136,6 +144,9 @@ function splitBody(lines) {
          && bodies[bodies.length-1] === '' ) {
       // do nothing
     } else {
+      // *図、*表を置換
+      lines[i] = lines[i].replace(/\*図/g, '★図');
+      lines[i] = lines[i].replace(/\*表/g, '★表');
       bodies.push(lines[i]);
     }
   }
@@ -241,7 +252,8 @@ function makeHtmls(lines, imageDir) {
   var html = [];
   var figMode = false;
   var figTextMode = false;
-  var figName;
+  var assumedFigName;
+  var figName
   var figId;
   for (var i = 0; i < lines.length; i++) {
 
@@ -253,14 +265,15 @@ function makeHtmls(lines, imageDir) {
     // figure
     if (lines[i].match(/^☆図/)) {
       figId = lines[i].match(/^☆図([0-9]+-[0-9]+)/);
-      figName = 'fig' + figId[1] + '.fw.png';
+      console.log(lines[i]);
+      assumedFigName = 'fig' + figId[1] + '.fw.png';
       figMode = true;
-      if (isExistsFigure(figName, imageDir)) {
+      if (isExistsFigure(assumedFigName, imageDir)) {
         html.push('<span class="caption">' + lines[i] + '</span>');
-        html.push('<img src="figures/' + figName + '">');
-        html.push('<span class="filename">' + figName + '</span>');
+        html.push('<img src="figures/' + assumedFigName + '">');
+        html.push('<span class="filename">' + assumedFigName + '</span>');
         i++;
-        while(!lines[i].match(/^＞＞＞＞/)) {
+        while((i < lines.length) && (!lines[i].match(/^＞＞＞＞/))) {
           if (lines[i].match(/^\s*$/)) {
             i++;
             continue;
@@ -270,7 +283,7 @@ function makeHtmls(lines, imageDir) {
           }
           if (figMode) {
             figName = findImageFile(lines[i], imageDir);
-            if (figName != '') {
+            if ((figName != '') && (figName != assumedFigName)) {
               html.push('<span class="filename">' + figName + '</span>');
             }
           }
@@ -309,7 +322,10 @@ function makeHtmls(lines, imageDir) {
       html.push('<span class="caption">' + lines[i] + '</span>');
       html.push('<table>');
       i++;
-      while(!lines[i].match(/^\s+$/)) {
+      while((i < lines.length) && (!lines[i].match(/^\s*$/))) {
+        if (lines[i].match(/^＞＞＞＞/)) {
+          break;
+        }
         html.push(lines[i].replace(/^/, '<tr><td>')
                   .replace(/$/, '</td></tr>')
                   .replace(/\t/, '</td><td>'));

--- a/tools/export/export.js
+++ b/tools/export/export.js
@@ -22,12 +22,12 @@ function exportPages(taget, output) {
   }
   var contents = toc.directories[target].contents;
   var page = toc.directories[target].pageStart;
-  console.log(toc.directories[target]);
+  //console.log(toc.directories[target]);
   contents.forEach(function (content) {
     var outputDirPath = calcOutputDirPath(content, page);
     page += content.pages;
     var targetPathname = path.join(config.rootDir, target, content.title + '.txt');
-    console.log(targetPathname, outputDirPath);
+    //console.log(targetPathname, outputDirPath);
     exportSinge(targetPathname, outputDirPath);
   });
 }