diff options
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-a4-1p.pdf | bin | 218606 -> 218739 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-a4-6p.pdf | bin | 223109 -> 223298 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-1p.pdf | bin | 205692 -> 205909 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-6p.pdf | bin | 210120 -> 210384 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-private.svg | 2 | ||||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-1p.pdf | bin | 205315 -> 205536 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-6p.pdf | bin | 209742 -> 210010 bytes | |||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow-simple.svg | 2 | ||||
| -rw-r--r-- | public/ijime-judai-jitai/images/ijime-judai-flow.svg | 2 | ||||
| -rw-r--r-- | scripts/make-flow-pdfs.py | 6 | ||||
| -rw-r--r-- | scripts/make-flow-simple.py | 2 |
11 files changed, 7 insertions, 7 deletions
diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-a4-1p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-a4-1p.pdf Binary files differindex bef1e67..15700b8 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-a4-1p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-a4-1p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-a4-6p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-a4-6p.pdf Binary files differindex c9b32bd..2aea850 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-a4-6p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-a4-6p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-1p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-1p.pdf Binary files differindex f46fbf4..814ffab 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-1p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-1p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-6p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-6p.pdf Binary files differindex 5df0ddf..480dd6b 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-6p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-private-a4-6p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-private.svg b/public/ijime-judai-jitai/images/ijime-judai-flow-private.svg index a53b11b..49e17f2 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-private.svg +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-private.svg @@ -389,7 +389,7 @@ <text x="910" y="3672" text-anchor="middle" font-family="sans-serif" font-size="24" font-weight="700" fill="#0B4C8C" text-decoration="underline">このフロー図の解説ページ:https://yasutakeyohei.com/ijime-judai-jitai/flow/</text> </a> <a href="https://creativecommons.org/licenses/by-nd/4.0/deed.ja" target="_blank"> -<text x="910" y="3706" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> +<text x="910" y="3706" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず(一部の切り取りは可)、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> </a> <text x="910" y="3734" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">この図は正確を期して作成していますが、誤りが含まれている可能性があります。この図を利用したことによって生じたいかなる損害についても、作成者は責任を負いません。</text> </svg>
\ No newline at end of file diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-1p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-1p.pdf Binary files differindex 268cc6f..d31e9a7 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-1p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-1p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-6p.pdf b/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-6p.pdf Binary files differindex 51e42bf..7f55af8 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-6p.pdf +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-simple-a4-6p.pdf diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow-simple.svg b/public/ijime-judai-jitai/images/ijime-judai-flow-simple.svg index e7c0fd0..995504a 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow-simple.svg +++ b/public/ijime-judai-jitai/images/ijime-judai-flow-simple.svg @@ -387,7 +387,7 @@ <text x="910" y="3557" text-anchor="middle" font-family="sans-serif" font-size="24" font-weight="700" fill="#0B4C8C" text-decoration="underline">このフロー図の解説ページ:https://yasutakeyohei.com/ijime-judai-jitai/flow/</text> </a> <a href="https://creativecommons.org/licenses/by-nd/4.0/deed.ja" target="_blank"> -<text x="910" y="3591" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> +<text x="910" y="3591" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず(一部の切り取りは可)、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> </a> <text x="910" y="3619" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">この図は正確を期して作成していますが、誤りが含まれている可能性があります。この図を利用したことによって生じたいかなる損害についても、作成者は責任を負いません。</text> </svg>
\ No newline at end of file diff --git a/public/ijime-judai-jitai/images/ijime-judai-flow.svg b/public/ijime-judai-jitai/images/ijime-judai-flow.svg index a7349a7..843e009 100644 --- a/public/ijime-judai-jitai/images/ijime-judai-flow.svg +++ b/public/ijime-judai-jitai/images/ijime-judai-flow.svg @@ -505,7 +505,7 @@ <text x="910" y="4082" text-anchor="middle" font-family="sans-serif" font-size="24" font-weight="700" fill="#0B4C8C" text-decoration="underline">このフロー図の解説ページ:https://yasutakeyohei.com/ijime-judai-jitai/flow/</text> </a> <a href="https://creativecommons.org/licenses/by-nd/4.0/deed.ja" target="_blank"> -<text x="910" y="4116" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず(下部の【課題・論点】を省くのは可)、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> +<text x="910" y="4116" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">© 安竹洋平(小平市議会議員)/公立学校版・私立学校版とも CC BY-ND 4.0(表示—改変禁止)です。内容を変えず(課題欄の省略・一部の切り取りは可)、出典 yasutakeyohei.com/ijime-judai-jitai/flow/ を表示してご利用ください。</text> </a> <text x="910" y="4144" text-anchor="middle" font-family="'Noto Sans JP','Yu Gothic','Hiragino Kaku Gothic ProN',Meiryo,sans-serif" font-size="13" fill="#546E7A">この図は正確を期して作成していますが、誤りが含まれている可能性があります。この図を利用したことによって生じたいかなる損害についても、作成者は責任を負いません。</text> <a href="#issue4" style="cursor:pointer"> diff --git a/scripts/make-flow-pdfs.py b/scripts/make-flow-pdfs.py index e5ed6ae..70ad495 100644 --- a/scripts/make-flow-pdfs.py +++ b/scripts/make-flow-pdfs.py @@ -35,7 +35,7 @@ DEST = pymupdf.Rect(MARGIN, MARGIN, MARGIN + 2900 * PX2PT, MARGIN + 4182 * PX2PT TILE_W1 = 1160.0 # タイル幅(SVG座標=1x基準) TILE_H1 = 1672.8 # タイル高さ FOOT_SIZE = 50 * PX2PT # 旧: int(20*2.5)=50px -FOOT_NOTE_SIZE = 31 * PX2PT +FOOT_NOTE_SIZE = 29 * PX2PT FOOT_TOP = (4382 - 100 + 3) * PX2PT FOOT_COLOR = (0x45 / 255, 0x5A / 255, 0x64 / 255) FOOT_6P = TITLE + " {n}/6 (全体の一部・のりしろ重複あり)" @@ -45,10 +45,10 @@ FOOT_1P = TITLE + " 全体像(縮小のため文字は小さめ。読みやã # 「無保証」は、内容の正確性を保証せず、誤りがあっても責任を負わない旨。 # 課題欄があるのは公立学校版だけなので、その旨も公立版にだけ入れる LIC_PUBLIC = ("© 安竹洋平(小平市議会議員)/公立版・私立版とも CC BY-ND 4.0" - "(課題欄の省略可・無保証)/yasutakeyohei.com/ijime-judai-jitai/flow/") + "(課題欄の省略・切り取り可・無保証)/yasutakeyohei.com/ijime-judai-jitai/flow/") # 私立版と簡易版には課題欄がないので、その但し書きは入れない LIC_NO_KADAI = ("© 安竹洋平(小平市議会議員)/公立版・私立版とも CC BY-ND 4.0" - "(無保証)/yasutakeyohei.com/ijime-judai-jitai/flow/") + "(切り取り可・無保証)/yasutakeyohei.com/ijime-judai-jitai/flow/") # 図に合わせた版の情報(PDFのメタデータにも入れる) EDITION = "第1版(令和8年9月23日)" diff --git a/scripts/make-flow-simple.py b/scripts/make-flow-simple.py index 1e0b566..be16cf1 100644 --- a/scripts/make-flow-simple.py +++ b/scripts/make-flow-simple.py @@ -40,7 +40,7 @@ text, n_note = re.subn(r'<text x="20" y="\d+"[^>]*>※6[^<]*</text>\n', "", text # 簡易版には課題欄がないので、ライセンス行の但し書きも外す text = text.replace("課題欄のリンク先:yasutakeyohei.com", "各課題の詳細:yasutakeyohei.com/ijime-judai-jitai/flow/") -text = text.replace("内容を変えず(下部の【課題・論点】を省くのは可)、", "内容を変えず、") +text = text.replace("内容を変えず(課題欄の省略・一部の切り取りは可)、", "内容を変えず(一部の切り取りは可)、") # 5) 課題欄より下の要素を上へ寄せる def _shift(m): |
