diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 55ca433..5f892a7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - build: + test-ubuntu-gcc: runs-on: ubuntu-latest @@ -19,3 +19,24 @@ jobs: run: make - name: make test run: make test + + test-windows-msys2-UCRT64: + + runs-on: windows-latest + + defaults: + run: + shell: msys2 {0} + + steps: + - uses: msys2/setup-msys2@v2 + with: + msystem: UCRT64 + install: make mingw-w64-ucrt-x86_64-gcc + - uses: actions/checkout@v6 + - name: configure + run: ./configure + - name: make + run: make + - name: make test + run: make test diff --git a/include/bibtool/resource.h b/include/bibtool/resource.h index 1fc6724..660b9d4 100644 --- a/include/bibtool/resource.h +++ b/include/bibtool/resource.h @@ -149,7 +149,7 @@ RSC_NEXT('p') RscBoolean( "print.parentheses" , r_pp ,rsc_parentheses , false ) RscBoolean( "print.terminal.comma" , r_ptc ,rsc_print_tc , false ) RscBoolean( "print.use.tab" , r_put ,rsc_use_tabs , true ) - RscBoolean( "print.wide.equal" , r_pwe ,rsc_print_we , true ) + RscBoolean( "print.wide.equal" , r_pwe ,rsc_print_we , false ) RSC_NEXT('q') RscBoolean( "quiet" , r_q ,rsc_quiet , false ) RSC_NEXT('r') diff --git a/include/bibtool/rsc.h b/include/bibtool/rsc.h index 1dac968..4fc580a 100644 --- a/include/bibtool/rsc.h +++ b/include/bibtool/rsc.h @@ -33,7 +33,7 @@ ******************************************************************************/ #include - +#warning ##RSC_BIBTOOL_DEFAULT #ifdef RSC_INIT #define RscNumeric(SYM,S,V,I) int V = I; #define RscString(SYM,S,V,I) String V = (String)I; diff --git a/print.c b/print.c index 795c20e..2360080 100644 --- a/print.c +++ b/print.c @@ -449,11 +449,13 @@ static void print_equation(pre, lhs, rhs, align, fct)/* */ else if ( rsc_print_we && column > align - 2 ) /* */ { PUTC(' '); } /* */ else if ( rsc_eq_right ) /* */ - { indent(align - (rsc_print_we ? 3: align_auto? 1 : 2), fct); }/* */ + { indent(align - ((rsc_print_we || !align_auto) ? 2 : 1), fct); }/* */ else if ( column < align || rsc_print_we ) /* */ { PUTC(' '); } /* */ /* */ - PUTS(rsc_print_we ? " = " : "="); /* */ + PUTC('='); /* */ + if ( rsc_print_we && column > align ) + { PUTC(' '); } /* */ line_breaking(SymbolValue(rhs), align, fct); /* */ } /*------------------------*/