diff --git a/internal/grammaratur/authoring.go b/internal/grammaratur/authoring.go index 03c44c9..875239c 100644 --- a/internal/grammaratur/authoring.go +++ b/internal/grammaratur/authoring.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "io" + "regexp" "sort" "strings" @@ -13,8 +14,24 @@ import ( // HTMLToMarkdownAuthoring keeps source HTML when conversion loses structure, // attributes, comments or text. This is not a sanitization boundary. +var nestedListGap = regexp.MustCompile(`\n[\t ]*\n([\t ]+(?:[-+*]|[0-9]+\.) )`) + +func authoringMarkdown(source string) (string, error) { + md, err := HTMLToMarkdown(source) + if err != nil { + return md, err + } + // The converter inserts a loose-list gap before nested lists. Only accept + // tightening when the resulting DOM matches; code and real paragraphs stay protected. + tight := nestedListGap.ReplaceAllString(md, "\n$1") + if tight != md && htmlStructure(source) == htmlStructure(MarkdownToHTML(tight)) { + return tight, nil + } + return md, nil +} + func HTMLToMarkdownAuthoring(source string) (string, error) { - converted, err := HTMLToMarkdown(source) + converted, err := authoringMarkdown(source) if err != nil { return "", err } @@ -30,7 +47,7 @@ func HTMLToMarkdownAuthoring(source string) (string, error) { if strings.TrimSpace(raw) == "" { continue } - md, e := HTMLToMarkdown(raw) + md, e := authoringMarkdown(raw) if e != nil || htmlStructure(raw) != htmlStructure(MarkdownToHTML(md)) { md = rawHTMLBlock(raw) } @@ -171,6 +188,22 @@ func htmlStructure(source string) string { literal = literal || n.Data == "pre" || n.Data == "code" || n.Data == "script" || n.Data == "style" data := n.Data if n.Type == html.TextNode && !literal { + // Formatting whitespace beside a nested block is not an inline word + // separator. Keep all whitespace between inline siblings significant. + if n.Parent != nil && n.Parent.Data == "li" { + isList := func(x *html.Node) bool { + return x != nil && x.Type == html.ElementNode && (x.Data == "ul" || x.Data == "ol") + } + if isList(n.NextSibling) { + data = strings.TrimRight(data, " \t\r\n") + } + if isList(n.PrevSibling) { + data = strings.TrimLeft(data, " \t\r\n") + } + if data == "" { + return + } + } if strings.TrimSpace(data) == "" && n.Parent != nil { switch n.Parent.Data { case "ul", "ol", "table", "thead", "tbody", "tfoot", "tr": diff --git a/internal/grammaratur/nested_list_test.go b/internal/grammaratur/nested_list_test.go new file mode 100644 index 0000000..3e46d68 --- /dev/null +++ b/internal/grammaratur/nested_list_test.go @@ -0,0 +1,33 @@ +package grammaratur + +import ( + "strings" + "testing" +) + +func TestAuthoringNestedLists(t *testing.T) { + for _, source := range []string{ + "", + "", + "", + "
  1. Parent
", + "", + } { + md, err := HTMLToMarkdownAuthoring(source) + if htmlStructure(source) != htmlStructure(MarkdownAuthoringHTML(md)) { + t.Errorf("list structure changed: %q", md) + } + if err != nil || strings.Contains(md, "{=html}") { + plain, _ := HTMLToMarkdown(source) + t.Errorf("source=%q md=%q plain=%q rendered=%q err=%v", source, md, plain, MarkdownToHTML(plain), err) + } + } +} + +func TestAuthoringNestedListPreservesAttributes(t *testing.T) { + source := `` + md, err := HTMLToMarkdownAuthoring(source) + if err != nil || MarkdownAuthoringHTML(md) != source { + t.Fatalf("protected list changed: %q %v", md, err) + } +} diff --git a/internal/server/testdata/feeds.js b/internal/server/testdata/feeds.js index 6b8400c..437e8ef 100644 --- a/internal/server/testdata/feeds.js +++ b/internal/server/testdata/feeds.js @@ -27,7 +27,7 @@ d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body')); d.querySelector('#feed-reader .feed-actions button:last-child').click();await wait(()=>d.querySelector('#feed-reader form')); assert(!['rgba(0, 0, 0, 0)','transparent'].includes(w.getComputedStyle(d.querySelector('.feed-capture')).backgroundColor),'Capture dialog background transparent'); - const form=d.querySelector('#feed-reader form'),inputs=form.querySelectorAll('input');assert(inputs[2].value==='/notes/{YYYY}/{MM}/{DD}/{Subject}','Wiki default not filled');assert(form.closest('dialog').open&&d.querySelector('#feed-reader .feed-body'),'Capture replaced article');assert(form.querySelector('a[href="/-/sys/config?panel=organizer"]'),'Default settings link missing');await wait(()=>form.querySelector('output').textContent.includes('/rss-'));assert(!form.querySelector('output').textContent.includes('{'),'Template not expanded');inputs[2].value='/notes/feed-ui';inputs[2].dispatchEvent(new w.Event('input'));await wait(()=>form.querySelector('output').textContent.startsWith('/notes/feed-ui/rss-'));inputs[5].checked=true;form.requestSubmit();await wait(()=>d.querySelector('#feed-reader a[href^="/v/uuid:"]'));d.querySelector('.feed-capture button').click();await wait(()=>!d.querySelector('.feed-capture'));assert(d.querySelector('#feed-reader .feed-body'),'Closing capture lost article'); + const form=d.querySelector('#feed-reader form'),inputs=form.querySelectorAll('input');assert(inputs[2].value==='/notes/{YYYY}/{MM}/{DD}/{Subject}','Wiki default not filled');assert(form.closest('dialog').open&&d.querySelector('#feed-reader .feed-body'),'Capture replaced article');assert(form.querySelector('a[href="/-/sys/config?panel=organizer"]'),'Default settings link missing');await wait(()=>form.querySelector('output').textContent.includes('/rss-'));assert(!form.querySelector('output').textContent.includes('{'),'Template not expanded');inputs[2].value='/notes/feed-ui';inputs[2].dispatchEvent(new w.Event('input'));await wait(()=>form.querySelector('output').textContent.startsWith('/notes/feed-ui/rss-'));inputs[5].checked=true;form.requestSubmit();await wait(()=>d.querySelector('#feed-reader a[href^="/o/uuid:"]'));d.querySelector('.feed-capture button').click();await wait(()=>!d.querySelector('.feed-capture'));assert(d.querySelector('#feed-reader .feed-body'),'Closing capture lost article'); const search=d.querySelector('#feed-toolbar input');search.value='';search.dispatchEvent(new w.Event('input',{bubbles:true}));await wait(()=>d.querySelectorAll('.feed-row').length===100);d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body')); assert(d.documentElement.scrollWidth<=w.innerWidth,'Reader overflow'); d.getElementById('feed-opml').click();await wait(()=>d.getElementById('feed-opml-file')); diff --git a/static/js/feeds.js b/static/js/feeds.js index 8b5eca1..1133fa1 100644 --- a/static/js/feeds.js +++ b/static/js/feeds.js @@ -273,7 +273,7 @@ form.onsubmit=async event=>{event.preventDefault();if(busy||resolved===null||!form.reportValidity())return;const body='Source: '+item.url+'\nFeed: '+item.feed+'\n\n'+notes.value+(copy.checked?'\n\n'+item.body:'');const spec={title:title.value,notes:notes.value,prefix:resolved,body,task:task.checked};const fingerprint=JSON.stringify(spec);if(!pending||pending.fingerprint!==fingerprint)pending={fingerprint,request_id:requestID};busy=true;save.disabled=true; try{let data;if(task.checked){const input={request_id:pending.request_id,title:title.value,notes:(notes.value+'\nSource: '+item.url).trim()};if(spec.prefix){input.wiki_prefix=spec.prefix;input.wiki_body=body;}const res=await fetch('/_/api/v1/extension/organizer.tasks/capture',{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:JSON.stringify(input)});data=await res.json().catch(()=>({}));if(!res.ok||res.redirected)throw Error(t('Capture failed: ','作成に失敗: ')+(data.error||res.status));} else data=await post('note',{request_id:pending.request_id,source:item.source,id:item.id,path:spec.prefix.replace(/\/$/,'')+'/rss-'+pending.request_id,title:title.value,body,confirm_publication:confirm.checked}); - dialog.replaceChildren(el('h2',t('Created','作成しました')));if(data.item){const a=el('a',t('Open task','タスクを開く'));a.href='/v/plan/task/'+encodeURIComponent(data.item.uuid);dialog.append(a);}const page=data.page_uuid||data.item?.page_uuid;if(page){const a=el('a',t('Open Wiki','Wikiを開く'));a.href='/v/uuid:'+encodeURIComponent(page);dialog.append(el('p'),a);}const done=button(t('Close','閉じる'),'',close);dialog.append(el('p'),done);done.focus(); + dialog.replaceChildren(el('h2',t('Created','作成しました')));if(data.item){const a=el('a',t('Open task','タスクを開く'));a.href='/v/plan/task/'+encodeURIComponent(data.item.uuid);dialog.append(a);}const page=data.page_uuid||data.item?.page_uuid;if(page){const a=el('a',t('Open Wiki','Wikiを開く'));a.href='/o/uuid:'+encodeURIComponent(page);dialog.append(el('p'),a);}const done=button(t('Close','閉じる'),'',close);dialog.append(el('p'),done);done.focus(); }catch(e){notice.textContent=e.message;}finally{busy=false;save.disabled=resolved===null;} }; } diff --git a/static/js/organizer-dashboard.js b/static/js/organizer-dashboard.js index ed0b637..1fc4625 100644 --- a/static/js/organizer-dashboard.js +++ b/static/js/organizer-dashboard.js @@ -122,7 +122,7 @@ for(const task of data.items){const row=el('li');row.dataset.task=task.uuid; const title=link(task.title,'/v/plan/task/'+encodeURIComponent(task.uuid));title.title=task.title;window.PagesTaskPresentation?.render(title,task.title,false); row.append(el('span',task.status==='done'?'✓':task.status==='cancelled'?'−':task.status==='doing'?'◐':'○'),title); - if(task.page_uuid){const note=link('▣','/v/uuid:'+encodeURIComponent(task.page_uuid));note.title=note.ariaLabel=t('Open linked Wiki page','関連Wikiページを開く');note.className='dashboard-note';row.append(note);}if(task.due_on)row.append(el('time',task.due_on));ul.append(row); + if(task.page_uuid){const note=link('▣','/o/uuid:'+encodeURIComponent(task.page_uuid));note.title=note.ariaLabel=t('Open linked Wiki page','関連Wikiページを開く');note.className='dashboard-note';row.append(note);}if(task.due_on)row.append(el('time',task.due_on));ul.append(row); } list.append(ul);if(!data.items.length&&!append)list.append(el('p',t('No matching tasks.','該当するタスクはありません。'))); if(data.next){const more=button(t('Load more','続きを表示'),t('Load more','続きを表示'),()=>{more.disabled=true;tasks(tab,true,data.next).finally(()=>{more.disabled=false;});});more.dataset.more='true';panel.append(more);} diff --git a/templates/pages/feeds.gohtml b/templates/pages/feeds.gohtml index ad64835..fbb4d60 100644 --- a/templates/pages/feeds.gohtml +++ b/templates/pages/feeds.gohtml @@ -6,4 +6,4 @@

-
{{ end }} +{{ end }} diff --git a/templates/pages/organizer_dashboard.gohtml b/templates/pages/organizer_dashboard.gohtml index 7bf3569..e0d30ae 100644 --- a/templates/pages/organizer_dashboard.gohtml +++ b/templates/pages/organizer_dashboard.gohtml @@ -4,4 +4,4 @@ {{ template "organizer-nav" . }}

{{ T "organizer.dashboard" }}

{{ .Today }} · {{ .Timezone }}

-
{{ end }} +{{ end }}