OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
  • HTTPS

modchxj: Commit


Commit MetaInfo

Revision4898 (tree)
Zeit2011-04-22 01:56:42
Autorkonn

Log Message

Merge branch 'branch_0.13.0' into branch_0.13.0-svn

Ändern Zusammenfassung

Diff

--- mod_chxj/branches/RELEASE_0_13_0/configure (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/configure (revision 4898)
@@ -1,6 +1,6 @@
11 #! /bin/sh
22 # Guess values for system-dependent variables and create Makefiles.
3-# Generated by GNU Autoconf 2.67 for mod_chxj 0.13.2.
3+# Generated by GNU Autoconf 2.67 for mod_chxj 0.13.3.
44 #
55 # Report bugs to <konn@users.sourceforge.jp>.
66 #
@@ -701,8 +701,8 @@
701701 # Identity of this package.
702702 PACKAGE_NAME='mod_chxj'
703703 PACKAGE_TARNAME='mod_chxj'
704-PACKAGE_VERSION='0.13.2'
705-PACKAGE_STRING='mod_chxj 0.13.2'
704+PACKAGE_VERSION='0.13.3'
705+PACKAGE_STRING='mod_chxj 0.13.3'
706706 PACKAGE_BUGREPORT='konn@users.sourceforge.jp'
707707 PACKAGE_URL=''
708708
@@ -1447,7 +1447,7 @@
14471447 # Omit some internal or obsolete options to make the list less imposing.
14481448 # This message is too long to be a string in the A/UX 3.1 sh.
14491449 cat <<_ACEOF
1450-\`configure' configures mod_chxj 0.13.2 to adapt to many kinds of systems.
1450+\`configure' configures mod_chxj 0.13.3 to adapt to many kinds of systems.
14511451
14521452 Usage: $0 [OPTION]... [VAR=VALUE]...
14531453
@@ -1518,7 +1518,7 @@
15181518
15191519 if test -n "$ac_init_help"; then
15201520 case $ac_init_help in
1521- short | recursive ) echo "Configuration of mod_chxj 0.13.2:";;
1521+ short | recursive ) echo "Configuration of mod_chxj 0.13.3:";;
15221522 esac
15231523 cat <<\_ACEOF
15241524
@@ -1633,7 +1633,7 @@
16331633 test -n "$ac_init_help" && exit $ac_status
16341634 if $ac_init_version; then
16351635 cat <<\_ACEOF
1636-mod_chxj configure 0.13.2
1636+mod_chxj configure 0.13.3
16371637 generated by GNU Autoconf 2.67
16381638
16391639 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2002,7 +2002,7 @@
20022002 This file contains any messages produced by compilers while
20032003 running configure, to aid debugging if configure makes a mistake.
20042004
2005-It was created by mod_chxj $as_me 0.13.2, which was
2005+It was created by mod_chxj $as_me 0.13.3, which was
20062006 generated by GNU Autoconf 2.67. Invocation command line was
20072007
20082008 $ $0 $@
@@ -2929,7 +2929,7 @@
29292929
29302930 # Define the identity of the package.
29312931 PACKAGE=mod_chxj
2932- VERSION=0.13.2
2932+ VERSION=0.13.3
29332933
29342934
29352935 cat >>confdefs.h <<_ACEOF
@@ -12175,7 +12175,7 @@
1217512175 # report actual input values of CONFIG_FILES etc. instead of their
1217612176 # values after options handling.
1217712177 ac_log="
12178-This file was extended by mod_chxj $as_me 0.13.2, which was
12178+This file was extended by mod_chxj $as_me 0.13.3, which was
1217912179 generated by GNU Autoconf 2.67. Invocation command line was
1218012180
1218112181 CONFIG_FILES = $CONFIG_FILES
@@ -12241,7 +12241,7 @@
1224112241 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1224212242 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1224312243 ac_cs_version="\\
12244-mod_chxj config.status 0.13.2
12244+mod_chxj config.status 0.13.3
1224512245 configured by $0, generated by GNU Autoconf 2.67,
1224612246 with options \\"\$ac_cs_config\\"
1224712247
--- mod_chxj/branches/RELEASE_0_13_0/include/config.h (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/include/config.h (revision 4898)
@@ -100,7 +100,7 @@
100100 #define PACKAGE_NAME "mod_chxj"
101101
102102 /* Define to the full name and version of this package. */
103-#define PACKAGE_STRING "mod_chxj 0.13.2"
103+#define PACKAGE_STRING "mod_chxj 0.13.3"
104104
105105 /* Define to the one symbol short name of this package. */
106106 #define PACKAGE_TARNAME "mod_chxj"
@@ -109,13 +109,13 @@
109109 #define PACKAGE_URL ""
110110
111111 /* Define to the version of this package. */
112-#define PACKAGE_VERSION "0.13.2"
112+#define PACKAGE_VERSION "0.13.3"
113113
114114 /* Define to 1 if you have the ANSI C header files. */
115115 #define STDC_HEADERS 1
116116
117117 /* Version number of package */
118-#define VERSION "0.13.2"
118+#define VERSION "0.13.3"
119119
120120 /* Define to empty if `const' does not conform to ANSI C. */
121121 /* #undef const */
--- mod_chxj/branches/RELEASE_0_13_0/src/chxj_jxhtml.c (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/src/chxj_jxhtml.c (revision 4898)
@@ -2569,7 +2569,7 @@
25692569
25702570 char *vv = s_jxhtml_istyle_to_wap_input_format(doc->buf.pool,attr_istyle);
25712571 W_L(" style=\"");
2572- W_L("-wrap-input-format:");
2572+ W_L("-wap-input-format:");
25732573 W_V(vv);
25742574 W_L(";");
25752575 W_L("\"");
@@ -2579,7 +2579,7 @@
25792579
25802580 char *vv = s_jxhtml_istyle_to_wap_input_format(doc->buf.pool,"4");
25812581 W_L(" style=\"");
2582- W_L("-wrap-input-format:");
2582+ W_L("-wap-input-format:");
25832583 W_V(vv);
25842584 W_L(";");
25852585 W_L("\"");
@@ -6625,6 +6625,8 @@
66256625 Doc *doc;
66266626 Attr *attr;
66276627 char *type = NULL;
6628+ Node *child = NULL;
6629+ char *style;
66286630
66296631 jxhtml = GET_JXHTML(pdoc);
66306632 doc = jxhtml->doc;
@@ -6645,15 +6647,24 @@
66456647 }
66466648 }
66476649
6648- Node *child = qs_get_child_node(doc, node);
6649- if (type && child) {
6650- char *name = qs_get_node_name(doc, child);
6651- if (STRCASEEQ('t','T',"text", name)) {
6652- char *value = qs_get_node_value(doc, child);
6653- DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
6654- jxhtml->style = chxj_css_parse_style_value(doc, jxhtml->style, value);
6655- DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
6650+ if (type) {
6651+ style = "";
6652+ for (child = qs_get_child_node(doc, node);
6653+ child;
6654+ child = qs_get_next_node(doc, child)) {
6655+ char *name = qs_get_node_name(doc, child);
6656+ if (STRCASEEQ('t','T',"text", name)) {
6657+ char *value = qs_get_node_value(doc, child);
6658+ if (value && *value) {
6659+ style = apr_pstrcat(doc->r->pool, style, value, NULL);
6660+ }
6661+ }
66566662 }
6663+ if (strlen(style) > 0) {
6664+ DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
6665+ jxhtml->style = chxj_css_parse_style_value(doc, jxhtml->style, style);
6666+ DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
6667+ }
66576668 }
66586669 return jxhtml->out;
66596670 }
--- mod_chxj/branches/RELEASE_0_13_0/src/chxj_xhtml_mobile_1_0.c (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/src/chxj_xhtml_mobile_1_0.c (revision 4898)
@@ -6277,6 +6277,8 @@
62776277 Doc *doc;
62786278 Attr *attr;
62796279 char *type = NULL;
6280+ Node *child = NULL;
6281+ char *style;
62806282
62816283 xhtml = GET_XHTML(pdoc);
62826284 doc = xhtml->doc;
@@ -6297,15 +6299,24 @@
62976299 }
62986300 }
62996301
6300- Node *child = qs_get_child_node(doc, node);
6301- if (type && child) {
6302- char *name = qs_get_node_name(doc, child);
6303- if (STRCASEEQ('t','T',"text", name)) {
6304- char *value = qs_get_node_value(doc, child);
6305- DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
6306- xhtml->style = chxj_css_parse_style_value(doc, xhtml->style, value);
6307- DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
6302+ if (type) {
6303+ style = "";
6304+ for (child = qs_get_child_node(doc, node);
6305+ child;
6306+ child = qs_get_next_node(doc, child)) {
6307+ char *name = qs_get_node_name(doc, child);
6308+ if (STRCASEEQ('t','T',"text", name)) {
6309+ char *value = qs_get_node_value(doc, child);
6310+ if (value && *value) {
6311+ style = apr_pstrcat(doc->r->pool, style, value, NULL);
6312+ }
6313+ }
63086314 }
6315+ if (strlen(style) > 0) {
6316+ DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
6317+ xhtml->style = chxj_css_parse_style_value(doc, xhtml->style, style);
6318+ DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
6319+ }
63096320 }
63106321 return xhtml->out;
63116322 }
--- mod_chxj/branches/RELEASE_0_13_0/src/chxj_ixhtml10.c (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/src/chxj_ixhtml10.c (revision 4898)
@@ -6633,6 +6633,8 @@
66336633 Doc *doc;
66346634 Attr *attr;
66356635 char *type = NULL;
6636+ Node *child = NULL;
6637+ char *style;
66366638
66376639 ixhtml10 = GET_IXHTML10(pdoc);
66386640 doc = ixhtml10->doc;
@@ -6653,15 +6655,24 @@
66536655 }
66546656 }
66556657
6656- Node *child = qs_get_child_node(doc, node);
6657- if (type && child) {
6658- char *name = qs_get_node_name(doc, child);
6659- if (STRCASEEQ('t','T',"text", name)) {
6660- char *value = qs_get_node_value(doc, child);
6661- DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
6662- ixhtml10->style = chxj_css_parse_style_value(doc, ixhtml10->style, value);
6663- DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
6658+ if (type) {
6659+ style = "";
6660+ for (child = qs_get_child_node(doc, node);
6661+ child;
6662+ child = qs_get_next_node(doc, child)) {
6663+ char *name = qs_get_node_name(doc, child);
6664+ if (STRCASEEQ('t','T',"text", name)) {
6665+ char *value = qs_get_node_value(doc, child);
6666+ if (value && *value) {
6667+ style = apr_pstrcat(doc->r->pool, style, value, NULL);
6668+ }
6669+ }
66646670 }
6671+ if (strlen(style) > 0) {
6672+ DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),style);
6673+ ixhtml10->style = chxj_css_parse_style_value(doc, ixhtml10->style, style);
6674+ DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),style);
6675+ }
66656676 }
66666677 return ixhtml10->out;
66676678 }
--- mod_chxj/branches/RELEASE_0_13_0/ChangeLog (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/ChangeLog (revision 4898)
@@ -1,3 +1,11 @@
1+libapache2-mod-chxj (0.13.3-1) unstable; urgency=low
2+
3+ * Fixed Bug
4+ - wrap-input-format --> wap-input-format
5+ - When CrLf is contained in the style tag, it is not read correctly.
6+
7+ -- Atsushi Konno <konn@users.sourceforge.jp> Sat, 02 Apr 2011 17:35:24 +0900
8+
19 libapache2-mod-chxj (0.13.2-1) unstable; urgency=low
210
311 * Fixed Bug
--- mod_chxj/branches/RELEASE_0_13_0/configure.ac (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/configure.ac (revision 4898)
@@ -1,6 +1,6 @@
11 # -*- Autoconf -*-
22 # Process this file with autoconf to produce a configure script.
3-AC_INIT([mod_chxj],[0.13.2],[konn@users.sourceforge.jp])
3+AC_INIT([mod_chxj],[0.13.3],[konn@users.sourceforge.jp])
44 AC_PREREQ(2.59)
55 AC_CONFIG_SRCDIR([src/mod_chxj.c])
66 AC_CANONICAL_TARGET
--- mod_chxj/branches/RELEASE_0_13_0/support/freebsd/Makefile (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/support/freebsd/Makefile (revision 4898)
@@ -6,13 +6,13 @@
66 #
77
88 PORTNAME= mod_chxj
9-PORTVERSION= 0.13.2
9+PORTVERSION= 0.13.3
1010 PORTREVISION= 1
1111 PORTEPOCH= 1
1212 CATEGORIES= www
1313 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=modchxj/51413/}
1414 PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
15-DISTNAME= mod-chxj_0.13.2
15+DISTNAME= mod-chxj_0.13.3
1616 EXTRACT_SUFX= .src.tar.gz
1717
1818 MAINTAINER= konno@qsdn.co.jp
--- mod_chxj/branches/RELEASE_0_13_0/support/centos/mod-chxj.spec (revision 4897)
+++ mod_chxj/branches/RELEASE_0_13_0/support/centos/mod-chxj.spec (revision 4898)
@@ -1,4 +1,4 @@
1-%define version 0.13.2
1+%define version 0.13.3
22
33 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
44 Name: mod_chxj
Show on old repository browser