diff --git a/examples/CENELEC_50128/mini_odo/ROOT b/examples/CENELEC_50128/mini_odo/ROOT index 08298124..5bfd2143 100644 --- a/examples/CENELEC_50128/mini_odo/ROOT +++ b/examples/CENELEC_50128/mini_odo/ROOT @@ -1,6 +1,6 @@ session "mini_odo" = "Isabelle_DOF" + options [document = pdf, document_output = "output", document_build = dof, - dof_ontologies = "Isabelle_DOF.technical_report Isabelle_DOF.cenelec_50128", dof_template = "scrreprt-modern"] + dof_ontologies = "Isabelle_DOF.technical_report Isabelle_DOF.cenelec_50128", dof_template = "Isabelle_DOF.scrreprt-modern"] theories "mini_odo" document_files diff --git a/examples/scholarly_paper/2018-cicm-isabelle_dof-applications/ROOT b/examples/scholarly_paper/2018-cicm-isabelle_dof-applications/ROOT index 3b099c90..5ffe11c3 100644 --- a/examples/scholarly_paper/2018-cicm-isabelle_dof-applications/ROOT +++ b/examples/scholarly_paper/2018-cicm-isabelle_dof-applications/ROOT @@ -1,6 +1,6 @@ session "2018-cicm-isabelle_dof-applications" = "Isabelle_DOF" + options [document = pdf, document_output = "output", document_build = dof, - dof_ontologies = "Isabelle_DOF.scholarly_paper", dof_template = lncs, + dof_ontologies = "Isabelle_DOF.scholarly_paper", dof_template = Isabelle_DOF.lncs, quick_and_dirty = true] theories IsaDofApplications diff --git a/examples/scholarly_paper/2020-iFM-CSP/ROOT b/examples/scholarly_paper/2020-iFM-CSP/ROOT index 08f47b20..04a50c90 100644 --- a/examples/scholarly_paper/2020-iFM-CSP/ROOT +++ b/examples/scholarly_paper/2020-iFM-CSP/ROOT @@ -1,6 +1,6 @@ session "2020-iFM-csp" = "Isabelle_DOF" + options [document = pdf, document_output = "output", document_build = dof, - dof_ontologies = "Isabelle_DOF.scholarly_paper", dof_template = scrartcl] + dof_ontologies = "Isabelle_DOF.scholarly_paper", dof_template = Isabelle_DOF.scrartcl] theories "paper" document_files diff --git a/examples/technical_report/Isabelle_DOF-Manual/ROOT b/examples/technical_report/Isabelle_DOF-Manual/ROOT index b6f49cad..4396ec50 100644 --- a/examples/technical_report/Isabelle_DOF-Manual/ROOT +++ b/examples/technical_report/Isabelle_DOF-Manual/ROOT @@ -1,6 +1,6 @@ session "Isabelle_DOF-Manual" = "Isabelle_DOF" + options [document = pdf, document_output = "output", document_build = dof, - dof_ontologies = "Isabelle_DOF.technical_report Isabelle_DOF.cenelec_50128", dof_template = "scrreprt-modern", + dof_ontologies = "Isabelle_DOF.technical_report Isabelle_DOF.cenelec_50128", dof_template = "Isabelle_DOF.scrreprt-modern", quick_and_dirty = true] theories "Isabelle_DOF-Manual" diff --git a/examples/technical_report/TR_my_commented_isabelle/ROOT b/examples/technical_report/TR_my_commented_isabelle/ROOT index 846e7de9..c9134cec 100644 --- a/examples/technical_report/TR_my_commented_isabelle/ROOT +++ b/examples/technical_report/TR_my_commented_isabelle/ROOT @@ -1,6 +1,6 @@ session "TR_MyCommentedIsabelle" = "Isabelle_DOF" + options [document = pdf, document_output = "output", document_build = dof, - dof_ontologies = "Isabelle_DOF.technical_report", dof_template = scrreprt, + dof_ontologies = "Isabelle_DOF.technical_report", dof_template = Isabelle_DOF.scrreprt, quick_and_dirty = true] theories "TR_MyCommentedIsabelle" diff --git a/src/scala/dof_document_build.scala b/src/scala/dof_document_build.scala index fb138a54..ea4360a4 100644 --- a/src/scala/dof_document_build.scala +++ b/src/scala/dof_document_build.scala @@ -45,6 +45,7 @@ object DOF_Document_Build dir: Path, doc: Document_Build.Document_Variant): Document_Build.Directory = { + val regex = """^.*\.""".r val latex_output = new Latex_Output(context.options) val directory = context.prepare_directory(dir, doc, latex_output) @@ -64,7 +65,8 @@ object DOF_Document_Build // copy Isabelle/DOF LaTeX templates val template_dir = dof_home + Path.explode("src/document-templates/") // TODO: error handling in case 1) template does not exist or 2) root.tex does already exist - Isabelle_System.copy_file(template_dir + Path.explode("root-"+context.options.string("dof_template")+".tex"), + val template = regex.replaceAllIn(context.options.string("dof_template"),"") + Isabelle_System.copy_file(template_dir + Path.explode("root-"+template+".tex"), directory.doc_dir+Path.explode("root.tex")) Isabelle_System.copy_file(template_dir + Path.explode("dof-common.tex"), directory.doc_dir) @@ -77,7 +79,6 @@ object DOF_Document_Build } // create ontology.sty - val regex = """^.*\.""".r val ltx_styles = context.options.string("dof_ontologies").split(" +").map(s => regex.replaceAllIn(s,"")) File.write(directory.doc_dir+Path.explode("ontologies.tex"), ltx_styles.mkString("\\usepackage{DOF-","}\n\\usepackage{DOF-","}\n"))