aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v5/ao_expand_insertions.rb56
-rw-r--r--lib/sisu/v6/ao_expand_insertions.rb56
2 files changed, 80 insertions, 32 deletions
diff --git a/lib/sisu/v5/ao_expand_insertions.rb b/lib/sisu/v5/ao_expand_insertions.rb
index 483e9fdb..4f4f7ae5 100644
--- a/lib/sisu/v5/ao_expand_insertions.rb
+++ b/lib/sisu/v5/ao_expand_insertions.rb
@@ -81,52 +81,61 @@ module SiSU_AO_Insertions
end
file_type_names={}
file_type_names[:gen],file_type_names[:src]=[],[]
- file_type_names[:gen] <<= if cmd_list =~ /y/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--manifest\b/
"~^ { document manifest }#{lnk[:manifest]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /h/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--html\b/
[
" { html, segmented text }#{lnk[:html_toc]}",
" { html, scroll, document in one }#{lnk[:html_doc]}",
]
end
- file_type_names[:gen] <<= if cmd_list =~ /e/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--epub\b/
[" { epub }#{lnk[:epub]}"]
end
- file_type_names[:gen] <<= if cmd_list =~ /p/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--pdf\b/ \
+ or cmd_list =~ /--pdf-landscape/
[
" { pdf, landscape }#{lnk[:pdf_landscape]}",
+ ]
+ end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--pdf\b/ \
+ or cmd_list =~ /--pdf-portrait/
+ [
" { pdf, portrait }#{lnk[:pdf_portrait]}",
]
end
- file_type_names[:gen] <<= if cmd_list =~ /o/
+ file_type_names[:gen] <<= if cmd_list =~ /\b(?:--odt|--odf)\b/
" { odf:odt, open document text }#{lnk[:odt]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /b/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xhtml\b/
" { xhtml scroll }#{lnk[:xhtml]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /x/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--docbook\b/
+ " { docbook }#{lnk[:docbook]}" #CHECK
+ end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xml-sax\b/
" { xml, sax }#{lnk[:xml_sax]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /X/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xml-dom\b/
" { xml, dom }#{lnk[:xml_dom]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /a/
+ file_type_names[:gen] <<= if cmd_list =~ /\b(?:--txt|--text|--plaintext)\b/
" { plain text utf-8 }#{lnk[:txt]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /g/
- 'wiki.txt'
- end
- file_type_names[:gen] <<= if cmd_list =~ /w/
+ #file_type_names[:gen] <<= if cmd_list =~ /g/
+ # 'wiki.txt'
+ #end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--concordance\b/
" { concordance }#{lnk[:html_concordance]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /N/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--digest\b/
" { dcc, document content certificate (digests) }#{lnk[:digest]}"
end
- file_type_names[:src] <<= if source and cmd_shortcut =~ /s/
+ file_type_names[:src] <<= if source and cmd_shortcut =~ /\b--source\b/
" { markup source text }#{lnk[:source]}"
end
- file_type_names[:src] <<= if cmd_shortcut =~ /S/
+ file_type_names[:src] <<= if cmd_shortcut =~ /\b--sisupod\b/
" { markup source (zipped) pod }#{lnk[:sisupod]}"
end
file_type_names[:gen]=file_type_names[:gen].flatten
@@ -180,6 +189,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn,'xhtml')
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn,'docbook')
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn,'xml_sax')
@@ -254,6 +267,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn,'xhtml')
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn,'docbook')
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn,'xml_sax')
@@ -329,6 +346,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn)
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn)
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn)
@@ -418,6 +439,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_language(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_language(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_language(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_language(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_language(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_language(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_language(m_linked_doc,m_linked_doc_lang).txt,
@@ -436,6 +458,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_filetype(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_filetype(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_filetype(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_filetype(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_filetype(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_filetype(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_filetype(m_linked_doc,m_linked_doc_lang).txt,
@@ -454,6 +477,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_filename(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_filename(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_filename(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_filename(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_filename(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_filename(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_filename(m_linked_doc,m_linked_doc_lang).txt,
diff --git a/lib/sisu/v6/ao_expand_insertions.rb b/lib/sisu/v6/ao_expand_insertions.rb
index 8eb0e5c4..bcbec588 100644
--- a/lib/sisu/v6/ao_expand_insertions.rb
+++ b/lib/sisu/v6/ao_expand_insertions.rb
@@ -81,52 +81,61 @@ module SiSU_AO_Insertions
end
file_type_names={}
file_type_names[:gen],file_type_names[:src]=[],[]
- file_type_names[:gen] <<= if cmd_list =~ /y/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--manifest\b/
"~^ { document manifest }#{lnk[:manifest]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /h/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--html\b/
[
" { html, segmented text }#{lnk[:html_toc]}",
" { html, scroll, document in one }#{lnk[:html_doc]}",
]
end
- file_type_names[:gen] <<= if cmd_list =~ /e/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--epub\b/
[" { epub }#{lnk[:epub]}"]
end
- file_type_names[:gen] <<= if cmd_list =~ /p/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--pdf\b/ \
+ or cmd_list =~ /--pdf-landscape/
[
" { pdf, landscape }#{lnk[:pdf_landscape]}",
+ ]
+ end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--pdf\b/ \
+ or cmd_list =~ /--pdf-portrait/
+ [
" { pdf, portrait }#{lnk[:pdf_portrait]}",
]
end
- file_type_names[:gen] <<= if cmd_list =~ /o/
+ file_type_names[:gen] <<= if cmd_list =~ /\b(?:--odt|--odf)\b/
" { odf:odt, open document text }#{lnk[:odt]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /b/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xhtml\b/
" { xhtml scroll }#{lnk[:xhtml]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /x/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--docbook\b/
+ " { docbook }#{lnk[:docbook]}" #CHECK
+ end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xml-sax\b/
" { xml, sax }#{lnk[:xml_sax]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /X/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--xml-dom\b/
" { xml, dom }#{lnk[:xml_dom]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /a/
+ file_type_names[:gen] <<= if cmd_list =~ /\b(?:--txt|--text|--plaintext)\b/
" { plain text utf-8 }#{lnk[:txt]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /g/
- 'wiki.txt'
- end
- file_type_names[:gen] <<= if cmd_list =~ /w/
+ #file_type_names[:gen] <<= if cmd_list =~ /g/
+ # 'wiki.txt'
+ #end
+ file_type_names[:gen] <<= if cmd_list =~ /\b--concordance\b/
" { concordance }#{lnk[:html_concordance]}"
end
- file_type_names[:gen] <<= if cmd_list =~ /N/
+ file_type_names[:gen] <<= if cmd_list =~ /\b--digest\b/
" { dcc, document content certificate (digests) }#{lnk[:digest]}"
end
- file_type_names[:src] <<= if source and cmd_shortcut =~ /s/
+ file_type_names[:src] <<= if source and cmd_shortcut =~ /\b--source\b/
" { markup source text }#{lnk[:source]}"
end
- file_type_names[:src] <<= if cmd_shortcut =~ /S/
+ file_type_names[:src] <<= if cmd_shortcut =~ /\b--sisupod\b/
" { markup source (zipped) pod }#{lnk[:sisupod]}"
end
file_type_names[:gen]=file_type_names[:gen].flatten
@@ -180,6 +189,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn,'xhtml')
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn,'docbook')
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn,'xml_sax')
@@ -254,6 +267,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn,'xhtml')
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn,'docbook')
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn,'xml_sax')
@@ -329,6 +346,10 @@ module SiSU_AO_Insertions
fn=@md.file.base_filename.xhtml(fnh)
path_and_file(fn)
end
+ def docbook
+ fn=@md.file.base_filename.xml_docbook_book(fnh)
+ path_and_file(fn)
+ end
def xml_sax
fn=@md.file.base_filename.xml_sax(fnh)
path_and_file(fn)
@@ -418,6 +439,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_language(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_language(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_language(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_language(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_language(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_language(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_language(m_linked_doc,m_linked_doc_lang).txt,
@@ -436,6 +458,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_filetype(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_filetype(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_filetype(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_filetype(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_filetype(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_filetype(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_filetype(m_linked_doc,m_linked_doc_lang).txt,
@@ -454,6 +477,7 @@ module SiSU_AO_Insertions
pdf_portrait: by_filename(m_linked_doc,m_linked_doc_lang).pdf_landscape,
odt: by_filename(m_linked_doc,m_linked_doc_lang).odt,
xhtml: by_filename(m_linked_doc,m_linked_doc_lang).xhtml,
+ docbook: by_filename(m_linked_doc,m_linked_doc_lang).docbook,
xml_sax: by_filename(m_linked_doc,m_linked_doc_lang).xml_sax,
xml_dom: by_filename(m_linked_doc,m_linked_doc_lang).xml_dom,
txt: by_filename(m_linked_doc,m_linked_doc_lang).txt,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:19:09 +0000