Isabelle_DOF
/
Isabelle_DOF
1
0
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity

Renamed sideBySideFigure to side_by_side_figure.

This commit is contained in:
Achim D. Brucker 2018-06-11 18:34:41 +01:00
parent 774a5f20e8
commit f4c66cd085
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Isa_DOF.thy
View File

@ -16,7 +16,7 @@ theory Isa_DOF (* Isabelle Document Ontology Framework *)
and "title*" "subtitle*"
"section*" "subsection*" "subsubsection*"
"figure*" "sideBySideFigure*"
"figure*" "side_by_side_figure*"
"paragraph*" "subparagraph*"
"text*" :: thy_decl
@ -547,7 +547,7 @@ val _ =
>> enriched_document_command {markdown = false});
val _ =
Outer_Syntax.command ("sideBySideFigure*", @{here}) "paragraph heading"
Outer_Syntax.command ("side_by_side_figure*", @{here}) "paragraph heading"
(attributes -- Parse.opt_target -- Parse.document_source --| semi
>> enriched_document_command {markdown = false});

15
document-generator/converter/src/main/scala/com/logicalhacking/dof/converter/DofConverter.scala
View File

@ -187,6 +187,21 @@ object DofConverter {
case Nil => (Nil, Nil, false)
case COMMAND("""\isacommand""") :: CURLYOPEN :: RAWTEXT(cmd) :: CURLYOPEN
:: COMMAND("""\isacharasterisk""") :: CURLYCLOSE :: CURLYCLOSE :: ts => (convertIsaDofCommand(cmd, ts), Nil, false)
case COMMAND("""\isacommand""") :: CURLYOPEN :: RAWTEXT(cmd0) ::CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd1) :: CURLYOPEN
:: COMMAND("""\isacharasterisk""") :: CURLYCLOSE :: CURLYCLOSE :: ts => (convertIsaDofCommand(cmd0 + "_" + cmd1, ts), Nil, false)
case COMMAND("""\isacommand""") :: CURLYOPEN :: RAWTEXT(cmd0) ::CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd1) ::CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd2) :: CURLYOPEN
:: COMMAND("""\isacharasterisk""") :: CURLYCLOSE :: CURLYCLOSE :: ts => (convertIsaDofCommand(cmd0 + "_" + cmd1 + "_" + cmd2, ts), Nil, false)
case COMMAND("""\isacommand""") :: CURLYOPEN :: RAWTEXT(cmd0) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd1) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd2) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd3) ::
CURLYOPEN :: COMMAND("""\isacharasterisk""") :: CURLYCLOSE :: CURLYCLOSE :: ts => (convertIsaDofCommand(cmd0 + "_" + cmd1 + "_" + cmd2 + "_" + cmd3, ts), Nil, false)
case COMMAND("""\isacommand""") :: CURLYOPEN :: RAWTEXT(cmd0) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd1) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd2) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd3) ::
CURLYOPEN :: COMMAND("""\isacharunderscore""")::CURLYCLOSE::RAWTEXT(cmd4) ::
CURLYOPEN :: COMMAND("""\isacharasterisk""") :: CURLYCLOSE :: CURLYCLOSE :: ts => (convertIsaDofCommand(cmd0 + "_" + cmd1 + "_" + cmd2 + "_" + cmd3 + "_" + cmd4, ts), Nil, false)
case t :: ts => (t::Nil, ts, true)
}
if (! rec) acc++res

6
examples/math_exam/MathExam/MathExam.thy
View File

@ -3,8 +3,8 @@ theory MathExam
imports "../../../ontologies/mathex_onto"
Real
begin
(*>*)
open_monitor*[exam::MathExam]
(*>*)
section*[idir::Author, affiliation="''CentraleSupelec''",
email="''idir.aitsadoune@centralesupelec.fr''"]
@ -70,7 +70,7 @@ text*[q2::Task, level="threeStars", mark="3::int", type="formal"]
Prove that @{term "n*(n+5) + 2*(n+3) "} is always the product of two numbers with a difference of 5.
*}
(*<*)
close_monitor*[exam]
(*>*)
end