From dc6019413c4609c49322e80d1ec2b089e85486f3 Mon Sep 17 00:00:00 2001 From: Melven Roehrig-Zoellner Date: Mon, 1 Aug 2016 18:07:04 +0200 Subject: Also map .f95, .f03 and .f08 file types to Fortran These are for Fortran 95, Fortran 2003 and Fortran 2008, respectively. --- src/config.xml | 3 +++ src/util.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/config.xml b/src/config.xml index abed704..4c13e9c 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1337,6 +1337,9 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" + + + diff --git a/src/util.cpp b/src/util.cpp index c630449..fbb5855 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -7132,6 +7132,9 @@ void initDefaultExtensionMapping() updateLanguageMapping(".f", "fortran"); updateLanguageMapping(".for", "fortran"); updateLanguageMapping(".f90", "fortran"); + updateLanguageMapping(".f95", "fortran"); + updateLanguageMapping(".f03", "fortran"); + updateLanguageMapping(".f08", "fortran"); updateLanguageMapping(".vhd", "vhdl"); updateLanguageMapping(".vhdl", "vhdl"); updateLanguageMapping(".tcl", "tcl"); -- cgit v0.12 From 2bcf196332084067c3d2409fa07992a6b833473d Mon Sep 17 00:00:00 2001 From: Artur Kink Date: Sun, 7 Aug 2016 21:32:01 -0400 Subject: Parse more than 1 size indiction in defaultHandleTitleAndSize --- src/docparser.cpp | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/docparser.cpp b/src/docparser.cpp index 5dfa7b3..f06f6cd 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -1264,9 +1264,6 @@ static void defaultHandleTitleAndSize(const int cmd, DocNode *parent, QListname=="width=" || g_token->name=="height=")) { // special case: no title, but we do have a size indicator - doctokenizerYYsetStateTitleAttrValue(); - // strip = - g_token->name = g_token->name.left(g_token->name.length()-1); break; } if (!defaultHandleToken(parent,tok,children)) @@ -1293,21 +1290,32 @@ static void defaultHandleTitleAndSize(const int cmd, DocNode *parent, QListname=="width") + if(tok == TK_WORD) { - width = g_token->chars; - } - else if (g_token->name=="height") - { - height = g_token->chars; - } - else - { - warn_doc_error(g_fileName,doctokenizerYYlineno,"Unknown option '%s' after \\%s command, expected 'width' or 'height'", - qPrint(g_token->name), Mappers::cmdMapper->find(cmd).data()); + if (g_token->name=="width=" || g_token->name=="height=") + { + doctokenizerYYsetStateTitleAttrValue(); + g_token->name = g_token->name.left(g_token->name.length()-1); + } + + if (g_token->name=="width") + { + width = g_token->chars; + } + else if (g_token->name=="height") + { + height = g_token->chars; + } + else + { + warn_doc_error(g_fileName,doctokenizerYYlineno,"Unknown option '%s' after \\%s command, expected 'width' or 'height'", + qPrint(g_token->name), Mappers::cmdMapper->find(cmd).data()); + break; + } } + tok=doctokenizerYYlex(); } doctokenizerYYsetStatePara(); -- cgit v0.12 From 360987c61462c185942e5055a345dd777920216a Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 17 Aug 2016 09:32:29 +0200 Subject: Missing semicolon in navtree.css Added missing semicolon in navtree,css --- templates/html/navtree.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/html/navtree.css b/templates/html/navtree.css index d6b54b5..7d1cb67 100644 --- a/templates/html/navtree.css +++ b/templates/html/navtree.css @@ -96,7 +96,7 @@ .ui-resizable-e { background-image:url("splitbar.png"); background-size:100%; - background-repeat:no-repeat + background-repeat:no-repeat; background-attachment: scroll; cursor:ew-resize; height:100%; -- cgit v0.12 From 0f047eb1862193713889d10bccb4894df1f7c23d Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 18 Aug 2016 18:21:41 +0200 Subject: Color code word RESULT as keyword in FORTRAN code --- src/fortrancode.l | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/fortrancode.l b/src/fortrancode.l index f14867c..4cd1b3a 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -925,7 +925,12 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I startScope(); generateLink(*g_code,yytext); } -"(".* { // ignore rest of line +"result"/{BS}"("[^)]*")" { + startFontClass("keyword"); + codifyLines(yytext); + endFontClass(); + } +"("[^)]*")" { // ignore rest of line codifyLines(yytext); } "\n" { codifyLines(yytext); -- cgit v0.12 From 3f559575d63f2fd29888107afae85f4cc902b189 Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 19 Aug 2016 13:38:38 +0200 Subject: Color code word OPERATOR and ASSIGNMENT as keyword in FORTRAN code --- src/fortrancode.l | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/fortrancode.l b/src/fortrancode.l index f14867c..d5cf663 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -1123,6 +1123,16 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I codifyLines(yytext); endFontClass(); } +<*>"assignment"/{BS}"("{BS}"="{BS}")" { + startFontClass("keyword"); + codifyLines(yytext); + endFontClass(); + } +<*>"operator"/{BS}"("[^)]*")" { + startFontClass("keyword"); + codifyLines(yytext); + endFontClass(); + } /*------ preprocessor --------------------------------------------*/ "#".*\n { -- cgit v0.12 From 4c2e91c10dc6d007c410cd282a00fc7a42d38a0d Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 21 Aug 2016 10:07:28 +0200 Subject: Documentation for extensions .f95, .f03 and .f08 Added documentation for pull request #495 --- doc/starting.doc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/starting.doc b/doc/starting.doc index f82e90d..bfb8e8f 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -126,6 +126,9 @@ Extension | Language .f |Fortran .for |Fortran .f90 |Fortran +.f95 |Fortran +.f03 |Fortran +.f08 |Fortran .vhd |VHDL .vhdl |VHDL .tcl |TCL -- cgit v0.12