Skip to content

Commit 596ab42

Browse files
committed
Merge branch 'master' of github.com:doxygen/doxygen
2 parents 0bcc24b + d0128c2 commit 596ab42

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/build_cmake.yml

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
sudo apt update
158158
sudo apt remove llvm-14 llvm-14-dev llvm-14-tools llvm-14-runtime clang-14 clang-format-14 libclang-common-14-dev libclang-cpp14 libclang1-14 libllvm14
159159
sudo apt remove llvm-15 llvm-15-dev llvm-15-tools llvm-15-runtime clang-15 clang-format-15 libclang-common-15-dev libclang-cpp15 libclang1-15 libllvm15
160+
sudo apt remove llvm-16 llvm-16-dev llvm-16-tools llvm-16-runtime clang-16 clang-format-16 libclang-common-16-dev libclang-cpp16 libclang1-16 libllvm16
160161
sudo apt-get autoremove
161162
sudo apt-get clean
162163
sudo apt install -y libclang-common-18-dev libclang-18-dev clang-18 llvm-18 llvm-18-dev

.github/workflows/docker_publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Log in to the Container registry
23-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
23+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
2424
with:
2525
registry: ${{ env.REGISTRY }}
2626
username: ${{ github.actor }}

src/docnode.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1360,8 +1360,8 @@ Token DocHtmlHeader::parse()
13601360
}
13611361
break;
13621362
default:
1363-
char tmp[20];
1364-
qsnprintf(tmp,20,"<h%d>tag",m_level);
1363+
char tmp[20];
1364+
qsnprintf(tmp,20,"<h%d> tag",m_level);
13651365
parser()->errorHandleDefaultToken(thisVariant(),tok,children(),tmp);
13661366
}
13671367
}
@@ -2824,7 +2824,7 @@ Token DocAutoList::parse()
28242824
int num=1;
28252825
auto ns = AutoNodeStack(parser(),thisVariant());
28262826
parser()->tokenizer.startAutoList();
2827-
// first item or sub list => create new list
2827+
// first item or sub list => create new list
28282828
do
28292829
{
28302830
switch (parser()->context.token->id)
@@ -2851,7 +2851,7 @@ Token DocAutoList::parse()
28512851
}
28522852
while (retval.is(TokenRetval::TK_LISTITEM) && // new list item
28532853
m_indent==parser()->context.token->indent && // at same indent level
2854-
m_isEnumList==parser()->context.token->isEnumList && // of the same kind
2854+
m_isEnumList==parser()->context.token->isEnumList && // of the same kind
28552855
m_isCheckedList==parser()->context.token->isCheckedList && // of the same kind
28562856
(parser()->context.token->id==-1 || parser()->context.token->id>=num) // increasing number (or no number or checked list)
28572857
);
@@ -5761,7 +5761,7 @@ Token DocPara::parse()
57615761
}
57625762
INTERNAL_ASSERT(retval.is_any_of(TokenRetval::TK_NONE,TokenRetval::TK_EOF,TokenRetval::TK_NEWPARA,TokenRetval::TK_LISTITEM,
57635763
TokenRetval::TK_ENDLIST,TokenRetval::RetVal_OK)
5764-
);
5764+
);
57655765

57665766
AUTO_TRACE_EXIT("retval={}",retval.to_string());
57675767
return retval;
@@ -5951,11 +5951,11 @@ void DocText::parse()
59515951
switch(tok.value())
59525952
{
59535953
case TokenRetval::TK_WORD:
5954-
children().append<DocWord>(parser(),thisVariant(),parser()->context.token->name);
5955-
break;
5954+
children().append<DocWord>(parser(),thisVariant(),parser()->context.token->name);
5955+
break;
59565956
case TokenRetval::TK_WHITESPACE:
59575957
children().append<DocWhiteSpace>(parser(),thisVariant(),parser()->context.token->chars);
5958-
break;
5958+
break;
59595959
case TokenRetval::TK_SYMBOL:
59605960
{
59615961
HtmlEntityMapper::SymType s = DocSymbol::decodeSymbol(parser()->context.token->name);

0 commit comments

Comments
 (0)